🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor site metadata handling and component structure
Bill Yang74130d8d1203
diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/sites.tsindex 1299faf71..883a69965 100644--- a/client/src/api/admin/sites.ts+++ b/client/src/api/admin/sites.ts@@ -1,4 +1,5 @@import { BACKEND_URL } from "../../lib/const";+import { useStore } from "../../lib/store";import { authedFetch, genericQuery, useGenericQuery } from "../utils";export type GetSitesResponse = {@@ -59,10 +60,11 @@ export function useSiteHasData(siteId: string) {return useGenericQuery<boolean>(`site-has-data/${siteId}`);}-export function useGetSiteMetadata(siteId: string | number) {+export function useGetSiteMetadata() {+ const { site } = useStore();const { data, isLoading } = useGetSites();return {- siteMetadata: data?.find((site) => site.siteId === Number(siteId)),+ siteMetadata: data?.find(({ siteId }) => siteId === Number(site)),isLoading,};}diff --git a/client/src/app/[site]/Header/Header.tsx b/client/src/app/[site]/Header/Header.tsxindex e91ad66f1..5703dd1ad 100644--- a/client/src/app/[site]/Header/Header.tsx+++ b/client/src/app/[site]/Header/Header.tsx@@ -47,7 +47,7 @@ export function Header() {<div className="flex items-center gap-1 text-base text-neutral-600 dark:text-neutral-400"><Circle size={12} weight="fill" color="hsl(var(--green-500))" />{data?.count} users online- <SiteSettings siteId={site?.siteId ?? 0} />+ <SiteSettings /></div></div><div className="flex space-x-2">diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsxindex 16972f63b..f9c309e99 100644--- a/client/src/app/[site]/layout.tsx+++ b/client/src/app/[site]/layout.tsx@@ -17,7 +17,7 @@ export default function SiteLayout({const { data: siteHasData, isLoading } = useSiteHasData(site);const { siteMetadata, isLoading: isLoadingSiteMetadata } =- useGetSiteMetadata(site);+ useGetSiteMetadata();// Sync store state with URL parametersuseSyncStateWithUrl();diff --git a/client/src/app/[site]/main/components/sections/Events.tsx b/client/src/app/[site]/main/components/sections/Events.tsxindex 3edd40c4d..34708eaaf 100644--- a/client/src/app/[site]/main/components/sections/Events.tsx+++ b/client/src/app/[site]/main/components/sections/Events.tsx@@ -7,12 +7,15 @@ import {} from "../../../../../components/ui/basic-tabs";import { Card, CardContent } from "../../../../../components/ui/card";import { StandardSection } from "../../../components/shared/StandardSection/StandardSection";+import { StandardSectionRealtime } from "../../../components/shared/StandardSection/StandardSectionRealtime";type Tab = "events";-export function Events() {+export function Events({ isRealtime = false }: { isRealtime?: boolean }) {const [tab, setTab] = useState<Tab>("events");+ const ComponentToUse = isRealtime ? StandardSectionRealtime : StandardSection;+return (<Card><CardContent className="mt-2">@@ -25,7 +28,7 @@ export function Events() {<TabsTrigger value="events">Custom Events</TabsTrigger></TabsList><TabsContent value="events">- <StandardSection+ <ComponentToUsefilterParameter="event_name"title="Events"countLabel="Count"diff --git a/client/src/app/[site]/main/components/sections/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsxindex aa98f0de3..b06088408 100644--- a/client/src/app/[site]/main/components/sections/Pages.tsx+++ b/client/src/app/[site]/main/components/sections/Pages.tsx@@ -1,7 +1,10 @@"use client";import { useState } from "react";-import { GetSitesResponse } from "../../../../../api/admin/sites";+import {+ GetSitesResponse,+ useGetSiteMetadata,+} from "../../../../../api/admin/sites";import {Tabs,TabsContent,@@ -14,13 +17,8 @@ import { StandardSectionRealtime } from "../../../components/shared/StandardSecttype Tab = "pages" | "entry_pages" | "exit_pages";-export function Pages({- siteMetadata,- isRealtime = false,-}: {- siteMetadata: GetSitesResponse[number];- isRealtime?: boolean;-}) {+export function Pages({ isRealtime = false }: { isRealtime?: boolean }) {+ const { siteMetadata } = useGetSiteMetadata();const [tab, setTab] = useState<Tab>("pages");const ComponentToUse = isRealtime ? StandardSectionRealtime : StandardSection;@@ -45,7 +43,7 @@ export function Pages({getValue={(e) => e.value}getKey={(e) => e.value}getLabel={(e) => e.value || "Other"}- getLink={(e) => `https://${siteMetadata.domain}${e.value}`}+ getLink={(e) => `https://${siteMetadata?.domain}${e.value}`}/></TabsContent><TabsContent value="entry_pages">@@ -55,7 +53,7 @@ export function Pages({getValue={(e) => e.value}getKey={(e) => e.value}getLabel={(e) => e.value || "Other"}- getLink={(e) => `https://${siteMetadata.domain}${e.value}`}+ getLink={(e) => `https://${siteMetadata?.domain}${e.value}`}/></TabsContent><TabsContent value="exit_pages">@@ -65,7 +63,7 @@ export function Pages({getValue={(e) => e.value}getKey={(e) => e.value}getLabel={(e) => e.value || "Other"}- getLink={(e) => `https://${siteMetadata.domain}${e.value}`}+ getLink={(e) => `https://${siteMetadata?.domain}${e.value}`}/></TabsContent></Tabs>diff --git a/client/src/app/[site]/main/page.tsx b/client/src/app/[site]/main/page.tsxindex 7527c05b9..ca2b6cac6 100644--- a/client/src/app/[site]/main/page.tsx+++ b/client/src/app/[site]/main/page.tsx@@ -17,12 +17,12 @@ export default function MainPage() {return null;}- return <MainPageContent site={site} />;+ return <MainPageContent />;}-function MainPageContent({ site }: { site: string }) {+function MainPageContent() {const { siteMetadata, isLoading: isLoadingSiteMetadata } =- useGetSiteMetadata(site);+ useGetSiteMetadata();if (isLoadingSiteMetadata || !siteMetadata) {return null;@@ -34,7 +34,7 @@ function MainPageContent({ site }: { site: string }) {<MainSection /><div className="grid grid-cols-2 gap-4 mt-4"><Devices />- <Pages siteMetadata={siteMetadata} />+ <Pages /><Referrers /><Countries /><Events />diff --git a/client/src/app/[site]/realtime/page.tsx b/client/src/app/[site]/realtime/page.tsxindex c0088b2da..659f21848 100644--- a/client/src/app/[site]/realtime/page.tsx+++ b/client/src/app/[site]/realtime/page.tsx@@ -1,9 +1,8 @@"use client";-import { getCountryName } from "../../../lib/utils";-import { CountryFlag } from "../components/shared/icons/CountryFlag";-import { StandardSectionRealtime } from "../components/shared/StandardSection/StandardSectionRealtime";import { Countries } from "../main/components/sections/Countries";+import { Events } from "../main/components/sections/Events";+import { Pages } from "../main/components/sections/Pages";import { Referrers } from "../main/components/sections/Referrers";import { RealtimeMap } from "./RealtimeMap/RealtimeMap";@@ -12,8 +11,10 @@ export default function RealtimePage() {<div className="flex flex-col gap-4"><RealtimeMap /><div className="grid grid-cols-1 md:grid-cols-2 gap-4">- <Countries isRealtime />+ <Pages isRealtime />+ <Events isRealtime /><Referrers isRealtime />+ <Countries isRealtime /></div></div>);diff --git a/client/src/components/SiteCard.tsx b/client/src/components/SiteCard.tsxindex 47ff456c0..fd785c69e 100644--- a/client/src/components/SiteCard.tsx+++ b/client/src/components/SiteCard.tsx@@ -84,7 +84,7 @@ export function SiteCard({ siteId, domain }: SiteCardProps) {{domain}</span></Link>- <SiteSettings siteId={siteId} />+ <SiteSettings /></div><div className="relative mt-1 mb-1 rounded-md p-2 overflow-hidden">diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsxindex 0d5659eb5..5c2c10aca 100644--- a/client/src/components/SiteSettings/SiteSettings.tsx+++ b/client/src/components/SiteSettings/SiteSettings.tsx@@ -41,12 +41,8 @@ import {} from "@/api/admin/sites";import { BACKEND_URL } from "@/lib/const";-interface SiteSettingsProps {- siteId: number;-}--export function SiteSettings({ siteId }: SiteSettingsProps) {- const { siteMetadata } = useGetSiteMetadata(siteId);+export function SiteSettings() {+ const { siteMetadata } = useGetSiteMetadata();if (!siteMetadata) {return null;