Skip to content

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

Add Radix UI Tabs component and refactor sections in the main page

Bill Yang1f3f0744763a
diff --git a/client/package-lock.json b/client/package-lock.json
index f12cbf827..689d6918d 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -23,6 +23,7 @@
"@radix-ui/react-slider": "^1.2.3",
"@radix-ui/react-slot": "^1.1.2",
"@radix-ui/react-switch": "^1.1.3",
+ "@radix-ui/react-tabs": "^1.1.3",
"@radix-ui/react-tooltip": "^1.1.8",
"@radix-ui/themes": "^3.2.0",
"@tanstack/react-query": "^5.64.2",
diff --git a/client/package.json b/client/package.json
index ad772c0e1..f54e0b84c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -24,6 +24,7 @@
"@radix-ui/react-slider": "^1.2.3",
"@radix-ui/react-slot": "^1.1.2",
"@radix-ui/react-switch": "^1.1.3",
+ "@radix-ui/react-tabs": "^1.1.3",
"@radix-ui/react-tooltip": "^1.1.8",
"@radix-ui/themes": "^3.2.0",
"@tanstack/react-query": "^5.64.2",
diff --git a/client/src/app/[site]/components/shared/StandardCard.tsx b/client/src/app/[site]/components/shared/StandardCard.tsx
deleted file mode 100644
index 991b139f7..000000000
--- a/client/src/app/[site]/components/shared/StandardCard.tsx
+++ /dev/null
@@ -1,185 +0,0 @@
-"use client";
-
-import { Button } from "@/components/ui/button";
-import {
- Card,
- CardContent,
- CardHeader,
- CardLoader,
- CardTitle,
-} from "@/components/ui/card";
-import {
- Dialog,
- DialogContent,
- DialogHeader,
- DialogTitle,
- DialogTrigger,
-} from "@/components/ui/dialog";
-import { round } from "lodash";
-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 "../../../../api/analytics/useSingleCol";
-
-export function StandardCard({
- title,
- getKey,
- getLabel,
- getValue,
- getLink,
- filterParameter,
-}: {
- title: string;
- isFetching?: boolean;
- 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;
-
- return (
- <Card>
- {isFetching && <CardLoader />}
- <CardHeader>
- <CardTitle>{title}</CardTitle>
- </CardHeader>
- <CardContent className="flex flex-col gap-2">
- {data?.data?.slice(0, 10).map((e) => (
- <div
- key={getKey(e)}
- className="relative h-7 flex items-center cursor-pointer hover:bg-neutral-850 group"
- onClick={() =>
- addFilter({
- parameter: filterParameter,
- value: [getValue(e)],
- type: "equals",
- })
- }
- >
- <div
- className="absolute inset-0 bg-accent-400 py-2 opacity-30 rounded-md"
- style={{ width: `${e.percentage * ratio}%` }}
- ></div>
- <div className="z-10 mx-2 flex justify-between items-center text-sm w-full">
- <div className="flex items-center gap-1">
- {getLabel(e)}
- {getLink && (
- <a
- href={getLink(e)}
- target="_blank"
- onClick={(e) => e.stopPropagation()}
- >
- <SquareArrowOutUpRight
- className="w-3 h-3 text-neutral-300 hover:text-neutral-100"
- strokeWidth={3}
- />
- </a>
- )}
- </div>
- <div className="text-sm flex gap-2">
- <div className="hidden group-hover:block text-neutral-400">
- {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>
- ))}
- {data?.data?.length && data?.data?.length > 10 ? (
- <Dialog>
- <DialogTrigger asChild>
- <Button variant="outline">View All</Button>
- </DialogTrigger>
- <DialogContent className="max-w-[90vw] w-[1000px]">
- <DialogHeader>
- <DialogTitle>{title}</DialogTitle>
- </DialogHeader>
- <div className="flex flex-col gap-2 max-h-[90vh] overflow-x-hidden">
- {data?.data?.map((e) => (
- <div
- key={getKey(e)}
- className="relative flex items-center mr-3 cursor-pointer hover:bg-neutral-850 "
- onClick={() =>
- addFilter({
- parameter: filterParameter,
- value: [getValue(e)],
- type: "equals",
- })
- }
- >
- <div
- className="absolute inset-0 bg-accent-400 py-2 opacity-30 rounded-md"
- style={{ width: `${e.percentage * ratio}%` }}
- ></div>
- <div className="z-10 ml-2 mr-4 flex justify-between items-center text-sm w-full h-7">
- <div className="flex items-center gap-1">
- {getLabel(e)}
- {getLink && (
- <a
- href={getLink(e)}
- target="_blank"
- onClick={(e) => e.stopPropagation()}
- >
- <SquareArrowOutUpRight
- className="w-3 h-3 text-neutral-300 hover:text-neutral-100"
- strokeWidth={3}
- />
- </a>
- )}
- </div>
- <div className="text-sm flex">
- <div>{e.count.toLocaleString()}</div>
- <div className="mx-2 bg-neutral-400 w-[1px] rounded-full h-5"></div>
- <div className="w-10 text-neutral-400">
- {round(e.percentage, 2)}%
- </div>
- </div>
- </div>
- </div>
- ))}
- </div>
- </DialogContent>
- </Dialog>
- ) : null}
- </CardContent>
- </Card>
- );
-}
diff --git a/client/src/app/[site]/components/shared/StandardSection.tsx b/client/src/app/[site]/components/shared/StandardSection.tsx
new file mode 100644
index 000000000..d1a086ee7
--- /dev/null
+++ b/client/src/app/[site]/components/shared/StandardSection.tsx
@@ -0,0 +1,187 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+import {
+ Card,
+ CardContent,
+ CardHeader,
+ CardLoader,
+ CardTitle,
+} from "@/components/ui/card";
+import {
+ Dialog,
+ DialogContent,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import { round } from "lodash";
+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 "../../../../api/analytics/useSingleCol";
+
+export function StandardSection({
+ title,
+ getKey,
+ getLabel,
+ getValue,
+ getLink,
+ filterParameter,
+}: {
+ title: string;
+ isFetching?: boolean;
+ 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;
+
+ return (
+ // <Card>
+ // {isFetching && <CardLoader />}
+ // <CardHeader>
+ // <CardTitle>{title}</CardTitle>
+ // </CardHeader>
+ // <CardContent className="flex flex-col gap-2">
+ <div className="flex flex-col gap-2">
+ {data?.data?.slice(0, 10).map((e) => (
+ <div
+ key={getKey(e)}
+ className="relative h-7 flex items-center cursor-pointer hover:bg-neutral-850 group"
+ onClick={() =>
+ addFilter({
+ parameter: filterParameter,
+ value: [getValue(e)],
+ type: "equals",
+ })
+ }
+ >
+ <div
+ className="absolute inset-0 bg-accent-400 py-2 opacity-30 rounded-md"
+ style={{ width: `${e.percentage * ratio}%` }}
+ ></div>
+ <div className="z-10 mx-2 flex justify-between items-center text-sm w-full">
+ <div className="flex items-center gap-1">
+ {getLabel(e)}
+ {getLink && (
+ <a
+ href={getLink(e)}
+ target="_blank"
+ onClick={(e) => e.stopPropagation()}
+ >
+ <SquareArrowOutUpRight
+ className="w-3 h-3 text-neutral-300 hover:text-neutral-100"
+ strokeWidth={3}
+ />
+ </a>
+ )}
+ </div>
+ <div className="text-sm flex gap-2">
+ <div className="hidden group-hover:block text-neutral-400">
+ {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>
+ ))}
+ {data?.data?.length && data?.data?.length > 10 ? (
+ <Dialog>
+ <DialogTrigger asChild>
+ <Button variant="outline">View All</Button>
+ </DialogTrigger>
+ <DialogContent className="max-w-[90vw] w-[1000px]">
+ <DialogHeader>
+ <DialogTitle>{title}</DialogTitle>
+ </DialogHeader>
+ <div className="flex flex-col gap-2 max-h-[90vh] overflow-x-hidden">
+ {data?.data?.map((e) => (
+ <div
+ key={getKey(e)}
+ className="relative flex items-center mr-3 cursor-pointer hover:bg-neutral-850 "
+ onClick={() =>
+ addFilter({
+ parameter: filterParameter,
+ value: [getValue(e)],
+ type: "equals",
+ })
+ }
+ >
+ <div
+ className="absolute inset-0 bg-accent-400 py-2 opacity-30 rounded-md"
+ style={{ width: `${e.percentage * ratio}%` }}
+ ></div>
+ <div className="z-10 ml-2 mr-4 flex justify-between items-center text-sm w-full h-7">
+ <div className="flex items-center gap-1">
+ {getLabel(e)}
+ {getLink && (
+ <a
+ href={getLink(e)}
+ target="_blank"
+ onClick={(e) => e.stopPropagation()}
+ >
+ <SquareArrowOutUpRight
+ className="w-3 h-3 text-neutral-300 hover:text-neutral-100"
+ strokeWidth={3}
+ />
+ </a>
+ )}
+ </div>
+ <div className="text-sm flex">
+ <div>{e.count.toLocaleString()}</div>
+ <div className="mx-2 bg-neutral-400 w-[1px] rounded-full h-5"></div>
+ <div className="w-10 text-neutral-400">
+ {round(e.percentage, 2)}%
+ </div>
+ </div>
+ </div>
+ </div>
+ ))}
+ </div>
+ </DialogContent>
+ </Dialog>
+ ) : null}
+ </div>
+ // </CardContent>
+ // </Card>
+ );
+}
diff --git a/client/src/app/[site]/main/components/sections/Browsers.tsx b/client/src/app/[site]/main/components/sections/Browsers.tsx
deleted file mode 100644
index 2b1644eff..000000000
--- a/client/src/app/[site]/main/components/sections/Browsers.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-"use client";
-
-import { StandardCard } from "../../../components/shared/StandardCard";
-import { Browser } from "../../../components/shared/icons/Browser";
-
-export function Browsers() {
- return (
- <StandardCard
- title="Browsers"
- getKey={(e) => e.value}
- getLabel={(e) => (
- <div className="flex gap-2 items-center">
- <Browser browser={e.value} />
- {e.value || "Other"}
- </div>
- )}
- getValue={(e) => e.value}
- filterParameter="browser"
- />
- );
-}
diff --git a/client/src/app/[site]/main/components/sections/Countries.tsx b/client/src/app/[site]/main/components/sections/Countries.tsx
index 7b2cdf634..db6da3823 100644
--- a/client/src/app/[site]/main/components/sections/Countries.tsx
+++ b/client/src/app/[site]/main/components/sections/Countries.tsx
@@ -1,28 +1,57 @@
"use client";
-
import { getCountryName } from "../../../../../lib/utils";
-import { StandardCard } from "../../../components/shared/StandardCard";
+import { StandardSection } from "../../../components/shared/StandardSection";
import { CountryFlag } from "../../../components/shared/icons/CountryFlag";
+import { useState } from "react";
+import {
+ Tabs,
+ TabsContent,
+ TabsList,
+ TabsTrigger,
+} from "../../../../../components/ui/basic-tabs";
+import {
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+} from "../../../../../components/ui/card";
+
+type Tab = "countries" | "regions";
export function Countries() {
+ const [tab, setTab] = useState<Tab>("countries");
return (
- <StandardCard
- title="Countries"
- getKey={(e) => e.value}
- getLabel={(e) => (
- <span className="flex items-center gap-2">
- {e.value && getCountryName(e.value) ? (
- <>
- <CountryFlag country={e.value} />
- {getCountryName(e.value)}
- </>
- ) : (
- "Unknown"
- )}
- </span>
- )}
- getValue={(e) => e.value}
- filterParameter="country"
- />
+ <Card className="h-[493px]">
+ <CardHeader>
+ <CardTitle>Countries</CardTitle>
+ </CardHeader>
+ <CardContent className="mt-[-8px]">
+ <Tabs
+ defaultValue="countries"
+ value={tab}
+ onValueChange={(value) => setTab(value as Tab)}
+ >
+ <TabsList>
+ <TabsTrigger value="countries">Countries</TabsTrigger>
+ <TabsTrigger value="regions">Regions</TabsTrigger>
+ </TabsList>
+ <TabsContent value="countries">
+ <StandardSection
+ filterParameter="country"
+ title="Countries"
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
+ getLabel={(e) => (
+ <div className="flex gap-2 items-center">
+ <CountryFlag country={e.value} />
+ {getCountryName(e.value)}
+ </div>
+ )}
+ />
+ </TabsContent>
+ <TabsContent value="regions"></TabsContent>
+ </Tabs>
+ </CardContent>
+ </Card>
);
}
diff --git a/client/src/app/[site]/main/components/sections/Devices.tsx b/client/src/app/[site]/main/components/sections/Devices.tsx
index 0501ec875..3acfd399a 100644
--- a/client/src/app/[site]/main/components/sections/Devices.tsx
+++ b/client/src/app/[site]/main/components/sections/Devices.tsx
@@ -1,15 +1,81 @@
"use client";
-import { StandardCard } from "../../../components/shared/StandardCard";
+import { useState } from "react";
+import {
+ Tabs,
+ TabsContent,
+ TabsList,
+ TabsTrigger,
+} from "../../../../../components/ui/basic-tabs";
+import { StandardSection } from "../../../components/shared/StandardSection";
+import { OperatingSystem } from "../../../components/shared/icons/OperatingSystem";
+import {
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+} from "../../../../../components/ui/card";
+import { Browser } from "../../../components/shared/icons/Browser";
+
+type Tab = "devices" | "browsers" | "os";
export function Devices() {
+ const [tab, setTab] = useState<Tab>("devices");
return (
- <StandardCard
- filterParameter="device_type"
- title="Devices"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) => e.value || "Other"}
- />
+ <Card className="h-[493px]">
+ <CardHeader>
+ <CardTitle>Devices</CardTitle>
+ </CardHeader>
+ <CardContent className="mt-[-8px]">
+ <Tabs
+ defaultValue="devices"
+ value={tab}
+ onValueChange={(value) => setTab(value as Tab)}
+ >
+ <TabsList>
+ <TabsTrigger value="devices">Devices</TabsTrigger>
+ <TabsTrigger value="browsers">Browsers</TabsTrigger>
+ <TabsTrigger value="os">Operating Systems</TabsTrigger>
+ </TabsList>
+ <TabsContent value="devices">
+ <StandardSection
+ filterParameter="device_type"
+ title="Devices"
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
+ getLabel={(e) => e.value || "Other"}
+ />
+ </TabsContent>
+ <TabsContent value="browsers">
+ <StandardSection
+ filterParameter="browser"
+ title="Browsers"
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
+ getLabel={(e) => (
+ <div className="flex gap-2 items-center">
+ <Browser browser={e.value} />
+ {e.value || "Other"}
+ </div>
+ )}
+ />
+ </TabsContent>
+ <TabsContent value="os">
+ <StandardSection
+ title="Operating Systems"
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
+ getLabel={(e) => (
+ <div className="flex gap-2 items-center">
+ <OperatingSystem os={e.value || "Other"} />
+ {e.value || "Other"}
+ </div>
+ )}
+ filterParameter="operating_system"
+ />
+ </TabsContent>
+ </Tabs>
+ </CardContent>
+ </Card>
);
}
diff --git a/client/src/app/[site]/main/components/sections/OperatingSystems.tsx b/client/src/app/[site]/main/components/sections/OperatingSystems.tsx
deleted file mode 100644
index 2e8a8d021..000000000
--- a/client/src/app/[site]/main/components/sections/OperatingSystems.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-"use client";
-
-import { StandardCard } from "../../../components/shared/StandardCard";
-import { OperatingSystem } from "../../../components/shared/icons/OperatingSystem";
-
-export function OperatingSystems() {
- return (
- <StandardCard
- title="Operating Systems"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) => (
- <div className="flex gap-2 items-center">
- <OperatingSystem os={e.value || "Other"} />
- {e.value || "Other"}
- </div>
- )}
- filterParameter="operating_system"
- />
- );
-}
diff --git a/client/src/app/[site]/main/components/sections/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsx
index 6ee046223..a3a332053 100644
--- a/client/src/app/[site]/main/components/sections/Pages.tsx
+++ b/client/src/app/[site]/main/components/sections/Pages.tsx
@@ -1,21 +1,55 @@
"use client";
-import { GetSitesResponse } from "@/api/admin/sites";
-import { StandardCard } from "../../../components/shared/StandardCard";
+import { useState } from "react";
+import {
+ Tabs,
+ TabsContent,
+ TabsList,
+ TabsTrigger,
+} from "../../../../../components/ui/basic-tabs";
+import {
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+} from "../../../../../components/ui/card";
+import { StandardSection } from "../../../components/shared/StandardSection";
+import { GetSitesResponse } from "../../../../../api/admin/sites";
+
+type Tab = "pages";
export function Pages({
siteMetadata,
}: {
siteMetadata: GetSitesResponse[number];
}) {
+ const [tab, setTab] = useState<Tab>("pages");
return (
- <StandardCard
- filterParameter="pathname"
- title="Pages"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) => e.value || "Other"}
- getLink={(e) => `https://${siteMetadata.domain}${e.value}`}
- />
+ <Card className="h-[493px]">
+ <CardHeader>
+ <CardTitle>Pages</CardTitle>
+ </CardHeader>
+ <CardContent className="mt-[-8px]">
+ <Tabs
+ defaultValue="pages"
+ value={tab}
+ onValueChange={(value) => setTab(value as Tab)}
+ >
+ <TabsList>
+ <TabsTrigger value="pages">Pages</TabsTrigger>
+ </TabsList>
+ <TabsContent value="pages">
+ <StandardSection
+ filterParameter="pathname"
+ title="pages"
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
+ getLabel={(e) => e.value || "Other"}
+ getLink={(e) => `https://${siteMetadata.domain}${e.value}`}
+ />
+ </TabsContent>
+ </Tabs>
+ </CardContent>
+ </Card>
);
}
diff --git a/client/src/app/[site]/main/components/sections/Referrers.tsx b/client/src/app/[site]/main/components/sections/Referrers.tsx
index abd1188f5..9bdcc4683 100644
--- a/client/src/app/[site]/main/components/sections/Referrers.tsx
+++ b/client/src/app/[site]/main/components/sections/Referrers.tsx
@@ -1,24 +1,56 @@
"use client";
+import { useState } from "react";
+import {
+ Tabs,
+ TabsContent,
+ TabsList,
+ TabsTrigger,
+} from "../../../../../components/ui/basic-tabs";
+import {
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+} from "../../../../../components/ui/card";
+import { StandardSection } from "../../../components/shared/StandardSection";
-import { StandardCard } from "../../../components/shared/StandardCard";
+type Tab = "referrers";
export function Referrers() {
+ const [tab, setTab] = useState<Tab>("referrers");
return (
- <StandardCard
- filterParameter="referrer"
- title="Referrers"
- getKey={(e) => e.value}
- getLink={(e) => `https://${e.value}`}
- getLabel={(e) => (
- <div className="flex items-center">
- <img
- className="w-4 mr-2"
- src={`https://www.google.com/s2/favicons?domain=${e.value}&sz=32`}
- />
- {e.value ? e.value : "Direct"}
- </div>
- )}
- getValue={(e) => e.value}
- />
+ <Card className="h-[493px]">
+ <CardHeader>
+ <CardTitle>Referrers</CardTitle>
+ </CardHeader>
+ <CardContent className="mt-[-8px]">
+ <Tabs
+ defaultValue="referrers"
+ value={tab}
+ onValueChange={(value) => setTab(value as Tab)}
+ >
+ <TabsList>
+ <TabsTrigger value="referrers">Referrers</TabsTrigger>
+ </TabsList>
+ <TabsContent value="referrers">
+ <StandardSection
+ filterParameter="referrer"
+ title="Referrers"
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
+ getLabel={(e) => (
+ <div className="flex items-center">
+ <img
+ className="w-4 mr-2"
+ src={`https://www.google.com/s2/favicons?domain=${e.value}&sz=32`}
+ />
+ {e.value ? e.value : "Direct"}
+ </div>
+ )}
+ />
+ </TabsContent>
+ </Tabs>
+ </CardContent>
+ </Card>
);
}
diff --git a/client/src/app/[site]/main/page.tsx b/client/src/app/[site]/main/page.tsx
index ef5782006..e1ab63656 100644
--- a/client/src/app/[site]/main/page.tsx
+++ b/client/src/app/[site]/main/page.tsx
@@ -3,11 +3,9 @@ import { useGetSiteMetadata } from "../../../api/admin/sites";
import { useStore } from "../../../lib/store";
import { SubHeader } from "../components/SubHeader/SubHeader";
import { MainSection } from "./components/MainSection/MainSection";
-import { Browsers } from "./components/sections/Browsers";
import { Countries } from "./components/sections/Countries";
import { Devices } from "./components/sections/Devices";
import { Map } from "./components/sections/Map";
-import { OperatingSystems } from "./components/sections/OperatingSystems";
import { Pages } from "./components/sections/Pages";
import { Referrers } from "./components/sections/Referrers";
@@ -34,8 +32,6 @@ function MainPageContent({ site }: { site: string }) {
<SubHeader />
<MainSection />
<div className="grid grid-cols-2 gap-4 mt-4">
- <OperatingSystems />
- <Browsers />
<Devices />
<Pages siteMetadata={siteMetadata} />
<Referrers />
diff --git a/client/src/components/ui/basic-tabs.tsx b/client/src/components/ui/basic-tabs.tsx
new file mode 100644
index 000000000..7efdce73d
--- /dev/null
+++ b/client/src/components/ui/basic-tabs.tsx
@@ -0,0 +1,55 @@
+"use client";
+
+import * as React from "react";
+import * as TabsPrimitive from "@radix-ui/react-tabs";
+
+import { cn } from "@/lib/utils";
+
+const Tabs = TabsPrimitive.Root;
+
+const TabsList = React.forwardRef<
+ React.ElementRef<typeof TabsPrimitive.List>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
+>(({ className, ...props }, ref) => (
+ <TabsPrimitive.List
+ ref={ref}
+ className={cn(
+ "inline-flex h-8 items-center justify-start space-x-3",
+ className
+ )}
+ {...props}
+ />
+));
+TabsList.displayName = TabsPrimitive.List.displayName;
+
+const TabsTrigger = React.forwardRef<
+ React.ElementRef<typeof TabsPrimitive.Trigger>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
+>(({ className, ...props }, ref) => (
+ <TabsPrimitive.Trigger
+ ref={ref}
+ className={cn(
+ "inline-flex items-center justify-center whitespace-nowrap border-b-2 border-transparent py-1 text-xs font-medium text-neutral-600 transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:border-neutral-950 data-[state=active]:text-neutral-950 dark:text-neutral-400 dark:focus-visible:ring-neutral-300 dark:data-[state=active]:border-neutral-100 dark:data-[state=active]:text-neutral-50",
+ className
+ )}
+ {...props}
+ />
+));
+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName;
+
+const TabsContent = React.forwardRef<
+ React.ElementRef<typeof TabsPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
+>(({ className, ...props }, ref) => (
+ <TabsPrimitive.Content
+ ref={ref}
+ className={cn(
+ "mt-2 ring-offset-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2 dark:ring-offset-neutral-950 dark:focus-visible:ring-neutral-300",
+ className
+ )}
+ {...props}
+ />
+));
+TabsContent.displayName = TabsPrimitive.Content.displayName;
+
+export { Tabs, TabsList, TabsTrigger, TabsContent };
diff --git a/client/src/components/ui/tabs.tsx b/client/src/components/ui/tabs.tsx
new file mode 100644
index 000000000..b5686097d
--- /dev/null
+++ b/client/src/components/ui/tabs.tsx
@@ -0,0 +1,55 @@
+"use client"
+
+import * as React from "react"
+import * as TabsPrimitive from "@radix-ui/react-tabs"
+
+import { cn } from "@/lib/utils"
+
+const Tabs = TabsPrimitive.Root
+
+const TabsList = React.forwardRef<
+ React.ElementRef<typeof TabsPrimitive.List>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
+>(({ className, ...props }, ref) => (
+ <TabsPrimitive.List
+ ref={ref}
+ className={cn(
+ "inline-flex h-9 items-center justify-center rounded-lg bg-neutral-100 p-1 text-neutral-500 dark:bg-neutral-800 dark:text-neutral-400",
+ className
+ )}
+ {...props}
+ />
+))
+TabsList.displayName = TabsPrimitive.List.displayName
+
+const TabsTrigger = React.forwardRef<
+ React.ElementRef<typeof TabsPrimitive.Trigger>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
+>(({ className, ...props }, ref) => (
+ <TabsPrimitive.Trigger
+ ref={ref}
+ className={cn(
+ "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-white transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-neutral-950 data-[state=active]:shadow dark:ring-offset-neutral-950 dark:focus-visible:ring-neutral-300 dark:data-[state=active]:bg-neutral-950 dark:data-[state=active]:text-neutral-50",
+ className
+ )}
+ {...props}
+ />
+))
+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName
+
+const TabsContent = React.forwardRef<
+ React.ElementRef<typeof TabsPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
+>(({ className, ...props }, ref) => (
+ <TabsPrimitive.Content
+ ref={ref}
+ className={cn(
+ "mt-2 ring-offset-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2 dark:ring-offset-neutral-950 dark:focus-visible:ring-neutral-300",
+ className
+ )}
+ {...props}
+ />
+))
+TabsContent.displayName = TabsPrimitive.Content.displayName
+
+export { Tabs, TabsList, TabsTrigger, TabsContent }