Skip to content

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

Add ability to add and view sites

Bill Yangabdcbd78e919
diff --git a/client/package-lock.json b/client/package-lock.json
index 667f7684b..d908a91dc 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -12,7 +12,7 @@
"@nivo/core": "^0.88.0",
"@nivo/line": "^0.88.0",
"@phosphor-icons/react": "^2.1.7",
- "@radix-ui/react-dialog": "^1.1.5",
+ "@radix-ui/react-dialog": "^1.1.6",
"@radix-ui/react-dropdown-menu": "^2.1.5",
"@radix-ui/react-label": "^2.1.2",
"@radix-ui/react-navigation-menu": "^1.2.5",
@@ -1880,24 +1880,24 @@
}
},
"node_modules/@radix-ui/react-dialog": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.5.tgz",
- "integrity": "sha512-LaO3e5h/NOEL4OfXjxD43k9Dx+vn+8n+PCFt6uhX/BADFflllyv3WJG6rgvvSVBxpTch938Qq/LGc2MMxipXPw==",
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz",
+ "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==",
"dependencies": {
"@radix-ui/primitive": "1.1.1",
"@radix-ui/react-compose-refs": "1.1.1",
"@radix-ui/react-context": "1.1.1",
- "@radix-ui/react-dismissable-layer": "1.1.4",
+ "@radix-ui/react-dismissable-layer": "1.1.5",
"@radix-ui/react-focus-guards": "1.1.1",
- "@radix-ui/react-focus-scope": "1.1.1",
+ "@radix-ui/react-focus-scope": "1.1.2",
"@radix-ui/react-id": "1.1.0",
- "@radix-ui/react-portal": "1.1.3",
+ "@radix-ui/react-portal": "1.1.4",
"@radix-ui/react-presence": "1.1.2",
- "@radix-ui/react-primitive": "2.0.1",
- "@radix-ui/react-slot": "1.1.1",
+ "@radix-ui/react-primitive": "2.0.2",
+ "@radix-ui/react-slot": "1.1.2",
"@radix-ui/react-use-controllable-state": "1.1.0",
"aria-hidden": "^1.2.4",
- "react-remove-scroll": "^2.6.2"
+ "react-remove-scroll": "^2.6.3"
},
"peerDependencies": {
"@types/react": "*",
@@ -1914,20 +1914,98 @@
}
}
},
- "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.1.tgz",
- "integrity": "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==",
+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-dismissable-layer": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz",
+ "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==",
"dependencies": {
- "@radix-ui/react-compose-refs": "1.1.1"
+ "@radix-ui/primitive": "1.1.1",
+ "@radix-ui/react-compose-refs": "1.1.1",
+ "@radix-ui/react-primitive": "2.0.2",
+ "@radix-ui/react-use-callback-ref": "1.1.0",
+ "@radix-ui/react-use-escape-keydown": "1.1.0"
},
"peerDependencies": {
"@types/react": "*",
- "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-focus-scope": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz",
+ "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==",
+ "dependencies": {
+ "@radix-ui/react-compose-refs": "1.1.1",
+ "@radix-ui/react-primitive": "2.0.2",
+ "@radix-ui/react-use-callback-ref": "1.1.0"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-portal": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz",
+ "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==",
+ "dependencies": {
+ "@radix-ui/react-primitive": "2.0.2",
+ "@radix-ui/react-use-layout-effect": "1.1.0"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-primitive": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz",
+ "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==",
+ "dependencies": {
+ "@radix-ui/react-slot": "1.1.2"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
}
}
},
diff --git a/client/package.json b/client/package.json
index 7b4d9ce0a..a68e57d4b 100644
--- a/client/package.json
+++ b/client/package.json
@@ -13,7 +13,7 @@
"@nivo/core": "^0.88.0",
"@nivo/line": "^0.88.0",
"@phosphor-icons/react": "^2.1.7",
- "@radix-ui/react-dialog": "^1.1.5",
+ "@radix-ui/react-dialog": "^1.1.6",
"@radix-ui/react-dropdown-menu": "^2.1.5",
"@radix-ui/react-label": "^2.1.2",
"@radix-ui/react-navigation-menu": "^1.2.5",
diff --git a/client/src/app/[site]/components/Header/Header.tsx b/client/src/app/[site]/components/Header/Header.tsx
index ea5906806..190531bfe 100644
--- a/client/src/app/[site]/components/Header/Header.tsx
+++ b/client/src/app/[site]/components/Header/Header.tsx
@@ -43,7 +43,9 @@ export function Header() {
const { data } = useQuery<{ count: number }>({
queryKey: ["active-sessions"],
queryFn: () =>
- authedFetch(`${process.env.NEXT_PUBLIC_BACKEND_URL}/live-user-count`),
+ authedFetch(
+ `${process.env.NEXT_PUBLIC_BACKEND_URL}/live-user-count`
+ ).then((res) => res.json()),
});
const { time } = useTimeSelection();
diff --git a/client/src/app/components/AddSite.tsx b/client/src/app/components/AddSite.tsx
new file mode 100644
index 000000000..39b09ba9c
--- /dev/null
+++ b/client/src/app/components/AddSite.tsx
@@ -0,0 +1,95 @@
+"use client";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "../../components/ui/dialog";
+import { useState } from "react";
+import { Label } from "../../components/ui/label";
+import { Input } from "../../components/ui/input";
+import { addSite, useGetSites } from "../../hooks/api";
+import { Alert, AlertDescription, AlertTitle } from "../../components/ui/alert";
+import { AlertCircle } from "lucide-react";
+
+export function AddSite() {
+ const { data: sites, refetch } = useGetSites();
+
+ const existingSites = sites?.data?.map((site) => site.domain);
+
+ const [open, setOpen] = useState(false);
+ const [domain, setDomain] = useState("");
+ const [error, setError] = useState("");
+
+ const domainMatchesExistingSites = existingSites?.includes(domain);
+
+ const handleSubmit = async () => {
+ setError("");
+ const response = await addSite(domain, domain);
+ console.info(response);
+ if (!response.ok) {
+ const errorMessage = await response.json();
+ setError(errorMessage.error);
+ return;
+ }
+ setOpen(false);
+ refetch();
+ };
+
+ return (
+ <div>
+ <Dialog
+ open={open}
+ onOpenChange={(isOpen) => {
+ setOpen(isOpen);
+ setDomain("");
+ setError("");
+ }}
+ >
+ <DialogTrigger asChild>
+ <Button>Add Website</Button>
+ </DialogTrigger>
+ <DialogContent className="max-w-lg">
+ <DialogHeader>
+ <DialogTitle>Add Website</DialogTitle>
+ </DialogHeader>
+ <div className="grid w-full items-center gap-1.5">
+ <Label htmlFor="domain">Domain</Label>
+ <Input
+ value={domain}
+ onChange={(e) => setDomain(e.target.value)}
+ placeholder="frogstats.com"
+ />
+ </div>
+ {error && (
+ <Alert variant="destructive">
+ <AlertCircle className="h-4 w-4" />
+ <AlertTitle>Error Adding Websites</AlertTitle>
+ <AlertDescription>{error}</AlertDescription>
+ </Alert>
+ )}
+ <DialogFooter>
+ <Button
+ type="submit"
+ onClick={() => setOpen(false)}
+ variant={"ghost"}
+ >
+ Cancel
+ </Button>
+ <Button
+ type="submit"
+ onClick={handleSubmit}
+ disabled={!domain || domainMatchesExistingSites}
+ >
+ Add
+ </Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+ </div>
+ );
+}
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 67235e437..9dce405b6 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -1,7 +1,30 @@
+"use client";
+
+import Link from "next/link";
+import { useGetSites } from "../hooks/api";
+import { AddSite } from "./components/AddSite";
export default function Home() {
+ const { data: sites, refetch } = useGetSites();
+
return (
- <main className="flex min-h-screen flex-col items-center p-4 pt-1">
- home
- </main>
+ <div className="flex min-h-screen flex-col pt-1">
+ <div className="flex justify-between">
+ <div className="text-2xl font-bold">Websites</div>
+ <AddSite />
+ </div>
+ <div className="grid grid-cols-3 gap-4 mt-4">
+ {sites?.data?.map((site) => (
+ <Link href={`/${site.domain}`} key={site.site_id}>
+ <div className="flex p-4 rounded-lg bg-neutral-900 text-lg font-semibold gap-2">
+ <img
+ className="w-6 mr-1"
+ src={`https://www.google.com/s2/favicons?domain=${site.domain}&sz=48`}
+ />
+ {site.domain}
+ </div>
+ </Link>
+ ))}
+ </div>
+ </div>
);
}
diff --git a/client/src/components/TopBar.tsx b/client/src/components/TopBar.tsx
index d80dd4bbb..9a0f14a19 100644
--- a/client/src/components/TopBar.tsx
+++ b/client/src/components/TopBar.tsx
@@ -24,14 +24,20 @@ export function TopBar() {
<NavigationMenuList>
<NavigationMenuItem>
<Link href="/">
- <NavigationMenuLink className={navigationMenuTriggerStyle()}>
+ <NavigationMenuLink
+ className={navigationMenuTriggerStyle()}
+ asChild
+ >
Dashboard
</NavigationMenuLink>
</Link>
</NavigationMenuItem>
<NavigationMenuItem>
<Link href="/settings">
- <NavigationMenuLink className={navigationMenuTriggerStyle()}>
+ <NavigationMenuLink
+ className={navigationMenuTriggerStyle()}
+ asChild
+ >
Settings
</NavigationMenuLink>
</Link>
diff --git a/client/src/components/ui/alert.tsx b/client/src/components/ui/alert.tsx
new file mode 100644
index 000000000..3544c3be2
--- /dev/null
+++ b/client/src/components/ui/alert.tsx
@@ -0,0 +1,60 @@
+import * as React from "react";
+import { cva, type VariantProps } from "class-variance-authority";
+
+import { cn } from "@/lib/utils";
+
+const alertVariants = cva(
+ "relative w-full rounded-lg border border-neutral-200 px-4 py-3 text-sm [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-neutral-950 [&>svg~*]:pl-7 dark:border-neutral-800 dark:[&>svg]:text-neutral-50",
+ {
+ variants: {
+ variant: {
+ default:
+ "bg-white text-neutral-950 dark:bg-neutral-950 dark:text-neutral-50",
+ destructive:
+ "border-red-500/50 text-red-500 dark:border-red-500 [&>svg]:text-red-500 dark:bg-red-950 dark:border-red-900/50 dark:text-red-400 dark:dark:border-red-900 dark:[&>svg]:text-red-400",
+ },
+ },
+ defaultVariants: {
+ variant: "default",
+ },
+ }
+);
+
+const Alert = React.forwardRef<
+ HTMLDivElement,
+ React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
+>(({ className, variant, ...props }, ref) => (
+ <div
+ ref={ref}
+ role="alert"
+ className={cn(alertVariants({ variant }), className)}
+ {...props}
+ />
+));
+Alert.displayName = "Alert";
+
+const AlertTitle = React.forwardRef<
+ HTMLParagraphElement,
+ React.HTMLAttributes<HTMLHeadingElement>
+>(({ className, ...props }, ref) => (
+ <h5
+ ref={ref}
+ className={cn("mb-1 font-medium leading-none tracking-tight", className)}
+ {...props}
+ />
+));
+AlertTitle.displayName = "AlertTitle";
+
+const AlertDescription = React.forwardRef<
+ HTMLParagraphElement,
+ React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, ...props }, ref) => (
+ <div
+ ref={ref}
+ className={cn("text-sm [&_p]:leading-relaxed", className)}
+ {...props}
+ />
+));
+AlertDescription.displayName = "AlertDescription";
+
+export { Alert, AlertTitle, AlertDescription };
diff --git a/client/src/hooks/api.ts b/client/src/hooks/api.ts
index 903830a10..624c23ff4 100644
--- a/client/src/hooks/api.ts
+++ b/client/src/hooks/api.ts
@@ -27,7 +27,7 @@ export function useGenericQuery<T>(
const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
return authedFetch(
`${process.env.NEXT_PUBLIC_BACKEND_URL}/${endpoint}?startDate=${startDate}&endDate=${endDate}&timezone=${timezone}`
- );
+ ).then((res) => res.json());
},
staleTime: Infinity,
placeholderData: keepPreviousData,
@@ -113,7 +113,7 @@ export function useGetPageviews(
const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
return authedFetch(
`${process.env.NEXT_PUBLIC_BACKEND_URL}/pageviews?startDate=${startDate}&endDate=${endDate}&timezone=${timezone}&bucket=${bucket}`
- );
+ ).then((res) => res.json());
},
placeholderData: keepPreviousData,
staleTime: Infinity,
@@ -132,3 +132,35 @@ export type GetOverviewResponse = {
export function useGetOverview(periodTime?: PeriodTime) {
return useGenericQuery<GetOverviewResponse>("overview", periodTime);
}
+
+export type GetSitesResponse = {
+ site_id: string;
+ site_name: string;
+ domain: string;
+ created_at: string;
+ updated_at: string;
+ created_by: string;
+}[];
+
+export function useGetSites() {
+ return useGenericQuery<GetSitesResponse>("get-sites");
+}
+
+export function addSite(domain: string, name: string) {
+ return authedFetch(`${process.env.NEXT_PUBLIC_BACKEND_URL}/add-site`, {
+ method: "POST",
+ body: JSON.stringify({
+ domain,
+ name,
+ }),
+ });
+}
+
+export function deleteSite(siteId: string) {
+ return authedFetch(
+ `${process.env.NEXT_PUBLIC_BACKEND_URL}/delete-site/${siteId}`,
+ {
+ method: "POST",
+ }
+ );
+}
diff --git a/client/src/hooks/utils.ts b/client/src/hooks/utils.ts
index b499a3827..e9e32fdf2 100644
--- a/client/src/hooks/utils.ts
+++ b/client/src/hooks/utils.ts
@@ -16,12 +16,12 @@ export function getStartAndEndDate(time: Time) {
return { startDate: time.day, endDate: time.day };
}
-export async function authedFetch(url: string) {
+export async function authedFetch(url: string, opts: RequestInit = {}) {
return fetch(url, {
- method: "GET",
credentials: "include",
headers: {
"Content-Type": "application/json",
},
- }).then((res) => res.json());
+ ...opts,
+ });
}
diff --git a/server/src/actions/sites/addSite.ts b/server/src/actions/sites/addSite.ts
index 8bc350835..02b93dfeb 100644
--- a/server/src/actions/sites/addSite.ts
+++ b/server/src/actions/sites/addSite.ts
@@ -1,17 +1,28 @@
import { FastifyReply } from "fastify";
import { FastifyRequest } from "fastify";
+import { auth } from "../../lib/auth.js";
+import { fromNodeHeaders } from "better-auth/node";
+import { sql } from "../../db/postgres/postgres.js";
-export function addSite(
- request: FastifyRequest<{ Params: { domain: string } }>,
+export async function addSite(
+ request: FastifyRequest<{ Body: { domain: string; name: string } }>,
reply: FastifyReply
) {
- const { domain } = request.params;
- const { user } = request.user;
+ const { domain, name } = request.body;
- console.info(request);
+ const session = await auth.api.getSession({
+ headers: fromNodeHeaders(request.headers),
+ });
- // if (!user) {
- // return reply.status(401).send({ error: "Unauthorized" });
- // }
+ if (!session?.user.id) {
+ return reply.status(500).send({ error: "Could not find user id" });
+ }
+ try {
+ await sql`INSERT INTO sites (domain, name, created_by) VALUES (${domain}, ${name}, ${session?.user.id})`;
+
+ return reply.status(200).send();
+ } catch (err) {
+ return reply.status(500).send({ error: String(err) });
+ }
}
diff --git a/server/src/actions/sites/deleteSite.ts b/server/src/actions/sites/deleteSite.ts
index e69de29bb..9ad9659cb 100644
--- a/server/src/actions/sites/deleteSite.ts
+++ b/server/src/actions/sites/deleteSite.ts
@@ -0,0 +1,14 @@
+import { FastifyReply } from "fastify";
+
+import { FastifyRequest } from "fastify";
+import { sql } from "../../db/postgres/postgres.js";
+
+export async function deleteSite(
+ request: FastifyRequest<{ Params: { id: string } }>,
+ reply: FastifyReply
+) {
+ const { id } = request.params;
+
+ await sql`DELETE FROM sites WHERE id = ${id}`;
+ return reply.status(200).send();
+}
diff --git a/server/src/actions/sites/getSites.ts b/server/src/actions/sites/getSites.ts
new file mode 100644
index 000000000..3f264bc49
--- /dev/null
+++ b/server/src/actions/sites/getSites.ts
@@ -0,0 +1,13 @@
+import { FastifyReply } from "fastify";
+
+import { FastifyRequest } from "fastify";
+import { sql } from "../../db/postgres/postgres.js";
+
+export async function getSites(_: FastifyRequest, reply: FastifyReply) {
+ try {
+ const sites = await sql`SELECT * FROM sites`;
+ return reply.status(200).send({ data: sites });
+ } catch (err) {
+ return reply.status(500).send({ error: String(err) });
+ }
+}
diff --git a/server/src/index.ts b/server/src/index.ts
index c4e93a0c3..0968b754e 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -24,6 +24,8 @@ import { TrackingPayload } from "./types.js";
import { toNodeHandler } from "better-auth/node";
import { mapHeaders } from "./lib/betterAuth.js";
import { addSite } from "./actions/sites/addSite.js";
+import { getSites } from "./actions/sites/getSites.js";
+import { deleteSite } from "./actions/sites/deleteSite.js";
// ESM replacement for __dirname:
const __filename = fileURLToPath(import.meta.url);
@@ -128,6 +130,8 @@ server.get("/referrers", getReferrers);
server.get("/pageviews", getPageViews);
server.post("/add-site", addSite);
+server.post("/delete-site/:id", deleteSite);
+server.get("/get-sites", getSites);
// Track pageview endpoint
server.post<{ Body: TrackingPayload }>(