diff --git a/components/layout/NavBar.module.css b/components/layout/NavBar.module.css index 05dce2af..dd5085a0 100644 --- a/components/layout/NavBar.module.css +++ b/components/layout/NavBar.module.css @@ -27,7 +27,6 @@ gap: 10px; font-size: 16px; font-weight: 700; - cursor: pointer; min-width: 0; } diff --git a/components/messages.js b/components/messages.js index aa268225..245e8591 100644 --- a/components/messages.js +++ b/components/messages.js @@ -158,6 +158,10 @@ export const messages = defineMessages({ id: 'message.team-already-member', defaultMessage: 'You are already a member of the team.', }, + deleteAccount: { + id: 'message.delete-account', + defaultMessage: 'To delete this account, type {confirmation} in the box below to confirm.', + }, deleteWebsite: { id: 'message.delete-website', defaultMessage: 'To delete this website, type {confirmation} in the box below to confirm.', diff --git a/components/metrics/MetricsBar.js b/components/metrics/MetricsBar.js index 25b93115..ccaf627c 100644 --- a/components/metrics/MetricsBar.js +++ b/components/metrics/MetricsBar.js @@ -16,13 +16,13 @@ export function MetricsBar({ websiteId }) { const { startDate, endDate, modified } = dateRange; const [format, setFormat] = useState(true); const { - query: { url, referrer, os, browser, device, country, region, city }, + query: { url, referrer, title, os, browser, device, country, region, city }, } = usePageQuery(); const { data, error, isLoading, isFetched } = useQuery( [ 'websites:stats', - { websiteId, modified, url, referrer, os, browser, device, country, region, city }, + { websiteId, modified, url, referrer, title, os, browser, device, country, region, city }, ], () => get(`/websites/${websiteId}/stats`, { @@ -30,6 +30,7 @@ export function MetricsBar({ websiteId }) { endAt: +endDate, url, referrer, + title, os, browser, device, diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js index 97deb39d..3ad7f434 100644 --- a/components/metrics/MetricsTable.js +++ b/components/metrics/MetricsTable.js @@ -30,7 +30,7 @@ export function MetricsTable({ const { resolveUrl, router, - query: { url, referrer, os, browser, device, country, region, city }, + query: { url, referrer, title, os, browser, device, country, region, city }, } = usePageQuery(); const { formatMessage, labels } = useMessages(); const { get, useQuery } = useApi(); @@ -38,7 +38,20 @@ export function MetricsTable({ const { data, isLoading, isFetched, error } = useQuery( [ 'websites:metrics', - { websiteId, type, modified, url, referrer, os, browser, device, country, region, city }, + { + websiteId, + type, + modified, + url, + referrer, + os, + title, + browser, + device, + country, + region, + city, + }, ], () => get(`/websites/${websiteId}/metrics`, { @@ -46,6 +59,7 @@ export function MetricsTable({ startAt: +startDate, endAt: +endDate, url, + title, referrer, os, browser, diff --git a/components/pages/console/TestConsole.js b/components/pages/console/TestConsole.js index 745bf94c..6c14c2c1 100644 --- a/components/pages/console/TestConsole.js +++ b/components/pages/console/TestConsole.js @@ -30,6 +30,8 @@ export function TestConsole() { window.umami.track('track-event-with-data', { data: { test: 'test-data', + boolean: true, + booleanError: 'true', time: new Date(), number: 1, time2: new Date().toISOString(), diff --git a/components/pages/realtime/RealtimeUrls.js b/components/pages/realtime/RealtimeUrls.js index dfbf1fda..18d8f2f6 100644 --- a/components/pages/realtime/RealtimeUrls.js +++ b/components/pages/realtime/RealtimeUrls.js @@ -10,6 +10,7 @@ export function RealtimeUrls({ websiteDomain, data = {} }) { const { formatMessage, labels } = useMessages(); const { pageviews } = data; const [filter, setFilter] = useState(FILTER_REFERRERS); + const limit = 15; const buttons = [ { @@ -47,7 +48,8 @@ export function RealtimeUrls({ websiteDomain, data = {} }) { } return arr; }, []) - .sort(firstBy('y', -1)), + .sort(firstBy('y', -1)) + .slice(0, limit), ); const pages = percentFilter( @@ -62,7 +64,8 @@ export function RealtimeUrls({ websiteDomain, data = {} }) { } return arr; }, []) - .sort(firstBy('y', -1)), + .sort(firstBy('y', -1)) + .slice(0, limit), ); return [referrers, pages]; diff --git a/components/pages/settings/websites/WebsiteResetForm.js b/components/pages/settings/websites/WebsiteResetForm.js index 4ac24169..5fc0acf7 100644 --- a/components/pages/settings/websites/WebsiteResetForm.js +++ b/components/pages/settings/websites/WebsiteResetForm.js @@ -13,7 +13,7 @@ import useMessages from 'hooks/useMessages'; const CONFIRM_VALUE = 'RESET'; export function WebsiteResetForm({ websiteId, onSave, onClose }) { - const { formatMessage, labels, messages } = useMessages(); + const { formatMessage, labels, messages, FormattedMessage } = useMessages(); const { post, useMutation } = useApi(); const { mutate, error } = useMutation(data => post(`/websites/${websiteId}/reset`, data)); @@ -28,7 +28,12 @@ export function WebsiteResetForm({ websiteId, onSave, onClose }) { return (