Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Add loader and fix loading states

Bill Yang9ec957a4b120
diff --git a/client/src/app/[site]/components/NoData.tsx b/client/src/app/[site]/components/NoData.tsx
index ff52770be..0bcd2a4f5 100644
--- a/client/src/app/[site]/components/NoData.tsx
+++ b/client/src/app/[site]/components/NoData.tsx
@@ -10,11 +10,15 @@ export function NoData({
}) {
return (
<div className="flex justify-center items-center mt-5">
- <Card className="w-[600px]">
- <CardHeader>
- <div className=" text-xl font-medium text-center w-full">
+ <Card className="w-[500px] p-2">
+ <CardHeader className="flex justify-center items-center">
+ <div className="text-xl font-medium text-center w-full">
Waiting for analytics from {siteMetadata?.domain}...
</div>
+ <div className="p-5">
+ {/* @ts-ignore */}
+ <l-ping size={50} color="hsl(var(--emerald-400))" speed="3" />
+ </div>
</CardHeader>
<CardContent className="flex flex-col gap-4">
<div className="flex flex-col gap-1">
diff --git a/client/src/app/[site]/page.tsx b/client/src/app/[site]/page.tsx
index 974b31789..3f84619b1 100644
--- a/client/src/app/[site]/page.tsx
+++ b/client/src/app/[site]/page.tsx
@@ -1,7 +1,11 @@
"use client";
import { usePathname } from "next/navigation";
+import { useEffect } from "react";
+import { useGetSites, useSiteHasData } from "../../hooks/api";
+import { useStore } from "../../lib/store";
import { Header } from "./components/Header/Header";
import { MainSection } from "./components/MainSection/MainSection";
+import { NoData } from "./components/NoData";
import { Browsers } from "./components/sections/Browsers/Browsers";
import { Countries } from "./components/sections/Countries/Countries";
import { Devices } from "./components/sections/Devices/Devices";
@@ -9,13 +13,6 @@ import { Map } from "./components/sections/Map/Map";
import { OperatingSystems } from "./components/sections/OperatingSystems/OperatingSystems";
import { Pages } from "./components/sections/Pages/Pages";
import { Referrers } from "./components/sections/Referrers/Referrers";
-import { useStore } from "../../lib/store";
-import { useEffect } from "react";
-import { useGetSites, useSiteHasData } from "../../hooks/api";
-import { Card, CardContent, CardHeader } from "../../components/ui/card";
-import { CodeSnippet } from "../../components/CodeSnippet";
-import { BACKEND_URL } from "../../lib/const";
-import { NoData } from "./components/NoData";
export default function SitePage() {
const pathname = usePathname();
@@ -40,6 +37,10 @@ function SitePageInner({ site }: { site: string }) {
const siteMetadata = allSites?.data?.find((s) => s.site_id === Number(site));
+ console.info({
+ siteHasData,
+ });
+
if (isLoadingAllSites || isLoading) {
return null;
}
diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx
index 0b316e37b..531e45305 100644
--- a/client/src/app/layout.tsx
+++ b/client/src/app/layout.tsx
@@ -40,11 +40,18 @@ export default function RootLayout({
<body
className={`${inter.className} h-full bg-background text-foreground`}
>
+ {/* The ldrs are very pretty but it's super annoying to load them
+ https://github.com/GriffinJohnston/ldrs/blob/main/framework-guides.md#nextjs */}
<script
type="module"
defer
src="https://cdn.jsdelivr.net/npm/ldrs/dist/auto/zoomies.js"
></script>
+ <script
+ type="module"
+ defer
+ src="https://cdn.jsdelivr.net/npm/ldrs/dist/auto/ping.js"
+ ></script>
<ThemeProvider>
<Theme appearance="dark">
<QueryProvider>
diff --git a/client/src/hooks/api.ts b/client/src/hooks/api.ts
index c22be7c1f..d53c72184 100644
--- a/client/src/hooks/api.ts
+++ b/client/src/hooks/api.ts
@@ -42,7 +42,16 @@ export function useGenericQuery<T>(
).then((res) => res.json());
},
staleTime: Infinity,
- placeholderData: keepPreviousData,
+ placeholderData: (_, query: any) => {
+ if (!query?.queryKey) return undefined;
+ const prevQueryKey = query.queryKey as [string, string, string];
+ const [, , prevSite] = prevQueryKey;
+
+ if (prevSite === site) {
+ return query.state.data;
+ }
+ return undefined;
+ },
});
}
@@ -127,7 +136,16 @@ export function useGetPageviews(
`${BACKEND_URL}/pageviews?startDate=${startDate}&endDate=${endDate}&timezone=${timezone}&bucket=${bucket}&site=${site}`
).then((res) => res.json());
},
- placeholderData: keepPreviousData,
+ placeholderData: (_, query: any) => {
+ if (!query?.queryKey) return undefined;
+ const prevQueryKey = query.queryKey as [string, string, string];
+ const [, , prevSite] = prevQueryKey;
+
+ if (prevSite === site) {
+ return query.state.data;
+ }
+ return undefined;
+ },
staleTime: Infinity,
});
}