🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
update api (#788)
Bill Yang64cf22e0d299
diff --git a/client/src/api/admin/auth.ts b/client/src/api/admin/auth.tsdeleted file mode 100644index cb8c6aa81..000000000--- a/client/src/api/admin/auth.ts+++ /dev/null@@ -1,25 +0,0 @@-import { useQuery } from "@tanstack/react-query";-import { authedFetch } from "../utils";--type GetOrganizationMembersResponse = {- data: {- id: string;- role: string;- userId: string;- organizationId: string;- createdAt: string;- user: {- id: string;- name: string | null;- email: string;- };- }[];-};--export const useOrganizationMembers = (organizationId: string) => {- return useQuery<GetOrganizationMembersResponse>({- queryKey: ["organization-members", organizationId],- queryFn: () => authedFetch(`/organizations/${organizationId}/members`),- staleTime: Infinity,- });-};diff --git a/client/src/api/admin/endpoints/accountSettings.ts b/client/src/api/admin/endpoints/accountSettings.tsnew file mode 100644index 000000000..52ff48ad9--- /dev/null+++ b/client/src/api/admin/endpoints/accountSettings.ts@@ -0,0 +1,21 @@+import { authedFetch } from "../../utils";++export interface UpdateAccountSettingsRequest {+ sendAutoEmailReports?: boolean;+ // Add more settings here in the future+}++export interface UpdateAccountSettingsResponse {+ success: boolean;+ settings: {+ sendAutoEmailReports: boolean;+ // Add more settings here as they're added+ };+}++export function updateAccountSettings(settings: UpdateAccountSettingsRequest) {+ return authedFetch<UpdateAccountSettingsResponse>("/user/account-settings", undefined, {+ method: "POST",+ data: settings,+ });+}diff --git a/client/src/api/admin/getAdminOrganizations.ts b/client/src/api/admin/endpoints/adminOrganizations.tssimilarity index 69%rename from client/src/api/admin/getAdminOrganizations.tsrename to client/src/api/admin/endpoints/adminOrganizations.tsindex 41f0a6baf..7f5c71272 100644--- a/client/src/api/admin/getAdminOrganizations.ts+++ b/client/src/api/admin/endpoints/adminOrganizations.ts@@ -1,5 +1,4 @@-import { useQuery } from "@tanstack/react-query";-import { authedFetch } from "../utils";+import { authedFetch } from "../../utils";export interface AdminOrganizationData {id: string;@@ -33,13 +32,6 @@ export interface AdminOrganizationData {}[];}-async function getAdminOrganizations() {+export function getAdminOrganizations() {return authedFetch<AdminOrganizationData[]>("/admin/organizations");}--export function useAdminOrganizations() {- return useQuery<AdminOrganizationData[]>({- queryKey: ["admin-organizations"],- queryFn: getAdminOrganizations,- });-}diff --git a/client/src/api/admin/useGetAdminServiceEventCount.ts b/client/src/api/admin/endpoints/adminServiceEventCount.tssimilarity index 52%rename from client/src/api/admin/useGetAdminServiceEventCount.tsrename to client/src/api/admin/endpoints/adminServiceEventCount.tsindex 649392238..cb070b6ed 100644--- a/client/src/api/admin/useGetAdminServiceEventCount.ts+++ b/client/src/api/admin/endpoints/adminServiceEventCount.ts@@ -1,5 +1,4 @@-import { useQuery } from "@tanstack/react-query";-import { authedFetch } from "../utils";+import { authedFetch } from "../../utils";export type ServiceEventCountResponse = {event_date: string;@@ -13,15 +12,17 @@ export type GetServiceEventCountResponse = {data: ServiceEventCountResponse;};-async function getAdminServiceEventCount({- startDate,- endDate,- timeZone,-}: {+export interface GetAdminServiceEventCountParams {startDate?: string;endDate?: string;timeZone: string;-}): Promise<GetServiceEventCountResponse> {+}++export function getAdminServiceEventCount({+ startDate,+ endDate,+ timeZone,+}: GetAdminServiceEventCountParams): Promise<GetServiceEventCountResponse> {const params = new URLSearchParams();if (startDate) params.append("start_date", startDate);if (endDate) params.append("end_date", endDate);@@ -29,24 +30,3 @@ async function getAdminServiceEventCount({return authedFetch("/admin/service-event-count", Object.fromEntries(params));}--export function useGetAdminServiceEventCount({- startDate,- endDate,- timeZone,-}: {- startDate?: string;- endDate?: string;- timeZone: string;-}) {- return useQuery({- queryKey: ["admin-service-event-count", startDate, endDate, timeZone],- queryFn: () =>- getAdminServiceEventCount({- startDate,- endDate,- timeZone,- }),- staleTime: 1000 * 60 * 5, // 5 minutes- });-}diff --git a/client/src/api/admin/getAdminSites.ts b/client/src/api/admin/endpoints/adminSites.tssimilarity index 55%rename from client/src/api/admin/getAdminSites.tsrename to client/src/api/admin/endpoints/adminSites.tsindex db2af945b..f66f0d940 100644--- a/client/src/api/admin/getAdminSites.ts+++ b/client/src/api/admin/endpoints/adminSites.ts@@ -1,5 +1,4 @@-import { useQuery } from "@tanstack/react-query";-import { authedFetch } from "../utils";+import { authedFetch } from "../../utils";export interface AdminSiteData {siteId: number;@@ -15,13 +14,6 @@ export interface AdminSiteData {};}-async function getAdminSites() {+export function getAdminSites() {return authedFetch<AdminSiteData[]>("/admin/sites");}--export function useAdminSites() {- return useQuery<AdminSiteData[]>({- queryKey: ["admin-sites"],- queryFn: getAdminSites,- });-}diff --git a/client/src/api/admin/endpoints/auth.ts b/client/src/api/admin/endpoints/auth.tsnew file mode 100644index 000000000..b6745632d--- /dev/null+++ b/client/src/api/admin/endpoints/auth.ts@@ -0,0 +1,20 @@+import { authedFetch } from "../../utils";++export type GetOrganizationMembersResponse = {+ data: {+ id: string;+ role: string;+ userId: string;+ organizationId: string;+ createdAt: string;+ user: {+ id: string;+ name: string | null;+ email: string;+ };+ }[];+};++export function getOrganizationMembers(organizationId: string) {+ return authedFetch<GetOrganizationMembersResponse>(`/organizations/${organizationId}/members`);+}diff --git a/client/src/api/admin/endpoints/excludedCountries.ts b/client/src/api/admin/endpoints/excludedCountries.tsnew file mode 100644index 000000000..c0a76485f--- /dev/null+++ b/client/src/api/admin/endpoints/excludedCountries.ts@@ -0,0 +1,43 @@+import { authedFetch } from "../../utils";+import { updateSiteConfig } from "./sites";++export interface ExcludedCountriesResponse {+ success: boolean;+ excludedCountries: string[];+ error?: string;+}++export interface UpdateExcludedCountriesRequest {+ siteId: number;+ excludedCountries: string[];+}++export interface UpdateExcludedCountriesResponse {+ success: boolean;+ message: string;+ excludedCountries: string[];+ error?: string;+ details?: string[];+}++export const fetchExcludedCountries = async (siteId: number): Promise<ExcludedCountriesResponse> => {+ return await authedFetch<ExcludedCountriesResponse>(`/sites/${siteId}/excluded-countries`);+};++export const updateExcludedCountries = async (+ siteId: number,+ excludedCountries: string[]+): Promise<UpdateExcludedCountriesResponse> => {+ try {+ await updateSiteConfig(siteId, { excludedCountries });+ return {+ success: true,+ message: "Excluded countries updated successfully",+ excludedCountries: excludedCountries,+ };+ } catch (error) {+ throw new Error(+ `Failed to update excluded countries: ${error instanceof Error ? error.message : "Unknown error"}`+ );+ }+};diff --git a/client/src/api/admin/endpoints/excludedIPs.ts b/client/src/api/admin/endpoints/excludedIPs.tsnew file mode 100644index 000000000..0522fcc83--- /dev/null+++ b/client/src/api/admin/endpoints/excludedIPs.ts@@ -0,0 +1,42 @@+import { authedFetch } from "../../utils";+import { updateSiteConfig } from "./sites";++export interface ExcludedIPsResponse {+ success: boolean;+ excludedIPs: string[];+ error?: string;+}++export interface UpdateExcludedIPsRequest {+ siteId: number;+ excludedIPs: string[];+}++export interface UpdateExcludedIPsResponse {+ success: boolean;+ message: string;+ excludedIPs: string[];+ error?: string;+ details?: string[];+}++// Fetch excluded IPs for a site+export const fetchExcludedIPs = async (siteId: string): Promise<ExcludedIPsResponse> => {+ return await authedFetch<ExcludedIPsResponse>(`/sites/${siteId}/excluded-ips`);+};++// Update excluded IPs for a site using the consolidated endpoint+export const updateExcludedIPs = async (siteId: number, excludedIPs: string[]): Promise<UpdateExcludedIPsResponse> => {+ try {+ await updateSiteConfig(siteId, { excludedIPs });+ return {+ success: true,+ message: "Excluded IPs updated successfully",+ excludedIPs: excludedIPs,+ };+ } catch (error) {+ throw new Error(+ `Failed to update excluded IPs: ${error instanceof Error ? error.message : "Unknown error"}`+ );+ }+};diff --git a/client/src/api/admin/endpoints/import.ts b/client/src/api/admin/endpoints/import.tsnew file mode 100644index 000000000..76de5ed01--- /dev/null+++ b/client/src/api/admin/endpoints/import.ts@@ -0,0 +1,38 @@+import { authedFetch } from "@/api/utils";+import { APIResponse } from "@/api/types";+import { ImportPlatform } from "@/types/import";++export interface GetSiteImportsResponse {+ importId: string;+ platform: ImportPlatform;+ importedEvents: number;+ skippedEvents: number;+ invalidEvents: number;+ startedAt: string;+ completedAt: string | null;+}++export interface CreateSiteImportResponse {+ importId: string;+ allowedDateRange: {+ earliestAllowedDate: string;+ latestAllowedDate: string;+ };+}++export function getSiteImports(siteId: number) {+ return authedFetch<APIResponse<GetSiteImportsResponse[]>>(`/sites/${siteId}/imports`);+}++export function createSiteImport(siteId: number, data: { platform: ImportPlatform }) {+ return authedFetch<APIResponse<CreateSiteImportResponse>>(`/sites/${siteId}/imports`, undefined, {+ method: "POST",+ data,+ });+}++export function deleteSiteImport(siteId: number, importId: string) {+ return authedFetch(`/sites/${siteId}/imports/${importId}`, undefined, {+ method: "DELETE",+ });+}diff --git a/client/src/api/admin/endpoints/index.ts b/client/src/api/admin/endpoints/index.tsnew file mode 100644index 000000000..20d22e7ac--- /dev/null+++ b/client/src/api/admin/endpoints/index.ts@@ -0,0 +1,85 @@+// Sites endpoints+export {+ addSite,+ deleteSite,+ updateSiteConfig,+ fetchSite,+ fetchSitesFromOrg,+ fetchSiteHasData,+ fetchSiteIsPublic,+} from "./sites";+export type { SiteResponse, GetSitesFromOrgResponse } from "./sites";++// Organizations endpoints+export {+ getUserOrganizations,+ addUserToOrganization,+ USER_ORGANIZATIONS_QUERY_KEY,+} from "./organizations";+export type {+ UserOrganization,+ AddUserToOrganizationInput,+ RemoveUserFromOrganizationInput,+} from "./organizations";++// Admin Organizations endpoints+export { getAdminOrganizations } from "./adminOrganizations";+export type { AdminOrganizationData } from "./adminOrganizations";++// Admin Sites endpoints+export { getAdminSites } from "./adminSites";+export type { AdminSiteData } from "./adminSites";++// Admin Service Event Count endpoints+export { getAdminServiceEventCount } from "./adminServiceEventCount";+export type {+ ServiceEventCountResponse,+ GetServiceEventCountResponse,+ GetAdminServiceEventCountParams,+} from "./adminServiceEventCount";++// Excluded IPs endpoints+export { fetchExcludedIPs, updateExcludedIPs } from "./excludedIPs";+export type {+ ExcludedIPsResponse,+ UpdateExcludedIPsRequest,+ UpdateExcludedIPsResponse,+} from "./excludedIPs";++// Excluded Countries endpoints+export { fetchExcludedCountries, updateExcludedCountries } from "./excludedCountries";+export type {+ ExcludedCountriesResponse,+ UpdateExcludedCountriesRequest,+ UpdateExcludedCountriesResponse,+} from "./excludedCountries";++// Account Settings endpoints+export { updateAccountSettings } from "./accountSettings";+export type {+ UpdateAccountSettingsRequest,+ UpdateAccountSettingsResponse,+} from "./accountSettings";++// User API Keys endpoints+export { listApiKeys, createApiKey, deleteApiKey } from "./userApiKeys";+export type { ApiKey, ApiKeyWithKey, CreateApiKeyRequest } from "./userApiKeys";++// Private Link endpoints+export {+ getPrivateLinkConfig,+ generatePrivateLinkKey,+ revokePrivateLinkKey,+} from "./privateLink";+export type {+ PrivateLinkConfigResponse,+ UpdatePrivateLinkConfigResponse,+} from "./privateLink";++// Import endpoints+export { getSiteImports, createSiteImport, deleteSiteImport } from "./import";+export type { GetSiteImportsResponse, CreateSiteImportResponse } from "./import";++// Auth endpoints+export { getOrganizationMembers } from "./auth";+export type { GetOrganizationMembersResponse } from "./auth";diff --git a/client/src/api/admin/endpoints/organizations.ts b/client/src/api/admin/endpoints/organizations.tsnew file mode 100644index 000000000..518ea31d1--- /dev/null+++ b/client/src/api/admin/endpoints/organizations.ts@@ -0,0 +1,38 @@+import { authedFetch } from "../../utils";++export type UserOrganization = {+ id: string;+ name: string;+ slug: string;+ logo: string | null;+ createdAt: string;+ metadata: string | null;+ role: string;+};++export const USER_ORGANIZATIONS_QUERY_KEY = "userOrganizations";++export function getUserOrganizations(): Promise<UserOrganization[]> {+ return authedFetch("/user/organizations");+}++export interface AddUserToOrganizationInput {+ email: string;+ role: string;+ organizationId: string;+}++export function addUserToOrganization({ email, role, organizationId }: AddUserToOrganizationInput) {+ return authedFetch<{ message: string }>(`/organizations/${organizationId}/members`, undefined, {+ method: "POST",+ data: {+ email,+ role,+ },+ });+}++export interface RemoveUserFromOrganizationInput {+ memberIdOrEmail: string;+ organizationId: string;+}diff --git a/client/src/api/admin/endpoints/privateLink.ts b/client/src/api/admin/endpoints/privateLink.tsnew file mode 100644index 000000000..2b4c9a1cd--- /dev/null+++ b/client/src/api/admin/endpoints/privateLink.ts@@ -0,0 +1,47 @@+import { authedFetch } from "../../utils";++export interface PrivateLinkConfigResponse {+ privateLinkKey: string | null;+}++export interface UpdatePrivateLinkConfigResponse {+ privateLinkKey: string | null;+}++// Get private link config+export function getPrivateLinkConfig(siteId: number) {+ return authedFetch<{+ success: boolean;+ data: PrivateLinkConfigResponse;+ }>(`/sites/${siteId}/private-link-config`);+}++// Generate private link key+export function generatePrivateLinkKey(siteId: number) {+ return authedFetch<{+ success: boolean;+ data: UpdatePrivateLinkConfigResponse;+ }>(+ `/sites/${siteId}/private-link-config`,+ {},+ {+ method: "POST",+ data: { action: "generate_private_link_key" },+ }+ );+}++// Revoke private link key+export function revokePrivateLinkKey(siteId: number) {+ return authedFetch<{+ success: boolean;+ data: UpdatePrivateLinkConfigResponse;+ }>(+ `/sites/${siteId}/private-link-config`,+ {},+ {+ method: "POST",+ data: { action: "revoke_private_link_key" },+ }+ );+}diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/endpoints/sites.tssimilarity index 54%rename from client/src/api/admin/sites.tsrename to client/src/api/admin/endpoints/sites.tsindex dc95806ea..da64a29fc 100644--- a/client/src/api/admin/sites.ts+++ b/client/src/api/admin/endpoints/sites.ts@@ -1,8 +1,4 @@-import { useQuery } from "@tanstack/react-query";-import { useStore } from "../../lib/store";-import { authedFetch } from "../utils";-import { usePathname } from "next/navigation";-import { authClient } from "../../lib/auth";+import { authedFetch } from "../../utils";export type SiteResponse = {id: string | null;@@ -65,15 +61,8 @@ export type GetSitesFromOrgResponse = {};};-export function useGetSitesFromOrg(organizationId?: string) {- return useQuery<GetSitesFromOrgResponse>({- queryKey: ["get-sites-from-org", organizationId],- queryFn: () => {- return authedFetch(`/organizations/${organizationId}/sites`);- },- staleTime: 60000, // 1 minute- enabled: !!organizationId,- });+export function fetchSitesFromOrg(organizationId: string) {+ return authedFetch<GetSitesFromOrgResponse>(`/organizations/${organizationId}/sites`);}export function addSite(@@ -136,68 +125,14 @@ export function updateSiteConfig(});}-export function useSiteHasData(siteId: string) {- return useQuery({- queryKey: ["site-has-data", siteId],- queryFn: () => {- if (!siteId) {- return Promise.resolve(false);- }- return authedFetch<{ hasData: boolean }>(`/site-has-data/${siteId}`).then(data => data.hasData);- },- refetchInterval: 5000,- staleTime: Infinity,- });+export function fetchSite(siteId: string | number) {+ return authedFetch<SiteResponse>(`/sites/${siteId}`);}-export function useGetSite(siteId?: string | number) {- const { site: storeSelectedSite } = useStore();-- const siteIdToUse = siteId ?? storeSelectedSite;-- return useQuery({- queryKey: ["get-site", siteIdToUse],- queryFn: async () => {- if (!siteIdToUse) {- return null;- }-- const data = await authedFetch<SiteResponse>(`/sites/${siteIdToUse}`);- return data;- },- staleTime: 60000,- enabled: !!siteId,- });+export function fetchSiteHasData(siteId: string) {+ return authedFetch<{ hasData: boolean }>(`/site-has-data/${siteId}`);}-export function useGetSiteIsPublic(siteId?: string | number) {- return useQuery({- queryKey: ["site-is-public", siteId],- queryFn: async () => {- if (!siteId) {- return false;- }-- try {- const data = await authedFetch<{ isPublic: boolean }>(`/site-is-public/${siteId}`);- return !!data.isPublic;- } catch (error) {- console.error("Error checking if site is public:", error);- return false;- }- },- staleTime: 60000,- enabled: !!siteId,- });+export function fetchSiteIsPublic(siteId: string | number) {+ return authedFetch<{ isPublic: boolean }>(`/site-is-public/${siteId}`);}--export const useCurrentSite = () => {- const { data: activeOrganization } = authClient.useActiveOrganization();- const { data: sites } = useGetSitesFromOrg(activeOrganization?.id);- const pathname = usePathname();-- return {- site: sites?.sites.find(site => site.siteId === Number(pathname.split("/")[1])),- subscription: sites?.subscription,- };-};diff --git a/client/src/api/admin/endpoints/userApiKeys.ts b/client/src/api/admin/endpoints/userApiKeys.tsnew file mode 100644index 000000000..dffeaf950--- /dev/null+++ b/client/src/api/admin/endpoints/userApiKeys.ts@@ -0,0 +1,49 @@+import { authedFetch } from "../../utils";++// TypeScript interfaces for API keys+export interface ApiKey {+ id: string;+ name: string | null;+ start: string | null;+ prefix: string | null;+ userId: string;+ enabled: boolean;+ rateLimitEnabled: boolean;+ rateLimitTimeWindow: number | null;+ rateLimitMax: number | null;+ requestCount: number;+ remaining: number | null;+ lastRequest: string | null;+ expiresAt: string | null;+ createdAt: string;+ updatedAt: string;+}++export interface ApiKeyWithKey extends ApiKey {+ key: string; // The full API key, only returned on creation+}++export interface CreateApiKeyRequest {+ name: string;+ expiresIn?: number;+}++// List all API keys for the current user+export function listApiKeys() {+ return authedFetch<ApiKey[]>("/user/api-keys");+}++// Create a new API key+export function createApiKey(data: CreateApiKeyRequest) {+ return authedFetch<ApiKeyWithKey>("/user/api-keys", undefined, {+ method: "POST",+ data,+ });+}++// Delete an API key+export function deleteApiKey(keyId: string) {+ return authedFetch<{ success: boolean }>(`/user/api-keys/${keyId}`, undefined, {+ method: "DELETE",+ });+}diff --git a/client/src/api/admin/excludedCountries.ts b/client/src/api/admin/excludedCountries.tsdeleted file mode 100644index f094624dc..000000000--- a/client/src/api/admin/excludedCountries.ts+++ /dev/null@@ -1,67 +0,0 @@-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";-import { toast } from "sonner";-import { authedFetch } from "../utils";-import { updateSiteConfig } from "./sites";--export interface ExcludedCountriesResponse {- success: boolean;- excludedCountries: string[];- error?: string;-}--export interface UpdateExcludedCountriesRequest {- siteId: number;- excludedCountries: string[];-}--export interface UpdateExcludedCountriesResponse {- success: boolean;- message: string;- excludedCountries: string[];- error?: string;- details?: string[];-}--export const fetchExcludedCountries = async (siteId: string): Promise<ExcludedCountriesResponse> => {- return await authedFetch<ExcludedCountriesResponse>(`/sites/${siteId}/excluded-countries`);-};--export const updateExcludedCountries = async (- siteId: number,- excludedCountries: string[]-): Promise<UpdateExcludedCountriesResponse> => {- const result = await updateSiteConfig(siteId, { excludedCountries });-- return {- success: true,- message: "Excluded countries updated successfully",- excludedCountries: excludedCountries,- };-};--export const useGetExcludedCountries = (siteId: number) => {- return useQuery({- queryKey: ["excludedCountries", siteId],- queryFn: () => fetchExcludedCountries(siteId.toString()),- enabled: !!siteId,- });-};--export const useUpdateExcludedCountries = () => {- const queryClient = useQueryClient();-- return useMutation<UpdateExcludedCountriesResponse, Error, UpdateExcludedCountriesRequest>({- mutationFn: ({ siteId, excludedCountries }: UpdateExcludedCountriesRequest) =>- updateExcludedCountries(siteId, excludedCountries),- onSuccess: (_: UpdateExcludedCountriesResponse, variables: UpdateExcludedCountriesRequest) => {- toast.success("Excluded countries updated successfully");- // Invalidate and refetch excluded countries data- queryClient.invalidateQueries({- queryKey: ["excludedCountries", variables.siteId],- });- },- onError: (error: Error) => {- toast.error(error.message || "Failed to update excluded countries");- },- });-};diff --git a/client/src/api/admin/accountSettings.ts b/client/src/api/admin/hooks/useAccountSettings.tssimilarity index 54%rename from client/src/api/admin/accountSettings.tsrename to client/src/api/admin/hooks/useAccountSettings.tsindex e49e065d7..5fe862291 100644--- a/client/src/api/admin/accountSettings.ts+++ b/client/src/api/admin/hooks/useAccountSettings.ts@@ -1,18 +1,9 @@import { useMutation, useQueryClient } from "@tanstack/react-query";-import { authedFetch } from "../utils";--export interface UpdateAccountSettingsRequest {- sendAutoEmailReports?: boolean;- // Add more settings here in the future-}--export interface UpdateAccountSettingsResponse {- success: boolean;- settings: {- sendAutoEmailReports: boolean;- // Add more settings here as they're added- };-}+import {+ updateAccountSettings,+ UpdateAccountSettingsRequest,+ UpdateAccountSettingsResponse,+} from "../endpoints";export function useUpdateAccountSettings() {const queryClient = useQueryClient();@@ -20,10 +11,7 @@ export function useUpdateAccountSettings() {return useMutation<UpdateAccountSettingsResponse, Error, UpdateAccountSettingsRequest>({mutationFn: async (settings) => {try {- return await authedFetch<UpdateAccountSettingsResponse>("/user/account-settings", undefined, {- method: "POST",- data: settings,- });+ return await updateAccountSettings(settings);} catch (error) {throw new Error(error instanceof Error ? error.message : "Failed to update account settings");}diff --git a/client/src/api/admin/hooks/useAdminOrganizations.ts b/client/src/api/admin/hooks/useAdminOrganizations.tsnew file mode 100644index 000000000..85ef4b476--- /dev/null+++ b/client/src/api/admin/hooks/useAdminOrganizations.ts@@ -0,0 +1,9 @@+import { useQuery } from "@tanstack/react-query";+import { getAdminOrganizations, AdminOrganizationData } from "../endpoints";++export function useAdminOrganizations() {+ return useQuery<AdminOrganizationData[]>({+ queryKey: ["admin-organizations"],+ queryFn: getAdminOrganizations,+ });+}diff --git a/client/src/api/admin/hooks/useAdminServiceEventCount.ts b/client/src/api/admin/hooks/useAdminServiceEventCount.tsnew file mode 100644index 000000000..68dfe97d7--- /dev/null+++ b/client/src/api/admin/hooks/useAdminServiceEventCount.ts@@ -0,0 +1,19 @@+import { useQuery } from "@tanstack/react-query";+import { getAdminServiceEventCount, GetAdminServiceEventCountParams } from "../endpoints";++export function useGetAdminServiceEventCount({+ startDate,+ endDate,+ timeZone,+}: GetAdminServiceEventCountParams) {+ return useQuery({+ queryKey: ["admin-service-event-count", startDate, endDate, timeZone],+ queryFn: () =>+ getAdminServiceEventCount({+ startDate,+ endDate,+ timeZone,+ }),+ staleTime: 1000 * 60 * 5, // 5 minutes+ });+}diff --git a/client/src/api/admin/hooks/useAdminSites.ts b/client/src/api/admin/hooks/useAdminSites.tsnew file mode 100644index 000000000..a4df1ae48--- /dev/null+++ b/client/src/api/admin/hooks/useAdminSites.ts@@ -0,0 +1,9 @@+import { useQuery } from "@tanstack/react-query";+import { getAdminSites, AdminSiteData } from "../endpoints";++export function useAdminSites() {+ return useQuery<AdminSiteData[]>({+ queryKey: ["admin-sites"],+ queryFn: getAdminSites,+ });+}diff --git a/client/src/api/admin/hooks/useExcludedCountries.ts b/client/src/api/admin/hooks/useExcludedCountries.tsnew file mode 100644index 000000000..ce928720d--- /dev/null+++ b/client/src/api/admin/hooks/useExcludedCountries.ts@@ -0,0 +1,35 @@+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";+import { toast } from "sonner";+import {+ fetchExcludedCountries,+ updateExcludedCountries,+ UpdateExcludedCountriesRequest,+ UpdateExcludedCountriesResponse,+} from "../endpoints";++export const useGetExcludedCountries = (siteId: number) => {+ return useQuery({+ queryKey: ["excludedCountries", siteId],+ queryFn: () => fetchExcludedCountries(siteId),+ enabled: !!siteId,+ });+};++export const useUpdateExcludedCountries = () => {+ const queryClient = useQueryClient();++ return useMutation<UpdateExcludedCountriesResponse, Error, UpdateExcludedCountriesRequest>({+ mutationFn: ({ siteId, excludedCountries }: UpdateExcludedCountriesRequest) =>+ updateExcludedCountries(siteId, excludedCountries),+ onSuccess: (_: UpdateExcludedCountriesResponse, variables: UpdateExcludedCountriesRequest) => {+ toast.success("Excluded countries updated successfully");+ // Invalidate and refetch excluded countries data+ queryClient.invalidateQueries({+ queryKey: ["excludedCountries", variables.siteId],+ });+ },+ onError: (error: Error) => {+ toast.error(error.message || "Failed to update excluded countries");+ },+ });+};diff --git a/client/src/api/admin/excludedIPs.ts b/client/src/api/admin/hooks/useExcludedIPs.tssimilarity index 50%rename from client/src/api/admin/excludedIPs.tsrename to client/src/api/admin/hooks/useExcludedIPs.tsindex bf23dcd6c..87acd8eaf 100644--- a/client/src/api/admin/excludedIPs.ts+++ b/client/src/api/admin/hooks/useExcludedIPs.ts@@ -1,42 +1,11 @@import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";import { toast } from "sonner";-import { authedFetch } from "../utils";-import { updateSiteConfig } from "./sites";--export interface ExcludedIPsResponse {- success: boolean;- excludedIPs: string[];- error?: string;-}--export interface UpdateExcludedIPsRequest {- siteId: number;- excludedIPs: string[];-}--export interface UpdateExcludedIPsResponse {- success: boolean;- message: string;- excludedIPs: string[];- error?: string;- details?: string[];-}--// Fetch excluded IPs for a site-export const fetchExcludedIPs = async (siteId: string): Promise<ExcludedIPsResponse> => {- return await authedFetch<ExcludedIPsResponse>(`/sites/${siteId}/excluded-ips`);-};--// Update excluded IPs for a site using the consolidated endpoint-export const updateExcludedIPs = async (siteId: number, excludedIPs: string[]): Promise<UpdateExcludedIPsResponse> => {- const result = await updateSiteConfig(siteId, { excludedIPs });- // Map the response to match the expected interface- return {- success: true,- message: "Excluded IPs updated successfully",- excludedIPs: excludedIPs,- };-};+import {+ fetchExcludedIPs,+ updateExcludedIPs,+ UpdateExcludedIPsRequest,+ UpdateExcludedIPsResponse,+} from "../endpoints";// Hook to fetch excluded IPsexport const useGetExcludedIPs = (siteId: number) => {diff --git a/client/src/api/admin/import.ts b/client/src/api/admin/hooks/useImport.tssimilarity index 61%rename from client/src/api/admin/import.tsrename to client/src/api/admin/hooks/useImport.tsindex a8b3aac86..84f5dfcec 100644--- a/client/src/api/admin/import.ts+++ b/client/src/api/admin/hooks/useImport.ts@@ -1,28 +1,9 @@import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";-import { authedFetch } from "@/api/utils";-import { APIResponse } from "@/api/types";import { ImportPlatform } from "@/types/import";-import { useCurrentSite } from "./sites";import { DEFAULT_EVENT_LIMIT } from "@/lib/subscription/constants";import { IS_CLOUD } from "@/lib/const";--interface GetSiteImportsResponse {- importId: string;- platform: ImportPlatform;- importedEvents: number;- skippedEvents: number;- invalidEvents: number;- startedAt: string;- completedAt: string | null;-}--interface CreateSiteImportResponse {- importId: string;- allowedDateRange: {- earliestAllowedDate: string;- latestAllowedDate: string;- };-}+import { getSiteImports, createSiteImport, deleteSiteImport } from "../endpoints";+import { useCurrentSite } from "./useSites";export function useGetSiteImports(site: number) {const { subscription } = useCurrentSite();@@ -31,7 +12,7 @@ export function useGetSiteImports(site: number) {return useQuery({queryKey: ["get-site-imports", site],- queryFn: async () => await authedFetch<APIResponse<GetSiteImportsResponse[]>>(`/sites/${site}/imports`),+ queryFn: async () => await getSiteImports(site),refetchInterval: data => {const hasActiveImports = data.state.data?.data.some(imp => imp.completedAt === null);return hasActiveImports ? 5000 : false;@@ -47,10 +28,7 @@ export function useCreateSiteImport(site: number) {return useMutation({mutationFn: async (data: { platform: ImportPlatform }) => {- return await authedFetch<APIResponse<CreateSiteImportResponse>>(`/sites/${site}/imports`, undefined, {- method: "POST",- data,- });+ return await createSiteImport(site, data);},onSuccess: async () => {await queryClient.invalidateQueries({@@ -66,9 +44,7 @@ export function useDeleteSiteImport(site: number) {return useMutation({mutationFn: async (importId: string) => {- return await authedFetch(`/sites/${site}/imports/${importId}`, undefined, {- method: "DELETE",- });+ return await deleteSiteImport(site, importId);},onSuccess: async () => {await queryClient.invalidateQueries({diff --git a/client/src/api/admin/hooks/useOrganizationMembers.ts b/client/src/api/admin/hooks/useOrganizationMembers.tsnew file mode 100644index 000000000..6728beb33--- /dev/null+++ b/client/src/api/admin/hooks/useOrganizationMembers.ts@@ -0,0 +1,10 @@+import { useQuery } from "@tanstack/react-query";+import { getOrganizationMembers, GetOrganizationMembersResponse } from "../endpoints";++export const useOrganizationMembers = (organizationId: string) => {+ return useQuery<GetOrganizationMembersResponse>({+ queryKey: ["organization-members", organizationId],+ queryFn: () => getOrganizationMembers(organizationId),+ staleTime: Infinity,+ });+};diff --git a/client/src/api/admin/organizations.ts b/client/src/api/admin/hooks/useOrganizations.tssimilarity index 68%rename from client/src/api/admin/organizations.tsrename to client/src/api/admin/hooks/useOrganizations.tsindex 98d5e7155..656a1bb70 100644--- a/client/src/api/admin/organizations.ts+++ b/client/src/api/admin/hooks/useOrganizations.ts@@ -1,22 +1,14 @@import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";-import { authedFetch } from "../utils";-import { authClient } from "../../lib/auth";+import { authClient } from "../../../lib/auth";+import {+ getUserOrganizations,+ addUserToOrganization,+ USER_ORGANIZATIONS_QUERY_KEY,+ AddUserToOrganizationInput,+ RemoveUserFromOrganizationInput,+} from "../endpoints";-type UserOrganization = {- id: string;- name: string;- slug: string;- logo: string | null;- createdAt: string;- metadata: string | null;- role: string;-};--function getUserOrganizations(): Promise<UserOrganization[]> {- return authedFetch("/user/organizations");-}--export const USER_ORGANIZATIONS_QUERY_KEY = "userOrganizations";+export { USER_ORGANIZATIONS_QUERY_KEY } from "../endpoints";export function useUserOrganizations() {return useQuery({@@ -44,25 +36,13 @@ export function useOrganizationInvitations(organizationId: string) {});}-interface AddUserToOrganizationInput {- email: string;- role: string;- organizationId: string;-}-export function useAddUserToOrganization() {const queryClient = useQueryClient();return useMutation<{ message: string }, Error, AddUserToOrganizationInput>({- mutationFn: async ({ email, role, organizationId }: AddUserToOrganizationInput) => {+ mutationFn: async (input: AddUserToOrganizationInput) => {try {- return await authedFetch<{ message: string }>(`/organizations/${organizationId}/members`, undefined, {- method: "POST",- data: {- email,- role,- },- });+ return await addUserToOrganization(input);} catch (error) {throw new Error(error instanceof Error ? error.message : "Failed to add user to organization");}@@ -75,11 +55,6 @@ export function useAddUserToOrganization() {});}-interface RemoveUserFromOrganizationInput {- memberIdOrEmail: string;- organizationId: string;-}-export function useRemoveUserFromOrganization() {const queryClient = useQueryClient();@@ -101,4 +76,3 @@ export function useRemoveUserFromOrganization() {},});}-diff --git a/client/src/api/admin/privateLink.ts b/client/src/api/admin/hooks/usePrivateLink.tssimilarity index 51%rename from client/src/api/admin/privateLink.tsrename to client/src/api/admin/hooks/usePrivateLink.tsindex 906363514..4218fd83d 100644--- a/client/src/api/admin/privateLink.ts+++ b/client/src/api/admin/hooks/usePrivateLink.ts@@ -1,23 +1,16 @@import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";-import { authedFetch } from "../utils";--interface PrivateLinkConfigResponse {- privateLinkKey: string | null;-}--interface UpdatePrivateLinkConfigResponse {- privateLinkKey: string | null;-}+import {+ getPrivateLinkConfig,+ generatePrivateLinkKey,+ revokePrivateLinkKey,+} from "../endpoints";// Get API configexport const useGetPrivateLinkConfig = (siteId: number) => {return useQuery({queryKey: ["privateLinkConfig", siteId],queryFn: async () => {- const response = await authedFetch<{- success: boolean;- data: PrivateLinkConfigResponse;- }>(`/sites/${siteId}/private-link-config`);+ const response = await getPrivateLinkConfig(siteId);return response.data;},enabled: !!siteId,@@ -30,17 +23,7 @@ export const useGeneratePrivateLinkKey = () => {return useMutation({mutationFn: async (siteId: number) => {- const response = await authedFetch<{- success: boolean;- data: UpdatePrivateLinkConfigResponse;- }>(- `/sites/${siteId}/private-link-config`,- {},- {- method: "POST",- data: { action: "generate_private_link_key" },- }- );+ const response = await generatePrivateLinkKey(siteId);return response.data;},onSuccess: (_, siteId) => {@@ -55,17 +38,7 @@ export const useRevokePrivateLinkKey = () => {return useMutation({mutationFn: async (siteId: number) => {- const response = await authedFetch<{- success: boolean;- data: UpdatePrivateLinkConfigResponse;- }>(- `/sites/${siteId}/private-link-config`,- {},- {- method: "POST",- data: { action: "revoke_private_link_key" },- }- );+ const response = await revokePrivateLinkKey(siteId);return response.data;},onSuccess: (_, siteId) => {diff --git a/client/src/api/admin/hooks/useSites.ts b/client/src/api/admin/hooks/useSites.tsnew file mode 100644index 000000000..0130c6a09--- /dev/null+++ b/client/src/api/admin/hooks/useSites.ts@@ -0,0 +1,89 @@+import { useQuery } from "@tanstack/react-query";+import { usePathname } from "next/navigation";+import { useStore } from "../../../lib/store";+import { authClient } from "../../../lib/auth";+import {+ fetchSitesFromOrg,+ fetchSite,+ fetchSiteHasData,+ fetchSiteIsPublic,+ GetSitesFromOrgResponse,+ SiteResponse,+} from "../endpoints";++export function useGetSitesFromOrg(organizationId?: string) {+ return useQuery<GetSitesFromOrgResponse>({+ queryKey: ["get-sites-from-org", organizationId],+ queryFn: () => {+ return fetchSitesFromOrg(organizationId!);+ },+ staleTime: 60000, // 1 minute+ enabled: !!organizationId,+ });+}++export function useSiteHasData(siteId: string) {+ return useQuery({+ queryKey: ["site-has-data", siteId],+ queryFn: () => {+ if (!siteId) {+ return Promise.resolve(false);+ }+ return fetchSiteHasData(siteId).then(data => data.hasData);+ },+ refetchInterval: 5000,+ staleTime: Infinity,+ });+}++export function useGetSite(siteId?: string | number) {+ const { site: storeSelectedSite } = useStore();++ const siteIdToUse = siteId ?? storeSelectedSite;++ return useQuery({+ queryKey: ["get-site", siteIdToUse],+ queryFn: async () => {+ if (!siteIdToUse) {+ return null;+ }++ const data = await fetchSite(siteIdToUse);+ return data;+ },+ staleTime: 60000,+ enabled: !!siteIdToUse,+ });+}++export function useGetSiteIsPublic(siteId?: string | number) {+ return useQuery({+ queryKey: ["site-is-public", siteId],+ queryFn: async () => {+ if (!siteId) {+ return false;+ }++ try {+ const data = await fetchSiteIsPublic(siteId);+ return !!data.isPublic;+ } catch (error) {+ console.error("Error checking if site is public:", error);+ return false;+ }+ },+ staleTime: 60000,+ enabled: !!siteId,+ });+}++export const useCurrentSite = () => {+ const { data: activeOrganization } = authClient.useActiveOrganization();+ const { data: sites } = useGetSitesFromOrg(activeOrganization?.id);+ const pathname = usePathname();++ return {+ site: sites?.sites.find(site => site.siteId === Number(pathname.split("/")[1])),+ subscription: sites?.subscription,+ };+};diff --git a/client/src/api/admin/userApiKeys.ts b/client/src/api/admin/hooks/useUserApiKeys.tssimilarity index 56%rename from client/src/api/admin/userApiKeys.tsrename to client/src/api/admin/hooks/useUserApiKeys.tsindex fb4a5f7f1..9e9101133 100644--- a/client/src/api/admin/userApiKeys.ts+++ b/client/src/api/admin/hooks/useUserApiKeys.ts@@ -1,40 +1,19 @@import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";-import { authedFetch } from "../utils";--// TypeScript interfaces for API keys-export interface ApiKey {- id: string;- name: string | null;- start: string | null;- prefix: string | null;- userId: string;- enabled: boolean;- rateLimitEnabled: boolean;- rateLimitTimeWindow: number | null;- rateLimitMax: number | null;- requestCount: number;- remaining: number | null;- lastRequest: string | null;- expiresAt: string | null;- createdAt: string;- updatedAt: string;-}--export interface ApiKeyWithKey extends ApiKey {- key: string; // The full API key, only returned on creation-}--export interface CreateApiKeyRequest {- name: string;- expiresIn?: number;-}+import {+ listApiKeys,+ createApiKey,+ deleteApiKey,+ ApiKey,+ ApiKeyWithKey,+ CreateApiKeyRequest,+} from "../endpoints";// List all API keys for the current userexport const useListApiKeys = () => {return useQuery<ApiKey[]>({queryKey: ["userApiKeys"],queryFn: async () => {- const response = await authedFetch<ApiKey[]>("/user/api-keys");+ const response = await listApiKeys();return response;},});@@ -47,10 +26,7 @@ export const useCreateApiKey = () => {return useMutation<ApiKeyWithKey, Error, CreateApiKeyRequest>({mutationFn: async (data) => {try {- const response = await authedFetch<ApiKeyWithKey>("/user/api-keys", undefined, {- method: "POST",- data,- });+ const response = await createApiKey(data);return response;} catch (error) {throw new Error(error instanceof Error ? error.message : "Failed to create API key");@@ -70,9 +46,7 @@ export const useDeleteApiKey = () => {return useMutation<{ success: boolean }, Error, string>({mutationFn: async (keyId) => {try {- const response = await authedFetch<{ success: boolean }>(`/user/api-keys/${keyId}`, undefined, {- method: "DELETE",- });+ const response = await deleteApiKey(keyId);return response;} catch (error) {throw new Error(error instanceof Error ? error.message : "Failed to delete API key");diff --git a/client/src/app/[site]/components/Header/NoData.tsx b/client/src/app/[site]/components/Header/NoData.tsxindex 0260c652b..b88fee758 100644--- a/client/src/app/[site]/components/Header/NoData.tsx+++ b/client/src/app/[site]/components/Header/NoData.tsx@@ -24,7 +24,7 @@ import {SiMintlify,} from "@icons-pack/react-simple-icons";import React from "react";-import { useGetSite, useSiteHasData } from "../../../../api/admin/sites";+import { useGetSite, useSiteHasData } from "../../../../api/admin/hooks/useSites";import { CodeSnippet } from "../../../../components/CodeSnippet";import { Alert } from "../../../../components/ui/alert";import { useStore } from "../../../../lib/store";diff --git a/client/src/app/[site]/components/Header/UsageBanners.tsx b/client/src/app/[site]/components/Header/UsageBanners.tsxindex 07bb2e909..f087b3e7d 100644--- a/client/src/app/[site]/components/Header/UsageBanners.tsx+++ b/client/src/app/[site]/components/Header/UsageBanners.tsx@@ -1,6 +1,6 @@import { AlertTriangle, ArrowRight } from "lucide-react";import Link from "next/link";-import { useCurrentSite } from "../../../../api/admin/sites";+import { useCurrentSite } from "../../../../api/admin/hooks/useSites";import { Button } from "../../../../components/ui/button";export function UsageBanners() {diff --git a/client/src/app/[site]/components/Sidebar/MobileSidebar.tsx b/client/src/app/[site]/components/Sidebar/MobileSidebar.tsxindex 4353865ee..fa8a07cd1 100644--- a/client/src/app/[site]/components/Sidebar/MobileSidebar.tsx+++ b/client/src/app/[site]/components/Sidebar/MobileSidebar.tsx@@ -1,7 +1,7 @@"use client";import { usePathname } from "next/navigation";-import { useGetSite } from "../../../../api/admin/sites";+import { useGetSite } from "../../../../api/admin/hooks/useSites";import { Sidebar } from "./Sidebar";import { Button } from "../../../../components/ui/button";import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetTrigger } from "../../../../components/ui/sheet";diff --git a/client/src/app/[site]/components/Sidebar/Sidebar.tsx b/client/src/app/[site]/components/Sidebar/Sidebar.tsxindex 3f656f23e..8465e2f44 100644--- a/client/src/app/[site]/components/Sidebar/Sidebar.tsx+++ b/client/src/app/[site]/components/Sidebar/Sidebar.tsx@@ -18,7 +18,7 @@ import {} from "lucide-react";import { usePathname } from "next/navigation";import { Suspense } from "react";-import { useGetSite } from "../../../../api/admin/sites";+import { useGetSite } from "../../../../api/admin/hooks/useSites";import { Sidebar as SidebarComponents } from "../../../../components/sidebar/Sidebar";import { SiteSettings } from "../../../../components/SiteSettings/SiteSettings";import { authClient } from "../../../../lib/auth";diff --git a/client/src/app/[site]/components/Sidebar/SiteSelector.tsx b/client/src/app/[site]/components/Sidebar/SiteSelector.tsxindex eb71d4bf7..cad6261dd 100644--- a/client/src/app/[site]/components/Sidebar/SiteSelector.tsx+++ b/client/src/app/[site]/components/Sidebar/SiteSelector.tsx@@ -1,7 +1,7 @@import { ChevronDown, Plus } from "lucide-react";import { usePathname, useRouter } from "next/navigation";import { useState, Suspense } from "react";-import { useGetSite, useGetSitesFromOrg } from "../../../../api/admin/sites";+import { useGetSite, useGetSitesFromOrg } from "../../../../api/admin/hooks/useSites";import { Favicon } from "../../../../components/Favicon";import { Button } from "../../../../components/ui/button";import { Popover, PopoverContent, PopoverTrigger } from "../../../../components/ui/popover";diff --git a/client/src/app/[site]/components/SubHeader/ShareSite.tsx b/client/src/app/[site]/components/SubHeader/ShareSite.tsxindex 821648e09..34663e8b8 100644--- a/client/src/app/[site]/components/SubHeader/ShareSite.tsx+++ b/client/src/app/[site]/components/SubHeader/ShareSite.tsx@@ -5,7 +5,7 @@ import {useGeneratePrivateLinkKey,useGetPrivateLinkConfig,useRevokePrivateLinkKey,-} from "../../../../api/admin/privateLink";+} from "../../../../api/admin/hooks/usePrivateLink";import { Button } from "../../../../components/ui/button";import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from "../../../../components/ui/dropdown-menu";import { Input } from "../../../../components/ui/input";diff --git a/client/src/app/[site]/errors/components/EnableErrorTracking.tsx b/client/src/app/[site]/errors/components/EnableErrorTracking.tsxindex 2f70d22a7..b411fe227 100644--- a/client/src/app/[site]/errors/components/EnableErrorTracking.tsx+++ b/client/src/app/[site]/errors/components/EnableErrorTracking.tsx@@ -3,7 +3,8 @@import { AlertTriangle } from "lucide-react";import { useParams } from "next/navigation";import { toast } from "sonner";-import { updateSiteConfig, useGetSite } from "../../../../api/admin/sites";+import { updateSiteConfig } from "../../../../api/admin/endpoints";+import { useGetSite } from "../../../../api/admin/hooks/useSites";import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";import { Button } from "../../../../components/ui/button";diff --git a/client/src/app/[site]/globe/components/GlobeSessions.tsx b/client/src/app/[site]/globe/components/GlobeSessions.tsxindex 1f2a1f3c2..4553742ba 100644--- a/client/src/app/[site]/globe/components/GlobeSessions.tsx+++ b/client/src/app/[site]/globe/components/GlobeSessions.tsx@@ -3,7 +3,7 @@ import { VisuallyHidden } from "@radix-ui/react-visually-hidden";import { ArrowRight, ChevronDown, ChevronUp } from "lucide-react";import { DateTime } from "luxon";import { useMemo, useState } from "react";-import { useCurrentSite } from "../../../../api/admin/sites";+import { useCurrentSite } from "../../../../api/admin/hooks/useSites";import { useGetSessionsInfinite } from "../../../../api/analytics/hooks/useGetUserSessions";import { GetSessionsResponse } from "../../../../api/analytics/endpoints";import { Avatar, generateName } from "../../../../components/Avatar";diff --git a/client/src/app/[site]/journeys/page.tsx b/client/src/app/[site]/journeys/page.tsxindex 253f163d8..0e80fb3af 100644--- a/client/src/app/[site]/journeys/page.tsx+++ b/client/src/app/[site]/journeys/page.tsx@@ -6,7 +6,7 @@ import { Input } from "@/components/ui/input";import { Slider } from "@/components/ui/slider";import { AlertCircle } from "lucide-react";import { useState } from "react";-import { useGetSite } from "../../../api/admin/sites";+import { useGetSite } from "../../../api/admin/hooks/useSites";import { DisabledOverlay } from "../../../components/DisabledOverlay";import { useSetPageTitle } from "../../../hooks/useSetPageTitle";import { timeZone } from "../../../lib/dateTimeUtils";diff --git a/client/src/app/[site]/main/components/sections/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsxindex 6c09899ca..1ad80b5cc 100644--- a/client/src/app/[site]/main/components/sections/Pages.tsx+++ b/client/src/app/[site]/main/components/sections/Pages.tsx@@ -3,7 +3,7 @@import { useStore } from "@/lib/store";import { Expand } from "lucide-react";import { useState } from "react";-import { useGetSite } from "../../../../../api/admin/sites";+import { useGetSite } from "../../../../../api/admin/hooks/useSites";import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../../../../components/ui/basic-tabs";import { Button } from "../../../../../components/ui/button";import { Card, CardContent } from "../../../../../components/ui/card";diff --git a/client/src/app/[site]/pages/components/PageListItem.tsx b/client/src/app/[site]/pages/components/PageListItem.tsxindex fa5e32d2e..258d2e422 100644--- a/client/src/app/[site]/pages/components/PageListItem.tsx+++ b/client/src/app/[site]/pages/components/PageListItem.tsx@@ -1,6 +1,6 @@"use client";-import { useGetSite } from "@/api/admin/sites";+import { useGetSite } from "@/api/admin/hooks/useSites";import { useGetOverviewBucketed } from "@/api/analytics/hooks/useGetOverviewBucketed";import { MetricResponse } from "@/api/analytics/endpoints";import { usePageMetadata } from "@/api/usePageMetadata";diff --git a/client/src/app/[site]/performance/components/EnableWebVitals.tsx b/client/src/app/[site]/performance/components/EnableWebVitals.tsxindex 5cadd678c..d01ec948d 100644--- a/client/src/app/[site]/performance/components/EnableWebVitals.tsx+++ b/client/src/app/[site]/performance/components/EnableWebVitals.tsx@@ -3,7 +3,8 @@import { Gauge } from "lucide-react";import { useParams } from "next/navigation";import { toast } from "sonner";-import { updateSiteConfig, useGetSite } from "../../../../api/admin/sites";+import { updateSiteConfig } from "../../../../api/admin/endpoints";+import { useGetSite } from "../../../../api/admin/hooks/useSites";import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";import { Button } from "../../../../components/ui/button";diff --git a/client/src/app/[site]/performance/components/PerformanceTable.tsx b/client/src/app/[site]/performance/components/PerformanceTable.tsxindex 65110ef91..ef05360b3 100644--- a/client/src/app/[site]/performance/components/PerformanceTable.tsx+++ b/client/src/app/[site]/performance/components/PerformanceTable.tsx@@ -20,7 +20,7 @@ import {} from "@tanstack/react-table";import { Monitor, Smartphone, Tablet, SquareArrowOutUpRight } from "lucide-react";import { useMemo, useState, useCallback } from "react";-import { useGetSite } from "../../../../api/admin/sites";+import { useGetSite } from "../../../../api/admin/hooks/useSites";import { useGetPerformanceByDimension } from "../../../../api/analytics/hooks/performance/useGetPerformanceByDimension";import { PerformanceByDimensionItem } from "../../../../api/analytics/endpoints";import { Pagination } from "../../../../components/pagination";diff --git a/client/src/app/[site]/replay/components/EnableSessionReplay.tsx b/client/src/app/[site]/replay/components/EnableSessionReplay.tsxindex 318d8a0a1..6e3248832 100644--- a/client/src/app/[site]/replay/components/EnableSessionReplay.tsx+++ b/client/src/app/[site]/replay/components/EnableSessionReplay.tsx@@ -3,7 +3,8 @@import { Video } from "lucide-react";import { useParams } from "next/navigation";import { toast } from "sonner";-import { updateSiteConfig, useGetSite } from "../../../../api/admin/sites";+import { updateSiteConfig } from "../../../../api/admin/endpoints";+import { useGetSite } from "../../../../api/admin/hooks/useSites";import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";import { Button } from "../../../../components/ui/button";diff --git a/client/src/app/[site]/user/[userId]/components/UserTopPages.tsx b/client/src/app/[site]/user/[userId]/components/UserTopPages.tsxindex 24fe89aa9..dd18542aa 100644--- a/client/src/app/[site]/user/[userId]/components/UserTopPages.tsx+++ b/client/src/app/[site]/user/[userId]/components/UserTopPages.tsx@@ -1,6 +1,6 @@import { useParams } from "next/navigation";import { useState } from "react";-import { useGetSite } from "../../../../../api/admin/sites";+import { useGetSite } from "../../../../../api/admin/hooks/useSites";import { TabsContent, TabsList, TabsTrigger } from "../../../../../components/ui/basic-tabs";import { Card, CardContent } from "../../../../../components/ui/card";import { Tabs } from "../../../../../components/ui/tabs";diff --git a/client/src/app/[site]/utils.ts b/client/src/app/[site]/utils.tsindex 28b02ebc0..fd122c169 100644--- a/client/src/app/[site]/utils.ts+++ b/client/src/app/[site]/utils.ts@@ -1,7 +1,7 @@"use client";import { useQueryState, parseAsBoolean } from "nuqs";-import { useCurrentSite } from "../../api/admin/sites";+import { useCurrentSite } from "../../api/admin/hooks/useSites";export const useEmbedablePage = () => {const [embed] = useQueryState("embed", parseAsBoolean);diff --git a/client/src/app/admin/components/organizations/FilteredStatsCards.tsx b/client/src/app/admin/components/organizations/FilteredStatsCards.tsxindex d051538ae..6b8cc7ca0 100644--- a/client/src/app/admin/components/organizations/FilteredStatsCards.tsx+++ b/client/src/app/admin/components/organizations/FilteredStatsCards.tsx@@ -1,7 +1,7 @@"use client";import { useMemo } from "react";-import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";+import { AdminOrganizationData } from "@/api/admin/endpoints";import { Skeleton } from "@/components/ui/skeleton";import { Building2, Activity, Zap, Clock } from "lucide-react";diff --git a/client/src/app/admin/components/organizations/OrganizationExpandedRow.tsx b/client/src/app/admin/components/organizations/OrganizationExpandedRow.tsxindex b5d001abc..4e5fc4eeb 100644--- a/client/src/app/admin/components/organizations/OrganizationExpandedRow.tsx+++ b/client/src/app/admin/components/organizations/OrganizationExpandedRow.tsx@@ -2,7 +2,7 @@import { useCallback } from "react";import { useRouter } from "next/navigation";-import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";+import { AdminOrganizationData } from "@/api/admin/endpoints";import { Badge } from "@/components/ui/badge";import { formatDistanceToNow } from "date-fns";import { formatter } from "@/lib/utils";diff --git a/client/src/app/admin/components/organizations/Organizations.tsx b/client/src/app/admin/components/organizations/Organizations.tsxindex f770f7cd9..5e5418b2f 100644--- a/client/src/app/admin/components/organizations/Organizations.tsx+++ b/client/src/app/admin/components/organizations/Organizations.tsx@@ -1,7 +1,7 @@"use client";import { useState, useMemo } from "react";-import { useAdminOrganizations } from "@/api/admin/getAdminOrganizations";+import { useAdminOrganizations } from "@/api/admin/hooks/useAdminOrganizations";import { Button } from "@/components/ui/button";import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";import { DateTime } from "luxon";diff --git a/client/src/app/admin/components/organizations/OrganizationsTable.tsx b/client/src/app/admin/components/organizations/OrganizationsTable.tsxindex b1768ad5b..9103ce46f 100644--- a/client/src/app/admin/components/organizations/OrganizationsTable.tsx+++ b/client/src/app/admin/components/organizations/OrganizationsTable.tsx@@ -1,7 +1,7 @@"use client";import { useState, useMemo, useCallback } from "react";-import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";+import { AdminOrganizationData } from "@/api/admin/endpoints";import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";import { Badge } from "@/components/ui/badge";import { Skeleton } from "@/components/ui/skeleton";diff --git a/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsx b/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsxindex 2e0010a52..51ff91b24 100644--- a/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsx+++ b/client/src/app/admin/components/organizations/SubscriptionTiersTable.tsx@@ -1,7 +1,7 @@"use client";import { useState, useMemo } from "react";-import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";+import { AdminOrganizationData } from "@/api/admin/endpoints";import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";import { Badge } from "@/components/ui/badge";import { Skeleton } from "@/components/ui/skeleton";diff --git a/client/src/app/admin/components/organizations/useFilteredOrganizations.ts b/client/src/app/admin/components/organizations/useFilteredOrganizations.tsindex 324bb8cf8..542f8a36e 100644--- a/client/src/app/admin/components/organizations/useFilteredOrganizations.ts+++ b/client/src/app/admin/components/organizations/useFilteredOrganizations.ts@@ -1,5 +1,5 @@import { useMemo } from "react";-import { AdminOrganizationData } from "@/api/admin/getAdminOrganizations";+import { AdminOrganizationData } from "@/api/admin/endpoints";import { TierOption } from "./OrganizationFilters";interface FilterOptions {diff --git a/client/src/app/admin/components/shared/ServiceUsageChart.tsx b/client/src/app/admin/components/shared/ServiceUsageChart.tsxindex 9642a4fdf..1f1477e13 100644--- a/client/src/app/admin/components/shared/ServiceUsageChart.tsx+++ b/client/src/app/admin/components/shared/ServiceUsageChart.tsx@@ -1,6 +1,6 @@"use client";-import { useGetAdminServiceEventCount } from "@/api/admin/useGetAdminServiceEventCount";+import { useGetAdminServiceEventCount } from "@/api/admin/hooks/useAdminServiceEventCount";import { timeZone, userLocale } from "@/lib/dateTimeUtils";import { useNivoTheme } from "@/lib/nivo";import { formatter } from "@/lib/utils";diff --git a/client/src/app/admin/components/sites/Sites.tsx b/client/src/app/admin/components/sites/Sites.tsxindex e0af134ac..a2056ceb3 100644--- a/client/src/app/admin/components/sites/Sites.tsx+++ b/client/src/app/admin/components/sites/Sites.tsx@@ -1,7 +1,8 @@"use client";import { useMemo, useState } from "react";-import { useAdminSites, AdminSiteData } from "@/api/admin/getAdminSites";+import { useAdminSites } from "@/api/admin/hooks/useAdminSites";+import { AdminSiteData } from "@/api/admin/endpoints";import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";import { Badge } from "@/components/ui/badge";import { Skeleton } from "@/components/ui/skeleton";diff --git a/client/src/app/admin/components/users/AddToOrganizationDialog.tsx b/client/src/app/admin/components/users/AddToOrganizationDialog.tsxindex 33c649900..a7f15bad1 100644--- a/client/src/app/admin/components/users/AddToOrganizationDialog.tsx+++ b/client/src/app/admin/components/users/AddToOrganizationDialog.tsx@@ -17,8 +17,8 @@ import { Check, ChevronsUpDown } from "lucide-react";import { useState } from "react";import { toast } from "sonner";import { Alert } from "@/components/ui/alert";-import { useAddUserToOrganization } from "@/api/admin/organizations";-import { useAdminOrganizations } from "@/api/admin/getAdminOrganizations";+import { useAddUserToOrganization } from "@/api/admin/hooks/useOrganizations";+import { useAdminOrganizations } from "@/api/admin/hooks/useAdminOrganizations";import { cn } from "@/lib/utils";interface AddToOrganizationDialogProps {diff --git a/client/src/app/admin/components/users/UsersTable.tsx b/client/src/app/admin/components/users/UsersTable.tsxindex f53a5150f..7d93ef322 100644--- a/client/src/app/admin/components/users/UsersTable.tsx+++ b/client/src/app/admin/components/users/UsersTable.tsx@@ -38,8 +38,8 @@ import { userStore } from "@/lib/userStore";import { SortableHeader } from "../shared/SortableHeader";import { parseUtcTimestamp } from "../../../../lib/dateTimeUtils";import { AddToOrganizationDialog } from "./AddToOrganizationDialog";-import { useRemoveUserFromOrganization } from "@/api/admin/organizations";-import { useAdminOrganizations } from "@/api/admin/getAdminOrganizations";+import { useRemoveUserFromOrganization } from "@/api/admin/hooks/useOrganizations";+import { useAdminOrganizations } from "@/api/admin/hooks/useAdminOrganizations";import { toast } from "sonner";import { Label } from "@/components/ui/label";import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command";diff --git a/client/src/app/admin/page.tsx b/client/src/app/admin/page.tsxindex 76f2178fc..05fd6689a 100644--- a/client/src/app/admin/page.tsx+++ b/client/src/app/admin/page.tsx@@ -10,7 +10,7 @@ import { AdminLayout } from "./components/shared/AdminLayout";import { AppSidebar } from "../../components/AppSidebar";import { usePathname } from "next/navigation";-import { useGetSite } from "../../api/admin/sites";+import { useGetSite } from "../../api/admin/hooks/useSites";import { Button } from "../../components/ui/button";import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetTrigger } from "../../components/ui/sheet";diff --git a/client/src/app/as/callback/page.tsx b/client/src/app/as/callback/page.tsxindex 64e91f101..b81c1f74b 100644--- a/client/src/app/as/callback/page.tsx+++ b/client/src/app/as/callback/page.tsx@@ -12,7 +12,7 @@ import { ArrowRight, Check, Loader2 } from "lucide-react";import Link from "next/link";import { useRouter, useSearchParams } from "next/navigation";import React, { Suspense, useEffect, useState } from "react";-import { addSite } from "../../../api/admin/sites";+import { addSite } from "../../../api/admin/endpoints";import { RybbitTextLogo } from "../../../components/RybbitLogo";import { useSetPageTitle } from "../../../hooks/useSetPageTitle";import { authClient } from "../../../lib/auth";diff --git a/client/src/app/components/AddSite.tsx b/client/src/app/components/AddSite.tsxindex a5dc50f48..5bbf71acd 100644--- a/client/src/app/components/AddSite.tsx+++ b/client/src/app/components/AddSite.tsx@@ -4,7 +4,8 @@ import { AlertCircle, AppWindow, Plus } from "lucide-react";import { DateTime } from "luxon";import { useRouter } from "next/navigation";import { useState } from "react";-import { addSite, useGetSitesFromOrg } from "../../api/admin/sites";+import { addSite } from "../../api/admin/endpoints";+import { useGetSitesFromOrg } from "../../api/admin/hooks/useSites";import { Alert, AlertDescription, AlertTitle } from "../../components/ui/alert";import {Dialog,diff --git a/client/src/app/page.tsx b/client/src/app/page.tsxindex 78adaba99..389e35eca 100644--- a/client/src/app/page.tsx+++ b/client/src/app/page.tsx@@ -1,9 +1,9 @@"use client";import { ChevronLeft, ChevronRight, Plus } from "lucide-react";-import { useState } from "react";-import { useUserOrganizations } from "../api/admin/organizations";-import { useGetSitesFromOrg } from "../api/admin/sites";+import { useEffect, useState } from "react";+import { useUserOrganizations } from "../api/admin/hooks/useOrganizations";+import { useGetSitesFromOrg } from "../api/admin/hooks/useSites";import { CreateOrganizationDialog } from "../components/CreateOrganizationDialog";import { DateSelector } from "../components/DateSelector/DateSelector";import { NoOrganization } from "../components/NoOrganization";@@ -50,6 +50,10 @@ export default function Home() {const [createOrgDialogOpen, setCreateOrgDialogOpen] = useState(false);+ // Track hydration to avoid mismatch with date-dependent disabled states+ const [isMounted, setIsMounted] = useState(false);+ useEffect(() => setIsMounted(true), []);+// Handle successful organization creationconst handleOrganizationCreated = () => {refetchOrganizations();@@ -78,7 +82,7 @@ export default function Home() {variant="secondary"size="icon"onClick={goForward}- disabled={!canGoForward(time)}+ disabled={!isMounted || !canGoForward(time)}className="rounded-l-none -ml-px h-8 w-8"><ChevronRight />diff --git a/client/src/app/settings/account/components/AccountInner.tsx b/client/src/app/settings/account/components/AccountInner.tsxindex c1b6ed8bc..3f6536ff0 100644--- a/client/src/app/settings/account/components/AccountInner.tsx+++ b/client/src/app/settings/account/components/AccountInner.tsx@@ -5,7 +5,7 @@ import { useQueryClient } from "@tanstack/react-query";import { useRouter } from "next/navigation";import { useEffect, useState } from "react";import { toast } from "sonner";-import { useUpdateAccountSettings } from "../../../../api/admin/accountSettings";+import { useUpdateAccountSettings } from "../../../../api/admin/hooks/useAccountSettings";import { Button } from "../../../../components/ui/button";import { Card, CardContent, CardHeader, CardTitle } from "../../../../components/ui/card";import { Input } from "../../../../components/ui/input";diff --git a/client/src/app/settings/account/components/ApiKeyManager.tsx b/client/src/app/settings/account/components/ApiKeyManager.tsxindex d87b5ce07..01e023d08 100644--- a/client/src/app/settings/account/components/ApiKeyManager.tsx+++ b/client/src/app/settings/account/components/ApiKeyManager.tsx@@ -9,7 +9,7 @@ import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } fimport { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "../../../../components/ui/table";import { Label } from "../../../../components/ui/label";import { DateTime } from "luxon";-import { useListApiKeys, useCreateApiKey, useDeleteApiKey } from "../../../../api/admin/userApiKeys";+import { useListApiKeys, useCreateApiKey, useDeleteApiKey } from "../../../../api/admin/hooks/useUserApiKeys";export function ApiKeyManager() {const [apiKeyName, setApiKeyName] = useState("");diff --git a/client/src/app/settings/organization/members/components/CreateUserDialog.tsx b/client/src/app/settings/organization/members/components/CreateUserDialog.tsxindex 8e12c0a11..d45a30cae 100644--- a/client/src/app/settings/organization/members/components/CreateUserDialog.tsx+++ b/client/src/app/settings/organization/members/components/CreateUserDialog.tsx@@ -19,7 +19,7 @@ import { toast } from "sonner";import { Alert } from "../../../../../components/ui/alert";import { authClient } from "../../../../../lib/auth";import { validateEmail } from "../../../../../lib/auth-utils";-import { useAddUserToOrganization } from "../../../../../api/admin/organizations";+import { useAddUserToOrganization } from "../../../../../api/admin/hooks/useOrganizations";interface CreateUserDialogProps {organizationId: string;diff --git a/client/src/app/settings/organization/members/components/DeleteOrganizationDialog.tsx b/client/src/app/settings/organization/members/components/DeleteOrganizationDialog.tsxindex bbd8600ae..48561a890 100644--- a/client/src/app/settings/organization/members/components/DeleteOrganizationDialog.tsx+++ b/client/src/app/settings/organization/members/components/DeleteOrganizationDialog.tsx@@ -19,7 +19,7 @@ import { Button } from "@/components/ui/button";import { Input } from "@/components/ui/input";import { authClient } from "@/lib/auth";import { useStripeSubscription } from "@/lib/subscription/useStripeSubscription";-import { USER_ORGANIZATIONS_QUERY_KEY } from "../../../../../api/admin/organizations";+import { USER_ORGANIZATIONS_QUERY_KEY } from "../../../../../api/admin/hooks/useOrganizations";import { Organization } from "../page";interface DeleteOrganizationDialogProps {diff --git a/client/src/app/settings/organization/members/components/Invitations.tsx b/client/src/app/settings/organization/members/components/Invitations.tsxindex e61c1c147..0c267223c 100644--- a/client/src/app/settings/organization/members/components/Invitations.tsx+++ b/client/src/app/settings/organization/members/components/Invitations.tsx@@ -2,7 +2,7 @@import { DateTime } from "luxon";import { useState } from "react";import { toast } from "sonner";-import { useOrganizationInvitations } from "../../../../../api/admin/organizations";+import { useOrganizationInvitations } from "../../../../../api/admin/hooks/useOrganizations";import { Badge } from "../../../../../components/ui/badge";import { Button } from "../../../../../components/ui/button";import { Card, CardContent, CardHeader, CardTitle } from "../../../../../components/ui/card";diff --git a/client/src/app/settings/organization/members/page.tsx b/client/src/app/settings/organization/members/page.tsxindex 1aabbfe91..cc5a702f4 100644--- a/client/src/app/settings/organization/members/page.tsx+++ b/client/src/app/settings/organization/members/page.tsx@@ -7,8 +7,8 @@ import { authClient } from "../../../../lib/auth";import { useEffect, useState } from "react";import { toast } from "sonner";-import { useOrganizationMembers } from "../../../../api/admin/auth";-import { useOrganizationInvitations } from "../../../../api/admin/organizations";+import { useOrganizationMembers } from "../../../../api/admin/hooks/useOrganizationMembers";+import { useOrganizationInvitations } from "../../../../api/admin/hooks/useOrganizations";import { NoOrganization } from "../../../../components/NoOrganization";import { Button } from "../../../../components/ui/button";import { Input } from "../../../../components/ui/input";diff --git a/client/src/app/signup/page.tsx b/client/src/app/signup/page.tsxindex 7a717124e..85f5c62d4 100644--- a/client/src/app/signup/page.tsx+++ b/client/src/app/signup/page.tsx@@ -14,7 +14,7 @@ import Link from "next/link";import { useRouter } from "next/navigation";import { parseAsInteger, useQueryState } from "nuqs";import React, { Suspense, useEffect, useState } from "react";-import { addSite } from "../../api/admin/sites";+import { addSite } from "../../api/admin/endpoints";import { RybbitLogo, RybbitTextLogo } from "../../components/RybbitLogo";import { SpinningGlobe } from "../../components/SpinningGlobe";import { useSetPageTitle } from "../../hooks/useSetPageTitle";diff --git a/client/src/components/AuthenticationGuard.tsx b/client/src/components/AuthenticationGuard.tsxindex f0eeb0ade..9675fba02 100644--- a/client/src/components/AuthenticationGuard.tsx+++ b/client/src/components/AuthenticationGuard.tsx@@ -3,7 +3,7 @@import { useEffect } from "react";import { redirect, usePathname } from "next/navigation";import { userStore } from "../lib/userStore";-import { useGetSiteIsPublic } from "../api/admin/sites";+import { useGetSiteIsPublic } from "../api/admin/hooks/useSites";const PUBLIC_ROUTES = ["/login", "/signup", "/invitation", "/reset-password", "/as/callback"];diff --git a/client/src/components/CreateOrganizationDialog.tsx b/client/src/components/CreateOrganizationDialog.tsxindex 175ff6e27..22d5bf368 100644--- a/client/src/components/CreateOrganizationDialog.tsx+++ b/client/src/components/CreateOrganizationDialog.tsx@@ -15,7 +15,7 @@ import { AlertCircle, Building2 } from "lucide-react";import { authClient } from "../lib/auth";import { toast } from "sonner";import { useMutation, useQueryClient } from "@tanstack/react-query";-import { USER_ORGANIZATIONS_QUERY_KEY } from "../api/admin/organizations";+import { USER_ORGANIZATIONS_QUERY_KEY } from "../api/admin/hooks/useOrganizations";import { Alert, AlertDescription, AlertTitle } from "./ui/alert";interface CreateOrganizationDialogProps {diff --git a/client/src/components/DisabledOverlay.tsx b/client/src/components/DisabledOverlay.tsxindex 84ec64399..d72cc19a1 100644--- a/client/src/components/DisabledOverlay.tsx+++ b/client/src/components/DisabledOverlay.tsx@@ -1,7 +1,7 @@import { ArrowRight, Crown, ExternalLink } from "lucide-react";import Link from "next/link";import React, { ReactNode, useMemo, useRef, useEffect, useState } from "react";-import { useCurrentSite } from "../api/admin/sites";+import { useCurrentSite } from "../api/admin/hooks/useSites";import { DEFAULT_EVENT_LIMIT } from "../lib/subscription/constants";import { Button } from "./ui/button";import { authClient } from "../lib/auth";diff --git a/client/src/components/FreePlanBanner.tsx b/client/src/components/FreePlanBanner.tsxindex 5e77de302..c554a67bc 100644--- a/client/src/components/FreePlanBanner.tsx+++ b/client/src/components/FreePlanBanner.tsx@@ -1,6 +1,6 @@import { ArrowRight } from "lucide-react";import Link from "next/link";-import { useCurrentSite } from "../api/admin/sites";+import { useCurrentSite } from "../api/admin/hooks/useSites";import { DEFAULT_EVENT_LIMIT } from "../lib/subscription/constants";import { Button } from "./ui/button";diff --git a/client/src/components/NoOrganization.tsx b/client/src/components/NoOrganization.tsxindex 63102cb45..26ebc8d89 100644--- a/client/src/components/NoOrganization.tsx+++ b/client/src/components/NoOrganization.tsx@@ -1,6 +1,6 @@import { Building, Plus } from "lucide-react";import { useState } from "react";-import { useUserOrganizations } from "../api/admin/organizations";+import { useUserOrganizations } from "../api/admin/hooks/useOrganizations";import { CreateOrganizationDialog } from "./CreateOrganizationDialog";import { Button } from "./ui/button";import { Card, CardDescription, CardTitle } from "./ui/card";diff --git a/client/src/components/OrganizationInitializer.tsx b/client/src/components/OrganizationInitializer.tsxindex 8f3cd7955..eeb36be66 100644--- a/client/src/components/OrganizationInitializer.tsx+++ b/client/src/components/OrganizationInitializer.tsx@@ -2,7 +2,7 @@import { useEffect } from "react";import { authClient } from "../lib/auth";-import { useUserOrganizations } from "../api/admin/organizations";+import { useUserOrganizations } from "../api/admin/hooks/useOrganizations";import { useTrack } from "../hooks/useTrack";function OrganizationInitializerInner() {diff --git a/client/src/components/OrganizationSelector.tsx b/client/src/components/OrganizationSelector.tsxindex fb28ced88..d9be60946 100644--- a/client/src/components/OrganizationSelector.tsx+++ b/client/src/components/OrganizationSelector.tsx@@ -2,7 +2,7 @@ import { Building2 } from "lucide-react";import { useState, useEffect } from "react";import { authClient } from "../lib/auth";import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./ui/select";-import { useUserOrganizations } from "../api/admin/organizations";+import { useUserOrganizations } from "../api/admin/hooks/useOrganizations";export function OrganizationSelector() {const { data: organizations, isLoading: isLoadingOrganizations } = useUserOrganizations();diff --git a/client/src/components/SiteSettings/CountryExclusionManager.tsx b/client/src/components/SiteSettings/CountryExclusionManager.tsxindex 5a38e155c..c47b7a45e 100644--- a/client/src/components/SiteSettings/CountryExclusionManager.tsx+++ b/client/src/components/SiteSettings/CountryExclusionManager.tsx@@ -7,7 +7,7 @@ import { toast } from "sonner";import { Button } from "@/components/ui/button";import { Label } from "@/components/ui/label";-import { useGetExcludedCountries, useUpdateExcludedCountries } from "@/api/admin/excludedCountries";+import { useGetExcludedCountries, useUpdateExcludedCountries } from "@/api/admin/hooks/useExcludedCountries";import { CountrySelector } from "./CountrySelector";interface CountryExclusionManagerProps {diff --git a/client/src/components/SiteSettings/IPExclusionManager.tsx b/client/src/components/SiteSettings/IPExclusionManager.tsxindex c539d15bd..e01647e38 100644--- a/client/src/components/SiteSettings/IPExclusionManager.tsx+++ b/client/src/components/SiteSettings/IPExclusionManager.tsx@@ -8,7 +8,7 @@ import { Button } from "@/components/ui/button";import { Input } from "@/components/ui/input";import { Label } from "@/components/ui/label";-import { useGetExcludedIPs, useUpdateExcludedIPs } from "@/api/admin/excludedIPs";+import { useGetExcludedIPs, useUpdateExcludedIPs } from "@/api/admin/hooks/useExcludedIPs";import { validateIPPattern } from "@/lib/ipValidation";interface IPExclusionManagerProps {diff --git a/client/src/components/SiteSettings/ImportManager.tsx b/client/src/components/SiteSettings/ImportManager.tsxindex a67bdd609..2658a6abc 100644--- a/client/src/components/SiteSettings/ImportManager.tsx+++ b/client/src/components/SiteSettings/ImportManager.tsx@@ -21,7 +21,7 @@ import { Alert, AlertDescription } from "@/components/ui/alert";import { Badge } from "@/components/ui/badge";import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";import { Upload, FileText, AlertCircle, CheckCircle2, Loader2, Trash2 } from "lucide-react";-import { useGetSiteImports, useCreateSiteImport, useDeleteSiteImport } from "@/api/admin/import";+import { useGetSiteImports, useCreateSiteImport, useDeleteSiteImport } from "@/api/admin/hooks/useImport";import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";import { IS_CLOUD } from "@/lib/const";import { CsvParser } from "@/lib/import/csvParser";diff --git a/client/src/components/SiteSettings/SiteConfiguration.tsx b/client/src/components/SiteSettings/SiteConfiguration.tsxindex 3fff6c21e..2a7d27713 100644--- a/client/src/components/SiteSettings/SiteConfiguration.tsx+++ b/client/src/components/SiteSettings/SiteConfiguration.tsx@@ -21,7 +21,8 @@ import { Input } from "@/components/ui/input";import { Label } from "@/components/ui/label";import { Switch } from "@/components/ui/switch";-import { deleteSite, SiteResponse, updateSiteConfig, useGetSitesFromOrg } from "@/api/admin/sites";+import { deleteSite, updateSiteConfig, SiteResponse } from "@/api/admin/endpoints";+import { useGetSitesFromOrg } from "@/api/admin/hooks/useSites";import { normalizeDomain } from "@/lib/utils";import { IPExclusionManager } from "./IPExclusionManager";import { CountryExclusionManager } from "./CountryExclusionManager";diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsxindex 0506dc8b7..c2efb2fa1 100644--- a/client/src/components/SiteSettings/SiteSettings.tsx+++ b/client/src/components/SiteSettings/SiteSettings.tsx@@ -14,8 +14,9 @@ import {} from "@/components/ui/responsive-dialog";import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";-import { useUserOrganizations } from "@/api/admin/organizations";-import { SiteResponse, useGetSite } from "@/api/admin/sites";+import { useUserOrganizations } from "@/api/admin/hooks/useOrganizations";+import { SiteResponse } from "@/api/admin/endpoints";+import { useGetSite } from "@/api/admin/hooks/useSites";import { ImportManager } from "./ImportManager";import { ScriptBuilder } from "./ScriptBuilder";import { SiteConfiguration } from "./SiteConfiguration";diff --git a/client/src/hooks/useTrack.ts b/client/src/hooks/useTrack.tsindex eb6dd22b2..b9557120d 100644--- a/client/src/hooks/useTrack.ts+++ b/client/src/hooks/useTrack.ts@@ -1,7 +1,7 @@import { useEffect } from "react";import { authClient } from "@/lib/auth";import { useStripeSubscription } from "../lib/subscription/useStripeSubscription";-import { useGetSitesFromOrg } from "../api/admin/sites";+import { useGetSitesFromOrg } from "../api/admin/hooks/useSites";export function useTrack() {const { data: subscription, isLoading } = useStripeSubscription();