Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Remove unused analytics API hooks and related files to streamline the codebase. Update import paths for consistency and clarity across components utilizing metrics and user sessions.

Bill Yang4de8cd763646
diff --git a/client/src/api/analytics/useJourneys.ts b/client/src/api/analytics/useGetJourneys.ts
similarity index 100%
rename from client/src/api/analytics/useJourneys.ts
rename to client/src/api/analytics/useGetJourneys.ts
diff --git a/client/src/api/analytics/useLiveUserCount.ts b/client/src/api/analytics/useGetLiveUserCount.ts
similarity index 100%
rename from client/src/api/analytics/useLiveUserCount.ts
rename to client/src/api/analytics/useGetLiveUserCount.ts
diff --git a/client/src/api/analytics/useMetric.ts b/client/src/api/analytics/useGetMetric.ts
similarity index 100%
rename from client/src/api/analytics/useMetric.ts
rename to client/src/api/analytics/useGetMetric.ts
diff --git a/client/src/api/analytics/userSessions.ts b/client/src/api/analytics/useGetUserSessions.ts
similarity index 100%
rename from client/src/api/analytics/userSessions.ts
rename to client/src/api/analytics/useGetUserSessions.ts
diff --git a/client/src/api/analytics/users.ts b/client/src/api/analytics/useGetUsers.ts
similarity index 100%
rename from client/src/api/analytics/users.ts
rename to client/src/api/analytics/useGetUsers.ts
diff --git a/client/src/api/analytics/userInfo.ts b/client/src/api/analytics/userGetInfo.ts
similarity index 100%
rename from client/src/api/analytics/userInfo.ts
rename to client/src/api/analytics/userGetInfo.ts
diff --git a/client/src/app/[site]/components/SubHeader/LiveUserCount.tsx b/client/src/app/[site]/components/SubHeader/LiveUserCount.tsx
index 2a6d9aaa3..970b7fbd4 100644
--- a/client/src/app/[site]/components/SubHeader/LiveUserCount.tsx
+++ b/client/src/app/[site]/components/SubHeader/LiveUserCount.tsx
@@ -1,4 +1,4 @@
-import { useGetLiveUsercount } from "../../../../api/analytics/useLiveUserCount";
+import { useGetLiveUsercount } from "../../../../api/analytics/useGetLiveUserCount";
import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../components/ui/tooltip";
import NumberFlow from "@number-flow/react";
diff --git a/client/src/app/[site]/components/shared/Filters/ValueSelect.tsx b/client/src/app/[site]/components/shared/Filters/ValueSelect.tsx
index b37463775..7eff51b84 100644
--- a/client/src/app/[site]/components/shared/Filters/ValueSelect.tsx
+++ b/client/src/app/[site]/components/shared/Filters/ValueSelect.tsx
@@ -2,7 +2,7 @@
import { FilterParameter } from "@rybbit/shared";
import { useMemo } from "react";
-import { useMetric } from "../../../../../api/analytics/useMetric";
+import { useMetric } from "../../../../../api/analytics/useGetMetric";
import { MultiSelect } from "../../../../../components/MultiSelect";
import { useGetRegionName } from "../../../../../lib/geo";
import { getCountryName, getLanguageName } from "../../../../../lib/utils";
diff --git a/client/src/app/[site]/components/shared/Map/MapComponent.tsx b/client/src/app/[site]/components/shared/Map/MapComponent.tsx
index bef285de1..5c2ab532c 100644
--- a/client/src/app/[site]/components/shared/Map/MapComponent.tsx
+++ b/client/src/app/[site]/components/shared/Map/MapComponent.tsx
@@ -3,7 +3,7 @@
import { useMeasure } from "@uidotdev/usehooks";
import "ol/ol.css";
import { useEffect, useState } from "react";
-import { useMetric } from "../../../../../api/analytics/useMetric";
+import { useMetric } from "../../../../../api/analytics/useGetMetric";
import { useCountries, useSubdivisions } from "../../../../../lib/geo";
import { CountryFlag } from "../icons/CountryFlag";
import { useMapInstance } from "./hooks/useMapInstance";
diff --git a/client/src/app/[site]/components/shared/StandardSection/Row.tsx b/client/src/app/[site]/components/shared/StandardSection/Row.tsx
index 2a967805f..30626e678 100644
--- a/client/src/app/[site]/components/shared/StandardSection/Row.tsx
+++ b/client/src/app/[site]/components/shared/StandardSection/Row.tsx
@@ -3,8 +3,8 @@ import NumberFlow from "@number-flow/react";
import { round } from "lodash";
import { ChevronDown, ChevronRight, SquareArrowOutUpRight } from "lucide-react";
import { ReactNode, useState, useCallback } from "react";
-import { usePaginatedMetric } from "../../../../../api/analytics/useMetric";
-import { MetricResponse } from "../../../../../api/analytics/useMetric";
+import { usePaginatedMetric } from "../../../../../api/analytics/useGetMetric";
+import { MetricResponse } from "../../../../../api/analytics/useGetMetric";
import { addFilter, removeFilter, useStore } from "../../../../../lib/store";
// Custom hook for filter handling logic
diff --git a/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx b/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx
index 683d558fb..ed95706f6 100644
--- a/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx
+++ b/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx
@@ -5,7 +5,7 @@ import { FilterParameter } from "@rybbit/shared";
import { AlertCircle, Info, RefreshCcw } from "lucide-react";
import Link from "next/link";
import { ReactNode } from "react";
-import { MetricResponse, usePaginatedMetric } from "../../../../../api/analytics/useMetric";
+import { MetricResponse, usePaginatedMetric } from "../../../../../api/analytics/useGetMetric";
import { CardLoader } from "../../../../../components/ui/card";
import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../../components/ui/tooltip";
import { IS_CLOUD } from "../../../../../lib/const";
diff --git a/client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsx b/client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsx
index dce5bdea1..d691f31cb 100644
--- a/client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsx
+++ b/client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsx
@@ -11,8 +11,8 @@ import {
import { useDebounce, useIntersectionObserver } from "@uidotdev/usehooks";
import { ChevronDown, ChevronUp, Loader2, Search, SquareArrowOutUpRight } from "lucide-react";
import { ReactNode, useEffect, useMemo, useState } from "react";
-import { useInfiniteMetric } from "../../../../../api/analytics/useMetric";
-import { MetricResponse } from "../../../../../api/analytics/useMetric";
+import { useInfiniteMetric } from "../../../../../api/analytics/useGetMetric";
+import { MetricResponse } from "../../../../../api/analytics/useGetMetric";
import { FilterParameter } from "@rybbit/shared";
import { addFilter } from "../../../../../lib/store";
import { cn, formatSecondsAsMinutesAndSeconds } from "../../../../../lib/utils";
diff --git a/client/src/app/[site]/funnels/components/FunnelForm.tsx b/client/src/app/[site]/funnels/components/FunnelForm.tsx
index 6e7641e43..23c555454 100644
--- a/client/src/app/[site]/funnels/components/FunnelForm.tsx
+++ b/client/src/app/[site]/funnels/components/FunnelForm.tsx
@@ -6,7 +6,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@
import { Plus, Save, Trash2 } from "lucide-react";
import { useState } from "react";
import { FunnelResponse, FunnelStep } from "../../../../api/analytics/funnels/useGetFunnel";
-import { useMetric } from "../../../../api/analytics/useMetric";
+import { useMetric } from "../../../../api/analytics/useGetMetric";
import { ThreeDotLoader } from "../../../../components/Loaders";
import { Label } from "../../../../components/ui/label";
import { Switch } from "../../../../components/ui/switch";
diff --git a/client/src/app/[site]/globe/2d/hooks/useOpenLayersCountriesLayer.ts b/client/src/app/[site]/globe/2d/hooks/useOpenLayersCountriesLayer.ts
index fd28d1ad9..76a07ccac 100644
--- a/client/src/app/[site]/globe/2d/hooks/useOpenLayersCountriesLayer.ts
+++ b/client/src/app/[site]/globe/2d/hooks/useOpenLayersCountriesLayer.ts
@@ -5,7 +5,7 @@ import VectorLayer from "ol/layer/Vector";
import VectorSource from "ol/source/Vector";
import { Fill, Stroke, Style } from "ol/style";
import { MutableRefObject, useEffect, useMemo, useRef, useState } from "react";
-import { useMetric } from "../../../../../api/analytics/useMetric";
+import { useMetric } from "../../../../../api/analytics/useGetMetric";
import { useCountries } from "../../../../../lib/geo";
import { addFilter } from "../../../../../lib/store";
import { createColorScale } from "../../utils/colorScale";
diff --git a/client/src/app/[site]/globe/2d/hooks/useOpenLayersSubdivisionsLayer.ts b/client/src/app/[site]/globe/2d/hooks/useOpenLayersSubdivisionsLayer.ts
index 505df59bf..7df70a423 100644
--- a/client/src/app/[site]/globe/2d/hooks/useOpenLayersSubdivisionsLayer.ts
+++ b/client/src/app/[site]/globe/2d/hooks/useOpenLayersSubdivisionsLayer.ts
@@ -5,7 +5,7 @@ import VectorLayer from "ol/layer/Vector";
import VectorSource from "ol/source/Vector";
import { Fill, Stroke, Style } from "ol/style";
import { MutableRefObject, useEffect, useMemo, useRef, useState } from "react";
-import { useMetric } from "../../../../../api/analytics/useMetric";
+import { useMetric } from "../../../../../api/analytics/useGetMetric";
import { useSubdivisions } from "../../../../../lib/geo";
import { addFilter } from "../../../../../lib/store";
import { createColorScale } from "../../utils/colorScale";
diff --git a/client/src/app/[site]/globe/2d/hooks/useOpenLayersTimelineLayer.ts b/client/src/app/[site]/globe/2d/hooks/useOpenLayersTimelineLayer.ts
index d648e80ad..136dda4cf 100644
--- a/client/src/app/[site]/globe/2d/hooks/useOpenLayersTimelineLayer.ts
+++ b/client/src/app/[site]/globe/2d/hooks/useOpenLayersTimelineLayer.ts
@@ -8,7 +8,7 @@ import Feature, { FeatureLike } from "ol/Feature";
import Point from "ol/geom/Point";
import { Circle, Fill, Stroke, Style, Text } from "ol/style";
import { fromLonLat } from "ol/proj";
-import type { GetSessionsResponse } from "../../../../../api/analytics/userSessions";
+import type { GetSessionsResponse } from "../../../../../api/analytics/useGetUserSessions";
import { useTimelineStore, useActiveSessions } from "../../timelineStore";
import { generateAvatarSVG } from "../../3d/hooks/timelineLayer/timelineMarkerHelpers";
import { buildTooltipHTML } from "../../utils/timelineTooltipBuilder";
@@ -127,20 +127,22 @@ export function useOpenLayersTimelineLayer({ mapInstanceRef, mapViewRef, mapView
if (shouldCluster) {
// Create features for clustering
- const features = activeSessions.map(session => {
- if (!session.lat || !session.lon) return null;
+ const features = activeSessions
+ .map(session => {
+ if (!session.lat || !session.lon) return null;
- const feature = new Feature({
- geometry: new Point(fromLonLat([session.lon, session.lat])),
- });
+ const feature = new Feature({
+ geometry: new Point(fromLonLat([session.lon, session.lat])),
+ });
- feature.setProperties({
- session_id: session.session_id,
- session,
- });
+ feature.setProperties({
+ session_id: session.session_id,
+ session,
+ });
- return feature;
- }).filter(Boolean) as Feature[];
+ return feature;
+ })
+ .filter(Boolean) as Feature[];
// Create vector source
const vectorSource = new VectorSource({
@@ -383,101 +385,101 @@ export function useOpenLayersTimelineLayer({ mapInstanceRef, mapViewRef, mapView
});
toRemove.forEach(id => overlaysMap.delete(id));
- // Create or update overlays for active sessions
- activeSessions.forEach(session => {
- if (!session?.session_id || !session.lat || !session.lon) return;
+ // Create or update overlays for active sessions
+ activeSessions.forEach(session => {
+ if (!session?.session_id || !session.lat || !session.lon) return;
- const existing = overlaysMap.get(session.session_id);
+ const existing = overlaysMap.get(session.session_id);
- if (existing) {
- // Update position if needed
- const currentPos = existing.overlay.getPosition();
- const newPos = fromLonLat([session.lon, session.lat]);
- if (!currentPos || currentPos[0] !== newPos[0] || currentPos[1] !== newPos[1]) {
- existing.overlay.setPosition(newPos);
- }
- } else {
- // Create new overlay
- const avatarContainer = document.createElement("div");
- avatarContainer.className = "timeline-avatar-marker";
- avatarContainer.style.cursor = "pointer";
- avatarContainer.style.borderRadius = "50%";
- avatarContainer.style.overflow = "hidden";
- avatarContainer.style.width = "32px";
- avatarContainer.style.height = "32px";
- avatarContainer.style.boxShadow = "0 2px 8px rgba(0,0,0,0.3)";
- avatarContainer.style.transform = "translate(-50%, -50%)"; // Center the avatar
-
- const avatarSVG = generateAvatarSVG(session.user_id, 32);
- avatarContainer.innerHTML = avatarSVG;
-
- // Track cleanup resources
- let timeoutId: number | null = null;
- let buttonHandler: ((e: Event) => void) | null = null;
- let buttonElement: Element | null = null;
-
- // Add click handler for tooltip
- const handleAvatarClick = (e: MouseEvent) => {
- e.stopPropagation();
-
- // If clicking the same avatar that has the tooltip open, close it
- if (openTooltipSessionId === session.session_id && tooltipOverlayRef.current) {
- tooltipOverlayRef.current.setPosition(undefined);
- setOpenTooltipSessionId(null);
- return;
+ if (existing) {
+ // Update position if needed
+ const currentPos = existing.overlay.getPosition();
+ const newPos = fromLonLat([session.lon, session.lat]);
+ if (!currentPos || currentPos[0] !== newPos[0] || currentPos[1] !== newPos[1]) {
+ existing.overlay.setPosition(newPos);
}
+ } else {
+ // Create new overlay
+ const avatarContainer = document.createElement("div");
+ avatarContainer.className = "timeline-avatar-marker";
+ avatarContainer.style.cursor = "pointer";
+ avatarContainer.style.borderRadius = "50%";
+ avatarContainer.style.overflow = "hidden";
+ avatarContainer.style.width = "32px";
+ avatarContainer.style.height = "32px";
+ avatarContainer.style.boxShadow = "0 2px 8px rgba(0,0,0,0.3)";
+ avatarContainer.style.transform = "translate(-50%, -50%)"; // Center the avatar
+
+ const avatarSVG = generateAvatarSVG(session.user_id, 32);
+ avatarContainer.innerHTML = avatarSVG;
+
+ // Track cleanup resources
+ let timeoutId: number | null = null;
+ let buttonHandler: ((e: Event) => void) | null = null;
+ let buttonElement: Element | null = null;
+
+ // Add click handler for tooltip
+ const handleAvatarClick = (e: MouseEvent) => {
+ e.stopPropagation();
+
+ // If clicking the same avatar that has the tooltip open, close it
+ if (openTooltipSessionId === session.session_id && tooltipOverlayRef.current) {
+ tooltipOverlayRef.current.setPosition(undefined);
+ setOpenTooltipSessionId(null);
+ return;
+ }
- // Show tooltip for this session
- if (tooltipOverlayRef.current) {
- const html = buildTooltipHTML(session, session.lon, session.lat);
- tooltipOverlayRef.current.getElement()!.innerHTML = html;
- tooltipOverlayRef.current.setPosition(fromLonLat([session.lon, session.lat]));
- setOpenTooltipSessionId(session.session_id);
-
- // Add click handler to "View Details" button
- timeoutId = window.setTimeout(() => {
- const button = document.querySelector(`[data-session-id="${session.session_id}"]`);
- if (button) {
- buttonHandler = (e: Event) => {
- e.stopPropagation();
- setSelectedSession(session);
- if (tooltipOverlayRef.current) {
- tooltipOverlayRef.current.setPosition(undefined);
- setOpenTooltipSessionId(null);
- }
- };
- buttonElement = button;
- button.addEventListener("click", buttonHandler);
- }
- }, 0);
- }
- };
+ // Show tooltip for this session
+ if (tooltipOverlayRef.current) {
+ const html = buildTooltipHTML(session, session.lon, session.lat);
+ tooltipOverlayRef.current.getElement()!.innerHTML = html;
+ tooltipOverlayRef.current.setPosition(fromLonLat([session.lon, session.lat]));
+ setOpenTooltipSessionId(session.session_id);
+
+ // Add click handler to "View Details" button
+ timeoutId = window.setTimeout(() => {
+ const button = document.querySelector(`[data-session-id="${session.session_id}"]`);
+ if (button) {
+ buttonHandler = (e: Event) => {
+ e.stopPropagation();
+ setSelectedSession(session);
+ if (tooltipOverlayRef.current) {
+ tooltipOverlayRef.current.setPosition(undefined);
+ setOpenTooltipSessionId(null);
+ }
+ };
+ buttonElement = button;
+ button.addEventListener("click", buttonHandler);
+ }
+ }, 0);
+ }
+ };
- avatarContainer.addEventListener("click", handleAvatarClick);
+ avatarContainer.addEventListener("click", handleAvatarClick);
- const overlay = new Overlay({
- element: avatarContainer,
- positioning: "center-center",
- stopEvent: false,
- });
+ const overlay = new Overlay({
+ element: avatarContainer,
+ positioning: "center-center",
+ stopEvent: false,
+ });
- overlay.setPosition(fromLonLat([session.lon, session.lat]));
- map.addOverlay(overlay);
+ overlay.setPosition(fromLonLat([session.lon, session.lat]));
+ map.addOverlay(overlay);
- // Cleanup function to remove all event listeners and clear timeouts
- const cleanup = () => {
- if (timeoutId !== null) {
- clearTimeout(timeoutId);
- }
- if (buttonHandler && buttonElement) {
- buttonElement.removeEventListener("click", buttonHandler);
- }
- avatarContainer.removeEventListener("click", handleAvatarClick);
- };
+ // Cleanup function to remove all event listeners and clear timeouts
+ const cleanup = () => {
+ if (timeoutId !== null) {
+ clearTimeout(timeoutId);
+ }
+ if (buttonHandler && buttonElement) {
+ buttonElement.removeEventListener("click", buttonHandler);
+ }
+ avatarContainer.removeEventListener("click", handleAvatarClick);
+ };
- overlaysMap.set(session.session_id, { overlay, element: avatarContainer, session, cleanup });
- }
- });
+ overlaysMap.set(session.session_id, { overlay, element: avatarContainer, session, cleanup });
+ }
+ });
}
// Handle cluster clicks to zoom in
diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineClusterUtils.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineClusterUtils.ts
index 9d1949a58..3a931b852 100644
--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineClusterUtils.ts
+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineClusterUtils.ts
@@ -1,6 +1,6 @@
import mapboxgl from "mapbox-gl";
import { isNil, round } from "lodash";
-import type { GetSessionsResponse } from "../../../../../../api/analytics/userSessions";
+import type { GetSessionsResponse } from "../../../../../../api/analytics/useGetUserSessions";
import { SOURCE_ID, MIN_CLUSTER_SIZE } from "./timelineLayerConstants";
import { spreadOverlappingPoints } from "./timelineLayerManager";
diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerManager.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerManager.ts
index fe9a55757..7f68410cc 100644
--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerManager.ts
+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerManager.ts
@@ -1,6 +1,6 @@
import mapboxgl from "mapbox-gl";
import { isNil, round } from "lodash";
-import type { GetSessionsResponse } from "../../../../../../api/analytics/userSessions";
+import type { GetSessionsResponse } from "../../../../../../api/analytics/useGetUserSessions";
import { CLUSTER_LAYER_ID, CLUSTER_COUNT_LAYER_ID, SOURCE_ID, SPREAD_RADIUS_DEGREES } from "./timelineLayerConstants";
/**
@@ -10,7 +10,7 @@ function hashStringToNumber(str: string): number {
let hash = 0;
for (let i = 0; i < str.length; i++) {
const char = str.charCodeAt(i);
- hash = ((hash << 5) - hash) + char;
+ hash = (hash << 5) - hash + char;
hash = hash & hash; // Convert to 32bit integer
}
return Math.abs(hash);
@@ -92,10 +92,7 @@ export function spreadOverlappingPoints(
const offsetLat = Math.sin(angle) * radius;
const offsetLon = (Math.cos(angle) * radius) / lonAdjustment;
- coordinateMap.set(session.session_id, [
- baseLon + offsetLon,
- baseLat + offsetLat,
- ]);
+ coordinateMap.set(session.session_id, [baseLon + offsetLon, baseLat + offsetLat]);
});
}
});
diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineMarkerManager.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineMarkerManager.ts
index fdb4a0fd8..31af22354 100644
--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineMarkerManager.ts
+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineMarkerManager.ts
@@ -1,5 +1,5 @@
import mapboxgl from "mapbox-gl";
-import type { GetSessionsResponse } from "../../../../../../api/analytics/userSessions";
+import type { GetSessionsResponse } from "../../../../../../api/analytics/useGetUserSessions";
import { generateAvatarSVG } from "./timelineMarkerHelpers";
import { getUnclusteredFeatures } from "./timelineClusterUtils";
import { buildTooltipHTML } from "../../../utils/timelineTooltipBuilder";
diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineLayer.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineLayer.ts
index 2d9aede7d..e27f51dbe 100644
--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineLayer.ts
+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineLayer.ts
@@ -1,7 +1,7 @@
import mapboxgl from "mapbox-gl";
import { useEffect, useRef, useState, useCallback } from "react";
import { throttle } from "lodash";
-import type { GetSessionsResponse } from "../../../../../../api/analytics/userSessions";
+import type { GetSessionsResponse } from "../../../../../../api/analytics/useGetUserSessions";
import { useTimelineStore, useActiveSessions } from "../../../timelineStore";
import { initializeClusterSource, setupClusterClickHandler } from "./timelineClusterUtils";
import {
diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineSessions.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineSessions.ts
index bd5e474d3..73df2c247 100644
--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineSessions.ts
+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineSessions.ts
@@ -1,7 +1,7 @@
import { useQuery } from "@tanstack/react-query";
import { DateTime } from "luxon";
import { useEffect, useMemo } from "react";
-import { GetSessionsResponse } from "../../../../../../api/analytics/userSessions";
+import { GetSessionsResponse } from "../../../../../../api/analytics/useGetUserSessions";
import { APIResponse } from "../../../../../../api/types";
import { authedFetch, getQueryParams } from "../../../../../../api/utils";
import { getFilteredFilters, useStore } from "../../../../../../lib/store";
diff --git a/client/src/app/[site]/globe/3d/hooks/useCountriesLayer.ts b/client/src/app/[site]/globe/3d/hooks/useCountriesLayer.ts
index 6cee8fe31..79bfb724e 100644
--- a/client/src/app/[site]/globe/3d/hooks/useCountriesLayer.ts
+++ b/client/src/app/[site]/globe/3d/hooks/useCountriesLayer.ts
@@ -1,7 +1,7 @@
import { FilterParameter } from "@rybbit/shared";
import mapboxgl from "mapbox-gl";
import { useEffect, useMemo, useRef } from "react";
-import { useMetric } from "../../../../../api/analytics/useMetric";
+import { useMetric } from "../../../../../api/analytics/useGetMetric";
import { useCountries } from "../../../../../lib/geo";
import { addFilter } from "../../../../../lib/store";
import { createColorScale } from "../../utils/colorScale";
diff --git a/client/src/app/[site]/globe/3d/hooks/useSubdivisionsLayer.ts b/client/src/app/[site]/globe/3d/hooks/useSubdivisionsLayer.ts
index a070c6fc7..bc4f867d0 100644
--- a/client/src/app/[site]/globe/3d/hooks/useSubdivisionsLayer.ts
+++ b/client/src/app/[site]/globe/3d/hooks/useSubdivisionsLayer.ts
@@ -1,7 +1,7 @@
import { FilterParameter } from "@rybbit/shared";
import mapboxgl from "mapbox-gl";
import { useEffect, useMemo, useRef } from "react";
-import { useMetric } from "../../../../../api/analytics/useMetric";
+import { useMetric } from "../../../../../api/analytics/useGetMetric";
import { useSubdivisions } from "../../../../../lib/geo";
import { addFilter } from "../../../../../lib/store";
import { createColorScale } from "../../utils/colorScale";
diff --git a/client/src/app/[site]/globe/components/GlobeSessions.tsx b/client/src/app/[site]/globe/components/GlobeSessions.tsx
index a8fb54b74..cf33e87dd 100644
--- a/client/src/app/[site]/globe/components/GlobeSessions.tsx
+++ b/client/src/app/[site]/globe/components/GlobeSessions.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
import { useMemo, useState } from "react";
import { VisuallyHidden } from "radix-ui";
import { useCurrentSite } from "../../../../api/admin/sites";
-import { GetSessionsResponse, useGetSessionsInfinite } from "../../../../api/analytics/userSessions";
+import { GetSessionsResponse, useGetSessionsInfinite } from "../../../../api/analytics/useGetUserSessions";
import { Avatar, generateName } from "../../../../components/Avatar";
import { Channel } from "../../../../components/Channel";
import { EventIcon, PageviewIcon } from "../../../../components/EventIcons";
diff --git a/client/src/app/[site]/globe/timelineStore.ts b/client/src/app/[site]/globe/timelineStore.ts
index 73b638a21..e25c18fcd 100644
--- a/client/src/app/[site]/globe/timelineStore.ts
+++ b/client/src/app/[site]/globe/timelineStore.ts
@@ -1,7 +1,7 @@
import { DateTime } from "luxon";
import { create } from "zustand";
import { useMemo } from "react";
-import type { GetSessionsResponse } from "../../../api/analytics/userSessions";
+import type { GetSessionsResponse } from "../../../api/analytics/useGetUserSessions";
import { getActiveSessions } from "./timelineUtils";
interface TimelineStore {
diff --git a/client/src/app/[site]/globe/timelineUtils.ts b/client/src/app/[site]/globe/timelineUtils.ts
index 13acdb4e4..f07e9e7e0 100644
--- a/client/src/app/[site]/globe/timelineUtils.ts
+++ b/client/src/app/[site]/globe/timelineUtils.ts
@@ -1,5 +1,5 @@
import { DateTime } from "luxon";
-import { GetSessionsResponse } from "../../../api/analytics/userSessions";
+import { GetSessionsResponse } from "../../../api/analytics/useGetUserSessions";
/**
* Calculate the appropriate window size in minutes based on the total time range
diff --git a/client/src/app/[site]/globe/utils/timelineTooltipBuilder.ts b/client/src/app/[site]/globe/utils/timelineTooltipBuilder.ts
index 2bdbb3e6e..ad2e457d7 100644
--- a/client/src/app/[site]/globe/utils/timelineTooltipBuilder.ts
+++ b/client/src/app/[site]/globe/utils/timelineTooltipBuilder.ts
@@ -5,7 +5,7 @@ import { renderToStaticMarkup } from "react-dom/server";
import { Eye, MousePointerClick } from "lucide-react";
import { generateName } from "../../../../components/Avatar";
import { formatShortDuration, hour12, userLocale } from "../../../../lib/dateTimeUtils";
-import type { GetSessionsResponse } from "../../../../api/analytics/userSessions";
+import type { GetSessionsResponse } from "../../../../api/analytics/useGetUserSessions";
import { extractDomain, getDisplayName } from "../../../../components/Channel";
import {
generateAvatarSVG,
diff --git a/client/src/app/[site]/goals/components/GoalFormModal.tsx b/client/src/app/[site]/goals/components/GoalFormModal.tsx
index 4ea4ca4d5..7354b026b 100644
--- a/client/src/app/[site]/goals/components/GoalFormModal.tsx
+++ b/client/src/app/[site]/goals/components/GoalFormModal.tsx
@@ -7,7 +7,7 @@ import * as z from "zod";
import { useCreateGoal } from "../../../../api/analytics/goals/useCreateGoal";
import { Goal } from "../../../../api/analytics/goals/useGetGoals";
import { useUpdateGoal } from "../../../../api/analytics/goals/useUpdateGoal";
-import { useMetric } from "../../../../api/analytics/useMetric";
+import { useMetric } from "../../../../api/analytics/useGetMetric";
import { EventIcon, PageviewIcon } from "../../../../components/EventIcons";
import { Button } from "../../../../components/ui/button";
import {
diff --git a/client/src/app/[site]/journeys/page.tsx b/client/src/app/[site]/journeys/page.tsx
index f5aabb1a1..1b91e7d2a 100644
--- a/client/src/app/[site]/journeys/page.tsx
+++ b/client/src/app/[site]/journeys/page.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useJourneys } from "@/api/analytics/useJourneys";
+import { useJourneys } from "@/api/analytics/useGetJourneys";
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
import { Input } from "@/components/ui/input";
import { Slider } from "@/components/ui/slider";
diff --git a/client/src/app/[site]/pages/components/PageListItem.tsx b/client/src/app/[site]/pages/components/PageListItem.tsx
index 83d9c3548..560c2ee94 100644
--- a/client/src/app/[site]/pages/components/PageListItem.tsx
+++ b/client/src/app/[site]/pages/components/PageListItem.tsx
@@ -2,7 +2,7 @@
import { useGetSite } from "@/api/admin/sites";
import { useGetOverviewBucketed } from "@/api/analytics/useGetOverviewBucketed";
-import { MetricResponse } from "@/api/analytics/useMetric";
+import { MetricResponse } from "@/api/analytics/useGetMetric";
import { usePageMetadata } from "@/api/usePageMetadata";
import { Card, CardContent } from "@/components/ui/card";
import { Filter } from "@rybbit/shared";
diff --git a/client/src/app/[site]/realtime/page.tsx b/client/src/app/[site]/realtime/page.tsx
index 980870079..10e6b525d 100644
--- a/client/src/app/[site]/realtime/page.tsx
+++ b/client/src/app/[site]/realtime/page.tsx
@@ -3,7 +3,7 @@
import NumberFlow from "@number-flow/react";
import { useMeasure } from "@uidotdev/usehooks";
import { useAtom } from "jotai";
-import { useGetLiveUsercount } from "../../../api/analytics/useLiveUserCount";
+import { useGetLiveUsercount } from "../../../api/analytics/useGetLiveUserCount";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../../../components/ui/select";
import { useSetPageTitle } from "../../../hooks/useSetPageTitle";
import { RealtimeChart } from "./RealtimeChart/RealtimeChart";
diff --git a/client/src/app/[site]/user/[userId]/components/Calendar.tsx b/client/src/app/[site]/user/[userId]/components/Calendar.tsx
index eb463a4f4..04439bab0 100644
--- a/client/src/app/[site]/user/[userId]/components/Calendar.tsx
+++ b/client/src/app/[site]/user/[userId]/components/Calendar.tsx
@@ -1,7 +1,7 @@
import { ResponsiveCalendar } from "@nivo/calendar";
import _ from "lodash";
import { DateTime } from "luxon";
-import { UserSessionCountResponse } from "../../../../../api/analytics/userSessions";
+import { UserSessionCountResponse } from "../../../../../api/analytics/useGetUserSessions";
import { nivoTheme } from "../../../../../lib/nivo";
export const VisitCalendar = ({ sessionCount }: { sessionCount: UserSessionCountResponse[] }) => {
diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsx
index 289f0035e..609aa55c8 100644
--- a/client/src/app/[site]/user/[userId]/page.tsx
+++ b/client/src/app/[site]/user/[userId]/page.tsx
@@ -15,8 +15,8 @@ import {
} from "lucide-react";
import { DateTime } from "luxon";
import { useParams, useRouter } from "next/navigation";
-import { useUserInfo } from "../../../../api/analytics/userInfo";
-import { useGetUserSessionCount } from "../../../../api/analytics/userSessions";
+import { useUserInfo } from "../../../../api/analytics/userGetInfo";
+import { useGetUserSessionCount } from "../../../../api/analytics/useGetUserSessions";
import { Avatar, generateName } from "../../../../components/Avatar";
import { Badge } from "../../../../components/ui/badge";
import { Button } from "../../../../components/ui/button";
diff --git a/client/src/app/[site]/users/page.tsx b/client/src/app/[site]/users/page.tsx
index 5aea1f2ec..1fb11e4f9 100644
--- a/client/src/app/[site]/users/page.tsx
+++ b/client/src/app/[site]/users/page.tsx
@@ -14,7 +14,7 @@ import { DateTime } from "luxon";
import Link from "next/link";
import { useParams } from "next/navigation";
import { useState } from "react";
-import { useGetUsers, UsersResponse } from "../../../api/analytics/users";
+import { useGetUsers, UsersResponse } from "../../../api/analytics/useGetUsers";
import { Avatar, generateName } from "../../../components/Avatar";
import { extractDomain, getChannelIcon, getDisplayName } from "../../../components/Channel";
import { DisabledOverlay } from "../../../components/DisabledOverlay";
diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsx
index a974fe070..9c31a33a1 100644
--- a/client/src/components/Sessions/SessionCard.tsx
+++ b/client/src/components/Sessions/SessionCard.tsx
@@ -3,7 +3,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
import { ArrowRight, ChevronDown, ChevronRight } from "lucide-react";
import { DateTime } from "luxon";
import { memo, useState } from "react";
-import { GetSessionsResponse } from "../../api/analytics/userSessions";
+import { GetSessionsResponse } from "../../api/analytics/useGetUserSessions";
import { formatDuration, hour12, userLocale } from "../../lib/dateTimeUtils";
import { cn, formatter } from "../../lib/utils";
import { Avatar, generateName } from "../Avatar";
diff --git a/client/src/components/Sessions/SessionDetails.tsx b/client/src/components/Sessions/SessionDetails.tsx
index 1482edd73..5926391fb 100644
--- a/client/src/components/Sessions/SessionDetails.tsx
+++ b/client/src/components/Sessions/SessionDetails.tsx
@@ -9,7 +9,11 @@ import { DateTime } from "luxon";
import Link from "next/link";
import { useParams } from "next/navigation";
import { memo, useMemo } from "react";
-import { GetSessionsResponse, SessionEvent, useGetSessionDetailsInfinite } from "../../api/analytics/userSessions";
+import {
+ GetSessionsResponse,
+ SessionEvent,
+ useGetSessionDetailsInfinite,
+} from "../../api/analytics/useGetUserSessions";
import { Browser } from "../../app/[site]/components/shared/icons/Browser";
import { CountryFlag } from "../../app/[site]/components/shared/icons/CountryFlag";
import { OperatingSystem } from "../../app/[site]/components/shared/icons/OperatingSystem";
diff --git a/client/src/components/Sessions/SessionsList.tsx b/client/src/components/Sessions/SessionsList.tsx
index 554fe3d98..aaaf164c0 100644
--- a/client/src/components/Sessions/SessionsList.tsx
+++ b/client/src/components/Sessions/SessionsList.tsx
@@ -1,5 +1,5 @@
import { useEffect, useMemo, useRef } from "react";
-import { useGetSessionsInfinite } from "../../api/analytics/userSessions";
+import { useGetSessionsInfinite } from "../../api/analytics/useGetUserSessions";
import { SessionCard, SessionCardSkeleton } from "./SessionCard";
import { Button } from "../ui/button";
import { NothingFound } from "../NothingFound";