+
{countryNames[code]}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 92285c63..999cea03 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -4,7 +4,6 @@ import '@fontsource/inter/400.css';
import '@fontsource/inter/700.css';
import '@fontsource/inter/800.css';
import 'react-basics/dist/styles.css';
-import 'styles/locale.css';
import 'styles/index.css';
import 'styles/variables.css';
diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index 7624ba1c..eadc4af7 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -7,6 +7,7 @@ import { useMemo, useState } from 'react';
export interface BarChartProps extends ChartProps {
unit: string;
stacked?: boolean;
+ currency?: string;
renderXLabel?: (label: string, index: number, values: any[]) => string;
renderYLabel?: (label: string, index: number, values: any[]) => string;
XAxisType?: string;
@@ -27,6 +28,7 @@ export function BarChart(props: BarChartProps) {
stacked = false,
minDate,
maxDate,
+ currency,
} = props;
const options: any = useMemo(() => {
@@ -76,7 +78,9 @@ export function BarChart(props: BarChartProps) {
const handleTooltip = ({ tooltip }: { tooltip: any }) => {
const { opacity } = tooltip;
- setTooltip(opacity ? : null);
+ setTooltip(
+ opacity ? : null,
+ );
};
return (
diff --git a/src/components/charts/BarChartTooltip.tsx b/src/components/charts/BarChartTooltip.tsx
index fed5af92..201c6e4c 100644
--- a/src/components/charts/BarChartTooltip.tsx
+++ b/src/components/charts/BarChartTooltip.tsx
@@ -1,7 +1,7 @@
-import { formatDate } from 'lib/date';
-import { Flexbox, StatusLight } from 'react-basics';
-import { formatLongNumber } from 'lib/format';
import { useLocale } from 'components/hooks';
+import { formatDate } from 'lib/date';
+import { formatLongCurrency, formatLongNumber } from 'lib/format';
+import { Flexbox, StatusLight } from 'react-basics';
const formats = {
millisecond: 'T',
@@ -15,7 +15,7 @@ const formats = {
year: 'yyyy',
};
-export default function BarChartTooltip({ tooltip, unit }) {
+export default function BarChartTooltip({ tooltip, unit, currency }) {
const { locale } = useLocale();
const { labelColors, dataPoints } = tooltip;
@@ -26,7 +26,10 @@ export default function BarChartTooltip({ tooltip, unit }) {
- {formatLongNumber(dataPoints[0].raw.y)} {dataPoints[0].dataset.label}
+ {currency
+ ? formatLongCurrency(dataPoints[0].raw.y, currency)
+ : formatLongNumber(dataPoints[0].raw.y)}{' '}
+ {dataPoints[0].dataset.label}
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index 1be99732..7c16eeee 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -1,9 +1,7 @@
-export * from './queries/useApi';
export * from './queries/useConfig';
export * from './queries/useEventDataEvents';
export * from './queries/useEventDataProperties';
export * from './queries/useEventDataValues';
-export * from './queries/usePagedQuery';
export * from './queries/useLogin';
export * from './queries/useRealtime';
export * from './queries/useReport';
@@ -28,6 +26,7 @@ export * from './queries/useWebsiteEvents';
export * from './queries/useWebsiteEventsSeries';
export * from './queries/useWebsiteMetrics';
export * from './queries/useWebsiteValues';
+export * from './useApi';
export * from './useCountryNames';
export * from './useDateRange';
export * from './useDocumentClick';
@@ -41,6 +40,7 @@ export * from './useLocale';
export * from './useMessages';
export * from './useModified';
export * from './useNavigation';
+export * from './usePagedQuery';
export * from './useRegionNames';
export * from './useSticky';
export * from './useTeamUrl';
diff --git a/src/components/hooks/queries/useConfig.ts b/src/components/hooks/queries/useConfig.ts
index 72fe095d..f6293a44 100644
--- a/src/components/hooks/queries/useConfig.ts
+++ b/src/components/hooks/queries/useConfig.ts
@@ -1,6 +1,6 @@
import { useEffect } from 'react';
import useStore, { setConfig } from 'store/app';
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
let loading = false;
diff --git a/src/components/hooks/queries/useEventDataEvents.ts b/src/components/hooks/queries/useEventDataEvents.ts
index 1d7ccf2d..5cad9916 100644
--- a/src/components/hooks/queries/useEventDataEvents.ts
+++ b/src/components/hooks/queries/useEventDataEvents.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
import { UseQueryOptions } from '@tanstack/react-query';
import { useFilterParams } from '../useFilterParams';
diff --git a/src/components/hooks/queries/useEventDataProperties.ts b/src/components/hooks/queries/useEventDataProperties.ts
index 4eabd051..b841a8f4 100644
--- a/src/components/hooks/queries/useEventDataProperties.ts
+++ b/src/components/hooks/queries/useEventDataProperties.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
import { UseQueryOptions } from '@tanstack/react-query';
+import { useApi } from '../useApi';
import { useFilterParams } from '../useFilterParams';
export function useEventDataProperties(
diff --git a/src/components/hooks/queries/useEventDataValues.ts b/src/components/hooks/queries/useEventDataValues.ts
index 61aea58e..de6783a0 100644
--- a/src/components/hooks/queries/useEventDataValues.ts
+++ b/src/components/hooks/queries/useEventDataValues.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
import { UseQueryOptions } from '@tanstack/react-query';
+import { useApi } from '../useApi';
import { useFilterParams } from '../useFilterParams';
export function useEventDataValues(
@@ -12,7 +12,7 @@ export function useEventDataValues(
const params = useFilterParams(websiteId);
return useQuery({
- queryKey: ['websites:event-data:values', { websiteId, propertyName, ...params }],
+ queryKey: ['websites:event-data:values', { websiteId, eventName, propertyName, ...params }],
queryFn: () =>
get(`/websites/${websiteId}/event-data/values`, { ...params, eventName, propertyName }),
enabled: !!(websiteId && propertyName),
diff --git a/src/components/hooks/queries/useLogin.ts b/src/components/hooks/queries/useLogin.ts
index c17687b0..a54f38d1 100644
--- a/src/components/hooks/queries/useLogin.ts
+++ b/src/components/hooks/queries/useLogin.ts
@@ -1,6 +1,6 @@
-import useStore, { setUser } from 'store/app';
-import useApi from './useApi';
import { UseQueryResult } from '@tanstack/react-query';
+import useStore, { setUser } from 'store/app';
+import { useApi } from '../useApi';
const selector = (state: { user: any }) => state.user;
diff --git a/src/components/hooks/queries/useRealtime.ts b/src/components/hooks/queries/useRealtime.ts
index 9c665e4f..b87f74c4 100644
--- a/src/components/hooks/queries/useRealtime.ts
+++ b/src/components/hooks/queries/useRealtime.ts
@@ -1,7 +1,7 @@
import { useTimezone } from 'components/hooks';
import { REALTIME_INTERVAL } from 'lib/constants';
import { RealtimeData } from 'lib/types';
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
export function useRealtime(websiteId: string) {
const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useReport.ts b/src/components/hooks/queries/useReport.ts
index 2e63e4e6..f7d2a1a0 100644
--- a/src/components/hooks/queries/useReport.ts
+++ b/src/components/hooks/queries/useReport.ts
@@ -1,6 +1,6 @@
import { produce } from 'immer';
import { useCallback, useEffect, useState } from 'react';
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
import { useTimezone } from '../useTimezone';
import { useMessages } from '../useMessages';
diff --git a/src/components/hooks/queries/useReports.ts b/src/components/hooks/queries/useReports.ts
index 88e4f02e..21db1536 100644
--- a/src/components/hooks/queries/useReports.ts
+++ b/src/components/hooks/queries/useReports.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
-import usePagedQuery from './usePagedQuery';
+import useApi from '../useApi';
+import usePagedQuery from '../usePagedQuery';
import useModified from '../useModified';
export function useReports({ websiteId, teamId }: { websiteId?: string; teamId?: string }) {
diff --git a/src/components/hooks/queries/useRevenueValues.ts b/src/components/hooks/queries/useRevenueValues.ts
new file mode 100644
index 00000000..007ca3c5
--- /dev/null
+++ b/src/components/hooks/queries/useRevenueValues.ts
@@ -0,0 +1,18 @@
+import { useApi } from '../useApi';
+
+export function useRevenueValues(websiteId: string, startDate: Date, endDate: Date) {
+ const { get, useQuery } = useApi();
+
+ return useQuery({
+ queryKey: ['revenue:values', { websiteId, startDate, endDate }],
+ queryFn: () =>
+ get(`/reports/revenue`, {
+ websiteId,
+ startDate,
+ endDate,
+ }),
+ enabled: !!(websiteId && startDate && endDate),
+ });
+}
+
+export default useRevenueValues;
diff --git a/src/components/hooks/queries/useSessionActivity.ts b/src/components/hooks/queries/useSessionActivity.ts
index 16c139ab..1c9c8f57 100644
--- a/src/components/hooks/queries/useSessionActivity.ts
+++ b/src/components/hooks/queries/useSessionActivity.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
export function useSessionActivity(
websiteId: string,
diff --git a/src/components/hooks/queries/useSessionData.ts b/src/components/hooks/queries/useSessionData.ts
index 14e046d1..521ba7d5 100644
--- a/src/components/hooks/queries/useSessionData.ts
+++ b/src/components/hooks/queries/useSessionData.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
export function useSessionData(websiteId: string, sessionId: string) {
const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useSessionDataProperties.ts b/src/components/hooks/queries/useSessionDataProperties.ts
index 459dccd6..45590b39 100644
--- a/src/components/hooks/queries/useSessionDataProperties.ts
+++ b/src/components/hooks/queries/useSessionDataProperties.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
import { UseQueryOptions } from '@tanstack/react-query';
import { useFilterParams } from '../useFilterParams';
diff --git a/src/components/hooks/queries/useSessionDataValues.ts b/src/components/hooks/queries/useSessionDataValues.ts
index ce9a67f3..85529fc0 100644
--- a/src/components/hooks/queries/useSessionDataValues.ts
+++ b/src/components/hooks/queries/useSessionDataValues.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
import { UseQueryOptions } from '@tanstack/react-query';
import { useFilterParams } from '../useFilterParams';
diff --git a/src/components/hooks/queries/useShareToken.ts b/src/components/hooks/queries/useShareToken.ts
index 189657be..f9db7dbf 100644
--- a/src/components/hooks/queries/useShareToken.ts
+++ b/src/components/hooks/queries/useShareToken.ts
@@ -1,5 +1,5 @@
import useStore, { setShareToken } from 'store/app';
-import useApi from './useApi';
+import { useApi } from '../useApi';
const selector = (state: { shareToken: string }) => state.shareToken;
diff --git a/src/components/hooks/queries/useTeam.ts b/src/components/hooks/queries/useTeam.ts
index e348531c..d0ce7499 100644
--- a/src/components/hooks/queries/useTeam.ts
+++ b/src/components/hooks/queries/useTeam.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
export function useTeam(teamId: string) {
const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useTeamMembers.ts b/src/components/hooks/queries/useTeamMembers.ts
index a3e8bcd2..b6353afc 100644
--- a/src/components/hooks/queries/useTeamMembers.ts
+++ b/src/components/hooks/queries/useTeamMembers.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
-import usePagedQuery from './usePagedQuery';
+import { useApi } from '../useApi';
+import usePagedQuery from '../usePagedQuery';
import useModified from '../useModified';
export function useTeamMembers(teamId: string) {
diff --git a/src/components/hooks/queries/useTeamWebsites.ts b/src/components/hooks/queries/useTeamWebsites.ts
index fac82d13..5606407e 100644
--- a/src/components/hooks/queries/useTeamWebsites.ts
+++ b/src/components/hooks/queries/useTeamWebsites.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
-import usePagedQuery from './usePagedQuery';
+import { useApi } from '../useApi';
+import { usePagedQuery } from '../usePagedQuery';
import useModified from '../useModified';
export function useTeamWebsites(teamId: string) {
diff --git a/src/components/hooks/queries/useTeams.ts b/src/components/hooks/queries/useTeams.ts
index e1f7790a..e5197c97 100644
--- a/src/components/hooks/queries/useTeams.ts
+++ b/src/components/hooks/queries/useTeams.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
-import usePagedQuery from './usePagedQuery';
+import { useApi } from '../useApi';
+import { usePagedQuery } from '../usePagedQuery';
import useModified from '../useModified';
export function useTeams(userId: string) {
diff --git a/src/components/hooks/queries/useUser.ts b/src/components/hooks/queries/useUser.ts
index 61c22ecd..8541a220 100644
--- a/src/components/hooks/queries/useUser.ts
+++ b/src/components/hooks/queries/useUser.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
export function useUser(userId: string, options?: { [key: string]: any }) {
const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useUsers.ts b/src/components/hooks/queries/useUsers.ts
index 519fb899..3d70d262 100644
--- a/src/components/hooks/queries/useUsers.ts
+++ b/src/components/hooks/queries/useUsers.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
-import usePagedQuery from './usePagedQuery';
+import { useApi } from '../useApi';
+import { usePagedQuery } from '../usePagedQuery';
import useModified from '../useModified';
export function useUsers() {
diff --git a/src/components/hooks/queries/useWebsite.ts b/src/components/hooks/queries/useWebsite.ts
index 4121f97b..9151b55d 100644
--- a/src/components/hooks/queries/useWebsite.ts
+++ b/src/components/hooks/queries/useWebsite.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
export function useWebsite(websiteId: string, options?: { [key: string]: any }) {
const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.ts
index 5d9bd196..2a47c3eb 100644
--- a/src/components/hooks/queries/useWebsiteEvents.ts
+++ b/src/components/hooks/queries/useWebsiteEvents.ts
@@ -1,7 +1,7 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
import { UseQueryOptions } from '@tanstack/react-query';
import { useFilterParams } from '../useFilterParams';
-import { usePagedQuery } from './usePagedQuery';
+import { usePagedQuery } from '../usePagedQuery';
export function useWebsiteEvents(
websiteId: string,
diff --git a/src/components/hooks/queries/useWebsiteEventsSeries.ts b/src/components/hooks/queries/useWebsiteEventsSeries.ts
index 88b49375..91c50fff 100644
--- a/src/components/hooks/queries/useWebsiteEventsSeries.ts
+++ b/src/components/hooks/queries/useWebsiteEventsSeries.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
import { UseQueryOptions } from '@tanstack/react-query';
import { useFilterParams } from '../useFilterParams';
diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index 184fd4d4..8a3976e1 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -1,5 +1,5 @@
import { UseQueryOptions } from '@tanstack/react-query';
-import useApi from './useApi';
+import { useApi } from '../useApi';
import { useFilterParams } from '../useFilterParams';
export function useWebsiteMetrics(
diff --git a/src/components/hooks/queries/useWebsitePageviews.ts b/src/components/hooks/queries/useWebsitePageviews.ts
index c9260bcb..42fb527e 100644
--- a/src/components/hooks/queries/useWebsitePageviews.ts
+++ b/src/components/hooks/queries/useWebsitePageviews.ts
@@ -1,5 +1,5 @@
import { UseQueryOptions } from '@tanstack/react-query';
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
import { useFilterParams } from '..//useFilterParams';
export function useWebsitePageviews(
diff --git a/src/components/hooks/queries/useWebsiteSession.ts b/src/components/hooks/queries/useWebsiteSession.ts
index 64c7be58..93e9057c 100644
--- a/src/components/hooks/queries/useWebsiteSession.ts
+++ b/src/components/hooks/queries/useWebsiteSession.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
export function useWebsiteSession(websiteId: string, sessionId: string) {
const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useWebsiteSessionStats.ts b/src/components/hooks/queries/useWebsiteSessionStats.ts
index 7671b2eb..5c02cfdc 100644
--- a/src/components/hooks/queries/useWebsiteSessionStats.ts
+++ b/src/components/hooks/queries/useWebsiteSessionStats.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
import { useFilterParams } from '../useFilterParams';
export function useWebsiteSessionStats(websiteId: string, options?: { [key: string]: string }) {
diff --git a/src/components/hooks/queries/useWebsiteSessions.ts b/src/components/hooks/queries/useWebsiteSessions.ts
index ce65512c..ad7bb616 100644
--- a/src/components/hooks/queries/useWebsiteSessions.ts
+++ b/src/components/hooks/queries/useWebsiteSessions.ts
@@ -1,5 +1,5 @@
-import { useApi } from './useApi';
-import { usePagedQuery } from './usePagedQuery';
+import { useApi } from '../useApi';
+import { usePagedQuery } from '../usePagedQuery';
import useModified from '../useModified';
import { useFilterParams } from 'components/hooks/useFilterParams';
diff --git a/src/components/hooks/queries/useWebsiteSessionsWeekly.ts b/src/components/hooks/queries/useWebsiteSessionsWeekly.ts
index 5df543f5..c4e83f98 100644
--- a/src/components/hooks/queries/useWebsiteSessionsWeekly.ts
+++ b/src/components/hooks/queries/useWebsiteSessionsWeekly.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
import useModified from '../useModified';
import { useFilterParams } from 'components/hooks/useFilterParams';
diff --git a/src/components/hooks/queries/useWebsiteStats.ts b/src/components/hooks/queries/useWebsiteStats.ts
index b24399fa..6d42009e 100644
--- a/src/components/hooks/queries/useWebsiteStats.ts
+++ b/src/components/hooks/queries/useWebsiteStats.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
import { useFilterParams } from '../useFilterParams';
export function useWebsiteStats(
diff --git a/src/components/hooks/queries/useWebsiteValues.ts b/src/components/hooks/queries/useWebsiteValues.ts
index c5358df2..68e950f2 100644
--- a/src/components/hooks/queries/useWebsiteValues.ts
+++ b/src/components/hooks/queries/useWebsiteValues.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
export function useWebsiteValues({
websiteId,
diff --git a/src/components/hooks/queries/useWebsites.ts b/src/components/hooks/queries/useWebsites.ts
index d6fe00df..7a5004d7 100644
--- a/src/components/hooks/queries/useWebsites.ts
+++ b/src/components/hooks/queries/useWebsites.ts
@@ -1,5 +1,5 @@
-import { useApi } from './useApi';
-import { usePagedQuery } from './usePagedQuery';
+import { useApi } from '../useApi';
+import { usePagedQuery } from '../usePagedQuery';
import { useLogin } from './useLogin';
import useModified from '../useModified';
diff --git a/src/components/hooks/queries/useApi.ts b/src/components/hooks/useApi.ts
similarity index 100%
rename from src/components/hooks/queries/useApi.ts
rename to src/components/hooks/useApi.ts
diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.ts
index 248070f4..23cb6e70 100644
--- a/src/components/hooks/useDateRange.ts
+++ b/src/components/hooks/useDateRange.ts
@@ -5,7 +5,7 @@ import websiteStore, { setWebsiteDateRange, setWebsiteDateCompare } from 'store/
import appStore, { setDateRange } from 'store/app';
import { DateRange } from 'lib/types';
import { useLocale } from './useLocale';
-import { useApi } from './queries/useApi';
+import { useApi } from './useApi';
export function useDateRange(websiteId?: string): {
dateRange: DateRange;
diff --git a/src/components/hooks/useFields.ts b/src/components/hooks/useFields.ts
index e6fc54b3..859ca1ce 100644
--- a/src/components/hooks/useFields.ts
+++ b/src/components/hooks/useFields.ts
@@ -15,6 +15,7 @@ export function useFields() {
{ name: 'region', type: 'string', label: formatMessage(labels.region) },
{ name: 'city', type: 'string', label: formatMessage(labels.city) },
{ name: 'host', type: 'string', label: formatMessage(labels.host) },
+ { name: 'tag', type: 'string', label: formatMessage(labels.tag) },
];
return { fields };
diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
index 525f3492..55deed14 100644
--- a/src/components/hooks/useFilterParams.ts
+++ b/src/components/hooks/useFilterParams.ts
@@ -7,7 +7,21 @@ export function useFilterParams(websiteId: string) {
const { startDate, endDate, unit } = dateRange;
const { timezone, toUtc } = useTimezone();
const {
- query: { url, referrer, title, query, host, os, browser, device, country, region, city, event },
+ query: {
+ url,
+ referrer,
+ title,
+ query,
+ host,
+ os,
+ browser,
+ device,
+ country,
+ region,
+ city,
+ event,
+ tag,
+ },
} = useNavigation();
return {
@@ -27,5 +41,6 @@ export function useFilterParams(websiteId: string) {
region,
city,
event,
+ tag,
};
}
diff --git a/src/components/hooks/queries/usePagedQuery.ts b/src/components/hooks/usePagedQuery.ts
similarity index 94%
rename from src/components/hooks/queries/usePagedQuery.ts
rename to src/components/hooks/usePagedQuery.ts
index 253f8092..19471432 100644
--- a/src/components/hooks/queries/usePagedQuery.ts
+++ b/src/components/hooks/usePagedQuery.ts
@@ -1,8 +1,8 @@
import { UseQueryOptions } from '@tanstack/react-query';
import { useState } from 'react';
-import { useApi } from './useApi';
import { PageResult, PageParams, PagedQueryResult } from 'lib/types';
-import { useNavigation } from '../useNavigation';
+import { useApi } from './useApi';
+import { useNavigation } from './useNavigation';
export function usePagedQuery({
queryKey,
diff --git a/src/components/input/LanguageButton.tsx b/src/components/input/LanguageButton.tsx
index fcaa4046..5da3bf78 100644
--- a/src/components/input/LanguageButton.tsx
+++ b/src/components/input/LanguageButton.tsx
@@ -1,4 +1,4 @@
-import { Icon, Button, PopupTrigger, Popup, Text } from 'react-basics';
+import { Icon, Button, PopupTrigger, Popup } from 'react-basics';
import classNames from 'classnames';
import { languages } from 'lib/lang';
import { useLocale } from 'components/hooks';
@@ -33,7 +33,7 @@ export function LanguageButton() {
className={classNames(styles.item, { [styles.selected]: value === locale })}
onClick={(e: any) => handleSelect(value, close, e)}
>
- {label}
+ {label}
{value === locale && (
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 933a7a0f..688dd11d 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -98,6 +98,7 @@ export const labels = defineMessages({
devices: { id: 'label.devices', defaultMessage: 'Devices' },
countries: { id: 'label.countries', defaultMessage: 'Countries' },
languages: { id: 'label.languages', defaultMessage: 'Languages' },
+ tags: { id: 'label.tags', defaultMessage: 'Tags' },
count: { id: 'label.count', defaultMessage: 'Count' },
average: { id: 'label.average', defaultMessage: 'Average' },
sum: { id: 'label.sum', defaultMessage: 'Sum' },
@@ -114,8 +115,6 @@ export const labels = defineMessages({
none: { id: 'label.none', defaultMessage: 'None' },
clearAll: { id: 'label.clear-all', defaultMessage: 'Clear all' },
property: { id: 'label.property', defaultMessage: 'Property' },
- revenueProperty: { id: 'label.revenue-property', defaultMessage: 'Revenue Property' },
- userProperty: { id: 'label.user-property', defaultMessage: 'User Property' },
today: { id: 'label.today', defaultMessage: 'Today' },
lastHours: { id: 'label.last-hours', defaultMessage: 'Last {x} hours' },
yesterday: { id: 'label.yesterday', defaultMessage: 'Yesterday' },
@@ -162,8 +161,9 @@ export const labels = defineMessages({
revenue: { id: 'label.revenue', defaultMessage: 'Revenue' },
revenueDescription: {
id: 'label.revenue-description',
- defaultMessage: 'Look into your revenue across time.',
+ defaultMessage: 'Look into your revenue data and how users are spending.',
},
+ currency: { id: 'label.currency', defaultMessage: 'Currency' },
url: { id: 'label.url', defaultMessage: 'URL' },
urls: { id: 'label.urls', defaultMessage: 'URLs' },
path: { id: 'label.path', defaultMessage: 'Path' },
@@ -221,6 +221,7 @@ export const labels = defineMessages({
browser: { id: 'label.browser', defaultMessage: 'Browser' },
device: { id: 'label.device', defaultMessage: 'Device' },
pageTitle: { id: 'label.pageTitle', defaultMessage: 'Page title' },
+ tag: { id: 'label.tag', defaultMessage: 'Tag' },
day: { id: 'label.day', defaultMessage: 'Day' },
date: { id: 'label.date', defaultMessage: 'Date' },
pageOf: { id: 'label.page-of', defaultMessage: 'Page {current} of {total}' },
diff --git a/src/components/metrics/CountriesTable.tsx b/src/components/metrics/CountriesTable.tsx
index 592ade8a..c1fc2831 100644
--- a/src/components/metrics/CountriesTable.tsx
+++ b/src/components/metrics/CountriesTable.tsx
@@ -12,12 +12,7 @@ export function CountriesTable({ ...props }: MetricsTableProps) {
const renderLink = ({ x: code }) => {
return (
-
+
);
diff --git a/src/components/metrics/HostsTable.tsx b/src/components/metrics/HostsTable.tsx
index d3a0f3bf..45147eac 100644
--- a/src/components/metrics/HostsTable.tsx
+++ b/src/components/metrics/HostsTable.tsx
@@ -25,7 +25,7 @@ export function HostsTable(props: MetricsTableProps) {
{...props}
title={formatMessage(labels.hosts)}
type="host"
- metric={formatMessage(labels.views)}
+ metric={formatMessage(labels.visitors)}
renderLabel={renderLink}
/>
diff --git a/src/components/metrics/LanguagesTable.tsx b/src/components/metrics/LanguagesTable.tsx
index 67b6e622..f4b0b503 100644
--- a/src/components/metrics/LanguagesTable.tsx
+++ b/src/components/metrics/LanguagesTable.tsx
@@ -13,7 +13,7 @@ export function LanguagesTable({
const languageNames = useLanguageNames(locale);
const renderLabel = ({ x }) => {
- return {languageNames[x?.split('-')[0]] ?? x}
;
+ return languageNames[x?.split('-')[0]] ?? x;
};
return (
diff --git a/src/components/metrics/Legend.tsx b/src/components/metrics/Legend.tsx
index c7ef1022..4ebcf4b4 100644
--- a/src/components/metrics/Legend.tsx
+++ b/src/components/metrics/Legend.tsx
@@ -3,7 +3,6 @@ import { safeDecodeURIComponent } from 'next-basics';
import { colord } from 'colord';
import classNames from 'classnames';
import { LegendItem } from 'chart.js/auto';
-import { useLocale } from 'components/hooks';
import styles from './Legend.module.css';
export function Legend({
@@ -13,8 +12,6 @@ export function Legend({
items: any[];
onClick: (index: LegendItem) => void;
}) {
- const { locale } = useLocale();
-
if (!items.find(({ text }) => text)) {
return null;
}
@@ -32,7 +29,7 @@ export function Legend({
onClick={() => onClick(item)}
>
- {safeDecodeURIComponent(text)}
+ {safeDecodeURIComponent(text)}
);
diff --git a/src/components/metrics/RegionsTable.tsx b/src/components/metrics/RegionsTable.tsx
index 215551af..b4071f50 100644
--- a/src/components/metrics/RegionsTable.tsx
+++ b/src/components/metrics/RegionsTable.tsx
@@ -11,7 +11,7 @@ export function RegionsTable(props: MetricsTableProps) {
const renderLink = ({ x: code, country }) => {
return (
-
+
);
diff --git a/src/components/metrics/TagsTable.tsx b/src/components/metrics/TagsTable.tsx
new file mode 100644
index 00000000..a1130bb4
--- /dev/null
+++ b/src/components/metrics/TagsTable.tsx
@@ -0,0 +1,30 @@
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
+import FilterLink from 'components/common/FilterLink';
+import { useMessages } from 'components/hooks';
+import { Flexbox } from 'react-basics';
+
+export function TagsTable(props: MetricsTableProps) {
+ const { formatMessage, labels } = useMessages();
+
+ const renderLink = ({ x: tag }) => {
+ return (
+
+
+
+ );
+ };
+
+ return (
+ <>
+
+
+ );
+}
+
+export default TagsTable;
diff --git a/src/lang/cs-CZ.json b/src/lang/cs-CZ.json
index 717bd970..8adc5e36 100644
--- a/src/lang/cs-CZ.json
+++ b/src/lang/cs-CZ.json
@@ -1,88 +1,88 @@
{
- "label.access-code": "Access code",
+ "label.access-code": "Přístupový kód",
"label.actions": "Akce",
- "label.activity": "Activity log",
- "label.add": "Add",
- "label.add-description": "Add description",
- "label.add-member": "Add member",
- "label.add-step": "Add step",
+ "label.activity": "Log aktivity",
+ "label.add": "Přidat",
+ "label.add-description": "Přidat popis",
+ "label.add-member": "Přidat člena",
+ "label.add-step": "Přidat krok",
"label.add-website": "Přidat web",
"label.admin": "Administrátor",
- "label.after": "After",
+ "label.after": "Po",
"label.all": "Vše",
- "label.all-time": "All time",
+ "label.all-time": "Celá doba",
"label.analytics": "Analytics",
- "label.average": "Average",
+ "label.average": "Průměr",
"label.back": "Zpět",
- "label.before": "Before",
+ "label.before": "Před",
"label.bounce-rate": "Okamžité opuštění",
"label.breakdown": "Breakdown",
- "label.browser": "Browser",
- "label.browsers": "Prohlížeč",
+ "label.browser": "Prohlížeč",
+ "label.browsers": "Prohlížeče",
"label.cancel": "Zrušit",
"label.change-password": "Změnit heslo",
- "label.cities": "Cities",
- "label.city": "City",
- "label.clear-all": "Clear all",
- "label.compare": "Compare",
- "label.confirm": "Confirm",
+ "label.cities": "Města",
+ "label.city": "Město",
+ "label.clear-all": "Vyčistit vše",
+ "label.compare": "Porovnat",
+ "label.confirm": "Potvrdit",
"label.confirm-password": "Potvrdit heslo",
- "label.contains": "Contains",
- "label.continue": "Continue",
- "label.count": "Count",
- "label.countries": "Země",
- "label.country": "Country",
- "label.create": "Create",
- "label.create-report": "Create report",
- "label.create-team": "Create team",
- "label.create-user": "Create user",
- "label.created": "Created",
+ "label.contains": "Obsahuje",
+ "label.continue": "Pokračovat",
+ "label.count": "Počet",
+ "label.countries": "Státy",
+ "label.country": "Stát",
+ "label.create": "Vytvořit",
+ "label.create-report": "Vytvořit hlášení",
+ "label.create-team": "Vytvořit tým",
+ "label.create-user": "Vytvořit uživatele",
+ "label.created": "Vytvořeno",
"label.created-by": "Created By",
- "label.current": "Current",
+ "label.current": "Aktuální",
"label.current-password": "Aktuální heslo",
"label.custom-range": "Vlastní rozsah",
"label.dashboard": "Přehled",
"label.data": "Data",
- "label.date": "Date",
+ "label.date": "Datum",
"label.date-range": "Období",
- "label.day": "Day",
+ "label.day": "Den",
"label.default-date-range": "Výchozí období",
"label.delete": "Smazat",
- "label.delete-report": "Delete report",
- "label.delete-team": "Delete team",
- "label.delete-user": "Delete user",
+ "label.delete-report": "Smazat hlášení",
+ "label.delete-team": "Smazat tým",
+ "label.delete-user": "Smazat uživatele",
"label.delete-website": "Smazat web",
- "label.description": "Description",
+ "label.description": "Popis",
"label.desktop": "Stolní počítač",
- "label.details": "Details",
- "label.device": "Device",
+ "label.details": "Detaily",
+ "label.device": "Zařízení",
"label.devices": "Zařízení",
"label.dismiss": "Odejít",
- "label.does-not-contain": "Does not contain",
+ "label.does-not-contain": "Neobsahuje",
"label.domain": "Doména",
"label.dropoff": "Dropoff",
"label.edit": "Upravit",
- "label.edit-dashboard": "Edit dashboard",
- "label.edit-member": "Edit member",
+ "label.edit-dashboard": "Upravit dashboard",
+ "label.edit-member": "Upravit člena",
"label.enable-share-url": "Povolit sdílení URL",
"label.end-step": "End Step",
- "label.entry": "Entry URL",
- "label.event": "Event",
+ "label.entry": "Vstupní URL",
+ "label.event": "Událost",
"label.event-data": "Event data",
"label.events": "Události",
"label.exit": "Exit URL",
"label.false": "False",
- "label.field": "Field",
+ "label.field": "Pole",
"label.fields": "Fields",
- "label.filter": "Filter",
+ "label.filter": "Filtr",
"label.filter-combined": "Kombinace",
"label.filter-raw": "Nezpracované",
- "label.filters": "Filters",
+ "label.filters": "Filtry",
"label.first-seen": "First seen",
"label.funnel": "Funnel",
"label.funnel-description": "Understand the conversion and drop-off rate of users.",
- "label.goal": "Goal",
- "label.goals": "Goals",
+ "label.goal": "Cíl",
+ "label.goals": "Cíle",
"label.goals-description": "Track your goals for pageviews and events.",
"label.greater-than": "Greater than",
"label.greater-than-equals": "Greater than or equals",
@@ -98,44 +98,44 @@
"label.join-team": "Join team",
"label.journey": "Journey",
"label.journey-description": "Understand how users navigate through your website.",
- "label.language": "Language",
- "label.languages": "Languages",
+ "label.language": "Jazyk",
+ "label.languages": "Jazyky",
"label.laptop": "Přenosný počítač",
"label.last-days": "Posledních {x} dnů",
"label.last-hours": "Posledních {x} hodin",
- "label.last-months": "Last {x} months",
+ "label.last-months": "Posledních {x} měsíců",
"label.last-seen": "Last seen",
- "label.leave": "Leave",
- "label.leave-team": "Leave team",
+ "label.leave": "Opustit",
+ "label.leave-team": "Opustit tým",
"label.less-than": "Less than",
"label.less-than-equals": "Less than or equals",
"label.login": "Přihlásit",
"label.logout": "Odhlásit",
- "label.manage": "Manage",
- "label.manager": "Manager",
+ "label.manage": "Spravovat",
+ "label.manager": "Správce",
"label.max": "Max",
- "label.member": "Member",
- "label.members": "Members",
+ "label.member": "Člen",
+ "label.members": "Členové",
"label.min": "Min",
"label.mobile": "Mobilní telefon",
"label.more": "Více",
- "label.my-account": "My account",
- "label.my-websites": "My websites",
+ "label.my-account": "Můj účet",
+ "label.my-websites": "Mé weby",
"label.name": "Jméno",
"label.new-password": "Nové heslo",
"label.none": "None",
"label.number-of-records": "{x} {x, plural, one {record} other {records}}",
"label.ok": "OK",
"label.os": "OS",
- "label.overview": "Overview",
- "label.owner": "Owner",
+ "label.overview": "Přehled",
+ "label.owner": "Vlastník",
"label.page-of": "Page {current} of {total}",
"label.page-views": "Zobrazení stránek",
- "label.pageTitle": "Page title",
+ "label.pageTitle": "Název stránky",
"label.pages": "Stránky",
"label.password": "Heslo",
- "label.path": "Path",
- "label.paths": "Paths",
+ "label.path": "Cesta",
+ "label.paths": "Cesty",
"label.powered-by": "Běží na {name}",
"label.previous": "Previous",
"label.previous-period": "Previous period",
@@ -228,13 +228,13 @@
"label.views": "Zobrazení",
"label.views-per-visit": "Views per visit",
"label.visit-duration": "Průměrný čas návštěvy",
- "label.visitors": "Návštěvy",
- "label.visits": "Visits",
+ "label.visitors": "Návštěvníci",
+ "label.visits": "Návštěvy",
"label.website": "Website",
"label.website-id": "Website ID",
"label.websites": "Weby",
- "label.window": "Window",
- "label.yesterday": "Yesterday",
+ "label.window": "Okno",
+ "label.yesterday": "Včera",
"message.action-confirmation": "Type {confirmation} in the box below to confirm.",
"message.active-users": "{x} aktuálně {x, plural, one {návštěvník} other {návštěvníci}}",
"message.collected-data": "Collected data",
diff --git a/src/lang/de-CH.json b/src/lang/de-CH.json
index aa57f90c..e99ecaca 100644
--- a/src/lang/de-CH.json
+++ b/src/lang/de-CH.json
@@ -2,278 +2,278 @@
"label.access-code": "Zuegangscode",
"label.actions": "Aktione",
"label.activity": "Aktivitätsverlauf",
- "label.add": "Add",
- "label.add-description": "Add description",
- "label.add-member": "Add member",
- "label.add-step": "Add step",
+ "label.add": "hinzuefüege",
+ "label.add-description": "Beschriibig hinzuefüege",
+ "label.add-member": "Mitglied hinzuefüege",
+ "label.add-step": "Schritt hinzuefüege",
"label.add-website": "Websiite hinzuefüege",
"label.admin": "Administrator",
- "label.after": "After",
+ "label.after": "Nach",
"label.all": "Alli",
- "label.all-time": "Gesamte Zitruum",
+ "label.all-time": "Gsamte Zitruum",
"label.analytics": "Analytics",
- "label.average": "Average",
+ "label.average": "Durchschnitt",
"label.back": "Zrugg",
- "label.before": "Before",
+ "label.before": "Vor",
"label.bounce-rate": "Absprungsrate",
- "label.breakdown": "Breakdown",
+ "label.breakdown": "Uufschlüsselig",
"label.browser": "Browser",
"label.browsers": "Browser",
"label.cancel": "Abbreche",
"label.change-password": "Passwort ändere",
"label.cities": "Städt",
- "label.city": "City",
+ "label.city": "Stadt",
"label.clear-all": "Alles lösche",
- "label.compare": "Compare",
+ "label.compare": "Vergliiche",
"label.confirm": "Bestätige",
"label.confirm-password": "Passwort widerhole",
- "label.contains": "Contains",
+ "label.contains": "Enthaltet",
"label.continue": "Wiiter",
- "label.count": "Count",
+ "label.count": "Azahl",
"label.countries": "Länder",
- "label.country": "Country",
- "label.create": "Create",
- "label.create-report": "Create report",
+ "label.country": "Land",
+ "label.create": "Erstelle",
+ "label.create-report": "Bricht erstelle",
"label.create-team": "Team erstelle",
"label.create-user": "Benutzer erstelle",
"label.created": "Erstellt",
"label.created-by": "Created By",
- "label.current": "Current",
- "label.current-password": "Jetzigs Passwort",
+ "label.current": "Aktuell",
+ "label.current-password": "Aktuells Passwort",
"label.custom-range": "Benutzerdefinierte Bereich",
"label.dashboard": "Übersicht",
"label.data": "Datä",
- "label.date": "Date",
+ "label.date": "Datum",
"label.date-range": "Datumsbereich",
- "label.day": "Day",
- "label.default-date-range": "Vorigstellte Datumsbereich",
+ "label.day": "Tag",
+ "label.default-date-range": "Voriigstellte Datumsbereich",
"label.delete": "Lösche",
- "label.delete-report": "Delete report",
+ "label.delete-report": "Bricht lösche",
"label.delete-team": "Team lösche",
"label.delete-user": "Benutzer lösche",
"label.delete-website": "Websiite lösche",
- "label.description": "Description",
+ "label.description": "Beschriibig",
"label.desktop": "Desktop",
"label.details": "Details",
- "label.device": "Device",
+ "label.device": "Grät",
"label.devices": "Grät",
- "label.dismiss": "Verwerfe",
- "label.does-not-contain": "Does not contain",
+ "label.dismiss": "Verwärfe",
+ "label.does-not-contain": "Enthaltet nid",
"label.domain": "Domain",
- "label.dropoff": "Dropoff",
+ "label.dropoff": "Absprung",
"label.edit": "Bearbeite",
"label.edit-dashboard": "Dashboard bearbeite",
- "label.edit-member": "Edit member",
+ "label.edit-member": "Mitglied bearbeite",
"label.enable-share-url": "Freigab-URL aktiviere",
- "label.end-step": "End Step",
- "label.entry": "Entry URL",
- "label.event": "Event",
- "label.event-data": "Event data",
+ "label.end-step": "Schlussschritt",
+ "label.entry": "Iigangs URL",
+ "label.event": "Ereigniss",
+ "label.event-data": "Ereigniss Date",
"label.events": "Ereigniss",
- "label.exit": "Exit URL",
- "label.false": "False",
- "label.field": "Field",
- "label.fields": "Fields",
+ "label.exit": "Uusgangs URL",
+ "label.false": "Falsch",
+ "label.field": "Fäld",
+ "label.fields": "Fälder",
"label.filter": "Filter",
"label.filter-combined": "Kombiniert",
"label.filter-raw": "Rohdate",
"label.filters": "Filters",
- "label.first-seen": "First seen",
- "label.funnel": "Funnel",
- "label.funnel-description": "Understand the conversion and drop-off rate of users.",
- "label.goal": "Goal",
- "label.goals": "Goals",
- "label.goals-description": "Track your goals for pageviews and events.",
- "label.greater-than": "Greater than",
- "label.greater-than-equals": "Greater than or equals",
+ "label.first-seen": "Erstmal gse",
+ "label.funnel": "Tunnel",
+ "label.funnel-description": "Verstönd Sie d Konversions- und Abspruungsrate vo Nutzer.",
+ "label.goal": "Ziel",
+ "label.goals": "Ziele",
+ "label.goals-description": "verfolged Sie Ihri Ziel für Siitenufrüef und Ereigniss.",
+ "label.greater-than": "Grösser als",
+ "label.greater-than-equals": "Grösser oder gliich",
"label.host": "Host",
"label.hosts": "Hosts",
- "label.insights": "Insights",
- "label.insights-description": "Dive deeper into your data by using segments and filters.",
- "label.is": "Is",
- "label.is-not": "Is not",
- "label.is-not-set": "Is not set",
- "label.is-set": "Is set",
+ "label.insights": "Iiblick",
+ "label.insights-description": "Vertüfed Sie sich i Ihri Date, mit Hilf vo Segment und Filter.",
+ "label.is": "Isch",
+ "label.is-not": "Isch nid",
+ "label.is-not-set": "Isch ned gsetzt",
+ "label.is-set": "Isch gsetzt",
"label.join": "Biträte",
"label.join-team": "Team biträte",
- "label.journey": "Journey",
- "label.journey-description": "Understand how users navigate through your website.",
+ "label.journey": "Reis",
+ "label.journey-description": "Verstönd Sie, wie Nutzer dur Ihri Website navigiered.",
"label.language": "Sprach",
"label.languages": "Sprache",
"label.laptop": "Laptop",
"label.last-days": "Letzti {x} Täg",
"label.last-hours": "Letzti {x} Stunde",
- "label.last-months": "Last {x} months",
- "label.last-seen": "Last seen",
+ "label.last-months": "Letzti {x} Mönet",
+ "label.last-seen": "Zletzt gse",
"label.leave": "Verlah",
"label.leave-team": "Team verlah",
- "label.less-than": "Less than",
- "label.less-than-equals": "Less than or equals",
- "label.login": "Aamelde",
- "label.logout": "Abmelde",
- "label.manage": "Manage",
+ "label.less-than": "Kliiner als",
+ "label.less-than-equals": "Kliiner oder gliich",
+ "label.login": "Aamälde",
+ "label.logout": "Abmälde",
+ "label.manage": "Verwalte",
"label.manager": "Manager",
"label.max": "Max",
- "label.member": "Member",
+ "label.member": "Mitglied",
"label.members": "Mitglieder",
"label.min": "Min",
- "label.mobile": "Handy",
+ "label.mobile": "Händy",
"label.more": "Meh",
- "label.my-account": "My account",
- "label.my-websites": "My websites",
+ "label.my-account": "Min Account",
+ "label.my-websites": "Mini Websiite",
"label.name": "Name",
"label.new-password": "Neus Passwort",
"label.none": "Keis",
"label.number-of-records": "{x} {x, plural, one {record} other {records}}",
"label.ok": "OK",
"label.os": "OS",
- "label.overview": "Overview",
+ "label.overview": "Übersicht",
"label.owner": "Bsitzer",
- "label.page-of": "Page {current} of {total}",
+ "label.page-of": "Siite {current} vo {total}",
"label.page-views": "Siitenufrüef",
- "label.pageTitle": "Page title",
+ "label.pageTitle": "Siitetitel",
"label.pages": "Siite",
"label.password": "Passwort",
- "label.path": "Path",
- "label.paths": "Paths",
- "label.powered-by": "Betribe dur {name}",
- "label.previous": "Previous",
- "label.previous-period": "Previous period",
- "label.previous-year": "Previous year",
+ "label.path": "Pfad",
+ "label.paths": "Pfade",
+ "label.powered-by": "Betriibe dur {name}",
+ "label.previous": "Vorherig",
+ "label.previous-period": "Vorherigi Periode",
+ "label.previous-year": "Vorherigs Jahr",
"label.profile": "Profil",
"label.properties": "Properties",
"label.property": "Property",
"label.queries": "Abfrage",
- "label.query": "Query",
+ "label.query": "Abfrag",
"label.query-parameters": "Abfragparameter",
"label.realtime": "Echtzit",
- "label.referrer": "Referrer",
- "label.referrers": "Referrer",
+ "label.referrer": "Verwiiser",
+ "label.referrers": "Verwiisendi",
"label.refresh": "Aktualisiere",
"label.regenerate": "Erneuere",
"label.region": "Region",
"label.regions": "Regionä",
"label.remove": "Entferne",
- "label.remove-member": "Remove member",
- "label.reports": "Reports",
+ "label.remove-member": "Mitglied entferne",
+ "label.reports": "Brichte",
"label.required": "Erforderlich",
"label.reset": "Zruggsetze",
"label.reset-website": "Statistik zruggsetze",
"label.retention": "Retention",
- "label.retention-description": "Measure your website stickiness by tracking how often users return.",
- "label.revenue": "Revenue",
- "label.revenue-description": "Look into your revenue across time.",
- "label.revenue-property": "Revenue Property",
+ "label.retention-description": "Mässed Sie d Verwiilduur vo Ihrere Website, indem Sie verfolged wie oft ihri Nutzer zruggkehred.",
+ "label.revenue": "Umsatz",
+ "label.revenue-description": "Lueged Sie sich Ihre Umsatz im Lauf vor Ziit a.",
+ "label.revenue-property": "Umsatzeigenschafte",
"label.role": "Rollä",
- "label.run-query": "Run query",
+ "label.run-query": "Abfrag starte",
"label.save": "Speichere",
"label.screens": "Bildschirmuflösige",
- "label.search": "Search",
- "label.select": "Select",
- "label.select-date": "Select date",
- "label.select-role": "Select role",
+ "label.search": "Sueche",
+ "label.select": "Auswähle",
+ "label.select-date": "Datä uuswähle",
+ "label.select-role": "Rollä uuswähle",
"label.select-website": "Websiite uuswähle",
- "label.session": "Session",
- "label.sessions": "Sessions",
+ "label.session": "Sitzig",
+ "label.sessions": "Sitzige",
"label.settings": "Istellige",
"label.share-url": "Freigab-URL",
"label.single-day": "Ein Tag",
- "label.start-step": "Start Step",
- "label.steps": "Steps",
- "label.sum": "Sum",
+ "label.start-step": "Startschritt",
+ "label.steps": "Schritt",
+ "label.sum": "Summe",
"label.tablet": "Tablet",
"label.team": "Team",
"label.team-id": "Team ID",
- "label.team-manager": "Team manager",
+ "label.team-manager": "Team Manager",
"label.team-member": "Team Mitglied",
- "label.team-name": "Team name",
+ "label.team-name": "Team Name",
"label.team-owner": "Team Bsitzer",
- "label.team-view-only": "Team view only",
- "label.team-websites": "Team websites",
+ "label.team-view-only": "Nur für Teammitglieder sichtbar",
+ "label.team-websites": "Team Websiite",
"label.teams": "Teams",
"label.theme": "Thema",
- "label.this-month": "De Monet",
- "label.this-week": "Die Wuche",
- "label.this-year": "Das Jahr",
+ "label.this-month": "Dä Monet",
+ "label.this-week": "Diä Wuuche",
+ "label.this-year": "Das Johr",
"label.timezone": "Ziitzone",
"label.title": "Titel",
"label.today": "Hüt",
- "label.toggle-charts": "Schaubilder umschalte",
+ "label.toggle-charts": "Charts umschalte",
"label.total": "Total",
- "label.total-records": "Total records",
+ "label.total-records": "Gsamti Datesätz",
"label.tracking-code": "Tracking Code",
- "label.transactions": "Transactions",
- "label.transfer": "Transfer",
- "label.transfer-website": "Transfer website",
- "label.true": "True",
- "label.type": "Type",
- "label.unique": "Unique",
- "label.unique-visitors": "Eidütigi Bsuecher",
- "label.uniqueCustomers": "Unique Customers",
+ "label.transactions": "Transaktione",
+ "label.transfer": "Transferiere",
+ "label.transfer-website": "Websiite transferiere",
+ "label.true": "Wahr",
+ "label.type": "Typ",
+ "label.unique": "Einzigartigi",
+ "label.unique-visitors": "Einzigartigi Bsuecher",
+ "label.uniqueCustomers": "Einzigartigi Kunde",
"label.unknown": "Unbekannt",
- "label.untitled": "Untitled",
+ "label.untitled": "Unbennant",
"label.update": "Update",
"label.url": "URL",
"label.urls": "URLs",
"label.user": "Benutzer",
- "label.user-property": "User Property",
+ "label.user-property": "Benutzereigeschafte",
"label.username": "Benutzername",
"label.users": "Benutzer",
"label.utm": "UTM",
- "label.utm-description": "Track your campaigns through UTM parameters.",
- "label.value": "Value",
+ "label.utm-description": "Tracked Sie Ihri Kampagnen mit UTM Parameters.",
+ "label.value": "Wärt",
"label.view": "Azeige",
"label.view-details": "Details azeige",
- "label.view-only": "View only",
+ "label.view-only": "Nume aluege",
"label.views": "Ufrüef",
- "label.views-per-visit": "Views per visit",
+ "label.views-per-visit": "Ufrüef pro Bsuech",
"label.visit-duration": "Durchschn. Bsuechsziit",
"label.visitors": "Bsuecher",
- "label.visits": "Visits",
+ "label.visits": "Bsüech",
"label.website": "Website",
"label.website-id": "Websiite ID",
"label.websites": "Websiite",
- "label.window": "Window",
+ "label.window": "Fenster",
"label.yesterday": "Gester",
- "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+ "message.action-confirmation": "Typed Sie {confirmation} is Feld underhalb um z bestätige.",
"message.active-users": "{x} {x, plural, one {aktive Bsuecher} other {aktivi Bsuecher}}",
- "message.collected-data": "Collected data",
+ "message.collected-data": "Gsammleti Date",
"message.confirm-delete": "Sind Sie sich sicher, {target} zlösche?",
"message.confirm-leave": "Sind Sie sich sicher, {target} zverlah?",
- "message.confirm-remove": "Are you sure you want to remove {target}?",
- "message.confirm-reset": "Sind Sie sicher, dass Sie dStatistike vo {target} zruggsetze wend?",
- "message.delete-team-warning": "Deleting a team will also delete all team websites.",
- "message.delete-website-warning": "Alli dezueghörige Date werdet ebefalls glöscht.",
- "message.error": "Es isch en Fehler uftrete.",
+ "message.confirm-remove": "Sind Sie sich sicher, dass Sie {target} wänd entferne?",
+ "message.confirm-reset": "Sind Sie sicher, dass Sie d Statistike vo {target} zruggsetze wänd?",
+ "message.delete-team-warning": "Es Team lösche dued ebefalls alli team Websiite lösche.",
+ "message.delete-website-warning": "Alli dezueghörige Date werded ebefalls glöscht.",
+ "message.error": "Es isch en Fehler ufträte.",
"message.event-log": "{event} uf {url}",
"message.go-to-settings": "Zu de Istellige",
- "message.incorrect-username-password": "Falschs Passwort oder Benutzername.",
+ "message.incorrect-username-password": "Falsches Passwort oder Benutzername.",
"message.invalid-domain": "Ungültigi Domain",
"message.min-password-length": "Miminamli längi vo {n} Zeiche",
- "message.new-version-available": "A new version of Umami {version} is available!",
+ "message.new-version-available": "Es isch en neue Version vo Umami {version} verfügbar!",
"message.no-data-available": "Kei Date vorhande.",
- "message.no-event-data": "No event data is available.",
+ "message.no-event-data": "Es sind kei Event Date verfügbar.",
"message.no-match-password": "Passwörter stimmed ned überi",
- "message.no-results-found": "No results were found.",
+ "message.no-results-found": "Kei Ergäbnis gfunde.",
"message.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
"message.no-teams": "Bisher sind no kei Teams erstellt worde.",
"message.no-users": "Da gits kei Benutzer",
"message.no-websites-configured": "Es isch kei Websiite vorhande.",
"message.page-not-found": "Siite ned gfunde.",
- "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
+ "message.reset-website": "Um die Websiite zruggzsetze, typed Sie {confirmation} is Feld unde dran.",
"message.reset-website-warning": "Alli Date für die Websiite werdet glöscht, nur de Tracking Code blibt bestah.",
"message.saved": "Erfolgrich gspeichert.",
"message.share-url": "Ihri Websiitestatistik isch under de folgende URL öffentlich zuegänglich:",
- "message.team-already-member": "Sie sind bereits es Mitglied vo dem Team.",
+ "message.team-already-member": "Sie sind bereits es Mitglied vo däm Team.",
"message.team-not-found": "Team nöd gfunde.",
- "message.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde",
+ "message.team-websites-info": "Websiite chöi vo jedem im Team agluegt werde",
"message.tracking-code": "Tracking Code",
- "message.transfer-team-website-to-user": "Transfer this website to your account?",
- "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
- "message.transfer-website": "Transfer website ownership to your account or another team.",
- "message.triggered-event": "Triggered event",
- "message.user-deleted": "Benutzer glöscht.",
- "message.viewed-page": "Viewed page",
- "message.visitor-log": "Bsuecher us {country} benutzt {browser} uf {os} {device}",
- "message.visitors-dropped-off": "Visitors dropped off"
-}
+ "message.transfer-team-website-to-user": "Websiite uf zu Ihrem Account transferiere?",
+ "message.transfer-user-website-to-team": "Wähled Sie s Team zum däm Websiite transferiert werde söll.",
+ "message.transfer-website": "Übertraged Sie d Websiite Eigetümerrecht uf Ihre Account oder uf es anders Team",
+ "message.triggered-event": "Usglösts Ereigniss",
+ "message.user-deleted": "Bnutzer glöscht.",
+ "message.viewed-page": "Siite agluegt",
+ "message.visitor-log": "Bsuecher us {country} nutzt {browser} uf {os} {device}",
+ "message.visitors-dropped-off": "Bsuercher verlore"
+}
\ No newline at end of file
diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index dfbb9a47..36090a84 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -67,8 +67,8 @@
"label.enable-share-url": "Freigabe-URL aktivieren",
"label.end-step": "Schlussschritt",
"label.entry": "Eingangs-URL",
- "label.event": "Ereigniss",
- "label.event-data": "Ereignissdaten",
+ "label.event": "Ereignis",
+ "label.event-data": "Ereignisdaten",
"label.events": "Ereignisse",
"label.exit": "Ausgangs-URL",
"label.false": "Falsch",
@@ -271,7 +271,7 @@
"message.transfer-team-website-to-user": "Diese Website zu Ihrem Account transferieren?",
"message.transfer-user-website-to-team": "Wählen Sie ein Team aus, zu dem die Website transferiert werden soll.",
"message.transfer-website": "Übertragen Sie die Eigentümerrechte zu Ihrem Account oder einem anderen Team.",
- "message.triggered-event": "Ausgelöstes Ereigniss",
+ "message.triggered-event": "Ereignis ausgelöst",
"message.user-deleted": "Benutzer gelöscht.",
"message.viewed-page": "Seite besucht",
"message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",
diff --git a/src/lang/ko-KR.json b/src/lang/ko-KR.json
index 07494d93..933e2883 100644
--- a/src/lang/ko-KR.json
+++ b/src/lang/ko-KR.json
@@ -160,7 +160,7 @@
"label.reset": "초기화",
"label.reset-website": "웹사이트 초기화",
"label.retention": "리텐션",
- "label.retention-description": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하십시오.",
+ "label.retention-description": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하세요.",
"label.revenue": "수익",
"label.revenue-description": "시간대별 수익을 살펴보세요.",
"label.revenue-property": "수익 속성",
@@ -220,14 +220,14 @@
"label.username": "사용자 이름",
"label.users": "사용자",
"label.utm": "UTM",
- "label.utm-description": "UTM 매개변수를 통해 캠페인을 추적합니다.",
+ "label.utm-description": "UTM 매개변수를 통해 캠페인을 추적하세요.",
"label.value": "값",
"label.view": "보기",
"label.view-details": "자세히 보기",
"label.view-only": "보기 전용",
"label.views": "조회",
"label.views-per-visit": "방문당 조회",
- "label.visit-duration": "평균 방문 시간",
+ "label.visit-duration": "방문 시간",
"label.visitors": "방문자",
"label.visits": "방문",
"label.website": "웹사이트",
@@ -244,7 +244,7 @@
"message.confirm-reset": "{target}을(를) 초기화하시겠습니까?",
"message.delete-team-warning": "팀을 삭제하면 팀에 등록된 모든 웹사이트도 삭제됩니다.",
"message.delete-website-warning": "관련된 모든 데이터가 삭제됩니다.",
- "message.error": "오류가 발생했습니다.",
+ "message.error": "문제가 발생했습니다.",
"message.event-log": "{event} - {url}",
"message.go-to-settings": "설정으로 이동",
"message.incorrect-username-password": "사용자 이름 또는 비밀번호를 잘못 입력했습니다.",
diff --git a/src/lang/ru-RU.json b/src/lang/ru-RU.json
index f483522a..745f2179 100644
--- a/src/lang/ru-RU.json
+++ b/src/lang/ru-RU.json
@@ -2,194 +2,194 @@
"label.access-code": "Код доступа",
"label.actions": "Действия",
"label.activity": "Журнал активности",
- "label.add": "Add",
- "label.add-description": "Add description",
- "label.add-member": "Add member",
- "label.add-step": "Add step",
+ "label.add": "Добавить",
+ "label.add-description": "Добавить описание",
+ "label.add-member": "Добавить участника",
+ "label.add-step": "Добавить шаг",
"label.add-website": "Добавить сайт",
"label.admin": "Администратор",
- "label.after": "After",
+ "label.after": "После",
"label.all": "Все",
"label.all-time": "Все время",
"label.analytics": "Аналитика",
- "label.average": "Average",
+ "label.average": "Средний",
"label.back": "Назад",
- "label.before": "Before",
+ "label.before": "До",
"label.bounce-rate": "Отказы",
- "label.breakdown": "Breakdown",
- "label.browser": "Browser",
+ "label.breakdown": "Авария",
+ "label.browser": "Браузер",
"label.browsers": "Браузеры",
"label.cancel": "Отменить",
"label.change-password": "Изменить пароль",
"label.cities": "Города",
- "label.city": "City",
+ "label.city": "Город",
"label.clear-all": "Очистить все",
- "label.compare": "Compare",
+ "label.compare": "Сравнить",
"label.confirm": "Подтвердить",
"label.confirm-password": "Подтвердить пароль",
- "label.contains": "Contains",
+ "label.contains": "Содержит",
"label.continue": "Продолжить",
- "label.count": "Count",
+ "label.count": "Считать",
"label.countries": "Страны",
- "label.country": "Country",
- "label.create": "Create",
- "label.create-report": "Create report",
+ "label.country": "Страна",
+ "label.create": "Создать",
+ "label.create-report": "Создать отчет",
"label.create-team": "Создать команду",
"label.create-user": "Создать пользователя",
"label.created": "Создано",
- "label.created-by": "Created By",
- "label.current": "Current",
+ "label.created-by": "Создано",
+ "label.current": "Текущий",
"label.current-password": "Текущий пароль",
"label.custom-range": "Другой период",
"label.dashboard": "Информационная панель",
"label.data": "Данные",
- "label.date": "Date",
+ "label.date": "Дата",
"label.date-range": "Диапазон дат",
- "label.day": "Day",
+ "label.day": "День",
"label.default-date-range": "Диапазон дат по-умолчанию",
"label.delete": "Удалить",
- "label.delete-report": "Delete report",
+ "label.delete-report": "Удалить отчет",
"label.delete-team": "Удалить команду",
"label.delete-user": "Удалить пользователя",
"label.delete-website": "Удалить сайт",
- "label.description": "Description",
+ "label.description": "Описание",
"label.desktop": "Настольный компьютер",
"label.details": "Подробности",
- "label.device": "Device",
+ "label.device": "Устройство",
"label.devices": "Устройства",
"label.dismiss": "Отклонить",
- "label.does-not-contain": "Does not contain",
+ "label.does-not-contain": "Не содержит",
"label.domain": "Домен",
- "label.dropoff": "Dropoff",
+ "label.dropoff": "Высадка",
"label.edit": "Изменить",
"label.edit-dashboard": "Редактировать дашборд",
- "label.edit-member": "Edit member",
+ "label.edit-member": "Редактировать участника",
"label.enable-share-url": "Разрешить делиться ссылкой",
- "label.end-step": "End Step",
- "label.entry": "Entry URL",
- "label.event": "Event",
- "label.event-data": "Event data",
+ "label.end-step": "Конечный шаг",
+ "label.entry": "URL-адрес входа",
+ "label.event": "Событие",
+ "label.event-data": "Данные о событии",
"label.events": "События",
- "label.exit": "Exit URL",
- "label.false": "False",
- "label.field": "Field",
- "label.fields": "Fields",
- "label.filter": "Filter",
+ "label.exit": "URL-адрес выхода",
+ "label.false": "Ложь",
+ "label.field": "Поле",
+ "label.fields": "Поля",
+ "label.filter": "Фильтр",
"label.filter-combined": "Объединенные",
"label.filter-raw": "Сырые данные",
- "label.filters": "Filters",
- "label.first-seen": "First seen",
- "label.funnel": "Funnel",
- "label.funnel-description": "Understand the conversion and drop-off rate of users.",
- "label.goal": "Goal",
- "label.goals": "Goals",
- "label.goals-description": "Track your goals for pageviews and events.",
- "label.greater-than": "Greater than",
- "label.greater-than-equals": "Greater than or equals",
+ "label.filters": "Фильтры",
+ "label.first-seen": "Первый вход",
+ "label.funnel": "Воронка",
+ "label.funnel-description": "Изучите коэффициент конверсии и ухода пользователей.",
+ "label.goal": "Цель",
+ "label.goals": "Цели",
+ "label.goals-description": "Отслеживайте свои цели по просмотрам страниц и событиям.",
+ "label.greater-than": "Больше, чем",
+ "label.greater-than-equals": "Больше или равно",
"label.host": "Host",
"label.hosts": "Hosts",
- "label.insights": "Insights",
- "label.insights-description": "Dive deeper into your data by using segments and filters.",
- "label.is": "Is",
- "label.is-not": "Is not",
- "label.is-not-set": "Is not set",
- "label.is-set": "Is set",
+ "label.insights": "Информация",
+ "label.insights-description": "Погрузитесь глубже в свои данные с помощью сегментов и фильтров.",
+ "label.is": "Является",
+ "label.is-not": "Не установлен",
+ "label.is-not-set": "Не установлено",
+ "label.is-set": "Установлен",
"label.join": "Присоединиться",
"label.join-team": "Присоединиться к команде",
"label.journey": "Journey",
- "label.journey-description": "Understand how users navigate through your website.",
+ "label.journey-description": "Поймите, как пользователи перемещаются по вашему сайту.",
"label.language": "Язык",
"label.languages": "Языки",
"label.laptop": "Ноутбук",
"label.last-days": "Последние {x} дней",
"label.last-hours": "Последние {x} часа",
- "label.last-months": "Last {x} months",
- "label.last-seen": "Last seen",
+ "label.last-months": "Последние {x} месяцев",
+ "label.last-seen": "Последний вход",
"label.leave": "Уйти",
"label.leave-team": "Покинуть команду",
- "label.less-than": "Less than",
- "label.less-than-equals": "Less than or equals",
+ "label.less-than": "Меньше, чем",
+ "label.less-than-equals": "Меньше или равно",
"label.login": "Войти",
"label.logout": "Выйти",
- "label.manage": "Manage",
- "label.manager": "Manager",
- "label.max": "Max",
- "label.member": "Member",
+ "label.manage": "Управление",
+ "label.manager": "Менеджер",
+ "label.max": "Максимум",
+ "label.member": "Участник",
"label.members": "Участники",
- "label.min": "Min",
+ "label.min": "Минимум",
"label.mobile": "Смартфон",
"label.more": "Больше",
- "label.my-account": "My account",
- "label.my-websites": "My websites",
+ "label.my-account": "Мой профиль",
+ "label.my-websites": "Мои сайты",
"label.name": "Имя",
"label.new-password": "Новый пароль",
"label.none": "Не указано",
- "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
+ "label.number-of-records": "{x} {x, множественное число, один {запись} другие {записи}}",
"label.ok": "OK",
"label.os": "OS",
- "label.overview": "Overview",
+ "label.overview": "Обзор",
"label.owner": "Владелец",
- "label.page-of": "Page {current} of {total}",
+ "label.page-of": "Страница {current} из {total}",
"label.page-views": "Просмотры страниц",
- "label.pageTitle": "Page title",
+ "label.pageTitle": "Название страницы",
"label.pages": "Страницы",
"label.password": "Пароль",
- "label.path": "Path",
- "label.paths": "Paths",
+ "label.path": "Путь",
+ "label.paths": "Пути",
"label.powered-by": "На движке {name}",
- "label.previous": "Previous",
- "label.previous-period": "Previous period",
- "label.previous-year": "Previous year",
+ "label.previous": "Предыдущий",
+ "label.previous-period": "Предыдущий период",
+ "label.previous-year": "Предыдущий год",
"label.profile": "Профиль",
- "label.properties": "Properties",
- "label.property": "Property",
+ "label.properties": "Свойства",
+ "label.property": "Свойство",
"label.queries": "Запросы",
- "label.query": "Query",
+ "label.query": "Запрос",
"label.query-parameters": "Параметры запроса",
"label.realtime": "Реальное время",
- "label.referrer": "Referrer",
+ "label.referrer": "Реферер",
"label.referrers": "Источники",
"label.refresh": "Обновить",
"label.regenerate": "Обновить",
- "label.region": "Region",
+ "label.region": "Регион",
"label.regions": "Регионы",
"label.remove": "Удалить",
- "label.remove-member": "Remove member",
- "label.reports": "Reports",
+ "label.remove-member": "Удалить участника",
+ "label.reports": "Отчеты",
"label.required": "Обязательное",
"label.reset": "Сбросить",
"label.reset-website": "Сбросить статистику",
- "label.retention": "Retention",
- "label.retention-description": "Measure your website stickiness by tracking how often users return.",
- "label.revenue": "Revenue",
- "label.revenue-description": "Look into your revenue across time.",
- "label.revenue-property": "Revenue Property",
+ "label.retention": "Удержание",
+ "label.retention-description": "Измерьте «прилипаемость» вашего сайта, отслеживая, как часто пользователи возвращаются на него.",
+ "label.revenue": "Выручка",
+ "label.revenue-description": "Изучите свои доходы за определенное время.",
+ "label.revenue-property": "Доходная недвижимость",
"label.role": "Роль",
- "label.run-query": "Run query",
+ "label.run-query": "Выполнить запрос",
"label.save": "Сохранить",
"label.screens": "Экраны",
- "label.search": "Search",
- "label.select": "Select",
- "label.select-date": "Select date",
- "label.select-role": "Select role",
+ "label.search": "Поиск",
+ "label.select": "Выберите",
+ "label.select-date": "Выберите дату",
+ "label.select-role": "Выберите роль",
"label.select-website": "Выбрать сайт",
- "label.session": "Session",
+ "label.session": "Сессия",
"label.sessions": "Сессии",
"label.settings": "Настройки",
"label.share-url": "Поделиться ссылкой",
"label.single-day": "Один день",
- "label.start-step": "Start Step",
- "label.steps": "Steps",
- "label.sum": "Sum",
+ "label.start-step": "Начальный этап",
+ "label.steps": "Шаги",
+ "label.sum": "Сумма",
"label.tablet": "Планшет",
"label.team": "Команда",
"label.team-id": "ID команды",
- "label.team-manager": "Team manager",
+ "label.team-manager": "Менеджер команды",
"label.team-member": "Член команды",
- "label.team-name": "Team name",
+ "label.team-name": "Название команды",
"label.team-owner": "Владелец команды",
- "label.team-view-only": "Team view only",
- "label.team-websites": "Team websites",
+ "label.team-view-only": "Только командный просмотр",
+ "label.team-websites": "Веб-сайты команды",
"label.teams": "Команды",
"label.theme": "Тема",
"label.this-month": "Этот месяц",
@@ -199,62 +199,62 @@
"label.title": "Заголовок",
"label.today": "Сегодня",
"label.toggle-charts": "Показать/скрыть графики",
- "label.total": "Total",
- "label.total-records": "Total records",
+ "label.total": "Всего",
+ "label.total-records": "Всего записей",
"label.tracking-code": "Код отслеживания",
- "label.transactions": "Transactions",
- "label.transfer": "Transfer",
- "label.transfer-website": "Transfer website",
- "label.true": "True",
- "label.type": "Type",
- "label.unique": "Unique",
+ "label.transactions": "Транзакции",
+ "label.transfer": "Передача",
+ "label.transfer-website": "Передать сайт",
+ "label.true": "Правда",
+ "label.type": "Тип",
+ "label.unique": "Уникальный",
"label.unique-visitors": "Уникальные посетители",
- "label.uniqueCustomers": "Unique Customers",
+ "label.uniqueCustomers": "Уникальные клиенты",
"label.unknown": "Неизвестно",
- "label.untitled": "Untitled",
- "label.update": "Update",
+ "label.untitled": "Без названия",
+ "label.update": "Обновление",
"label.url": "URL",
"label.urls": "URLs",
"label.user": "Пользователь",
- "label.user-property": "User Property",
+ "label.user-property": "Собственность пользователя",
"label.username": "Имя пользователя",
"label.users": "Пользователи",
"label.utm": "UTM",
- "label.utm-description": "Track your campaigns through UTM parameters.",
- "label.value": "Value",
+ "label.utm-description": "Отслеживайте свои кампании с помощью UTM-параметров.",
+ "label.value": "Значение",
"label.view": "Просмотреть",
"label.view-details": "Посмотреть детали",
- "label.view-only": "View only",
+ "label.view-only": "Только просмотр",
"label.views": "Просмотры",
- "label.views-per-visit": "Views per visit",
+ "label.views-per-visit": "Просмотров за посещение",
"label.visit-duration": "Среднее время посещения",
"label.visitors": "Посетители",
- "label.visits": "Visits",
- "label.website": "Website",
+ "label.visits": "Посещения",
+ "label.website": "Сайт",
"label.website-id": "ID сайта",
"label.websites": "Сайты",
- "label.window": "Window",
+ "label.window": "Окно",
"label.yesterday": "Вчера",
- "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+ "message.action-confirmation": "Введите {confirmation} в поле ниже, чтобы подтвердить.",
"message.active-users": "{x} текущих посетителей",
- "message.collected-data": "Collected data",
+ "message.collected-data": "Собранные данные",
"message.confirm-delete": "Вы уверены, что хотите удалить {target}?",
"message.confirm-leave": "Вы уверены, что хотите уйти {target}?",
- "message.confirm-remove": "Are you sure you want to remove {target}?",
+ "message.confirm-remove": "Вы уверены, что хотите удалить {target}?",
"message.confirm-reset": "Вы уверены, что хотите сбросить статистику {target}?",
- "message.delete-team-warning": "Deleting a team will also delete all team websites.",
+ "message.delete-team-warning": "При удалении команды будут удалены и все ее веб-сайты.",
"message.delete-website-warning": "Все связанные данные будут также удалены.",
"message.error": "Что-то пошло не так.",
- "message.event-log": "{event} on {url}",
+ "message.event-log": "{event} на {url}",
"message.go-to-settings": "Перейти к настройкам",
"message.incorrect-username-password": "Неверное имя пользователя/пароль.",
"message.invalid-domain": "Некорректный домен",
"message.min-password-length": "Минимальная длина {n} символов",
- "message.new-version-available": "A new version of Umami {version} is available!",
+ "message.new-version-available": "Вышла новая версия Umami {version}!",
"message.no-data-available": "Нет данных.",
- "message.no-event-data": "No event data is available.",
+ "message.no-event-data": "Данные о событиях отсутствуют.",
"message.no-match-password": "Пароли не совпадают",
- "message.no-results-found": "No results were found.",
+ "message.no-results-found": "Результаты не найдены.",
"message.no-team-websites": "У этой команды нет ни одного сайта.",
"message.no-teams": "Вы не создали ни одной команды.",
"message.no-users": "Нет пользователей.",
@@ -268,12 +268,12 @@
"message.team-not-found": "Команда не найдена.",
"message.team-websites-info": "Сайты могут просматривать все члены команды.",
"message.tracking-code": "Код отслеживания",
- "message.transfer-team-website-to-user": "Transfer this website to your account?",
- "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
- "message.transfer-website": "Transfer website ownership to your account or another team.",
- "message.triggered-event": "Triggered event",
+ "message.transfer-team-website-to-user": "Перенести этот сайт в свой прфоиль?",
+ "message.transfer-user-website-to-team": "Выберите команду, которой нужно передать этот сайт.",
+ "message.transfer-website": "Передайте право владения сайтом своей учетной записи или другой команде.",
+ "message.triggered-event": "Запущенное событие",
"message.user-deleted": "Пользователь удален.",
- "message.viewed-page": "Viewed page",
+ "message.viewed-page": "Просмотренная страница",
"message.visitor-log": "Посетитель из {country} используя {browser} на {os} {device}",
- "message.visitors-dropped-off": "Visitors dropped off"
+ "message.visitors-dropped-off": "Высадка посетителей"
}
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 5502b5ba..b588ec84 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -2,9 +2,9 @@ import { ClickHouseClient, createClient } from '@clickhouse/client';
import { formatInTimeZone } from 'date-fns-tz';
import debug from 'debug';
import { CLICKHOUSE } from 'lib/db';
+import { getWebsite } from 'queries/index';
import { DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
import { maxDate } from './date';
-import { fetchWebsite } from './load';
import { filtersToArray } from './params';
import { PageParams, QueryFilters, QueryOptions } from './types';
@@ -132,7 +132,7 @@ function getFilterParams(filters: QueryFilters = {}) {
}
async function parseFilters(websiteId: string, filters: QueryFilters = {}, options?: QueryOptions) {
- const website = await fetchWebsite(websiteId);
+ const website = await getWebsite(websiteId);
return {
filterQuery: getFilterQuery(filters, options),
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 5d3a9776..7f8acf88 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -33,7 +33,7 @@ export const FILTER_REFERRERS = 'filter-referrers';
export const FILTER_PAGES = 'filter-pages';
export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
-export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event'];
+export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event', 'tag'];
export const SESSION_COLUMNS = [
'browser',
@@ -63,6 +63,7 @@ export const FILTER_COLUMNS = {
city: 'city',
language: 'language',
event: 'event_name',
+ tag: 'tag',
};
export const COLLECTION_TYPE = {
diff --git a/src/lib/format.ts b/src/lib/format.ts
index a662a9eb..e497464a 100644
--- a/src/lib/format.ts
+++ b/src/lib/format.ts
@@ -47,6 +47,9 @@ export function formatNumber(n: string | number) {
export function formatLongNumber(value: number) {
const n = Number(value);
+ if (n >= 1000000000) {
+ return `${(n / 1000000).toFixed(1)}b`;
+ }
if (n >= 1000000) {
return `${(n / 1000000).toFixed(1)}m`;
}
@@ -78,3 +81,38 @@ export function stringToColor(str: string) {
}
return color;
}
+
+export function formatCurrency(value: number, currency: string, locale = 'en-US') {
+ let formattedValue;
+
+ try {
+ formattedValue = new Intl.NumberFormat(locale, {
+ style: 'currency',
+ currency: currency,
+ });
+ } catch (error) {
+ // Fallback to default currency format if an error occurs
+ formattedValue = new Intl.NumberFormat(locale, {
+ style: 'currency',
+ currency: 'USD',
+ });
+ }
+
+ return formattedValue.format(value);
+}
+
+export function formatLongCurrency(value: number, currency: string, locale = 'en-US') {
+ const n = Number(value);
+
+ if (n >= 1000000000) {
+ return `${formatCurrency(n / 1000000000, currency, locale)}b`;
+ }
+ if (n >= 1000000) {
+ return `${formatCurrency(n / 1000000, currency, locale)}m`;
+ }
+ if (n >= 1000) {
+ return `${formatCurrency(n / 1000, currency, locale)}k`;
+ }
+
+ return formatCurrency(n, currency, locale);
+}
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 7fabbfc8..615882ef 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -179,6 +179,7 @@ export interface QueryFilters {
language?: string;
event?: string;
search?: string;
+ tag?: string;
}
export interface QueryOptions {
diff --git a/src/pages/api/reports/revenue.ts b/src/pages/api/reports/revenue.ts
index ac4dc6b3..d23ce55a 100644
--- a/src/pages/api/reports/revenue.ts
+++ b/src/pages/api/reports/revenue.ts
@@ -5,49 +5,60 @@ import { TimezoneTest, UnitTypeTest } from 'lib/yup';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getRevenue } from 'queries/analytics/reports/getRevenue';
+import { getRevenueValues } from 'queries/analytics/reports/getRevenueValues';
import * as yup from 'yup';
-export interface RetentionRequestBody {
+export interface RevenueRequestBody {
websiteId: string;
- dateRange: { startDate: string; endDate: string; unit?: string; timezone?: string };
- eventName: string;
- revenueProperty: string;
- userProperty: string;
+ currency?: string;
+ timezone?: string;
+ dateRange: { startDate: string; endDate: string; unit?: string };
}
const schema = {
POST: yup.object().shape({
websiteId: yup.string().uuid().required(),
+ timezone: TimezoneTest,
dateRange: yup
.object()
.shape({
startDate: yup.date().required(),
endDate: yup.date().required(),
unit: UnitTypeTest,
- timezone: TimezoneTest,
})
.required(),
- eventName: yup.string().required(),
- revenueProperty: yup.string().required(),
- userProperty: yup.string(),
}),
};
export default async (
- req: NextApiRequestQueryBody,
+ req: NextApiRequestQueryBody,
res: NextApiResponse,
) => {
await useCors(req, res);
await useAuth(req, res);
await useValidate(schema, req, res);
+ if (req.method === 'GET') {
+ const { websiteId, startDate, endDate } = req.query;
+
+ if (!(await canViewWebsite(req.auth, websiteId))) {
+ return unauthorized(res);
+ }
+
+ const data = await getRevenueValues(websiteId, {
+ startDate: new Date(startDate),
+ endDate: new Date(endDate),
+ });
+
+ return ok(res, data);
+ }
+
if (req.method === 'POST') {
const {
websiteId,
- dateRange: { startDate, endDate, unit, timezone },
- eventName,
- revenueProperty,
- userProperty,
+ currency,
+ timezone,
+ dateRange: { startDate, endDate, unit },
} = req.body;
if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -59,9 +70,7 @@ export default async (
endDate: new Date(endDate),
unit,
timezone,
- eventName,
- revenueProperty,
- userProperty,
+ currency,
});
return ok(res, data);
diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
index 23640de9..fb4e90c7 100644
--- a/src/pages/api/send.ts
+++ b/src/pages/api/send.ts
@@ -96,7 +96,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
}
const { type, payload } = req.body;
- const { url, referrer, name: eventName, data, title } = payload;
+ const { url, referrer, name: eventName, data, title, tag } = payload;
const pageTitle = safeDecodeURI(title);
await useSession(req, res);
@@ -143,6 +143,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
eventData: data,
...session,
sessionId: session.id,
+ tag,
});
} else if (type === COLLECTION_TYPE.identify) {
if (!data) {
diff --git a/src/pages/api/websites/[websiteId]/events/series.ts b/src/pages/api/websites/[websiteId]/events/series.ts
index 08cade12..6d67a264 100644
--- a/src/pages/api/websites/[websiteId]/events/series.ts
+++ b/src/pages/api/websites/[websiteId]/events/series.ts
@@ -24,6 +24,7 @@ export interface WebsiteEventsRequestQuery {
country?: string;
region: string;
city?: string;
+ tag?: string;
}
const schema = {
@@ -43,6 +44,7 @@ const schema = {
country: yup.string(),
region: yup.string(),
city: yup.string(),
+ tag: yup.string(),
}),
};
diff --git a/src/pages/api/websites/[websiteId]/metrics.ts b/src/pages/api/websites/[websiteId]/metrics.ts
index 3dac217b..1996a61a 100644
--- a/src/pages/api/websites/[websiteId]/metrics.ts
+++ b/src/pages/api/websites/[websiteId]/metrics.ts
@@ -29,6 +29,7 @@ export interface WebsiteMetricsRequestQuery {
limit?: number;
offset?: number;
search?: string;
+ tag?: string;
}
const schema = {
@@ -53,6 +54,7 @@ const schema = {
limit: yup.number(),
offset: yup.number(),
search: yup.string(),
+ tag: yup.string(),
}),
};
diff --git a/src/pages/api/websites/[websiteId]/pageviews.ts b/src/pages/api/websites/[websiteId]/pageviews.ts
index badb8a47..c3b6b797 100644
--- a/src/pages/api/websites/[websiteId]/pageviews.ts
+++ b/src/pages/api/websites/[websiteId]/pageviews.ts
@@ -25,6 +25,7 @@ export interface WebsitePageviewRequestQuery {
country?: string;
region: string;
city?: string;
+ tag?: string;
compare?: string;
}
@@ -45,6 +46,7 @@ const schema = {
country: yup.string(),
region: yup.string(),
city: yup.string(),
+ tag: yup.string(),
compare: yup.string(),
}),
};
diff --git a/src/pages/api/websites/[websiteId]/sessions/stats.ts b/src/pages/api/websites/[websiteId]/sessions/stats.ts
index a522bd6b..fe92ce6f 100644
--- a/src/pages/api/websites/[websiteId]/sessions/stats.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/stats.ts
@@ -23,6 +23,7 @@ export interface WebsiteSessionStatsRequestQuery {
country?: string;
region?: string;
city?: string;
+ tag?: string;
}
const schema = {
@@ -42,6 +43,7 @@ const schema = {
country: yup.string(),
region: yup.string(),
city: yup.string(),
+ tag: yup.string(),
}),
};
diff --git a/src/pages/api/websites/[websiteId]/stats.ts b/src/pages/api/websites/[websiteId]/stats.ts
index 9ca84c74..dfc9198d 100644
--- a/src/pages/api/websites/[websiteId]/stats.ts
+++ b/src/pages/api/websites/[websiteId]/stats.ts
@@ -24,6 +24,7 @@ export interface WebsiteStatsRequestQuery {
country?: string;
region?: string;
city?: string;
+ tag?: string;
compare?: string;
}
@@ -44,6 +45,7 @@ const schema = {
country: yup.string(),
region: yup.string(),
city: yup.string(),
+ tag: yup.string(),
compare: yup.string(),
}),
};
diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index 6c0f917b..2424186a 100644
--- a/src/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -28,6 +28,7 @@ export async function saveEvent(args: {
subdivision1?: string;
subdivision2?: string;
city?: string;
+ tag?: string;
}) {
return runQuery({
[PRISMA]: () => relationalQuery(args),
@@ -47,6 +48,7 @@ async function relationalQuery(data: {
pageTitle?: string;
eventName?: string;
eventData?: any;
+ tag?: string;
}) {
const {
websiteId,
@@ -60,6 +62,7 @@ async function relationalQuery(data: {
eventName,
eventData,
pageTitle,
+ tag,
} = data;
const websiteEventId = uuid();
@@ -77,6 +80,7 @@ async function relationalQuery(data: {
pageTitle: pageTitle?.substring(0, PAGE_TITLE_LENGTH),
eventType: eventName ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
eventName: eventName ? eventName?.substring(0, EVENT_NAME_LENGTH) : null,
+ tag,
},
});
@@ -116,6 +120,7 @@ async function clickhouseQuery(data: {
subdivision1?: string;
subdivision2?: string;
city?: string;
+ tag?: string;
}) {
const {
websiteId,
@@ -133,6 +138,7 @@ async function clickhouseQuery(data: {
subdivision1,
subdivision2,
city,
+ tag,
...args
} = data;
const { insert, getUTCString } = clickhouse;
@@ -145,7 +151,7 @@ async function clickhouseQuery(data: {
website_id: websiteId,
session_id: sessionId,
visit_id: visitId,
- event_id: uuid(),
+ event_id: eventId,
country: country,
subdivision1:
country && subdivision1
@@ -163,6 +169,7 @@ async function clickhouseQuery(data: {
page_title: pageTitle?.substring(0, PAGE_TITLE_LENGTH),
event_type: eventName ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
event_name: eventName ? eventName?.substring(0, EVENT_NAME_LENGTH) : null,
+ tag: tag,
created_at: createdAt,
};
diff --git a/src/queries/analytics/reports/getRevenue.ts b/src/queries/analytics/reports/getRevenue.ts
index 502505f4..a2803e85 100644
--- a/src/queries/analytics/reports/getRevenue.ts
+++ b/src/queries/analytics/reports/getRevenue.ts
@@ -1,5 +1,5 @@
import clickhouse from 'lib/clickhouse';
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { CLICKHOUSE, getDatabaseType, POSTGRESQL, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
export async function getRevenue(
@@ -10,9 +10,7 @@ export async function getRevenue(
endDate: Date;
unit: string;
timezone: string;
- eventName: string;
- revenueProperty: string;
- userProperty: string;
+ currency: string;
},
]
) {
@@ -29,61 +27,115 @@ async function relationalQuery(
endDate: Date;
unit: string;
timezone: string;
- eventName: string;
- revenueProperty: string;
- userProperty: string;
+ currency: string;
},
): Promise<{
- chart: { time: string; sum: number; avg: number; count: number; uniqueCount: number }[];
- total: { sum: number; avg: number; count: number; uniqueCount: number };
+ chart: { x: string; t: string; y: number }[];
+ country: { name: string; value: number }[];
+ total: { sum: number; count: number; unique_count: number };
+ table: {
+ currency: string;
+ sum: number;
+ count: number;
+ unique_count: number;
+ }[];
}> {
- const {
- startDate,
- endDate,
- eventName,
- revenueProperty,
- userProperty,
- timezone = 'UTC',
- unit = 'day',
- } = criteria;
+ const { startDate, endDate, timezone = 'UTC', unit = 'day', currency } = criteria;
const { getDateSQL, rawQuery } = prisma;
+ const db = getDatabaseType();
+ const like = db === POSTGRESQL ? 'ilike' : 'like';
const chartRes = await rawQuery(
`
select
- ${getDateSQL('website_event.created_at', unit, timezone)} time,
- sum(case when data_key = {{revenueProperty}} then number_value else 0 end) sum,
- avg(case when data_key = {{revenueProperty}} then number_value else 0 end) avg,
- count(case when data_key = {{revenueProperty}} then 1 else 0 end) count,
- count(distinct {{userProperty}}) uniqueCount
- from event_data
- where website_event.website_id = {{websiteId::uuid}}
- and website_event.created_at between {{startDate}} and {{endDate}}
- and event_name = {{eventType}}
- and data_key in ({{revenueProperty}} , {{userProperty}})
- group by 1
+ we.event_name x,
+ ${getDateSQL('ed.created_at', unit, timezone)} t,
+ sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) y
+ from event_data ed
+ join website_event we
+ on we.event_id = ed.website_event_id
+ join (select website_event_id
+ from event_data
+ where data_key ${like} '%currency%'
+ and string_value = {{currency}}) currency
+ on currency.website_event_id = ed.website_event_id
+ where ed.website_id = {{websiteId::uuid}}
+ and ed.created_at between {{startDate}} and {{endDate}}
+ and ed.data_key ${like} '%revenue%'
+ group by x, t
+ order by t
`,
- { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
+ { websiteId, startDate, endDate, unit, timezone, currency },
+ );
+
+ const countryRes = await rawQuery(
+ `
+ select
+ s.country as name,
+ sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) value
+ from event_data ed
+ join website_event we
+ on we.event_id = ed.website_event_id
+ join session s
+ on s.session_id = we.session_id
+ join (select website_event_id
+ from event_data
+ where data_key ${like} '%currency%'
+ and string_value = {{currency}}) currency
+ on currency.website_event_id = ed.website_event_id
+ where ed.website_id = {{websiteId::uuid}}
+ and ed.created_at between {{startDate}} and {{endDate}}
+ and ed.data_key ${like} '%revenue%'
+ group by s.country
+ `,
+ { websiteId, startDate, endDate, currency },
);
const totalRes = await rawQuery(
`
select
- sum(case when data_key = {{revenueProperty}} then number_value else 0 end) sum,
- avg(case when data_key = {{revenueProperty}} then number_value else 0 end) avg,
- count(case when data_key = {{revenueProperty}} then 1 else 0 end) count,
- count(distinct {{userProperty}}) uniqueCount
- from event_data
- where website_event.website_id = {{websiteId::uuid}}
- and website_event.created_at between {{startDate}} and {{endDate}}
- and event_name = {{eventType}}
- and data_key in ({{revenueProperty}} , {{userProperty}})
- group by 1
+ sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) as sum,
+ count(distinct event_id) as count,
+ count(distinct session_id) as unique_count
+ from event_data ed
+ join website_event we
+ on we.event_id = ed.website_event_id
+ join (select website_event_id
+ from event_data
+ where data_key ${like} '%currency%'
+ and string_value = {{currency}}) currency
+ on currency.website_event_id = ed.website_event_id
+ where ed.website_id = {{websiteId::uuid}}
+ and ed.created_at between {{startDate}} and {{endDate}}
+ and ed.data_key ${like} '%revenue%'
+ `,
+ { websiteId, startDate, endDate, currency },
+ ).then(result => result?.[0]);
+
+ const tableRes = await rawQuery(
+ `
+ select
+ c.currency,
+ sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) as sum,
+ count(distinct ed.website_event_id) as count,
+ count(distinct we.session_id) as unique_count
+ from event_data ed
+ join website_event we
+ on we.event_id = ed.website_event_id
+ join (select website_event_id, string_value as currency
+ from event_data
+ where data_key ${like} '%currency%') c
+ on c.website_event_id = ed.website_event_id
+ where ed.website_id = {{websiteId::uuid}}
+ and ed.created_at between {{startDate}} and {{endDate}}
+ and ed.data_key ${like} '%revenue%'
+ group by c.currency
+ order by sum desc;
`,
- { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
+ { websiteId, startDate, endDate, unit, timezone, currency },
);
- return { chart: chartRes, total: totalRes };
+ return { chart: chartRes, country: countryRes, total: totalRes, table: tableRes };
}
async function clickhouseQuery(
@@ -91,80 +143,132 @@ async function clickhouseQuery(
criteria: {
startDate: Date;
endDate: Date;
- eventName: string;
- revenueProperty: string;
- userProperty: string;
unit: string;
timezone: string;
+ currency: string;
},
): Promise<{
- chart: { time: string; sum: number; avg: number; count: number; uniqueCount: number }[];
- total: { sum: number; avg: number; count: number; uniqueCount: number };
-}> {
- const {
- startDate,
- endDate,
- eventName,
- revenueProperty,
- userProperty = '',
- timezone = 'UTC',
- unit = 'day',
- } = criteria;
- const { getDateStringSQL, getDateSQL, rawQuery } = clickhouse;
-
- const chartRes = await rawQuery<{
- time: string;
+ chart: { x: string; t: string; y: number }[];
+ country: { name: string; value: number }[];
+ total: { sum: number; count: number; unique_count: number };
+ table: {
+ currency: string;
sum: number;
- avg: number;
count: number;
- uniqueCount: number;
- }>(
+ unique_count: number;
+ }[];
+}> {
+ const { startDate, endDate, timezone = 'UTC', unit = 'day', currency } = criteria;
+ const { getDateSQL, rawQuery } = clickhouse;
+
+ const chartRes = await rawQuery<
+ {
+ x: string;
+ t: string;
+ y: number;
+ }[]
+ >(
`
select
- ${getDateStringSQL('g.time', unit)} as time,
- g.sum as sum,
- g.avg as avg,
- g.count as count,
- g.uniqueCount as uniqueCount
- from (
- select
- ${getDateSQL('created_at', unit, timezone)} as time,
- sumIf(number_value, data_key = {revenueProperty:String}) as sum,
- avgIf(number_value, data_key = {revenueProperty:String}) as avg,
- countIf(data_key = {revenueProperty:String}) as count,
- uniqExactIf(string_value, data_key = {userProperty:String}) as uniqueCount
- from event_data
- where website_id = {websiteId:UUID}
- and created_at between {startDate:DateTime64} and {endDate:DateTime64}
- and event_name = {eventName:String}
- and data_key in ({revenueProperty:String}, {userProperty:String})
- group by time
- ) as g
- order by time
+ event_name x,
+ ${getDateSQL('created_at', unit, timezone)} t,
+ sum(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) y
+ from event_data
+ join (select event_id
+ from event_data
+ where positionCaseInsensitive(data_key, 'currency') > 0
+ and string_value = {currency:String}) currency
+ on currency.event_id = event_data.event_id
+ where website_id = {websiteId:UUID}
+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+ and positionCaseInsensitive(data_key, 'revenue') > 0
+ group by x, t
+ order by t
`,
- { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
- ).then(result => result?.[0]);
+ { websiteId, startDate, endDate, unit, timezone, currency },
+ );
+
+ const countryRes = await rawQuery<
+ {
+ name: string;
+ value: number;
+ }[]
+ >(
+ `
+ select
+ s.country as name,
+ sum(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) as value
+ from event_data ed
+ join (select event_id
+ from event_data
+ where positionCaseInsensitive(data_key, 'currency') > 0
+ and string_value = {currency:String}) c
+ on c.event_id = ed.event_id
+ join (select distinct website_id, session_id, country
+ from website_event_stats_hourly
+ where website_id = {websiteId:UUID}) s
+ on ed.website_id = s.website_id
+ and ed.session_id = s.session_id
+ where ed.website_id = {websiteId:UUID}
+ and ed.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+ and positionCaseInsensitive(ed.data_key, 'revenue') > 0
+ group by s.country
+ `,
+ { websiteId, startDate, endDate, currency },
+ );
const totalRes = await rawQuery<{
sum: number;
avg: number;
count: number;
- uniqueCount: number;
+ unique_count: number;
}>(
`
- select
- sumIf(number_value, data_key = {revenueProperty:String}) as sum,
- avgIf(number_value, data_key = {revenueProperty:String}) as avg,
- countIf(data_key = {revenueProperty:String}) as count,
- uniqExactIf(string_value, data_key = {userProperty:String}) as uniqueCount
- from event_data
- where website_id = {websiteId:UUID}
- and created_at between {startDate:DateTime64} and {endDate:DateTime64}
- and event_name = {eventName:String}
- and data_key in ({revenueProperty:String}, {userProperty:String})
+ select
+ sum(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) as sum,
+ uniqExact(event_id) as count,
+ uniqExact(session_id) as unique_count
+ from event_data
+ join (select event_id
+ from event_data
+ where positionCaseInsensitive(data_key, 'currency') > 0
+ and string_value = {currency:String}) currency
+ on currency.event_id = event_data.event_id
+ where website_id = {websiteId:UUID}
+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+ and positionCaseInsensitive(data_key, 'revenue') > 0
`,
- { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
+ { websiteId, startDate, endDate, currency },
+ ).then(result => result?.[0]);
+
+ const tableRes = await rawQuery<
+ {
+ currency: string;
+ sum: number;
+ avg: number;
+ count: number;
+ unique_count: number;
+ }[]
+ >(
+ `
+ select
+ c.currency,
+ sum(coalesce(toDecimal64(ed.number_value, 2), toDecimal64(ed.string_value, 2))) as sum,
+ uniqExact(ed.event_id) as count,
+ uniqExact(ed.session_id) as unique_count
+ from event_data ed
+ join (select event_id, string_value as currency
+ from event_data
+ where positionCaseInsensitive(data_key, 'currency') > 0) c
+ on c.event_id = ed.event_id
+ where website_id = {websiteId:UUID}
+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+ and positionCaseInsensitive(data_key, 'revenue') > 0
+ group by c.currency
+ order by sum desc;
+ `,
+ { websiteId, startDate, endDate, unit, timezone, currency },
);
- return { chart: chartRes, total: totalRes };
+ return { chart: chartRes, country: countryRes, total: totalRes, table: tableRes };
}
diff --git a/src/queries/analytics/reports/getRevenueValues.ts b/src/queries/analytics/reports/getRevenueValues.ts
new file mode 100644
index 00000000..4dcc4a22
--- /dev/null
+++ b/src/queries/analytics/reports/getRevenueValues.ts
@@ -0,0 +1,75 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, CLICKHOUSE, PRISMA, getDatabaseType, POSTGRESQL } from 'lib/db';
+
+export async function getRevenueValues(
+ ...args: [
+ websiteId: string,
+ criteria: {
+ startDate: Date;
+ endDate: Date;
+ },
+ ]
+) {
+ return runQuery({
+ [PRISMA]: () => relationalQuery(...args),
+ [CLICKHOUSE]: () => clickhouseQuery(...args),
+ });
+}
+
+async function relationalQuery(
+ websiteId: string,
+ criteria: {
+ startDate: Date;
+ endDate: Date;
+ },
+) {
+ const { rawQuery } = prisma;
+ const { startDate, endDate } = criteria;
+
+ const db = getDatabaseType();
+ const like = db === POSTGRESQL ? 'ilike' : 'like';
+
+ return rawQuery(
+ `
+ select distinct string_value as currency
+ from event_data
+ where website_id = {{websiteId::uuid}}
+ and created_at between {{startDate}} and {{endDate}}
+ and data_key ${like} '%currency%'
+ order by currency
+ `,
+ {
+ websiteId,
+ startDate,
+ endDate,
+ },
+ );
+}
+
+async function clickhouseQuery(
+ websiteId: string,
+ criteria: {
+ startDate: Date;
+ endDate: Date;
+ },
+) {
+ const { rawQuery } = clickhouse;
+ const { startDate, endDate } = criteria;
+
+ return rawQuery(
+ `
+ select distinct string_value as currency
+ from event_data
+ where website_id = {websiteId:UUID}
+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+ and positionCaseInsensitive(data_key, 'currency') > 0
+ order by currency
+ `,
+ {
+ websiteId,
+ startDate,
+ endDate,
+ },
+ );
+}
diff --git a/src/queries/analytics/sessions/getWebsiteSession.ts b/src/queries/analytics/sessions/getWebsiteSession.ts
index f9b9f39a..2c16741e 100644
--- a/src/queries/analytics/sessions/getWebsiteSession.ts
+++ b/src/queries/analytics/sessions/getWebsiteSession.ts
@@ -47,7 +47,7 @@ async function relationalQuery(websiteId: string, sessionId: string) {
min(website_event.created_at) as min_time,
max(website_event.created_at) as max_time,
sum(case when website_event.event_type = 1 then 1 else 0 end) as views,
- sum(case when website_event.event_type = 1 then 1 else 0 end) as events
+ sum(case when website_event.event_type = 2 then 1 else 0 end) as events
from session
join website_event on website_event.session_id = session.session_id
where session.website_id = {{websiteId::uuid}}
diff --git a/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts b/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
index 153c9bb3..48d4f7a9 100644
--- a/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
@@ -34,8 +34,8 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
const { timezone = 'utc' } = filters;
- const { rawQuery } = clickhouse;
- const { startDate, endDate } = filters;
+ const { rawQuery, parseFilters } = clickhouse;
+ const { params } = await parseFilters(websiteId, filters);
return rawQuery(
`
@@ -48,7 +48,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
group by time
order by time
`,
- { websiteId, startDate, endDate },
+ params,
).then(formatResults);
}
diff --git a/src/styles/locale.css b/src/styles/locale.css
deleted file mode 100644
index dddf495b..00000000
--- a/src/styles/locale.css
+++ /dev/null
@@ -1,29 +0,0 @@
-.zh-CN {
- font-family: '方体', 'PingFang SC', '黑体', 'Heiti SC', 'Microsoft JhengHei UI',
- 'Microsoft JhengHei', Roboto, Noto, 'Noto Sans CJK SC', sans-serif !important;
-}
-
-.zh-TW {
- font-family: '方體', 'PingFang TC', '黑體', 'Heiti TC', 'Microsoft JhengHei UI',
- 'Microsoft JhengHei', Roboto, Noto, 'Noto Sans CJK TC', sans-serif !important;
-}
-
-.ja-JP {
- font-family: '游ゴシック体', YuGothic, 'ヒラギノ丸ゴ', 'Hiragino Sans', 'Yu Gothic UI',
- 'Meiryo UI', 'MS Gothic', Roboto, Noto, 'Noto Sans CJK JP', sans-serif !important;
-}
-
-.ko-KR {
- font-family: 'Nanum Gothic', 'Apple SD Gothic Neo', 'Malgun Gothic', Roboto, Noto,
- 'Noto Sans CJK KR', sans-serif !important;
-}
-
-.ar-SA {
- font-family: 'Geeza Pro', 'Arabic Typesetting', Roboto, Noto, 'Noto Naskh Arabic',
- 'Times New Roman', serif !important;
-}
-
-.he-IL {
- font-family: 'New Peninim MT', 'Arial Hebrew', Gisha, 'Times New Roman', Roboto, Noto,
- 'Noto Sans Hebrew', sans-serif !important;
-}
diff --git a/src/tracker/index.js b/src/tracker/index.js
index 707594cf..16f714e4 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -3,12 +3,12 @@
screen: { width, height },
navigator: { language },
location,
- localStorage,
document,
history,
} = window;
const { hostname, href } = location;
const { currentScript, referrer } = document;
+ const localStorage = href.startsWith('data:') ? undefined : window.localStorage;
if (!currentScript) return;
diff --git a/yarn.lock b/yarn.lock
index 910f0c69..00bd738b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2197,10 +2197,10 @@
resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.6.0.tgz#970f96b11bee4fe115fad8e3e4f3c6121f97a370"
integrity sha512-PBrsd/GJZ9MN8BdyIoleTkY22lAUMfcRxrbb8wgxGzXtTW0RU0GW2mc99ISB6zOwWMZ11rSjeN0GS6znnukvww==
-"@next/env@14.2.5":
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.5.tgz#1d9328ab828711d3517d0a1d505acb55e5ef7ad0"
- integrity sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==
+"@next/env@14.2.10":
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.10.tgz#1d3178340028ced2d679f84140877db4f420333c"
+ integrity sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==
"@next/eslint-plugin-next@14.2.5":
version "14.2.5"
@@ -2209,50 +2209,50 @@
dependencies:
glob "10.3.10"
-"@next/swc-darwin-arm64@14.2.5":
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.5.tgz#d0a160cf78c18731c51cc0bff131c706b3e9bb05"
- integrity sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==
+"@next/swc-darwin-arm64@14.2.10":
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.10.tgz#49d10ca4086fbd59ee68e204f75d7136eda2aa80"
+ integrity sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ==
-"@next/swc-darwin-x64@14.2.5":
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.5.tgz#eb832a992407f6e6352eed05a073379f1ce0589c"
- integrity sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==
+"@next/swc-darwin-x64@14.2.10":
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.10.tgz#0ebeae3afb8eac433882b79543295ab83624a1a8"
+ integrity sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA==
-"@next/swc-linux-arm64-gnu@14.2.5":
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.5.tgz#098fdab57a4664969bc905f5801ef5a89582c689"
- integrity sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==
+"@next/swc-linux-arm64-gnu@14.2.10":
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.10.tgz#7e602916d2fb55a3c532f74bed926a0137c16f20"
+ integrity sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA==
-"@next/swc-linux-arm64-musl@14.2.5":
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.5.tgz#243a1cc1087fb75481726dd289c7b219fa01f2b5"
- integrity sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==
+"@next/swc-linux-arm64-musl@14.2.10":
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.10.tgz#6b143f628ccee490b527562e934f8de578d4be47"
+ integrity sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ==
-"@next/swc-linux-x64-gnu@14.2.5":
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.5.tgz#b8a2e436387ee4a52aa9719b718992e0330c4953"
- integrity sha512-8XFikMSxWleYNryWIjiCX+gU201YS+erTUidKdyOVYi5qUQo/gRxv/3N1oZFCgqpesN6FPeqGM72Zve+nReVXQ==
+"@next/swc-linux-x64-gnu@14.2.10":
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.10.tgz#086f2f16a0678890a1eb46518c4dda381b046082"
+ integrity sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg==
-"@next/swc-linux-x64-musl@14.2.5":
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.5.tgz#cb8a9adad5fb8df86112cfbd363aab5c6d32757b"
- integrity sha512-6QLwi7RaYiQDcRDSU/os40r5o06b5ue7Jsk5JgdRBGGp8l37RZEh9JsLSM8QF0YDsgcosSeHjglgqi25+m04IQ==
+"@next/swc-linux-x64-musl@14.2.10":
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.10.tgz#1befef10ed8dbcc5047b5d637a25ae3c30a0bfc3"
+ integrity sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA==
-"@next/swc-win32-arm64-msvc@14.2.5":
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.5.tgz#81f996c1c38ea0900d4e7719cc8814be8a835da0"
- integrity sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==
+"@next/swc-win32-arm64-msvc@14.2.10":
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.10.tgz#731f52c3ae3c56a26cf21d474b11ae1529531209"
+ integrity sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ==
-"@next/swc-win32-ia32-msvc@14.2.5":
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz#f61c74ce823e10b2bc150e648fc192a7056422e0"
- integrity sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==
+"@next/swc-win32-ia32-msvc@14.2.10":
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.10.tgz#32723ef7f04e25be12af357cc72ddfdd42fd1041"
+ integrity sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg==
-"@next/swc-win32-x64-msvc@14.2.5":
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.5.tgz#ed199a920efb510cfe941cd75ed38a7be21e756f"
- integrity sha512-tEQ7oinq1/CjSG9uSTerca3v4AZ+dFa+4Yu6ihaG8Ud8ddqLQgFGcnwYls13H5X5CPDPZJdYxyeMui6muOLd4g==
+"@next/swc-win32-x64-msvc@14.2.10":
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.10.tgz#ee1d036cb5ec871816f96baee7991035bb242455"
+ integrity sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ==
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
@@ -7870,12 +7870,12 @@ next-basics@^0.39.0:
jsonwebtoken "^9.0.0"
pure-rand "^6.0.2"
-next@14.2.5:
- version "14.2.5"
- resolved "https://registry.yarnpkg.com/next/-/next-14.2.5.tgz#afe4022bb0b752962e2205836587a289270efbea"
- integrity sha512-0f8aRfBVL+mpzfBjYfQuLWh2WyAwtJXCRfkPF4UJ5qd2YwrHczsrSzXU4tRMV0OAxR8ZJZWPFn6uhSC56UTsLA==
+next@14.2.10:
+ version "14.2.10"
+ resolved "https://registry.yarnpkg.com/next/-/next-14.2.10.tgz#331981a4fecb1ae8af1817d4db98fc9687ee1cb6"
+ integrity sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww==
dependencies:
- "@next/env" "14.2.5"
+ "@next/env" "14.2.10"
"@swc/helpers" "0.5.5"
busboy "1.6.0"
caniuse-lite "^1.0.30001579"
@@ -7883,15 +7883,15 @@ next@14.2.5:
postcss "8.4.31"
styled-jsx "5.1.1"
optionalDependencies:
- "@next/swc-darwin-arm64" "14.2.5"
- "@next/swc-darwin-x64" "14.2.5"
- "@next/swc-linux-arm64-gnu" "14.2.5"
- "@next/swc-linux-arm64-musl" "14.2.5"
- "@next/swc-linux-x64-gnu" "14.2.5"
- "@next/swc-linux-x64-musl" "14.2.5"
- "@next/swc-win32-arm64-msvc" "14.2.5"
- "@next/swc-win32-ia32-msvc" "14.2.5"
- "@next/swc-win32-x64-msvc" "14.2.5"
+ "@next/swc-darwin-arm64" "14.2.10"
+ "@next/swc-darwin-x64" "14.2.10"
+ "@next/swc-linux-arm64-gnu" "14.2.10"
+ "@next/swc-linux-arm64-musl" "14.2.10"
+ "@next/swc-linux-x64-gnu" "14.2.10"
+ "@next/swc-linux-x64-musl" "14.2.10"
+ "@next/swc-win32-arm64-msvc" "14.2.10"
+ "@next/swc-win32-ia32-msvc" "14.2.10"
+ "@next/swc-win32-x64-msvc" "14.2.10"
nice-try@^1.0.4:
version "1.0.5"
@@ -8860,7 +8860,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-postcss@8.4.31, postcss@^8.1.10:
+postcss@8.4.31:
version "8.4.31"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
@@ -8869,25 +8869,7 @@ postcss@8.4.31, postcss@^8.1.10:
picocolors "^1.0.0"
source-map-js "^1.0.2"
-postcss@^8.4.21:
- version "8.4.32"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.32.tgz#1dac6ac51ab19adb21b8b34fd2d93a86440ef6c9"
- integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==
- dependencies:
- nanoid "^3.3.7"
- picocolors "^1.0.0"
- source-map-js "^1.0.2"
-
-postcss@^8.4.28:
- version "8.4.35"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7"
- integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==
- dependencies:
- nanoid "^3.3.7"
- picocolors "^1.0.0"
- source-map-js "^1.0.2"
-
-postcss@^8.4.31:
+postcss@^8.1.10, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.31:
version "8.4.41"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
@@ -9500,9 +9482,9 @@ rollup-pluginutils@^2.8.2:
estree-walker "^0.6.1"
rollup@^3.28.0:
- version "3.29.4"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
- integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
+ version "3.29.5"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.5.tgz#8a2e477a758b520fb78daf04bca4c522c1da8a54"
+ integrity sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==
optionalDependencies:
fsevents "~2.3.2"
+ 