Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Theme change. Render custom date ranges.

Mike Cao039dcd96e619
diff --git a/package.json b/package.json
index d096916e0..c44f56ff4 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
"@prisma/extension-read-replicas": "^0.4.1",
"@react-spring/web": "^9.7.3",
"@tanstack/react-query": "^5.74.11",
- "@umami/react-zen": "^0.87.0",
+ "@umami/react-zen": "^0.88.0",
"@umami/redis-client": "^0.27.0",
"bcryptjs": "^2.4.3",
"chalk": "^4.1.1",
@@ -104,6 +104,7 @@
"isbot": "^5.1.27",
"jsonwebtoken": "^9.0.2",
"kafkajs": "^2.1.0",
+ "lucide-react": "^0.503.0",
"maxmind": "^4.3.24",
"md5": "^2.3.0",
"next": "15.3.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b2137d0f2..69ec6a106 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,8 +39,8 @@ importers:
specifier: ^5.74.11
version: 5.74.11([email protected])
'@umami/react-zen':
- specifier: ^0.87.0
+ specifier: ^0.88.0
'@umami/redis-client':
specifier: ^0.27.0
version: 0.27.0
@@ -116,6 +116,9 @@ importers:
kafkajs:
specifier: ^2.1.0
version: 2.2.4
+ lucide-react:
+ specifier: ^0.503.0
+ version: 0.503.0([email protected])
maxmind:
specifier: ^4.3.24
version: 4.3.24
@@ -385,6 +388,8 @@ importers:
specifier: ^4.3.8
+ src/generated/prisma: {}
+
packages:
'@ampproject/[email protected]':
@@ -2855,6 +2860,9 @@ packages:
resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}
+ resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==}
+
resolution: {integrity: sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==}
@@ -3103,8 +3111,8 @@ packages:
resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==}
engines: {node: ^16.0.0 || >=18.0.0}
- '@umami/[email protected]':
- resolution: {integrity: sha512-zgsvY54ykQ1jW5YTmvZkNa9JNPspjcJneyhQn6YGrWHBlpr9ddPttBWAr2muQM2WrKFEYHx31WKLnBlzGg2lgg==}
+ '@umami/[email protected]':
+ resolution: {integrity: sha512-7LumLMHAUCzXM1f/2JfkU+/V4eMFDSlJTfx+fsF2IQDICGCrDCv92R2Q8tzHYsi5VXzgiiy2B/55wmMWyc3vig==}
resolution: {integrity: sha512-SbHTpxhgeZyTBUSp2zdZM+XUtpsaSL4Tad8QXIEhEtjWhvvfoornyT5kLuyYCVtzSAT4daALeGmOO1z6EE1KcA==}
@@ -4619,6 +4627,10 @@ packages:
engines: {node: '>=16 || 14 >=14.17'}
hasBin: true
+ resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
+ hasBin: true
+
resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
deprecated: Glob versions prior to v9 are no longer supported
@@ -5076,6 +5088,9 @@ packages:
resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
engines: {node: '>=14'}
+ resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
+
resolution: {integrity: sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==}
engines: {node: '>=10'}
@@ -5482,6 +5497,11 @@ packages:
peerDependencies:
react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+ resolution: {integrity: sha512-HGGkdlPWQ0vTF8jJ5TdIqhQXZi6uh3LnNgfZ8MHiuxFfX3RZeA79r2MW2tHAZKlAVfoNE8esm3p+O6VkIvpj6w==}
+ peerDependencies:
+ react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
@@ -5845,6 +5865,9 @@ packages:
resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
engines: {node: '>=6'}
+ resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
+
resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
engines: {node: '>=6'}
@@ -6477,6 +6500,12 @@ packages:
peerDependencies:
react: ^16.8.0 || ^17 || ^18 || ^19
+ resolution: {integrity: sha512-qWAVokhSpshhcEuQDSANHx3jiAEFzu2HAaaQIzi/r9FNPm1ioAvuJSD4EuZzWd7Al7nTRKcKPnBKO7sRn+zavQ==}
+ engines: {node: '>=18.0.0'}
+ peerDependencies:
+ react: ^16.8.0 || ^17 || ^18 || ^19
+
resolution: {integrity: sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==}
peerDependencies:
@@ -9062,20 +9091,20 @@ snapshots:
'@internationalized/[email protected]':
dependencies:
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
'@internationalized/[email protected]':
dependencies:
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
intl-messageformat: 10.7.16
'@internationalized/[email protected]':
dependencies:
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
'@internationalized/[email protected]':
dependencies:
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
'@isaacs/[email protected]':
dependencies:
@@ -9424,7 +9453,7 @@ snapshots:
'@react-types/autocomplete': 3.0.0-alpha.30([email protected])
'@react-types/button': 3.12.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9435,7 +9464,7 @@ snapshots:
'@react-types/breadcrumbs': 3.7.12([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9447,7 +9476,7 @@ snapshots:
'@react-stately/toggle': 3.8.3([email protected])
'@react-types/button': 3.12.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9462,7 +9491,7 @@ snapshots:
'@react-types/button': 3.12.0([email protected])
'@react-types/calendar': 3.7.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9478,7 +9507,7 @@ snapshots:
'@react-stately/toggle': 3.8.3([email protected])
'@react-types/checkbox': 3.9.3([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9488,7 +9517,7 @@ snapshots:
'@react-aria/ssr': 3.9.8([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
use-sync-external-store: 1.5.0([email protected])
@@ -9507,7 +9536,7 @@ snapshots:
'@react-stately/form': 3.1.3([email protected])
'@react-types/color': 3.0.4([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9528,7 +9557,7 @@ snapshots:
'@react-types/button': 3.12.0([email protected])
'@react-types/combobox': 3.13.4([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9551,7 +9580,7 @@ snapshots:
'@react-types/datepicker': 3.12.0([email protected])
'@react-types/dialog': 3.5.17([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9562,7 +9591,7 @@ snapshots:
'@react-types/dialog': 3.5.17([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9572,7 +9601,7 @@ snapshots:
'@react-stately/disclosure': 3.0.3([email protected])
'@react-types/button': 3.12.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9587,7 +9616,7 @@ snapshots:
'@react-stately/dnd': 3.5.3([email protected])
'@react-types/button': 3.12.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9596,7 +9625,7 @@ snapshots:
'@react-aria/interactions': 3.25.0([email protected]([email protected]))([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
clsx: 2.1.1
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9607,7 +9636,7 @@ snapshots:
'@react-stately/form': 3.1.3([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9625,7 +9654,7 @@ snapshots:
'@react-types/checkbox': 3.9.3([email protected])
'@react-types/grid': 3.3.1([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9641,7 +9670,7 @@ snapshots:
'@react-stately/list': 3.12.1([email protected])
'@react-stately/tree': 3.8.9([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9654,7 +9683,7 @@ snapshots:
'@react-aria/ssr': 3.9.8([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9664,7 +9693,7 @@ snapshots:
'@react-stately/flags': 3.1.1
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9672,7 +9701,7 @@ snapshots:
dependencies:
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9680,7 +9709,7 @@ snapshots:
dependencies:
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
use-sync-external-store: 1.5.0([email protected])
@@ -9691,7 +9720,7 @@ snapshots:
'@react-types/link': 3.6.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9705,13 +9734,13 @@ snapshots:
'@react-stately/list': 3.12.1([email protected])
'@react-types/listbox': 3.6.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
'@react-aria/[email protected]':
dependencies:
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
dependencies:
@@ -9728,7 +9757,7 @@ snapshots:
'@react-types/button': 3.12.0([email protected])
'@react-types/menu': 3.10.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9737,7 +9766,7 @@ snapshots:
'@react-aria/progress': 3.4.22([email protected]([email protected]))([email protected])
'@react-types/meter': 3.4.8([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9753,7 +9782,7 @@ snapshots:
'@react-types/button': 3.12.0([email protected])
'@react-types/numberfield': 3.8.10([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9769,7 +9798,7 @@ snapshots:
'@react-types/button': 3.12.0([email protected])
'@react-types/overlays': 3.8.14([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9780,7 +9809,7 @@ snapshots:
'@react-types/progress': 3.5.11([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9795,7 +9824,7 @@ snapshots:
'@react-stately/radio': 3.10.12([email protected])
'@react-types/radio': 3.8.8([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9808,7 +9837,7 @@ snapshots:
'@react-types/button': 3.12.0([email protected])
'@react-types/searchfield': 3.6.1([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9827,7 +9856,7 @@ snapshots:
'@react-types/button': 3.12.0([email protected])
'@react-types/select': 3.9.11([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9839,7 +9868,7 @@ snapshots:
'@react-stately/selection': 3.20.1([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9847,7 +9876,7 @@ snapshots:
dependencies:
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9860,7 +9889,7 @@ snapshots:
'@react-stately/slider': 3.6.3([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/slider': 3.7.10([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9871,13 +9900,13 @@ snapshots:
'@react-types/button': 3.12.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
dependencies:
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -9886,7 +9915,7 @@ snapshots:
'@react-stately/toggle': 3.8.3([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/switch': 3.5.10([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9906,7 +9935,7 @@ snapshots:
'@react-types/grid': 3.3.1([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/table': 3.12.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9919,7 +9948,7 @@ snapshots:
'@react-stately/tabs': 3.8.1([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/tabs': 3.3.14([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9934,7 +9963,7 @@ snapshots:
'@react-stately/list': 3.12.1([email protected])
'@react-types/button': 3.12.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9948,7 +9977,7 @@ snapshots:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/textfield': 3.12.1([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9961,7 +9990,7 @@ snapshots:
'@react-stately/toast': 3.1.0([email protected])
'@react-types/button': 3.12.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9972,7 +10001,7 @@ snapshots:
'@react-stately/toggle': 3.8.3([email protected])
'@react-types/checkbox': 3.9.3([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9982,7 +10011,7 @@ snapshots:
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -9993,7 +10022,7 @@ snapshots:
'@react-stately/tooltip': 3.5.3([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/tooltip': 3.4.16([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -10006,7 +10035,7 @@ snapshots:
'@react-stately/tree': 3.8.9([email protected])
'@react-types/button': 3.12.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -10016,7 +10045,7 @@ snapshots:
'@react-stately/flags': 3.1.1
'@react-stately/utils': 3.10.6([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
clsx: 2.1.1
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -10028,7 +10057,7 @@ snapshots:
'@react-stately/virtualizer': 4.3.2([email protected]([email protected]))([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -10037,7 +10066,7 @@ snapshots:
'@react-aria/interactions': 3.25.0([email protected]([email protected]))([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -10076,7 +10105,7 @@ snapshots:
dependencies:
'@react-stately/utils': 3.10.6([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10085,7 +10114,7 @@ snapshots:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/calendar': 3.7.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10094,13 +10123,13 @@ snapshots:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/checkbox': 3.9.3([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
dependencies:
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10113,7 +10142,7 @@ snapshots:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/color': 3.0.4([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10126,13 +10155,13 @@ snapshots:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/combobox': 3.13.4([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
dependencies:
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10144,31 +10173,31 @@ snapshots:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/datepicker': 3.12.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
dependencies:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
dependencies:
'@react-stately/selection': 3.20.1([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
'@react-stately/[email protected]':
dependencies:
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
dependencies:
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10177,7 +10206,7 @@ snapshots:
'@react-stately/selection': 3.20.1([email protected])
'@react-types/grid': 3.3.1([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10188,7 +10217,7 @@ snapshots:
'@react-types/grid': 3.3.1([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/table': 3.12.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -10198,7 +10227,7 @@ snapshots:
'@react-stately/selection': 3.20.1([email protected])
'@react-stately/utils': 3.10.6([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10206,7 +10235,7 @@ snapshots:
'@react-stately/overlays': 3.6.15([email protected])
'@react-types/menu': 3.10.0([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10215,14 +10244,14 @@ snapshots:
'@react-stately/form': 3.1.3([email protected])
'@react-stately/utils': 3.10.6([email protected])
'@react-types/numberfield': 3.8.10([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
dependencies:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/overlays': 3.8.14([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10231,14 +10260,14 @@ snapshots:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/radio': 3.8.8([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
dependencies:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/searchfield': 3.6.1([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10248,7 +10277,7 @@ snapshots:
'@react-stately/overlays': 3.6.15([email protected])
'@react-types/select': 3.9.11([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10256,7 +10285,7 @@ snapshots:
'@react-stately/collections': 3.12.3([email protected])
'@react-stately/utils': 3.10.6([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10264,7 +10293,7 @@ snapshots:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/slider': 3.7.10([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10277,7 +10306,7 @@ snapshots:
'@react-types/grid': 3.3.1([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/table': 3.12.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10285,12 +10314,12 @@ snapshots:
'@react-stately/list': 3.12.1([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/tabs': 3.3.14([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
dependencies:
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
use-sync-external-store: 1.5.0([email protected])
@@ -10299,14 +10328,14 @@ snapshots:
'@react-stately/utils': 3.10.6([email protected])
'@react-types/checkbox': 3.9.3([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
dependencies:
'@react-stately/overlays': 3.6.15([email protected])
'@react-types/tooltip': 3.4.16([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
@@ -10315,19 +10344,19 @@ snapshots:
'@react-stately/selection': 3.20.1([email protected])
'@react-stately/utils': 3.10.6([email protected])
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
dependencies:
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
dependencies:
'@react-types/shared': 3.29.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -10692,6 +10721,10 @@ snapshots:
dependencies:
tslib: 2.8.1
+ dependencies:
+ tslib: 2.8.1
+
dependencies:
tslib: 2.8.1
@@ -10983,21 +11016,21 @@ snapshots:
'@typescript-eslint/types': 6.21.0
eslint-visitor-keys: 3.4.3
dependencies:
'@fontsource/jetbrains-mono': 5.2.5
'@internationalized/date': 3.8.0
classnames: 2.5.1
- glob: 10.3.10
+ glob: 10.4.5
highlight.js: 11.11.1
lucide-react: 0.479.0([email protected])
react: 19.1.0
react-dom: 19.1.0([email protected])
- react-hook-form: 7.55.0([email protected])
+ react-hook-form: 7.56.1([email protected])
react-icons: 5.5.0([email protected])
thenby: 1.3.4
@@ -12836,6 +12869,15 @@ snapshots:
minipass: 7.1.2
path-scurry: 1.11.1
+ dependencies:
+ foreground-child: 3.3.1
+ jackspeak: 3.4.3
+ minimatch: 9.0.5
+ minipass: 7.1.2
+ package-json-from-dist: 1.0.1
+ path-scurry: 1.11.1
+
dependencies:
fs.realpath: 1.0.0
@@ -13280,6 +13322,12 @@ snapshots:
optionalDependencies:
'@pkgjs/parseargs': 0.11.0
+ dependencies:
+ '@isaacs/cliui': 8.0.2
+ optionalDependencies:
+ '@pkgjs/parseargs': 0.11.0
+
dependencies:
async: 3.2.6
@@ -13874,6 +13922,10 @@ snapshots:
dependencies:
react: 19.1.0
+ dependencies:
+ react: 19.1.0
+
dependencies:
'@jridgewell/sourcemap-codec': 1.5.0
@@ -14265,6 +14317,8 @@ snapshots:
+
dependencies:
callsites: 3.1.0
@@ -14846,7 +14900,7 @@ snapshots:
'@react-types/grid': 3.3.1([email protected])
'@react-types/shared': 3.29.0([email protected])
'@react-types/table': 3.12.0([email protected])
- '@swc/helpers': 0.5.15
+ '@swc/helpers': 0.5.17
client-only: 0.0.1
react: 19.1.0
@@ -14931,6 +14985,10 @@ snapshots:
dependencies:
react: 19.1.0
+ dependencies:
+ react: 19.1.0
+
dependencies:
react: 19.1.0
diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx
index 258d2fdd9..2fe47d57a 100644
--- a/src/app/(main)/App.tsx
+++ b/src/app/(main)/App.tsx
@@ -38,7 +38,7 @@ export function App({ children }) {
gridRow="2 / 3"
alignItems="center"
overflow="auto"
- backgroundColor="0"
+ backgroundColor="2"
>
<Page>
{children}
diff --git a/src/app/(main)/MenuBar.tsx b/src/app/(main)/MenuBar.tsx
index 9f74f21b8..310cbf6a0 100644
--- a/src/app/(main)/MenuBar.tsx
+++ b/src/app/(main)/MenuBar.tsx
@@ -17,7 +17,7 @@ export function MenuBar(props: RowProps) {
paddingY="3"
paddingX="3"
paddingRight="5"
- backgroundColor="0"
+ backgroundColor="2"
style={{ borderBottom: '1px solid var(--border-color)' }}
>
<Row>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
index c7412449b..05c0a04b2 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
@@ -17,6 +17,7 @@ import { RegionsTable } from '@/components/metrics/RegionsTable';
import { ScreenTable } from '@/components/metrics/ScreenTable';
import { TagsTable } from '@/components/metrics/TagsTable';
import { ChannelsTable } from '@/components/metrics/ChannelsTable';
+import { Panel } from '@/components/common/Panel';
const views = {
url: PagesTable,
@@ -145,15 +146,17 @@ export function WebsiteExpandedView({
<SideBar items={items} selectedKey={view} />
</Column>
<Column>
- <DetailsComponent
- websiteId={websiteId}
- domainName={domainName}
- animate={false}
- virtualize={true}
- itemCount={25}
- allowFilter={true}
- allowSearch={true}
- />
+ <Panel>
+ <DetailsComponent
+ websiteId={websiteId}
+ domainName={domainName}
+ animate={false}
+ virtualize={true}
+ itemCount={25}
+ allowFilter={true}
+ allowSearch={true}
+ />
+ </Panel>
</Column>
</Grid>
);
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
index fb93a8601..8aefdcf5b 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
@@ -8,7 +8,6 @@ import { EventsMetricsBar } from './EventsMetricsBar';
import { Panel } from '@/components/common/Panel';
import { EventsChart } from '@/components/metrics/EventsChart';
import { GridRow } from '@/components/common/GridRow';
-import { MetricsTable } from '@/components/metrics/MetricsTable';
import { useMessages } from '@/components/hooks';
import { EventProperties } from './EventProperties';
@@ -29,28 +28,18 @@ export function EventsPage({ websiteId }) {
</Panel>
<GridRow layout="two-one">
<Panel gridColumn="span 2">
- <EventsChart websiteId={websiteId} />
+ <EventsChart websiteId={websiteId} focusLabel={label} />
</Panel>
<Panel>
- <MetricsTable
+ <EventsTable
websiteId={websiteId}
type="event"
title={formatMessage(labels.events)}
metric={formatMessage(labels.actions)}
+ onLabelClick={handleLabelClick}
/>
</Panel>
</GridRow>
- <EventsMetricsBar websiteId={websiteId} />
- <GridRow columns="two-one">
- <EventsChart websiteId={websiteId} focusLabel={label} />
- <EventsTable
- websiteId={websiteId}
- type="event"
- title={formatMessage(labels.events)}
- metric={formatMessage(labels.actions)}
- onLabelClick={handleLabelClick}
- />
- </GridRow>
<Panel marginY="6">
<Tabs selectedKey={tab} onSelectionChange={(value: any) => setTab(value)}>
<TabList>
diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsx
index 82714287f..9d36602d3 100644
--- a/src/components/input/DateFilter.tsx
+++ b/src/components/input/DateFilter.tsx
@@ -1,6 +1,6 @@
import { useState, Key, Fragment } from 'react';
import { Icon, Modal, Select, Text, Row, ListItem, ListSeparator, Dialog } from '@umami/react-zen';
-import { endOfYear, isSameDay } from 'date-fns';
+import { differenceInDays, endOfYear, isSameDay } from 'date-fns';
import { DatePickerForm } from '@/components/metrics/DatePickerForm';
import { useLocale, useMessages } from '@/components/hooks';
import { Icons } from '@/components/icons';
@@ -92,13 +92,26 @@ export function DateFilter({
onChange(value.toString());
};
+ const renderValue = ({ defaultChildren }) => {
+ return value.startsWith('range') ? (
+ <CustomRange
+ startDate={startDate}
+ endDate={endDate}
+ isSingleDate={differenceInDays(endDate, startDate) === 0}
+ />
+ ) : (
+ defaultChildren
+ );
+ };
+
return (
<>
<Select
selectedKey={value}
placeholder={formatMessage(labels.selectDate)}
onSelectionChange={handleChange}
- style={{ width: '200px' }}
+ renderValue={renderValue}
+ style={{ width: 'auto' }}
>
{options.map(({ label, value, divider }: any) => {
return (
@@ -127,29 +140,21 @@ export function DateFilter({
);
}
-export const CustomRange = ({ startDate, endDate, unit, onClick }) => {
+export const CustomRange = ({ startDate, endDate, isSingleDate }) => {
const { locale } = useLocale();
- const monthFormat = unit === 'month';
-
- function handleClick(e) {
- e.stopPropagation();
-
- onClick();
- }
-
return (
<Row gap="3" alignItems="center" wrap="nowrap">
- <Icon onClick={handleClick}>
+ <Icon>
<Icons.Calendar />
</Icon>
- <Text>
- {monthFormat ? (
- <>{formatDate(startDate, 'MMMM yyyy', locale)}</>
+ <Text wrap="nowrap">
+ {isSingleDate ? (
+ <>{formatDate(startDate, 'PP', locale)}</>
) : (
<>
- {formatDate(startDate, 'd LLL y', locale)}
- {!isSameDay(startDate, endDate) && ` — ${formatDate(endDate, 'd LLL y', locale)}`}
+ {formatDate(startDate, 'PP', locale)}
+ {!isSameDay(startDate, endDate) && ` — ${formatDate(endDate, 'PP', locale)}`}
</>
)}
</Text>
diff --git a/src/components/metrics/DatePickerForm.tsx b/src/components/metrics/DatePickerForm.tsx
index a8b2fb8c4..c72918293 100644
--- a/src/components/metrics/DatePickerForm.tsx
+++ b/src/components/metrics/DatePickerForm.tsx
@@ -64,7 +64,7 @@ export function DatePickerForm({
<Row justifyContent="end" gap>
<Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>
<Button variant="primary" onPress={handleSave} isDisabled={disabled}>
- {formatMessage(labels.save)}
+ {formatMessage(labels.apply)}
</Button>
</Row>
</Column>
diff --git a/src/components/metrics/FilterBar.tsx b/src/components/metrics/FilterBar.tsx
index 8e5174fbd..7404352c2 100644
--- a/src/components/metrics/FilterBar.tsx
+++ b/src/components/metrics/FilterBar.tsx
@@ -25,8 +25,8 @@ export function FilterBar({ websiteId }: { websiteId: string }) {
return (
<Row
- gap="3"
- backgroundColor="2"
+ gap
+ backgroundColor="1"
alignItems="center"
justifyContent="space-between"
paddingY="3"