🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
refactor: improve data handling and layout components
Bill Yang9fab1d8c6951
diff --git a/client/src/api/analytics/useSingleCol.ts b/client/src/api/analytics/useSingleCol.tsindex c969af6c6..17f658290 100644--- a/client/src/api/analytics/useSingleCol.ts+++ b/client/src/api/analytics/useSingleCol.ts@@ -67,9 +67,9 @@ export function useSingleCol({return useQuery({queryKey,queryFn: () => {- return authedFetch(`${BACKEND_URL}/single-col/${site}`, queryParams).then(- (res) => res.json()- );+ return authedFetch(`${BACKEND_URL}/single-col/${site}`, queryParams)+ .then((res) => res.json())+ .then((res) => res.data);},staleTime: Infinity,placeholderData: (_, query: any) => {diff --git a/client/src/app/[site]/components/Header/Header.tsx b/client/src/app/[site]/components/Header/Header.tsxindex 0e7a563f2..63a0e884a 100644--- a/client/src/app/[site]/components/Header/Header.tsx+++ b/client/src/app/[site]/components/Header/Header.tsx@@ -11,7 +11,7 @@ export function Header() {return (<div className="flex flex-col">{user && (- <div className="flex flex-col gap-4 m-4 mb-0">+ <div className="flex flex-col px-4"><FreeTrialBanner /><UsageBanners /><NoData />diff --git a/client/src/app/[site]/components/Header/NoData.tsx b/client/src/app/[site]/components/Header/NoData.tsxindex 01d6ba67c..8e48bfcb6 100644--- a/client/src/app/[site]/components/Header/NoData.tsx+++ b/client/src/app/[site]/components/Header/NoData.tsx@@ -1,8 +1,7 @@import { useGetSite, useSiteHasData } from "../../../../api/admin/sites";+import { CodeSnippet } from "../../../../components/CodeSnippet";import { Alert } from "../../../../components/ui/alert";import { useStore } from "../../../../lib/store";-import { CodeSnippet } from "../../../../components/CodeSnippet";-import { BACKEND_URL } from "../../../../lib/const";export function NoData() {const { site } = useStore();@@ -12,7 +11,7 @@ export function NoData() {if (!siteHasData && !isLoading && !isLoadingSiteMetadata) {return (- <Alert className="p-4 bg-yellow-50 border-yellow-200 dark:bg-yellow-900/20 dark:border-yellow-800">+ <Alert className="mt-4 p-4 bg-yellow-50 border-yellow-200 dark:bg-yellow-900/20 dark:border-yellow-800"><div className="flex flex-col gap-3"><div className="flex items-center gap-3"><span className="relative flex h-3 w-3">diff --git a/client/src/app/[site]/components/Header/UsageBanners.tsx b/client/src/app/[site]/components/Header/UsageBanners.tsxindex f9cdda201..7e4eed1d1 100644--- a/client/src/app/[site]/components/Header/UsageBanners.tsx+++ b/client/src/app/[site]/components/Header/UsageBanners.tsx@@ -39,7 +39,7 @@ export function UsageBanners() {site.monthlyEventCount > site.eventLimit) {return (- <Alert variant="destructive" className="p-4">+ <Alert variant="destructive" className="p-4 mt-4"><div className="flex items-start space-x-3"><AlertTriangle className="h-5 w-5 mt-0.5" /><div className="flex-1">@@ -78,7 +78,7 @@ export function UsageBanners() {// If approaching limit (>90%), show warning bannerif (isNearLimit) {return (- <Alert className="p-4 bg-amber-50 border-amber-200 dark:bg-amber-900/20 dark:border-amber-800">+ <Alert className="mt-4 p-4 bg-amber-50 border-amber-200 dark:bg-amber-900/20 dark:border-amber-800"><div className="flex items-start space-x-3"><AlertTriangle className="h-5 w-5 mt-0.5 text-amber-500" /><div className="flex-1">diff --git a/client/src/app/[site]/components/shared/Map.tsx b/client/src/app/[site]/components/shared/Map.tsxindex 19b0c9367..505e74347 100644--- a/client/src/app/[site]/components/shared/Map.tsx+++ b/client/src/app/[site]/components/shared/Map.tsx@@ -47,6 +47,7 @@ export function MapComponent({isFetching: isSubdivisionFetching,} = useSingleCol({parameter: "region",+ limit: 10000,});const [dataVersion, setDataVersion] = useState<number>(0);diff --git a/client/src/app/[site]/funnels/page.tsx b/client/src/app/[site]/funnels/page.tsxindex a0e955bef..4dd8a12b8 100644--- a/client/src/app/[site]/funnels/page.tsx+++ b/client/src/app/[site]/funnels/page.tsx@@ -82,7 +82,7 @@ export default function FunnelsPage() {}return (- <div className="p-2 md:p-4 max-w-[1300px] mx-auto space-y-3">+ <div className="p-2 md:p-4 max-w-[1300px] mx-auto space-y-3"><div className="flex justify-between items-center mb-3"><div><MobileSidebar />diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsxindex a9ee02756..6d47371c5 100644--- a/client/src/app/[site]/layout.tsx+++ b/client/src/app/[site]/layout.tsx@@ -63,7 +63,9 @@ export default function SiteLayout({{/* <div className="px-4 py-2 max-w-[1400px] mx-auto w-full mb-4"> */}<Header /><div>{children}</div>- <Footer />+ {!pathname.includes("/map") && !pathname.includes("/realtime") && (+ <Footer />+ )}</div></div></div>diff --git a/client/src/components/FreeTrialBanner.tsx b/client/src/components/FreeTrialBanner.tsxindex e183a4820..f8c9fe9f6 100644--- a/client/src/components/FreeTrialBanner.tsx+++ b/client/src/components/FreeTrialBanner.tsx@@ -24,7 +24,7 @@ export function FreeTrialBanner() {const eventsUsed = subscription.monthlyEventCount || 0;return (- <div className="px-4 py-3 rounded-lg border border-blue-100 dark:border-blue-400/30 bg-blue-50/80 dark:bg-blue-900/20 text-sm flex justify-between items-center">+ <div className="mt-4 px-4 py-3 rounded-lg border border-blue-100 dark:border-blue-400/30 bg-blue-50/80 dark:bg-blue-900/20 text-sm flex justify-between items-center"><div className="text-blue-700 dark:text-blue-300 flex items-center font-medium"><Clock className="h-4 w-4 mr-2 text-blue-500 dark:text-blue-400 flex-shrink-0" /><span>@@ -50,7 +50,7 @@ export function FreeTrialBanner() {// Trial expired banner - keep prominentif (subscription.status === "expired") {return (- <Alert className="p-4 bg-amber-50 border-amber-200 dark:bg-amber-900/20 dark:border-amber-800">+ <Alert className="mt-4 p-4 bg-amber-50 border-amber-200 dark:bg-amber-900/20 dark:border-amber-800"><div className="flex items-start space-x-3"><AlertTriangle className="h-5 w-5 mt-0.5 text-amber-500 dark:text-amber-400" /><div className="flex-1">