Skip to content

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

add loading state to sites with no data

Bill Yangd6a111264853
diff --git a/client/src/app/[site]/components/NoData.tsx b/client/src/app/[site]/components/NoData.tsx
new file mode 100644
index 000000000..ff52770be
--- /dev/null
+++ b/client/src/app/[site]/components/NoData.tsx
@@ -0,0 +1,33 @@
+import { CodeSnippet } from "../../../components/CodeSnippet";
+import { Card, CardContent, CardHeader } from "../../../components/ui/card";
+import { GetSitesResponse } from "../../../hooks/api";
+import { BACKEND_URL } from "../../../lib/const";
+
+export function NoData({
+ siteMetadata,
+}: {
+ siteMetadata?: GetSitesResponse[number];
+}) {
+ 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">
+ Waiting for analytics from {siteMetadata?.domain}...
+ </div>
+ </CardHeader>
+ <CardContent className="flex flex-col gap-4">
+ <div className="flex flex-col gap-1">
+ <div className="text-sm text-muted-foreground">
+ Place this snippet in the &lt;head&gt; of your website
+ </div>
+ <CodeSnippet
+ language="HTML"
+ code={`<script\n src="${BACKEND_URL}/analytics.js"\n site-id="${siteMetadata?.site_id}"\n defer\n/>`}
+ />
+ </div>
+ </CardContent>
+ </Card>
+ </div>
+ );
+}
diff --git a/client/src/app/[site]/page.tsx b/client/src/app/[site]/page.tsx
index b9afbedff..974b31789 100644
--- a/client/src/app/[site]/page.tsx
+++ b/client/src/app/[site]/page.tsx
@@ -11,6 +11,11 @@ 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();
@@ -26,6 +31,23 @@ export default function SitePage() {
return null;
}
+ return <SitePageInner site={site} />;
+}
+
+function SitePageInner({ site }: { site: string }) {
+ const { data: allSites, isLoading: isLoadingAllSites } = useGetSites();
+ const { data: siteHasData, isLoading } = useSiteHasData(site);
+
+ const siteMetadata = allSites?.data?.find((s) => s.site_id === Number(site));
+
+ if (isLoadingAllSites || isLoading) {
+ return null;
+ }
+
+ if (!siteHasData?.data && !isLoading && !isLoadingAllSites) {
+ return <NoData siteMetadata={siteMetadata} />;
+ }
+
return (
<>
<Header />
diff --git a/client/src/components/CodeSnippet.tsx b/client/src/components/CodeSnippet.tsx
new file mode 100644
index 000000000..416b30f82
--- /dev/null
+++ b/client/src/components/CodeSnippet.tsx
@@ -0,0 +1,54 @@
+"use client";
+
+import * as React from "react";
+import { Check, Copy } from "lucide-react";
+
+import { Button } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
+
+interface CodeSnippetProps extends React.HTMLAttributes<HTMLPreElement> {
+ code: string;
+ language?: string;
+}
+
+export function CodeSnippet({
+ code,
+ language,
+ className,
+ ...props
+}: CodeSnippetProps) {
+ const [hasCopied, setHasCopied] = React.useState(false);
+
+ const copyToClipboard = React.useCallback(async () => {
+ await navigator.clipboard.writeText(code);
+ setHasCopied(true);
+ setTimeout(() => setHasCopied(false), 2000);
+ }, [code]);
+
+ return (
+ <div className="relative">
+ <pre
+ className={cn(
+ "overflow-x-auto rounded-lg border-neutral-500 bg-muted p-3 text-wrap",
+ "font-mono text-sm",
+ className
+ )}
+ {...props}
+ >
+ {language && (
+ <div className="mb-1 text-xs text-muted-foreground">{language}</div>
+ )}
+ <code className="relative rounded bg-muted p-0">{code}</code>
+ </pre>
+ <Button
+ size="icon"
+ variant="ghost"
+ className="absolute right-3 top-3 h-6 w-6"
+ onClick={copyToClipboard}
+ >
+ {hasCopied ? <Check className="size-3" /> : <Copy className="size-3" />}
+ <span className="sr-only">Copy code</span>
+ </Button>
+ </div>
+ );
+}
diff --git a/client/src/hooks/api.ts b/client/src/hooks/api.ts
index 441efd080..c22be7c1f 100644
--- a/client/src/hooks/api.ts
+++ b/client/src/hooks/api.ts
@@ -165,11 +165,18 @@ export function addSite(domain: string, name: string) {
domain,
name,
}),
+ headers: {
+ "Content-Type": "application/json",
+ },
});
}
-export function deleteSite(siteId: string) {
+export function deleteSite(siteId: number) {
return authedFetch(`${BACKEND_URL}/delete-site/${siteId}`, {
method: "POST",
});
}
+
+export function useSiteHasData(siteId: string) {
+ return useGenericQuery<boolean>(`site-has-data/${siteId}`);
+}
diff --git a/client/src/hooks/utils.ts b/client/src/hooks/utils.ts
index faca60b33..7d22ebb69 100644
--- a/client/src/hooks/utils.ts
+++ b/client/src/hooks/utils.ts
@@ -19,9 +19,6 @@ export function getStartAndEndDate(time: Time) {
export async function authedFetch(url: string, opts: RequestInit = {}) {
return fetch(url, {
credentials: "include",
- // headers: {
- // "Content-Type": "application/json",
- // },
...opts,
});
}
diff --git a/server/src/actions/sites/addSite.ts b/server/src/api/sites/addSite.ts
similarity index 100%
rename from server/src/actions/sites/addSite.ts
rename to server/src/api/sites/addSite.ts
diff --git a/server/src/actions/sites/deleteSite.ts b/server/src/api/sites/deleteSite.ts
similarity index 100%
rename from server/src/actions/sites/deleteSite.ts
rename to server/src/api/sites/deleteSite.ts
diff --git a/server/src/api/sites/getSiteHasData.ts b/server/src/api/sites/getSiteHasData.ts
new file mode 100644
index 000000000..fa9f7b67a
--- /dev/null
+++ b/server/src/api/sites/getSiteHasData.ts
@@ -0,0 +1,22 @@
+import { FastifyReply } from "fastify";
+
+import { FastifyRequest } from "fastify";
+import clickhouse from "../../db/clickhouse/clickhouse.js";
+
+export async function getSiteHasData(
+ req: FastifyRequest<{ Params: { site: string } }>,
+ reply: FastifyReply
+) {
+ try {
+ const sites: { count: number }[] = await clickhouse
+ .query({
+ query: `SELECT count(*) as count FROM pageviews WHERE site_id = ${req.params.site}`,
+ format: "JSONEachRow",
+ })
+ .then((res) => res.json());
+
+ return reply.status(200).send({ data: sites[0].count > 0 });
+ } catch (err) {
+ return reply.status(500).send({ error: String(err) });
+ }
+}
diff --git a/server/src/actions/sites/getSites.ts b/server/src/api/sites/getSites.ts
similarity index 100%
rename from server/src/actions/sites/getSites.ts
rename to server/src/api/sites/getSites.ts
diff --git a/server/src/index.ts b/server/src/index.ts
index d633fd3eb..cadc7214b 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -6,10 +6,10 @@ import cron from "node-cron";
import { dirname, join } from "path";
import { Headers, HeadersInit } from "undici";
import { fileURLToPath } from "url";
-import { addSite } from "./actions/sites/addSite.js";
-import { deleteSite } from "./actions/sites/deleteSite.js";
-import { getSites } from "./actions/sites/getSites.js";
-import { trackPageView } from "./actions/trackPageView.js";
+import { addSite } from "./api/sites/addSite.js";
+import { deleteSite } from "./api/sites/deleteSite.js";
+import { getSites } from "./api/sites/getSites.js";
+import { trackPageView } from "./tracker/trackPageView.js";
import { getBrowsers } from "./api/getBrowsers.js";
import { getCountries } from "./api/getCountries.js";
import { getDevices } from "./api/getDevices.js";
@@ -26,6 +26,7 @@ import { allowList, loadAllowedDomains } from "./lib/allowedDomains.js";
import { auth } from "./lib/auth.js";
import { mapHeaders } from "./lib/betterAuth.js";
import { listUsers } from "./api/listUsers.js";
+import { getSiteHasData } from "./api/sites/getSiteHasData.js";
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
@@ -127,6 +128,7 @@ server.get("/devices", getDevices);
server.get("/pages", getPages);
server.get("/referrers", getReferrers);
server.get("/pageviews", getPageViews);
+server.get("/site-has-data/:site", getSiteHasData);
// Administrative
server.post("/add-site", addSite);
diff --git a/server/src/actions/pageviewQueue.ts b/server/src/tracker/pageviewQueue.ts
similarity index 100%
rename from server/src/actions/pageviewQueue.ts
rename to server/src/tracker/pageviewQueue.ts
diff --git a/server/src/actions/trackPageView.ts b/server/src/tracker/trackPageView.ts
similarity index 100%
rename from server/src/actions/trackPageView.ts
rename to server/src/tracker/trackPageView.ts