Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Moved files around.
Mike Cao2cd38f130631
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.tsindex 1be99732e..7c16eeee3 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.tsindex 72fe095d0..f6293a44d 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.tsindex 1d7ccf2da..5cad99169 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.tsindex 4eabd0519..b841a8f40 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.tsindex 61aea58e0..9960b3db9 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(diff --git a/src/components/hooks/queries/useLogin.ts b/src/components/hooks/queries/useLogin.tsindex c17687b04..a54f38d11 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.tsindex 9c665e4f0..b87f74c46 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.tsindex 2e63e4e6b..f7d2a1a0c 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.tsindex 88e4f02eb..21db15368 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/useSessionActivity.ts b/src/components/hooks/queries/useSessionActivity.tsindex 16c139ab3..1c9c8f57d 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.tsindex 14e046d1d..521ba7d56 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.tsindex 459dccd6a..45590b390 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.tsindex ce9a67f3e..85529fc09 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.tsindex 189657be4..f9db7dbfa 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.tsindex e348531c6..d0ce7499c 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.tsindex a3e8bcd23..b6353afc1 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.tsindex fac82d13b..5606407eb 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.tsindex e1f7790a5..e5197c97b 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.tsindex 61c22ecdf..8541a2207 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.tsindex 519fb8991..3d70d262d 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.tsindex 4121f97b2..9151b55d7 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.tsindex 5d9bd1966..2a47c3eb2 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.tsindex 88b493759..91c50ffff 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.tsindex 184fd4d44..8a3976e10 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.tsindex c9260bcbf..42fb527e3 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.tsindex 64c7be58b..93e9057c6 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.tsindex 7671b2ebe..5c02cfdce 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.tsindex ce65512c2..ad7bb616d 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.tsindex 5df543f50..c4e83f987 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.tsindex b24399fa9..6d42009ee 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.tsindex c5358df23..68e950f26 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.tsindex d6fe00df7..7a5004d75 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.tssimilarity index 100%rename from src/components/hooks/queries/useApi.tsrename to src/components/hooks/useApi.tsdiff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.tsindex 248070f47..23cb6e70e 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/queries/usePagedQuery.ts b/src/components/hooks/usePagedQuery.tssimilarity index 94%rename from src/components/hooks/queries/usePagedQuery.tsrename to src/components/hooks/usePagedQuery.tsindex 253f80925..19471432d 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<T = any>({queryKey,