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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Website header updates.
Mike Cao96c2c32d1418
diff --git a/package.json b/package.jsonindex fb7dcf7c5..d7cdf1cdd 100644--- a/package.json+++ b/package.json@@ -78,7 +78,7 @@"@react-spring/web": "^9.7.5","@tanstack/react-query": "^5.68.0","@umami/prisma-client": "^0.16.0",- "@umami/react-zen": "^0.76.0",+ "@umami/react-zen": "^0.77.0","@umami/redis-client": "^0.27.0","bcryptjs": "^2.4.3","chalk": "^4.1.2",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 7a6f6f87e..3bc058b10 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -45,8 +45,8 @@ importers:specifier: ^0.16.0version: 0.16.0(@prisma/[email protected]([email protected]([email protected]))([email protected]))(@prisma/[email protected](@prisma/[email protected]([email protected]([email protected]))([email protected])))'@umami/react-zen':- specifier: ^0.76.0- version: 0.76.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))+ specifier: ^0.77.0+ version: 0.77.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))'@umami/redis-client':specifier: ^0.27.0version: 0.27.0@@ -1314,8 +1314,8 @@ packages:peerDependencies:'@dicebear/core': ^9.0.0- '@emnapi/[email protected]':- resolution: {integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==}+ '@emnapi/[email protected]':+ resolution: {integrity: sha512-64WYIf4UYcdLnbKn/umDlNjQDSS8AgZrI/R9+x5ilkUVFxXcA1Ebl+gQLc/6mERA4407Xof0R7wEyEuj091CVw==}'@esbuild/[email protected]':resolution: {integrity: sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==}@@ -2961,8 +2961,8 @@ packages:'@prisma/client': ^4.8.0'@prisma/extension-read-replicas': ^0.3.0- '@umami/[email protected]':- resolution: {integrity: sha512-AjkRpJGPV514fo516csceh9kwQexfgZdZPli0bTui5FH9RObptgEev/ySW+x9dHWXJWch7GZ+81c+eNloX19YQ==}+ '@umami/[email protected]':+ resolution: {integrity: sha512-tdoPdCMfPOhBMEiGXZ62zfTG8qjto7Ii+mWXNX2qdPjZ+SP5AB8wnQpqIGiXoUZUnP41iWw0GS97sTZq3xeEBQ==}'@umami/[email protected]':resolution: {integrity: sha512-SbHTpxhgeZyTBUSp2zdZM+XUtpsaSL4Tad8QXIEhEtjWhvvfoornyT5kLuyYCVtzSAT4daALeGmOO1z6EE1KcA==}@@ -3329,8 +3329,8 @@ packages:resolution: {integrity: sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==}- resolution: {integrity: sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==}+ resolution: {integrity: sha512-NgL3vUTnDrPCZ3zTahp4fsugQ4dc7EKTSzwQDPEel6DMoMnfH2jhry9n2Zm8onbSR+f/QtKHFOA+iAQu4kbtWA==}resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}@@ -8404,7 +8404,7 @@ snapshots:dependencies:'@dicebear/core': 9.2.2- '@emnapi/[email protected]':+ '@emnapi/[email protected]':dependencies:tslib: 2.8.1optional: true@@ -8740,7 +8740,7 @@ snapshots:'@img/[email protected]':dependencies:- '@emnapi/runtime': 1.3.1+ '@emnapi/runtime': 1.4.0optional: true'@img/[email protected]':@@ -10646,7 +10646,7 @@ snapshots:transitivePeerDependencies:- supports-color- '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))':+ '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))':dependencies:'@fontsource/jetbrains-mono': 5.2.5@@ -11120,13 +11120,13 @@ snapshots:dependencies:browserslist: 4.24.4- caniuse-lite: 1.0.30001707+ caniuse-lite: 1.0.30001709lodash.memoize: 4.1.2lodash.uniq: 4.5.0- [email protected]: {}+ [email protected]: {}@@ -13667,7 +13667,7 @@ snapshots:'@swc/counter': 0.1.3'@swc/helpers': 0.5.15busboy: 1.6.0- caniuse-lite: 1.0.30001707+ caniuse-lite: 1.0.30001709postcss: 8.4.31react: 19.0.0react-dom: 19.0.0([email protected])@@ -13692,7 +13692,7 @@ snapshots:'@swc/counter': 0.1.3'@swc/helpers': 0.5.15busboy: 1.6.0- caniuse-lite: 1.0.30001707+ caniuse-lite: 1.0.30001709postcss: 8.4.31react: 19.1.0react-dom: 19.1.0([email protected])diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsxindex e4971adba..925bd193a 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx@@ -57,6 +57,7 @@ export function WebsiteTransferForm({};const handleChange = (key: Key) => {+ console.log('KEY', key);setTeamId(key as string);};@@ -73,10 +74,10 @@ export function WebsiteTransferForm({</Text><FormField name="teamId">{!isTeamWebsite && (- <Select onSelectionChange={handleChange} value={teamId}>+ <Select onSelectionChange={handleChange} selectedKey={teamId}>{items.map(({ id, name }) => {return (- <ListItem key={id} id={id}>+ <ListItem key={`${id}!!!!`} id={`${id}????`}>{name}</ListItem>);diff --git a/src/app/(main)/websites/[websiteId]/WebsiteCompareBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteCompareBar.tsxnew file mode 100644index 000000000..afb99cdbd--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/WebsiteCompareBar.tsx@@ -0,0 +1,5 @@+import { Row } from '@umami/react-zen';++export function WebsiteCompareBar({ websiteId }: { websiteId: string }) {+ return <Row>compare {websiteId}</Row>;+}diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.module.css b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.module.cssdeleted file mode 100644index 80f101e3a..000000000--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.module.css+++ /dev/null@@ -1,3 +0,0 @@-.button {- font-weight: 700;-}diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsxindex aeed8abc8..ccdcede35 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx@@ -2,7 +2,6 @@ import { Button, Icon, Icons, MenuTrigger, Popover, Text } from '@umami/react-zeimport { FilterSelectForm } from '@/app/(main)/reports/[reportId]/FilterSelectForm';import { useFields, useMessages, useNavigation, useDateRange } from '@/components/hooks';import { OPERATOR_PREFIXES } from '@/lib/constants';-import styles from './WebsiteFilterButton.module.css';export function WebsiteFilterButton({websiteId,@@ -28,7 +27,7 @@ export function WebsiteFilterButton({return (<MenuTrigger>- <Button className={styles.button} variant="quiet">+ <Button variant="quiet"><Icon><Icons.Plus /></Icon>diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsxindex 92f9d0094..9f33d0a3d 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx@@ -1,16 +1,4 @@-import {- Column,- Row,- Heading,- MenuTrigger,- Button,- Icon,- Icons,- Popover,- Menu,- MenuItem,- MenuSeparator,-} from '@umami/react-zen';+import { Column, Row, Heading } from '@umami/react-zen';import { Favicon } from '@/components/common/Favicon';import { ActiveUsers } from '@/components/metrics/ActiveUsers';import { WebsiteTabs } from '@/app/(main)/websites/[websiteId]/WebsiteTabs';@@ -18,61 +6,35 @@ import { useWebsite } from '@/components/hooks/useWebsite';import { WebsiteFilterButton } from '@/app/(main)/websites/[websiteId]/WebsiteFilterButton';import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';import { FilterBar } from '@/components/metrics/FilterBar';-import { useMessages } from '@/components/hooks';+import { WebsiteMenu } from '@/app/(main)/websites/[websiteId]/WebsiteMenu';+import { WebsiteCompareBar } from '@/app/(main)/websites/[websiteId]/WebsiteCompareBar';export function WebsiteHeader({- websiteId,showFilter = true,allowEdit = true,- compareMode = false,}: {- websiteId: string;showFilter?: boolean;allowEdit?: boolean;compareMode?: boolean;}) {const website = useWebsite();- const { formatMessage, labels } = useMessages();- const { name, domain } = website || {};-- const items = [- { label: formatMessage(labels.previousPeriod), value: 'prev' },- { label: formatMessage(labels.previousYear), value: 'yoy' },- ];+ const { id: websiteId, name, domain } = website || {};return (<Column marginY="6" gap="6"><Row alignItems="center" justifyContent="space-between" gap="3"><Row alignItems="center" gap="3"><Favicon domain={domain} />- <Heading>- {name}- <ActiveUsers websiteId={websiteId} />- </Heading>+ <Heading>{name}</Heading></Row>+ <ActiveUsers websiteId={websiteId} /><Row alignItems="center" gap="3">{showFilter && <WebsiteFilterButton websiteId={websiteId} />}<WebsiteDateFilter websiteId={websiteId} />- {allowEdit && (- <MenuTrigger>- <Button variant="quiet">- <Icon>- <Icons.More />- </Icon>- </Button>- <Popover placement="bottom end">- <Menu>- <MenuItem>Compare dates</MenuItem>- <MenuItem>Share</MenuItem>- <MenuSeparator />- <MenuItem>Settings</MenuItem>- </Menu>- </Popover>- </MenuTrigger>- )}+ {allowEdit && <WebsiteMenu websiteId={websiteId} />}</Row></Row>- {compareMode && items.map(item => <div key={item.value}>{item.label}</div>)}+ <WebsiteCompareBar websiteId={websiteId} /><FilterBar websiteId={websiteId} /><WebsiteTabs websiteId={websiteId} /></Column>diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsxnew file mode 100644index 000000000..8f7a33318--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsx@@ -0,0 +1,49 @@+import {+ Button,+ Icon,+ Icons,+ Menu,+ MenuItem,+ MenuSeparator,+ MenuTrigger,+ Popover,+ Text,+} from '@umami/react-zen';+import { Fragment } from 'react';+import { Lucide } from '@/components/icons';+import { useMessages } from '@/components/hooks';++export function WebsiteMenu({ websiteId }: { websiteId: string }) {+ const { formatMessage, labels } = useMessages();++ const menuItems = [+ { label: formatMessage(labels.compare), icon: <Lucide.GitCompare /> },+ { label: formatMessage(labels.share), icon: <Lucide.Share /> },+ { label: formatMessage(labels.edit), icon: <Lucide.Edit />, seperator: true },+ ];++ return (+ <MenuTrigger>+ <Button variant="quiet">+ <Icon>+ <Icons.More />+ </Icon>+ </Button>+ <Popover placement="bottom end">+ <Menu>+ {menuItems.map(({ label, icon, seperator }, index) => {+ return (+ <Fragment key={index}>+ {seperator && <MenuSeparator />}+ <MenuItem>+ <Icon>{icon}</Icon>+ <Text>{label}</Text>+ </MenuItem>+ </Fragment>+ );+ })}+ </Menu>+ </Popover>+ </MenuTrigger>+ );+}diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.tsindex 0966fff57..6f7388382 100644--- a/src/components/hooks/index.ts+++ b/src/components/hooks/index.ts@@ -1,3 +1,4 @@+export * from './queries/useActiveUsersQuery';export * from './queries/useEventDataEventsQuery';export * from './queries/useEventDataPropertiesQuery';export * from './queries/useEventDataValuesQuery';diff --git a/src/components/hooks/queries/useActiveUsersQuery.ts b/src/components/hooks/queries/useActiveUsersQuery.tsnew file mode 100644index 000000000..3b4b025dd--- /dev/null+++ b/src/components/hooks/queries/useActiveUsersQuery.ts@@ -0,0 +1,15 @@+import { useApi } from '../useApi';+import { UseQueryOptions } from '@tanstack/react-query';++export function useActyiveUsersQuery(+ websiteId: string,+ options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,+) {+ const { get, useQuery } = useApi();+ return useQuery<any>({+ queryKey: ['websites:active', websiteId],+ queryFn: () => get(`/websites/${websiteId}/active`),+ enabled: !!websiteId,+ ...options,+ });+}diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.tsindex 23ad20afd..f8a8adae3 100644--- a/src/components/hooks/useDateRange.ts+++ b/src/components/hooks/useDateRange.ts@@ -7,12 +7,7 @@ import { DateRange } from '@/lib/types';import { useLocale } from './useLocale';import { useApi } from './useApi';-export function useDateRange(websiteId?: string): {- dateRange: DateRange;- saveDateRange: (value: string | DateRange) => void;- dateCompare: string;- saveDateCompare: (value: string) => void;-} {+export function useDateRange(websiteId?: string) {const { get } = useApi();const { locale } = useLocale();const websiteConfig = useWebsites(state => state[websiteId]?.dateRange);diff --git a/src/components/hooks/useWebsite.ts b/src/components/hooks/useWebsite.tsindex daaf057b7..69a477d21 100644--- a/src/components/hooks/useWebsite.ts+++ b/src/components/hooks/useWebsite.ts@@ -2,7 +2,5 @@ import { WebsiteContext } from '@/app/(main)/websites/[websiteId]/WebsiteProvideimport { useContext } from 'react';export function useWebsite() {- const website = useContext(WebsiteContext);-- return website;+ return useContext(WebsiteContext);}diff --git a/src/components/input/DateFilter.module.css b/src/components/input/DateFilter.module.cssdeleted file mode 100644index bd9ec1a8c..000000000--- a/src/components/input/DateFilter.module.css+++ /dev/null@@ -1,3 +0,0 @@-.dropdown span {- white-space: nowrap;-}diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsxindex b55168e50..f72c74041 100644--- a/src/components/input/DateFilter.tsx+++ b/src/components/input/DateFilter.tsx@@ -95,7 +95,7 @@ export function DateFilter({return (<><Select- value={value}+ selectedKey={value}placeholder={formatMessage(labels.selectDate)}onSelectionChange={handleChange}>@@ -103,9 +103,7 @@ export function DateFilter({return (<Fragment key={label}>{divider && <ListSeparator />}- <ListItem key={label} id={value}>- {label}- </ListItem>+ <ListItem id={value}>{label}</ListItem></Fragment>);})}diff --git a/src/components/input/MonthSelect.module.css b/src/components/input/MonthSelect.module.cssdeleted file mode 100644index 3b13bcc18..000000000--- a/src/components/input/MonthSelect.module.css+++ /dev/null@@ -1,22 +0,0 @@-.container {- display: flex;- align-items: center;- justify-content: center;- border: 1px solid var(--base400);- border-radius: var(--border-radius);-}--.input {- display: flex;- align-items: center;- gap: 10px;- cursor: pointer;-}--.popup {- border: 1px solid var(--base400);- background: var(--base50);- border-radius: var(--border-radius);- padding: 20px;- margin-top: 5px;-}diff --git a/src/components/input/MonthSelect.tsx b/src/components/input/MonthSelect.tsxindex 2b9641a03..68830e5b7 100644--- a/src/components/input/MonthSelect.tsx+++ b/src/components/input/MonthSelect.tsx@@ -1,17 +1,15 @@-import { useRef } from 'react';import { Row, Text, Icon, Button, MenuTrigger, Popover, Menu, MenuItem } from '@umami/react-zen';import { startOfMonth, endOfMonth, startOfYear, addMonths, subYears } from 'date-fns';import { Icons } from '@/components/icons';import { useLocale } from '@/components/hooks';import { formatDate } from '@/lib/date';-import styles from './MonthSelect.module.css';export function MonthSelect({ date = new Date(), onChange }) {- const { locale, dateLocale } = useLocale();+ const { locale } = useLocale();const month = formatDate(date, 'MMMM', locale);const year = date.getFullYear();- const ref = useRef();+ // eslint-disable-next-line @typescript-eslint/no-unused-varsconst handleChange = (close: () => void, date: Date) => {onChange(`range:${startOfMonth(date).getTime()}:${endOfMonth(date).getTime()}`);close();@@ -30,32 +28,36 @@ export function MonthSelect({ date = new Date(), onChange }) {return (<Row><MenuTrigger>- <Button className={styles.input} variant="quiet">+ <Button variant="quiet"><Text>{month}</Text><Icon size="sm"><Icons.Chevron /></Icon></Button><Popover>- <Menu items={months}>- {month => {- return <MenuItem id={month}>{month.getDay()}</MenuItem>;- }}+ <Menu>+ {months.map(month => {+ return (+ <MenuItem key={month.toString()} id={month.toString()}>+ {month.getDay()}+ </MenuItem>+ );+ })}</Menu></Popover></MenuTrigger><MenuTrigger>- <Button className={styles.input} variant="quiet">+ <Button variant="quiet"><Text>{year}</Text><Icon size="sm"><Icons.Chevron /></Icon></Button><Popover>- <Menu items={years}>- {year => {+ <Menu>+ {years.map(year => {return <MenuItem id={year}>{year}</MenuItem>;- }}+ })}</Menu></Popover></MenuTrigger>diff --git a/src/components/input/ProfileButton.module.css b/src/components/input/ProfileButton.module.cssdeleted file mode 100644index 37f51f785..000000000--- a/src/components/input/ProfileButton.module.css+++ /dev/null@@ -1,28 +0,0 @@-.menu {- width: 200px;- z-index: var(--z-index-popup);- border: 1px solid var(--border-color);- border-radius: var(--border-radius);- overflow: hidden;- background: var(--base50);-}--.item {- display: flex;- gap: 12px;- background: var(--base50);-}--.version {- font-family: monospace;- font-size: 11px;- color: var(--base600);- text-align: right;- margin-inline-end: 10px;-}--.name {- color: var(--font-color200);- background: var(--base75);- padding: var(--size300) var(--size600);-}diff --git a/src/components/input/SettingsButton.module.css b/src/components/input/SettingsButton.module.cssdeleted file mode 100644index 8ebd44831..000000000--- a/src/components/input/SettingsButton.module.css+++ /dev/null@@ -1,11 +0,0 @@-.popup {- background: var(--base50);- border: 1px solid var(--base500);- border-radius: 4px;- display: flex;- flex-direction: column;- position: absolute;- top: 100%;- right: 0;- padding: 20px;-}diff --git a/src/components/input/SettingsButton.tsx b/src/components/input/SettingsButton.tsxindex 331207455..d9b72dba8 100644--- a/src/components/input/SettingsButton.tsx+++ b/src/components/input/SettingsButton.tsx@@ -1,30 +1,27 @@-import { Button, Icon, PopupTrigger, Popup, Form, FormRow } from '@umami/react-zen';+import { Button, Icon, DialogTrigger, Popover, Column, Label } from '@umami/react-zen';import { TimezoneSetting } from '@/app/(main)/profile/TimezoneSetting';import { DateRangeSetting } from '@/app/(main)/profile/DateRangeSetting';import { Icons } from '@/components/icons';import { useMessages } from '@/components/hooks';-import styles from './SettingsButton.module.css';export function SettingsButton() {const { formatMessage, labels } = useMessages();return (- <PopupTrigger>+ <DialogTrigger><Button variant="quiet"><Icon><Icons.Gear /></Icon></Button>- <Popup className={styles.popup} position="bottom" alignment="end">- <Form>- <FormRow label={formatMessage(labels.timezone)}>- <TimezoneSetting />- </FormRow>- <FormRow label={formatMessage(labels.defaultDateRange)}>- <DateRangeSetting />- </FormRow>- </Form>- </Popup>- </PopupTrigger>+ <Popover placement="bottom end">+ <Column gap="3">+ <Label>{formatMessage(labels.timezone)}</Label>+ <TimezoneSetting />+ <Label>{formatMessage(labels.defaultDateRange)}</Label>+ <DateRangeSetting />+ </Column>+ </Popover>+ </DialogTrigger>);}diff --git a/src/components/input/TeamsButton.module.css b/src/components/input/TeamsButton.module.cssdeleted file mode 100644index 2b1fd549f..000000000--- a/src/components/input/TeamsButton.module.css+++ /dev/null@@ -1,21 +0,0 @@-.button {- font-weight: 700;-}--.menu {- background: var(--base50);- min-width: 260px;-}--.heading {- color: var(--base600);- font-size: 10px;- font-weight: 700;- padding: 8px 16px;- text-transform: uppercase;- border-bottom: 1px solid var(--base300);-}--.selected {- font-weight: bold;-}diff --git a/src/components/input/WebsiteDateFilter.module.css b/src/components/input/WebsiteDateFilter.module.cssdeleted file mode 100644index c0b94beec..000000000--- a/src/components/input/WebsiteDateFilter.module.css+++ /dev/null@@ -1,24 +0,0 @@-.container {- display: flex;- align-items: center;- gap: 10px;-}--.dropdown {- min-width: 200px;-}--.buttons {- display: flex;-}--.buttons button:first-child {- border-start-end-radius: 0;- border-end-end-radius: 0;- border-inline-end: 1px solid var(--base400);-}--.buttons button:last-child {- border-start-start-radius: 0;- border-end-start-radius: 0;-}diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsxindex 52c4edc36..dc1828c2f 100644--- a/src/components/input/WebsiteDateFilter.tsx+++ b/src/components/input/WebsiteDateFilter.tsx@@ -18,6 +18,7 @@ export function WebsiteDateFilter({value === 'all' || isAfter(getOffsetDateRange(dateRange, 1).startDate, new Date());const handleChange = (value: string | DateRange) => {+ console.log('WebsiteDateFilter', value);saveDateRange(value);};@@ -25,6 +26,8 @@ export function WebsiteDateFilter({saveDateRange(getOffsetDateRange(dateRange, increment));};+ console.log({ dateRange, disableForward });+return (<Row gap="3">{value !== 'all' && !value.startsWith('range') && (diff --git a/src/components/input/WebsiteSelect.module.css b/src/components/input/WebsiteSelect.module.cssdeleted file mode 100644index 42e2911a8..000000000--- a/src/components/input/WebsiteSelect.module.css+++ /dev/null@@ -1,4 +0,0 @@-.dropdown {- max-height: 400px;- overflow-y: auto;-}diff --git a/src/components/messages.ts b/src/components/messages.tsindex 698108367..3d877bdd0 100644--- a/src/components/messages.ts+++ b/src/components/messages.ts@@ -51,6 +51,7 @@ export const labels = defineMessages({data: { id: 'label.data', defaultMessage: 'Data' },trackingCode: { id: 'label.tracking-code', defaultMessage: 'Tracking code' },shareUrl: { id: 'label.share-url', defaultMessage: 'Share URL' },+ share: { id: 'label.share', defaultMessage: 'Share' },actions: { id: 'label.actions', defaultMessage: 'Actions' },domain: { id: 'label.domain', defaultMessage: 'Domain' },websiteId: { id: 'label.website-id', defaultMessage: 'Website ID' },diff --git a/src/components/metrics/ActiveUsers.module.css b/src/components/metrics/ActiveUsers.module.cssdeleted file mode 100644index 4a984725e..000000000--- a/src/components/metrics/ActiveUsers.module.css+++ /dev/null@@ -1,12 +0,0 @@-.container {- display: flex;- align-items: center;- margin-inline-start: 20px;-}--.text {- display: flex;- white-space: nowrap;- font-size: var(--font-size-md);- font-weight: 400;-}diff --git a/src/components/metrics/ActiveUsers.tsx b/src/components/metrics/ActiveUsers.tsxindex 754c119b2..09df3fa19 100644--- a/src/components/metrics/ActiveUsers.tsx+++ b/src/components/metrics/ActiveUsers.tsx@@ -1,8 +1,6 @@import { useMemo } from 'react';-import { StatusLight } from '@umami/react-zen';-import { useApi } from '@/components/hooks';-import { useMessages } from '@/components/hooks';-import styles from './ActiveUsers.module.css';+import { Text, StatusLight } from '@umami/react-zen';+import { useMessages, useActyiveUsersQuery } from '@/components/hooks';export function ActiveUsers({websiteId,@@ -14,13 +12,7 @@ export function ActiveUsers({refetchInterval?: number;}) {const { formatMessage, messages } = useMessages();- const { get, useQuery } = useApi();- const { data } = useQuery({- queryKey: ['websites:active', websiteId],- queryFn: () => get(`/websites/${websiteId}/active`),- enabled: !!websiteId,- refetchInterval,- });+ const { data } = useActyiveUsersQuery(websiteId, { refetchInterval });const count = useMemo(() => {if (websiteId) {@@ -35,8 +27,8 @@ export function ActiveUsers({}return (- <StatusLight className={styles.container} variant="success">- <div className={styles.text}>{formatMessage(messages.activeUsers, { x: count })}</div>+ <StatusLight variant="success">+ <Text size="2">{formatMessage(messages.activeUsers, { x: count })}</Text></StatusLight>);}