🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Add site_id
Bill Yangc42bd9909d39
diff --git a/client/src/components/TopBar.tsx b/client/src/components/TopBar.tsxindex 9a0f14a19..2b6f109d9 100644--- a/client/src/components/TopBar.tsx+++ b/client/src/components/TopBar.tsx@@ -1,14 +1,5 @@import Link from "next/link";import { ThemeToggle } from "./ThemeToggle";-import {- NavigationMenu,- NavigationMenuContent,- NavigationMenuItem,- NavigationMenuLink,- NavigationMenuList,- NavigationMenuTrigger,- navigationMenuTriggerStyle,-} from "./ui/navigation-menu";export function TopBar() {return (@@ -19,47 +10,15 @@ export function TopBar() {🐸 Frogstats</Link></div>- <div className="ml-auto flex items-center space-x-4">- <NavigationMenu>- <NavigationMenuList>- <NavigationMenuItem>- <Link href="/">- <NavigationMenuLink- className={navigationMenuTriggerStyle()}- asChild- >- Dashboard- </NavigationMenuLink>- </Link>- </NavigationMenuItem>- <NavigationMenuItem>- <Link href="/settings">- <NavigationMenuLink- className={navigationMenuTriggerStyle()}- asChild- >- Settings- </NavigationMenuLink>- </Link>- </NavigationMenuItem>- </NavigationMenuList>- </NavigationMenu>- {/* <nav className="flex items-center space-x-4">- <Link- href="/"- className="text-sm font-medium transition-colors hover:text-primary"- >- Dashboard+ <nav className="ml-auto flex items-center space-x-6">+ <Link href="/" className="text-neutral-100">+ Websites</Link>- <Link- href="/settings"- className="text-sm font-medium text-muted-foreground transition-colors hover:text-primary"- >- Settings+ <Link href="/settings" className="text-neutral-100">+ Settings</Link>- </nav> */}<ThemeToggle />- </div>+ </nav></div></div>);diff --git a/server/public/analytics.js b/server/public/analytics.jsindex 92bfd1dc1..a261cbb87 100644--- a/server/public/analytics.js+++ b/server/public/analytics.js@@ -6,6 +6,8 @@.getAttribute("src").split("/analytics.js")[0];+ const SITE_ID = scriptTag.getAttribute("site-id");+// Get debounce duration from data attribute or default to 300msconst debounceDuration = scriptTag.getAttribute("data-debounce")? Math.max(0, parseInt(scriptTag.getAttribute("data-debounce")))@@ -24,6 +26,7 @@const trackPageview = () => {const url = new URL(window.location.href);const payload = {+ site_id: SITE_ID,hostname: url.hostname,pathname: url.pathname,querystring: url.search,diff --git a/server/src/actions/pageviewQueue.ts b/server/src/actions/pageviewQueue.tsindex 059f2a7cf..ab307c460 100644--- a/server/src/actions/pageviewQueue.ts+++ b/server/src/actions/pageviewQueue.ts@@ -55,6 +55,7 @@ class PageviewQueue {// Process each pageview with its geo dataconst processedPageviews = batch.map((pv) => ({+ site_id: pv.site_id,timestamp: DateTime.fromISO(pv.timestamp).toFormat("yyyy-MM-dd HH:mm:ss"),session_id: pv.sessionId,user_id: pv.userId,diff --git a/server/src/actions/trackPageView.ts b/server/src/actions/trackPageView.tsindex 66f19f85a..4ec7db004 100644--- a/server/src/actions/trackPageView.ts+++ b/server/src/actions/trackPageView.ts@@ -36,6 +36,7 @@ const updateSession = async (}const inserts = {+ site_id: pageview.site_id,session_id: pageview.sessionId,user_id: pageview.userId,hostname: pageview.hostname || "",diff --git a/server/src/db/clickhouse/clickhouse.ts b/server/src/db/clickhouse/clickhouse.tsindex d530602d1..d8ac4f3c2 100644--- a/server/src/db/clickhouse/clickhouse.ts+++ b/server/src/db/clickhouse/clickhouse.ts@@ -11,6 +11,7 @@ export const initializeClickhouse = async () => {await clickhouse.exec({query: `CREATE TABLE IF NOT EXISTS pageviews (+ site_id Uint16,timestamp DateTime,session_id String,user_id String,@@ -39,6 +40,7 @@ export const initializeClickhouse = async () => {await clickhouse.exec({query: `CREATE TABLE IF NOT EXISTS sessions (+ site_id Uint16,hostname String,session_id String,start_time DateTime,diff --git a/server/src/db/postgres/postgres.ts b/server/src/db/postgres/postgres.tsindex 551755f29..f1df90d54 100644--- a/server/src/db/postgres/postgres.ts+++ b/server/src/db/postgres/postgres.ts@@ -43,6 +43,7 @@ export async function initializePostgres() {sql<Session[]>`CREATE TABLE IF NOT EXISTS active_sessions (session_id TEXT PRIMARY KEY,+ site_id INT,user_id TEXT,hostname TEXT,start_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,diff --git a/server/src/types.ts b/server/src/types.tsindex 288aa7540..ac9efd9a1 100644--- a/server/src/types.ts+++ b/server/src/types.ts@@ -1,4 +1,5 @@export interface TrackingPayload {+ site_id: string;hostname: string;pathname: string;querystring: string;