Moved files around.

src/components/hooks/queries/useApi.ts

@@ -1,20 +0,0 @@
-import * as reactQuery from '@tanstack/react-query';
-import { useApi as nextUseApi } from 'next-basics';
-import { getClientAuthToken } from 'lib/client';
-import { SHARE_TOKEN_HEADER } from 'lib/constants';
-import useStore from 'store/app';
-
-const selector = (state: { shareToken: { token?: string } }) => state.shareToken;
-
-export function useApi() {
-  const shareToken = useStore(selector);
-
-  const { get, post, put, del } = nextUseApi(
-    { authorization: `Bearer ${getClientAuthToken()}`, [SHARE_TOKEN_HEADER]: shareToken?.token },
-    process.env.basePath,
-  );
-
-  return { get, post, put, del, ...reactQuery };
-}
-
-export default useApi;

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;
 

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';
 

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(

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(

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;
 

src/components/hooks/queries/usePagedQuery.ts

@@ -1,33 +0,0 @@
-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';
-
-export function usePagedQuery<T = any>({
-  queryKey,
-  queryFn,
-  ...options
-}: Omit<UseQueryOptions, 'queryFn'> & { queryFn: (params?: object) => any }): PagedQueryResult<T> {
-  const { query: queryParams } = useNavigation();
-  const [params, setParams] = useState<PageParams>({
-    query: '',
-    page: +queryParams.page || 1,
-  });
-
-  const { useQuery } = useApi();
-  const { data, ...query } = useQuery({
-    queryKey: [{ ...queryKey, ...params }],
-    queryFn: () => queryFn(params as any),
-    ...options,
-  });
-
-  return {
-    result: data as PageResult<T>,
-    query,
-    params,
-    setParams,
-  };
-}
-
-export default usePagedQuery;

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();

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';
 

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 }) {

src/components/hooks/queries/useSessionActivity.ts

@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 
 export function useSessionActivity(
   websiteId: string,

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();

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';
 

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';
 

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;
 

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();

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) {

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) {

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) {

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();

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() {

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();

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,

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';
 

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(

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(

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();

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 }) {

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';
 

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';
 

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(

src/components/hooks/queries/useWebsiteValues.ts

@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 
 export function useWebsiteValues({
   websiteId,

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';