🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Update event fetching API and clean up RealtimePage
Bill Yang35bfc48231c4
diff --git a/client/src/api/analytics/useGetEvents.ts b/client/src/api/analytics/useGetEvents.tsindex 9e7e7a50c..03c844a09 100644--- a/client/src/api/analytics/useGetEvents.ts+++ b/client/src/api/analytics/useGetEvents.ts@@ -26,8 +26,8 @@ export function useGetEvents(count = 10) {queryKey: ["events", site, count],refetchInterval: 5000,queryFn: () =>- authedFetch(`${BACKEND_URL}/events/${site}?count=${count}`).then((res) =>- res.json()+ authedFetch(`${BACKEND_URL}/recent-events/${site}?count=${count}`).then(+ (res) => res.json()),});}diff --git a/client/src/app/[site]/realtime/page.tsx b/client/src/app/[site]/realtime/page.tsxindex b0e47c5d8..4f118cbad 100644--- a/client/src/app/[site]/realtime/page.tsx+++ b/client/src/app/[site]/realtime/page.tsx@@ -22,7 +22,6 @@ import NumberFlow from "@number-flow/react";export default function RealtimePage() {const [ref, { width }] = useMeasure();- const size = useWindowSize();const [minutes, setMinutes] = useAtom(minutesAtom);diff --git a/server/src/api/analytics/getEvents.ts b/server/src/api/analytics/getEvents.tsindex aafe3f644..95daaa602 100644--- a/server/src/api/analytics/getEvents.ts+++ b/server/src/api/analytics/getEvents.ts@@ -71,7 +71,7 @@ export async function getEvents(format: "JSONEachRow",query_params: {siteId: Number(site),- limit: limitCount,+ limit: Number(limitCount),},});diff --git a/server/src/index.ts b/server/src/index.tsindex 5d6623d3c..3d41552e8 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -114,7 +114,7 @@ const ANALYTICS_ROUTES = ["/site-is-public/","/sessions/","/session/",- "/events/",+ "/recent-events/","/users/","/user/info/","/live-session-locations/",@@ -183,7 +183,7 @@ server.get("/user/:userId/sessions/:site", getUserSessions);server.get("/user/info/:userId/:site", getUserInfo);server.get("/live-session-locations/:site", getLiveSessionLocations);server.get("/funnels/:site", getFunnels);-server.get("/events/:site", getEvents);+server.get("/recent-events/:site", getEvents);server.post("/funnel/:site", getFunnel);server.post("/funnel/create/:site", createFunnel);server.delete("/report/:reportId", deleteReport);