Skip to content

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

Add site settings

Bill Yang00c928f23250
diff --git a/client/package-lock.json b/client/package-lock.json
index 515dc6984..15bc95290 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -11,6 +11,7 @@
"@nivo/core": "^0.88.0",
"@nivo/line": "^0.88.0",
"@phosphor-icons/react": "^2.1.7",
+ "@radix-ui/react-alert-dialog": "^1.1.6",
"@radix-ui/react-dialog": "^1.1.6",
"@radix-ui/react-dropdown-menu": "^2.1.5",
"@radix-ui/react-label": "^2.1.2",
@@ -51,6 +52,7 @@
"react-leaflet": "^5.0.0",
"react-select": "^5.10.0",
"react-simple-maps": "^3.0.0",
+ "sonner": "^2.0.1",
"spinners-react": "^1.0.10",
"tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7",
@@ -6839,6 +6841,15 @@
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
+ "node_modules/sonner": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/sonner/-/sonner-2.0.1.tgz",
+ "integrity": "sha512-FRBphaehZ5tLdLcQ8g2WOIRE+Y7BCfWi5Zyd8bCvBjiW8TxxAyoWZIxS661Yz6TGPqFQ4VLzOF89WEYhfynSFQ==",
+ "peerDependencies": {
+ "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
+ "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+ }
+ },
"node_modules/sort-keys": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-4.2.0.tgz",
diff --git a/client/package.json b/client/package.json
index bf25ac752..a1593bb20 100644
--- a/client/package.json
+++ b/client/package.json
@@ -12,6 +12,7 @@
"@nivo/core": "^0.88.0",
"@nivo/line": "^0.88.0",
"@phosphor-icons/react": "^2.1.7",
+ "@radix-ui/react-alert-dialog": "^1.1.6",
"@radix-ui/react-dialog": "^1.1.6",
"@radix-ui/react-dropdown-menu": "^2.1.5",
"@radix-ui/react-label": "^2.1.2",
@@ -52,6 +53,7 @@
"react-leaflet": "^5.0.0",
"react-select": "^5.10.0",
"react-simple-maps": "^3.0.0",
+ "sonner": "^2.0.1",
"spinners-react": "^1.0.10",
"tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7",
diff --git a/client/src/app/[site]/Header/Header.tsx b/client/src/app/[site]/Header/Header.tsx
index 824ac7b94..de5806b44 100644
--- a/client/src/app/[site]/Header/Header.tsx
+++ b/client/src/app/[site]/Header/Header.tsx
@@ -1,10 +1,11 @@
"use client";
+import { useStore } from "@/lib/store";
import { Circle } from "@phosphor-icons/react";
+import { ChartBarDecreasing, ChartLine, Radio, User } from "lucide-react";
import Link from "next/link";
-import { useStore } from "@/lib/store";
import { usePathname } from "next/navigation";
+import { SiteSettings } from "../../../components/SiteSettings/SiteSettings";
import { useGetLiveUsercount, useGetSites } from "../../../hooks/api";
-import { ChartBarDecreasing, ChartLine, Radio, User, Zap } from "lucide-react";
export function Header() {
const { data } = useGetLiveUsercount();
@@ -41,6 +42,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} />
</div>
</div>
<div className="flex space-x-2">
@@ -88,7 +90,7 @@ function TabButton({
return (
<Link href={href} className="focus:outline-none">
<button
- className={`px-4 py-2 rounded-lg font-medium transition-colors ${
+ className={`px-3 py-2 rounded-lg font-sm transition-colors ${
active
? "bg-neutral-800 text-white hover:bg-neutral-800/75 "
: "text-neutral-400 hover:text-white hover:bg-neutral-800/50"
diff --git a/client/src/app/[site]/components/shared/StandardCard.tsx b/client/src/app/[site]/components/shared/StandardCard.tsx
index 15d23f113..1c6d35949 100644
--- a/client/src/app/[site]/components/shared/StandardCard.tsx
+++ b/client/src/app/[site]/components/shared/StandardCard.tsx
@@ -16,35 +16,44 @@ import {
DialogTrigger,
} from "@/components/ui/dialog";
import { round } from "lodash";
-import { ReactNode } from "react";
+import { ReactNode, useMemo } from "react";
import { addFilter, FilterParameter } from "../../../../lib/store";
import { formatter } from "../../../../lib/utils";
import { SquareArrowOutUpRight } from "lucide-react";
+import { SingleColResponse, useSingleCol } from "../../../../hooks/api";
-export function StandardCard<T extends { percentage: number; count: number }>({
+export function StandardCard({
title,
- data,
getKey,
getLabel,
getValue,
getLink,
- isFetching,
filterParameter,
}: {
title: string;
- data:
- | {
- data?: T[];
- error?: string;
- }
- | undefined;
isFetching?: boolean;
- getKey: (item: T) => string;
- getLabel: (item: T) => ReactNode;
- getValue: (item: T) => string;
- getLink?: (item: T) => string;
+ getKey: (item: SingleColResponse) => string;
+ getLabel: (item: SingleColResponse) => ReactNode;
+ getValue: (item: SingleColResponse) => string;
+ getLink?: (item: SingleColResponse) => string;
filterParameter: FilterParameter;
}) {
+ const { data, isFetching } = useSingleCol({
+ parameter: filterParameter,
+ });
+
+ const { data: previousData, isFetching: previousIsFetching } = useSingleCol({
+ parameter: filterParameter,
+ periodTime: "previous",
+ });
+
+ const previousDataMap = useMemo(() => {
+ return previousData?.data?.reduce((acc, curr) => {
+ acc[getKey(curr)] = curr;
+ return acc;
+ }, {} as Record<string, SingleColResponse>);
+ }, [previousData]);
+
const ratio = data?.data?.[0]?.percentage
? 100 / data?.data?.[0]?.percentage
: 1;
@@ -93,6 +102,20 @@ export function StandardCard<T extends { percentage: number; count: number }>({
{round(e.percentage, 1)}%
</div>
<div>{formatter(e.count)}</div>
+ {/* <div>
+ {previousDataMap?.[getKey(e)]?.percentage ? (
+ <div className="text-sm flex gap-2">
+ <div>
+ {round(
+ e.percentage -
+ (previousDataMap?.[getKey(e)]?.percentage || 0),
+ 1
+ )}
+ %
+ </div>
+ </div>
+ ) : null}
+ </div> */}
</div>
</div>
</div>
diff --git a/client/src/app/[site]/main/components/sections/Browsers.tsx b/client/src/app/[site]/main/components/sections/Browsers.tsx
index c37f7d441..2b1644eff 100644
--- a/client/src/app/[site]/main/components/sections/Browsers.tsx
+++ b/client/src/app/[site]/main/components/sections/Browsers.tsx
@@ -1,17 +1,12 @@
"use client";
-import { useSingleCol } from "@/hooks/api";
import { StandardCard } from "../../../components/shared/StandardCard";
import { Browser } from "../../../components/shared/icons/Browser";
export function Browsers() {
- const { data, isFetching } = useSingleCol({ parameter: "browser" });
-
return (
<StandardCard
title="Browsers"
- data={data}
- isFetching={isFetching}
getKey={(e) => e.value}
getLabel={(e) => (
<div className="flex gap-2 items-center">
diff --git a/client/src/app/[site]/main/components/sections/Countries.tsx b/client/src/app/[site]/main/components/sections/Countries.tsx
index a2f687426..7b2cdf634 100644
--- a/client/src/app/[site]/main/components/sections/Countries.tsx
+++ b/client/src/app/[site]/main/components/sections/Countries.tsx
@@ -1,19 +1,13 @@
"use client";
-import { useSingleCol } from "@/hooks/api";
-import React from "react";
import { getCountryName } from "../../../../../lib/utils";
import { StandardCard } from "../../../components/shared/StandardCard";
import { CountryFlag } from "../../../components/shared/icons/CountryFlag";
export function Countries() {
- const { data, isFetching } = useSingleCol({ parameter: "country" });
-
return (
<StandardCard
title="Countries"
- data={data}
- isFetching={isFetching}
getKey={(e) => e.value}
getLabel={(e) => (
<span className="flex items-center gap-2">
diff --git a/client/src/app/[site]/main/components/sections/Devices.tsx b/client/src/app/[site]/main/components/sections/Devices.tsx
index e1d339c8d..0501ec875 100644
--- a/client/src/app/[site]/main/components/sections/Devices.tsx
+++ b/client/src/app/[site]/main/components/sections/Devices.tsx
@@ -1,16 +1,12 @@
"use client";
-import { useSingleCol } from "@/hooks/api";
import { StandardCard } from "../../../components/shared/StandardCard";
export function Devices() {
- const { data, isFetching } = useSingleCol({ parameter: "device_type" });
return (
<StandardCard
filterParameter="device_type"
- isFetching={isFetching}
title="Devices"
- data={data}
getValue={(e) => e.value}
getKey={(e) => e.value}
getLabel={(e) => e.value || "Other"}
diff --git a/client/src/app/[site]/main/components/sections/OperatingSystems.tsx b/client/src/app/[site]/main/components/sections/OperatingSystems.tsx
index 390f2496f..2e8a8d021 100644
--- a/client/src/app/[site]/main/components/sections/OperatingSystems.tsx
+++ b/client/src/app/[site]/main/components/sections/OperatingSystems.tsx
@@ -1,17 +1,12 @@
"use client";
-import { useSingleCol } from "@/hooks/api";
import { StandardCard } from "../../../components/shared/StandardCard";
import { OperatingSystem } from "../../../components/shared/icons/OperatingSystem";
export function OperatingSystems() {
- const { data, isFetching } = useSingleCol({ parameter: "operating_system" });
-
return (
<StandardCard
title="Operating Systems"
- data={data}
- isFetching={isFetching}
getValue={(e) => e.value}
getKey={(e) => e.value}
getLabel={(e) => (
diff --git a/client/src/app/[site]/main/components/sections/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsx
index a05d324c4..961dc7c82 100644
--- a/client/src/app/[site]/main/components/sections/Pages.tsx
+++ b/client/src/app/[site]/main/components/sections/Pages.tsx
@@ -1,6 +1,6 @@
"use client";
-import { GetSitesResponse, useSingleCol } from "@/hooks/api";
+import { GetSitesResponse } from "@/hooks/api";
import { StandardCard } from "../../../components/shared/StandardCard";
export function Pages({
@@ -8,14 +8,10 @@ export function Pages({
}: {
siteMetadata: GetSitesResponse[number];
}) {
- const { data, isFetching } = useSingleCol({ parameter: "pathname" });
-
return (
<StandardCard
filterParameter="pathname"
title="Pages"
- data={data}
- isFetching={isFetching}
getValue={(e) => e.value}
getKey={(e) => e.value}
getLabel={(e) => e.value || "Other"}
diff --git a/client/src/app/[site]/main/components/sections/Referrers.tsx b/client/src/app/[site]/main/components/sections/Referrers.tsx
index e6ee062dc..abd1188f5 100644
--- a/client/src/app/[site]/main/components/sections/Referrers.tsx
+++ b/client/src/app/[site]/main/components/sections/Referrers.tsx
@@ -1,17 +1,13 @@
"use client";
-import { useSingleCol } from "@/hooks/api";
import { StandardCard } from "../../../components/shared/StandardCard";
export function Referrers() {
- const { data, isFetching } = useSingleCol({ parameter: "referrer" });
return (
<StandardCard
filterParameter="referrer"
title="Referrers"
- data={data}
getKey={(e) => e.value}
- isFetching={isFetching}
getLink={(e) => `https://${e.value}`}
getLabel={(e) => (
<div className="flex items-center">
diff --git a/client/src/app/[site]/settings/DeleteSite.tsx b/client/src/app/[site]/settings/DeleteSite.tsx
deleted file mode 100644
index 309ca79b5..000000000
--- a/client/src/app/[site]/settings/DeleteSite.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { useState } from "react";
-import { ConfirmationModal } from "../../../components/ConfirmationModal";
-import { Button } from "../../../components/ui/button";
-import {
- APIResponse,
- deleteSite,
- GetSitesResponse,
- useGetSites,
-} from "../../../hooks/api";
-import { useRouter } from "next/navigation";
-
-export function DeleteSite({
- site,
-}: {
- site: APIResponse<GetSitesResponse>["data"][number];
-}) {
- const { refetch } = useGetSites();
- const [isOpen, setIsOpen] = useState(false);
- const router = useRouter();
-
- return (
- <ConfirmationModal
- title="Delete Site"
- description={`Are you sure you want to delete ${site.domain}? All tracking history will be deleted.`}
- isOpen={isOpen}
- setIsOpen={setIsOpen}
- onConfirm={async () => {
- await deleteSite(site.siteId);
- refetch();
- router.push("/");
- }}
- primaryAction={{
- variant: "destructive",
- children: "Delete",
- }}
- >
- <Button variant={"destructive"} size={"sm"}>
- Delete
- </Button>
- </ConfirmationModal>
- );
-}
diff --git a/client/src/app/[site]/settings/General.tsx b/client/src/app/[site]/settings/General.tsx
deleted file mode 100644
index 7482457a8..000000000
--- a/client/src/app/[site]/settings/General.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { useState } from "react";
-import { Button } from "../../../components/ui/button";
-import {
- Card,
- CardContent,
- CardFooter,
- CardHeader,
- CardTitle,
-} from "../../../components/ui/card";
-import { Input } from "../../../components/ui/input";
-import { Label } from "../../../components/ui/label";
-import { APIResponse, GetSitesResponse } from "../../../hooks/api";
-import { DeleteSite } from "./DeleteSite";
-
-export function General({
- site,
-}: {
- site: APIResponse<GetSitesResponse>["data"][number];
-}) {
- const [domain, setDomain] = useState("");
-
- const hasChanges = domain !== site.domain;
-
- return (
- <div className="flex flex-col gap-4">
- <Card className="p-2">
- <CardHeader>
- <CardTitle className="text-xl">General</CardTitle>
- </CardHeader>
- <CardContent className="flex flex-col gap-4">
- <div className="grid w-full items-center gap-1.5">
- <Label htmlFor="domain">Username</Label>
- <Input
- className="w-60"
- id="domain"
- value={domain}
- onChange={({ target }) => setDomain(target.value)}
- />
- </div>
- </CardContent>
- <CardFooter className="flex justify-end">
- <Button variant={"accent"} disabled={!hasChanges}>
- Save Changes
- </Button>
- </CardFooter>
- </Card>
- <Card className="p-2 pt-6">
- <CardContent className="flex flex-col gap-4">
- <DeleteSite site={site} />
- </CardContent>
- </Card>
- </div>
- );
-}
diff --git a/client/src/app/[site]/settings/page.tsx b/client/src/app/[site]/settings/page.tsx
deleted file mode 100644
index 9bb3964ef..000000000
--- a/client/src/app/[site]/settings/page.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-"use client";
-
-import { Button } from "@/components/ui/button";
-import { GearSix } from "@phosphor-icons/react";
-import { usePathname } from "next/navigation";
-import { useState } from "react";
-import { useGetSites } from "../../../hooks/api";
-import { General } from "./General";
-
-export default function SettingsPage() {
- const [selectedTab, setSelectedTab] = useState<"general">("general");
- const { data: sites } = useGetSites();
- const pathname = usePathname();
-
- const site = sites?.data?.find(
- (site) => site.siteId === Number(pathname.split("/")[1])
- );
-
- return (
- <div className="max-w-6xl">
- <div className="flex items-center gap-2 text-xl font-bold mb-4">
- <img
- className="w-7 mr-1"
- src={`https://www.google.com/s2/favicons?domain=${site?.domain}&sz=64`}
- />
- <div>{site?.domain}</div>
- </div>
- <div className="grid grid-cols-[200px_1fr] gap-6">
- <div className="flex flex-col gap-2">
- <Button
- variant={selectedTab === "general" ? "default" : "ghost"}
- onClick={() => setSelectedTab("general")}
- className="justify-start"
- >
- <GearSix size={16} weight="bold" />
- General
- </Button>
- </div>
- {selectedTab === "general" && site && <General site={site} />}
- </div>
- </div>
- );
-}
diff --git a/client/src/app/globals.css b/client/src/app/globals.css
index 2802e5175..363921b86 100644
--- a/client/src/app/globals.css
+++ b/client/src/app/globals.css
@@ -327,7 +327,7 @@ body {
}
.dark {
- --background: 0 0% 5%;
+ --background: 0 0% 7%;
--foreground: 0 0% 98%;
--card: 240 10% 3.9%;
--card-foreground: 0 0% 98%;
@@ -345,10 +345,6 @@ body {
--destructive-foreground: 0 0% 98%;
--input: 240 3.7% 15.9%;
--ring: 240 4.9% 83.9%;
- --chart-1: 220 70% 50%;
- --chart-2: 160 60% 45%;
- --chart-3: 30 80% 55%;
- --chart-4: 280 65% 60%;
- --chart-5: 340 75% 55%;
+
}
}
diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx
index 531e45305..100cf6620 100644
--- a/client/src/app/layout.tsx
+++ b/client/src/app/layout.tsx
@@ -9,8 +9,6 @@ import { redirect, usePathname } from "next/navigation";
import { useEffect } from "react";
import { userStore } from "../lib/userStore";
import "./globals.css";
-import "@radix-ui/themes/styles.css";
-import { Theme } from "@radix-ui/themes";
const inter = Inter({ subsets: ["latin"] });
@@ -53,22 +51,20 @@ export default function RootLayout({
src="https://cdn.jsdelivr.net/npm/ldrs/dist/auto/ping.js"
></script>
<ThemeProvider>
- <Theme appearance="dark">
- <QueryProvider>
- {pathname === "/login" ? (
- <div className="min-h-full flex items-center justify-center">
- {children}
- </div>
- ) : (
- <div className="min-h-full">
- <TopBar />
- <main className="flex min-h-screen flex-col items-center p-4">
- <div className="w-full max-w-6xl">{children}</div>
- </main>
- </div>
- )}
- </QueryProvider>
- </Theme>
+ <QueryProvider>
+ {pathname === "/login" ? (
+ <div className="min-h-full flex items-center justify-center">
+ {children}
+ </div>
+ ) : (
+ <div className="min-h-full">
+ <TopBar />
+ <main className="flex min-h-screen flex-col items-center p-4">
+ <div className="w-full max-w-6xl">{children}</div>
+ </main>
+ </div>
+ )}
+ </QueryProvider>
</ThemeProvider>
</body>
</html>
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 41e878d91..1bb19fed2 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -3,6 +3,7 @@
import Link from "next/link";
import { useGetSites } from "../hooks/api";
import { AddSite } from "./components/AddSite";
+import { SiteSettings } from "../components/SiteSettings/SiteSettings";
export default function Home() {
const { data: sites } = useGetSites();
@@ -15,15 +16,21 @@ export default function Home() {
</div>
<div className="grid grid-cols-3 gap-4 mt-4">
{sites?.data?.map((site) => (
- <Link href={`/${site.siteId}`} key={site.siteId}>
- <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
+ className="flex justify-between gap-2 p-4 rounded-lg bg-neutral-900 text-lg font-semibold"
+ key={site.siteId}
+ >
+ <Link href={`/${site.siteId}`}>
+ <div className="flex gap-2">
+ <img
+ className="w-6 mr-1"
+ src={`https://www.google.com/s2/favicons?domain=${site.domain}&sz=48`}
+ />
+ {site.domain}
+ </div>
+ </Link>
+ <SiteSettings siteId={site.siteId} />
+ </div>
))}
</div>
</div>
diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsx
new file mode 100644
index 000000000..77c61c97a
--- /dev/null
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@ -0,0 +1,200 @@
+"use client";
+
+import { AlertTriangle, Settings } from "lucide-react";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+import { toast } from "sonner";
+
+import { CodeSnippet } from "@/components/CodeSnippet";
+import {
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+ AlertDialogTrigger,
+} from "@/components/ui/alert-dialog";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogClose,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+
+import {
+ changeSiteDomain,
+ deleteSite,
+ GetSitesResponse,
+ useGetSites,
+} from "@/hooks/api";
+import { BACKEND_URL } from "@/lib/const";
+import { useGetSiteMetadata } from "../../hooks/hooks";
+
+interface SiteSettingsProps {
+ siteId: number;
+}
+
+export function SiteSettings({ siteId }: SiteSettingsProps) {
+ const { siteMetadata } = useGetSiteMetadata(siteId);
+
+ if (!siteMetadata) {
+ return null;
+ }
+
+ return <SiteSettingsInner siteMetadata={siteMetadata} />;
+}
+
+export function SiteSettingsInner({
+ siteMetadata,
+}: {
+ siteMetadata: GetSitesResponse[number];
+}) {
+ const { refetch } = useGetSites();
+ const router = useRouter();
+ const [newDomain, setNewDomain] = useState(siteMetadata.domain);
+ const [isChangingDomain, setIsChangingDomain] = useState(false);
+ const [isDeleting, setIsDeleting] = useState(false);
+ const [dialogOpen, setDialogOpen] = useState(false);
+
+ const trackingScript = `<script
+ src="${BACKEND_URL}/script.js"
+ site-id="${siteMetadata.siteId}"
+ defer
+/>`;
+
+ const handleDomainChange = async () => {
+ if (!newDomain) {
+ toast.error("Domain cannot be empty");
+ return;
+ }
+
+ try {
+ setIsChangingDomain(true);
+ await changeSiteDomain(siteMetadata.siteId, newDomain);
+ toast.success("Domain updated successfully");
+ router.refresh();
+ setDialogOpen(false);
+ refetch();
+ } catch (error) {
+ console.error("Error changing domain:", error);
+ toast.error("Failed to update domain");
+ } finally {
+ setIsChangingDomain(false);
+ }
+ };
+
+ const handleDelete = async () => {
+ try {
+ setIsDeleting(true);
+ await deleteSite(siteMetadata.siteId);
+ toast.success("Site deleted successfully");
+ router.push("/");
+ setDialogOpen(false);
+ refetch();
+ } catch (error) {
+ console.error("Error deleting site:", error);
+ toast.error("Failed to delete site");
+ } finally {
+ setIsDeleting(false);
+ }
+ };
+
+ if (!siteMetadata) {
+ return null;
+ }
+
+ return (
+ <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
+ <DialogTrigger asChild>
+ <Button variant="ghost" size="icon">
+ <Settings className="h-4 w-4" />
+ </Button>
+ </DialogTrigger>
+ <DialogContent className="sm:max-w-[425px]">
+ <DialogHeader>
+ <DialogTitle>Site Settings</DialogTitle>
+ <DialogDescription>
+ Manage settings for {siteMetadata.domain}
+ </DialogDescription>
+ </DialogHeader>
+ <div className="space-y-6 py-4">
+ <div className="space-y-2">
+ <h4 className="text-sm font-medium">Tracking Script</h4>
+ <p className="text-xs text-neutral-500">
+ Add this script to the <code>&lt;head&gt;</code> of your website
+ </p>
+ <CodeSnippet language="HTML" code={trackingScript} />
+ </div>
+
+ <div className="space-y-2">
+ <h4 className="text-sm font-medium">Change Domain</h4>
+ <p className="text-xs text-neutral-500">
+ Update the domain for this site
+ </p>
+ <div className="flex space-x-2">
+ <Input
+ value={newDomain}
+ onChange={(e) => setNewDomain(e.target.value)}
+ placeholder="example.com"
+ />
+ <Button
+ variant="outline"
+ onClick={handleDomainChange}
+ disabled={isChangingDomain || newDomain === siteMetadata.domain}
+ >
+ {isChangingDomain ? "Updating..." : "Update"}
+ </Button>
+ </div>
+ </div>
+
+ <div className="space-y-2">
+ <h4 className="text-sm font-medium text-red-500">Danger Zone</h4>
+ <AlertDialog>
+ <AlertDialogTrigger asChild>
+ <Button variant="destructive" className="w-full">
+ <AlertTriangle className="h-4 w-4" />
+ Delete Site
+ </Button>
+ </AlertDialogTrigger>
+ <AlertDialogContent>
+ <AlertDialogHeader>
+ <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+ <AlertDialogDescription>
+ This action cannot be undone. This will permanently delete
+ the site &quot;{siteMetadata.name}&quot; and all of its
+ analytics data.
+ </AlertDialogDescription>
+ </AlertDialogHeader>
+ <AlertDialogFooter>
+ <AlertDialogCancel>Cancel</AlertDialogCancel>
+ <AlertDialogAction
+ onClick={handleDelete}
+ disabled={isDeleting}
+ className="bg-red-500 hover:bg-red-600"
+ >
+ {isDeleting ? "Deleting..." : "Yes, delete site"}
+ </AlertDialogAction>
+ </AlertDialogFooter>
+ </AlertDialogContent>
+ </AlertDialog>
+ </div>
+ </div>
+
+ <DialogFooter>
+ <DialogClose asChild>
+ <Button variant="outline">Close</Button>
+ </DialogClose>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+ );
+}
diff --git a/client/src/components/ui/alert-dialog.tsx b/client/src/components/ui/alert-dialog.tsx
new file mode 100644
index 000000000..661167b2b
--- /dev/null
+++ b/client/src/components/ui/alert-dialog.tsx
@@ -0,0 +1,141 @@
+"use client";
+
+import * as React from "react";
+import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
+
+import { cn } from "@/lib/utils";
+import { buttonVariants } from "@/components/ui/button";
+
+const AlertDialog = AlertDialogPrimitive.Root;
+
+const AlertDialogTrigger = AlertDialogPrimitive.Trigger;
+
+const AlertDialogPortal = AlertDialogPrimitive.Portal;
+
+const AlertDialogOverlay = React.forwardRef<
+ React.ElementRef<typeof AlertDialogPrimitive.Overlay>,
+ React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+ <AlertDialogPrimitive.Overlay
+ className={cn(
+ "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+ className
+ )}
+ {...props}
+ ref={ref}
+ />
+));
+AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName;
+
+const AlertDialogContent = React.forwardRef<
+ React.ElementRef<typeof AlertDialogPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content>
+>(({ className, ...props }, ref) => (
+ <AlertDialogPortal>
+ <AlertDialogOverlay />
+ <AlertDialogPrimitive.Content
+ ref={ref}
+ className={cn(
+ "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border border-neutral-200 bg-white p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full dark:border-neutral-800 dark:bg-neutral-950",
+ className
+ )}
+ {...props}
+ />
+ </AlertDialogPortal>
+));
+AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName;
+
+const AlertDialogHeader = ({
+ className,
+ ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+ <div
+ className={cn(
+ "flex flex-col space-y-2 text-center sm:text-left",
+ className
+ )}
+ {...props}
+ />
+);
+AlertDialogHeader.displayName = "AlertDialogHeader";
+
+const AlertDialogFooter = ({
+ className,
+ ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+ <div
+ className={cn(
+ "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+ className
+ )}
+ {...props}
+ />
+);
+AlertDialogFooter.displayName = "AlertDialogFooter";
+
+const AlertDialogTitle = React.forwardRef<
+ React.ElementRef<typeof AlertDialogPrimitive.Title>,
+ React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
+>(({ className, ...props }, ref) => (
+ <AlertDialogPrimitive.Title
+ ref={ref}
+ className={cn("text-lg font-semibold", className)}
+ {...props}
+ />
+));
+AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName;
+
+const AlertDialogDescription = React.forwardRef<
+ React.ElementRef<typeof AlertDialogPrimitive.Description>,
+ React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
+>(({ className, ...props }, ref) => (
+ <AlertDialogPrimitive.Description
+ ref={ref}
+ className={cn("text-sm text-neutral-500 dark:text-neutral-400", className)}
+ {...props}
+ />
+));
+AlertDialogDescription.displayName =
+ AlertDialogPrimitive.Description.displayName;
+
+const AlertDialogAction = React.forwardRef<
+ React.ElementRef<typeof AlertDialogPrimitive.Action>,
+ React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
+>(({ className, ...props }, ref) => (
+ <AlertDialogPrimitive.Action
+ ref={ref}
+ className={cn(buttonVariants(), className)}
+ {...props}
+ />
+));
+AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName;
+
+const AlertDialogCancel = React.forwardRef<
+ React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
+ React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
+>(({ className, ...props }, ref) => (
+ <AlertDialogPrimitive.Cancel
+ ref={ref}
+ className={cn(
+ buttonVariants({ variant: "outline" }),
+ "mt-2 sm:mt-0",
+ className
+ )}
+ {...props}
+ />
+));
+AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName;
+
+export {
+ AlertDialog,
+ AlertDialogPortal,
+ AlertDialogOverlay,
+ AlertDialogTrigger,
+ AlertDialogContent,
+ AlertDialogHeader,
+ AlertDialogFooter,
+ AlertDialogTitle,
+ AlertDialogDescription,
+ AlertDialogAction,
+ AlertDialogCancel,
+};
diff --git a/client/src/hooks/api.ts b/client/src/hooks/api.ts
index 38081f1a3..c41dbad1e 100644
--- a/client/src/hooks/api.ts
+++ b/client/src/hooks/api.ts
@@ -25,6 +25,12 @@ export function useGetLiveUsercount() {
type PeriodTime = "current" | "previous";
+export type SingleColResponse = {
+ value: string;
+ count: number;
+ percentage: number;
+};
+
export function useSingleCol({
parameter,
limit = 10000,
@@ -35,9 +41,7 @@ export function useSingleCol({
limit?: number;
periodTime?: PeriodTime;
useFilters?: boolean;
-}): UseQueryResult<
- APIResponse<{ value: string; count: number; percentage: number }[]>
-> {
+}): UseQueryResult<APIResponse<SingleColResponse[]>> {
const { time, previousTime, site, filters } = useStore();
const timeToUse = periodTime === "previous" ? previousTime : time;
const { startDate, endDate } = getStartAndEndDate(timeToUse);
@@ -209,6 +213,19 @@ export function deleteSite(siteId: number) {
});
}
+export function changeSiteDomain(siteId: number, newDomain: string) {
+ return authedFetch(`${BACKEND_URL}/change-site-domain`, {
+ method: "POST",
+ body: JSON.stringify({
+ siteId,
+ newDomain,
+ }),
+ headers: {
+ "Content-Type": "application/json",
+ },
+ });
+}
+
export function useSiteHasData(siteId: string) {
return useGenericQuery<boolean>(`site-has-data/${siteId}`);
}
diff --git a/client/src/hooks/hooks.ts b/client/src/hooks/hooks.ts
index c730af9bd..1050140a5 100644
--- a/client/src/hooks/hooks.ts
+++ b/client/src/hooks/hooks.ts
@@ -1,6 +1,6 @@
import { useGetSites } from "./api";
-export function useGetSiteMetadata(siteId: string) {
+export function useGetSiteMetadata(siteId: string | number) {
const { data, isLoading } = useGetSites();
return {
siteMetadata: data?.data?.find((site) => site.siteId === Number(siteId)),
diff --git a/server/src/api/sites/changeSiteDomain.ts b/server/src/api/sites/changeSiteDomain.ts
new file mode 100644
index 000000000..fe68e1902
--- /dev/null
+++ b/server/src/api/sites/changeSiteDomain.ts
@@ -0,0 +1,67 @@
+import { eq } from "drizzle-orm";
+import { FastifyReply, FastifyRequest } from "fastify";
+import { db } from "../../db/postgres/postgres.js";
+import { sites } from "../../db/postgres/schema.js";
+import { loadAllowedDomains } from "../../lib/allowedDomains.js";
+
+export async function changeSiteDomain(
+ request: FastifyRequest<{
+ Body: {
+ siteId: number;
+ newDomain: string;
+ };
+ }>,
+ reply: FastifyReply
+) {
+ const { siteId, newDomain } = request.body;
+
+ // Validate domain format using regex
+ const domainRegex =
+ /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
+ if (!domainRegex.test(newDomain)) {
+ return reply.status(400).send({
+ error:
+ "Invalid domain format. Must be a valid domain like example.com or sub.example.com",
+ });
+ }
+
+ try {
+ // Check if site exists and user has permission
+ const siteResult = await db
+ .select()
+ .from(sites)
+ .where(eq(sites.siteId, siteId));
+
+ if (siteResult.length === 0) {
+ return reply.status(404).send({ error: "Site not found" });
+ }
+
+ // Update the site domain
+ await db
+ .update(sites)
+ .set({
+ domain: newDomain,
+ name: newDomain,
+ updatedAt: new Date(),
+ })
+ .where(eq(sites.siteId, siteId));
+
+ // Reload allowed domains to update CORS configuration
+ await loadAllowedDomains();
+
+ return reply.status(200).send({ message: "Domain updated successfully" });
+ } catch (err) {
+ console.error("Error changing site domain:", err);
+
+ // Check for unique constraint violation
+ if (
+ String(err).includes(
+ 'duplicate key value violates unique constraint "sites_domain_unique"'
+ )
+ ) {
+ return reply.status(409).send({ error: "Domain already in use" });
+ }
+
+ return reply.status(500).send({ error: String(err) });
+ }
+}
diff --git a/server/src/index.ts b/server/src/index.ts
index 132d5a732..7c61880d4 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -12,6 +12,7 @@ import { getOverviewBucketed } from "./api/getOverviewBucketed.js";
import { getSingleCol } from "./api/getSingleCol.js";
import { listUsers } from "./api/listUsers.js";
import { addSite } from "./api/sites/addSite.js";
+import { changeSiteDomain } from "./api/sites/changeSiteDomain.js";
import { deleteSite } from "./api/sites/deleteSite.js";
import { getSiteHasData } from "./api/sites/getSiteHasData.js";
import { getSites } from "./api/sites/getSites.js";
@@ -125,6 +126,7 @@ server.get("/user/:userId/sessions", getUserSessions);
// Administrative
server.post("/add-site", addSite);
+server.post("/change-site-domain", changeSiteDomain);
server.post("/delete-site/:id", deleteSite);
server.get("/get-sites", getSites);
server.get("/list-users", listUsers);