🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor site data fetching and public status checks
Bill Yang392d472495cf
diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/sites.tsindex 6cddda3b3..43d14349d 100644--- a/client/src/api/admin/sites.ts+++ b/client/src/api/admin/sites.ts@@ -89,9 +89,9 @@ export function useSiteHasData(siteId: string) {if (!siteId) {return Promise.resolve(false);}- return authedFetch(`${BACKEND_URL}/site-has-data/${siteId}`).then((res) =>- res.json()- );+ return authedFetch(`${BACKEND_URL}/site-has-data/${siteId}`)+ .then((res) => res.json())+ .then((data) => data.hasData as Boolean);},staleTime: Infinity,});diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsxindex 6ced02893..f7b7661ed 100644--- a/client/src/app/layout.tsx+++ b/client/src/app/layout.tsx@@ -22,10 +22,10 @@ const publicRoutes = ["/login", "/signup"];// Helper function to check if a site is publicasync function checkIfSiteIsPublic(siteId: string): Promise<boolean> {try {- const response = await fetch(`${BACKEND_URL}/site-has-data/${siteId}`);+ const response = await fetch(`${BACKEND_URL}/site-is-public/${siteId}`);if (response.ok) {const data = await response.json();- return !!data.public;+ return !!data.isPublic;}} catch (error) {console.error("Error checking if site is public:", error);diff --git a/server/src/api/sites/getSiteHasData.ts b/server/src/api/sites/getSiteHasData.tsindex 20bb8384b..07deacb77 100644--- a/server/src/api/sites/getSiteHasData.ts+++ b/server/src/api/sites/getSiteHasData.ts@@ -1,7 +1,4 @@-import { FastifyRequest, FastifyReply } from "fastify";-import { db } from "../../db/postgres/postgres.js";-import { sites } from "../../db/postgres/schema.js";-import { eq } from "drizzle-orm";+import { FastifyReply, FastifyRequest } from "fastify";import clickhouse from "../../db/clickhouse/clickhouse.js";export async function getSiteHasData(@@ -11,14 +8,6 @@ export async function getSiteHasData(const { site } = request.params;try {- // Get site information including public status- const siteInfo = await db.query.sites.findFirst({- where: eq(sites.siteId, Number(site)),- columns: {- public: true,- },- });-// Check if site has data using original methodconst pageviewsData: { count: number }[] = await clickhouse.query({@@ -28,10 +17,8 @@ export async function getSiteHasData(.then((res) => res.json());const hasData = pageviewsData[0].count > 0;-return {hasData,- public: siteInfo?.public || false,};} catch (error) {console.error("Error checking if site has data:", error);diff --git a/server/src/api/sites/getSiteIsPublic.ts b/server/src/api/sites/getSiteIsPublic.tsnew file mode 100644index 000000000..042386391--- /dev/null+++ b/server/src/api/sites/getSiteIsPublic.ts@@ -0,0 +1,11 @@+import { FastifyRequest, FastifyReply } from "fastify";+import { publicSites } from "../../lib/publicSites.js";++export async function getSiteIsPublic(+ request: FastifyRequest<{ Params: { site: string } }>,+ reply: FastifyReply+) {+ const { site } = request.params;+ const isPublic = publicSites.isSitePublic(site);+ return reply.status(200).send({ isPublic });+}diff --git a/server/src/index.ts b/server/src/index.tsindex 22f41ffed..bb87fe32b 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -42,6 +42,7 @@ import { auth } from "./lib/auth.js";import { trackEvent } from "./tracker/trackEvent.js";import { extractSiteId, isSitePublic } from "./utils.js";import { publicSites } from "./lib/publicSites.js";+import { getSiteIsPublic } from "./api/sites/getSiteIsPublic.js";const __filename = fileURLToPath(import.meta.url);const __dirname = dirname(__filename);@@ -109,6 +110,7 @@ const ANALYTICS_ROUTES = ["/single-col/","/retention/","/site-has-data/",+ "/site-is-public/","/sessions/","/session/","/users/",@@ -171,6 +173,7 @@ server.get("/overview-bucketed/:site", getOverviewBucketed);server.get("/single-col/:site", getSingleCol);server.get("/retention/:site", getRetention);server.get("/site-has-data/:site", getSiteHasData);+server.get("/site-is-public/:site", getSiteIsPublic);server.get("/sessions/:site", getSessions);server.get("/session/:sessionId/:site", getSession);server.get("/users/:site", getUsers);