Skip to content

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

Refactor layout and sidebar components for improved structure and usability

Bill Yang65ac09cc6030
diff --git a/client/src/app/[site]/components/Header/Header.tsx b/client/src/app/[site]/components/Header/Header.tsx
index 357ce65d8..43dfdfe16 100644
--- a/client/src/app/[site]/components/Header/Header.tsx
+++ b/client/src/app/[site]/components/Header/Header.tsx
@@ -1,8 +1,6 @@
"use client";
import { usePathname } from "next/navigation";
import { useGetSites } from "../../../../api/admin/sites";
-import { SiteSettings } from "../../../../components/SiteSettings/SiteSettings";
-import LiveUserCount from "./LiveUserCount";
import { UsageBanners } from "./UsageBanners";
export function Header() {
@@ -14,16 +12,6 @@ export function Header() {
);
return (
- <div className="flex flex-col">
- <div className="flex items-center justify-between py-2">
- <div className="flex gap-3">
- <div className="flex items-center gap-1 text-base text-neutral-600 dark:text-neutral-400">
- <LiveUserCount />
- <SiteSettings siteId={site?.siteId ?? 0} />
- </div>
- </div>
- </div>
- {/* <UsageBanners site={site} /> */}
- </div>
+ <div className="flex flex-col">{/* <UsageBanners site={site} /> */}</div>
);
}
diff --git a/client/src/app/[site]/components/Header/LiveUserCount.tsx b/client/src/app/[site]/components/Sidebar/LiveUserCount.tsx
similarity index 75%
rename from client/src/app/[site]/components/Header/LiveUserCount.tsx
rename to client/src/app/[site]/components/Sidebar/LiveUserCount.tsx
index 09422415e..88b5db134 100644
--- a/client/src/app/[site]/components/Header/LiveUserCount.tsx
+++ b/client/src/app/[site]/components/Sidebar/LiveUserCount.tsx
@@ -10,7 +10,8 @@ export default function LiveUserCount() {
const { data } = useGetLiveUsercount(5);
return (
- <div className="flex items-center gap-[6px] text-base text-neutral-200 cursor-default">
+ <div className="flex items-center gap-2 text-base text-neutral-200 cursor-default">
+ {/* <div className="flex items-center gap-2 text-base text-neutral-200 cursor-default bg-neutral-800/50 rounded-lg px-2 py-1 border border-neutral-750"> */}
<div className="flex justify-center">
<span className="relative flex h-3 w-3">
<span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75"></span>
@@ -26,6 +27,7 @@ export default function LiveUserCount() {
value={data?.count ?? 0}
/>
}
+ <span className="text-sm text-neutral-400 ml-1">users online</span>
</TooltipTrigger>
<TooltipContent>
<p>Users online in past 5 minutes</p>
diff --git a/client/src/app/[site]/components/Sidebar/Sidebar.tsx b/client/src/app/[site]/components/Sidebar/Sidebar.tsx
index fd994afe7..0ec9b0519 100644
--- a/client/src/app/[site]/components/Sidebar/Sidebar.tsx
+++ b/client/src/app/[site]/components/Sidebar/Sidebar.tsx
@@ -1,8 +1,18 @@
"use client";
-import { ChartBarDecreasing, ChartLine, Radio, User } from "lucide-react";
+import {
+ ChartBarDecreasing,
+ ChartLine,
+ Radio,
+ Settings,
+ User,
+} from "lucide-react";
import Link from "next/link";
import { usePathname } from "next/navigation";
import { useGetSites } from "../../../../api/admin/sites";
+import LiveUserCount from "./LiveUserCount";
+import { SiteSettings } from "../../../../components/SiteSettings/SiteSettings";
+import { Button } from "../../../../components/ui/button";
+import { SiteSelector } from "./SiteSelector";
export function Sidebar() {
const { data: sites } = useGetSites();
@@ -27,47 +37,54 @@ export function Sidebar() {
return (
<div className="w-56 bg-neutral-900 border-r border-neutral-850 h-full flex flex-col">
{site && (
- <div className="p-4 border-b border-t border-neutral-800">
- <div className="flex items-center gap-2">
- <img
- className="w-6"
- src={`https://www.google.com/s2/favicons?domain=${site.domain}&sz=64`}
- alt={site.domain}
- />
- <div className="font-medium text-white truncate">{site.domain}</div>
- </div>
+ <div className="p-3 border-b border-neutral-800 flex flex-col gap-2">
+ <SiteSelector />
+ {/* <div className="flex items-center gap-2">
+ <LiveUserCount />
+ </div> */}
</div>
)}
- <div className="flex flex-col space-y-1 p-3 mt-2">
+ <div className="flex flex-col space-y-1 p-3 mt-1">
<SidebarLink
label="Main"
active={isActiveTab("main")}
href={getTabPath("main")}
- icon={<ChartLine size={18} />}
+ icon={<ChartLine className="w-4 h-4" />}
/>
<SidebarLink
label="Sessions"
active={isActiveTab("sessions")}
href={getTabPath("sessions")}
- icon={<User size={18} />}
+ icon={<User className="w-4 h-4" />}
/>
<SidebarLink
label="Realtime"
active={isActiveTab("realtime")}
href={getTabPath("realtime")}
- icon={<Radio size={18} />}
+ icon={<Radio className="w-4 h-4" />}
/>
<SidebarLink
label="Retention"
active={isActiveTab("retention")}
href={getTabPath("retention")}
- icon={<ChartBarDecreasing size={18} />}
+ icon={<ChartBarDecreasing className="w-4 h-4" />}
/>
<SidebarLink
label="Reports"
active={isActiveTab("reports")}
href={getTabPath("reports")}
- icon={<ChartBarDecreasing size={18} />}
+ icon={<ChartBarDecreasing className="w-4 h-4" />}
+ />
+ <SiteSettings
+ siteId={site?.siteId ?? 0}
+ trigger={
+ <div className="px-3 py-2.5 rounded-lg transition-colors w-full text-neutral-200 hover:text-white hover:bg-neutral-800/50">
+ <div className="flex items-center gap-2">
+ <Settings className="h-4 w-4" />
+ <span className="text-sm">Settings</span>
+ </div>
+ </div>
+ }
/>
</div>
</div>
diff --git a/client/src/app/[site]/components/Sidebar/SiteSelector.tsx b/client/src/app/[site]/components/Sidebar/SiteSelector.tsx
new file mode 100644
index 000000000..ceb89a8cd
--- /dev/null
+++ b/client/src/app/[site]/components/Sidebar/SiteSelector.tsx
@@ -0,0 +1,62 @@
+import { Check } from "lucide-react";
+import { usePathname, useRouter } from "next/navigation";
+import { useGetSites } from "../../../../api/admin/sites";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from "../../../../components/ui/dropdown-menu";
+
+export function SiteSelector() {
+ const { data: sites } = useGetSites();
+ const pathname = usePathname();
+ const router = useRouter();
+
+ const currentSiteId = Number(pathname.split("/")[1]);
+
+ const site = sites?.find((site) => site.siteId === currentSiteId);
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger unstyled>
+ {site && (
+ <div className="flex gap-2 border border-neutral-800 rounded-lg py-1.5 px-3 justify-start cursor-pointer hover:bg-neutral-800/50 transition-colors h-[36px]">
+ <img
+ className="w-5 h-5"
+ src={`https://www.google.com/s2/favicons?domain=${site.domain}&sz=64`}
+ alt={site.domain}
+ />
+ <div className="text-white truncate text-sm">{site.domain}</div>
+ </div>
+ )}
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="start">
+ {sites?.map((site) => {
+ const isSelected = site.siteId === currentSiteId;
+ return (
+ <DropdownMenuItem
+ key={site.siteId}
+ onClick={() => {
+ router.push(`/${site.siteId}`);
+ }}
+ className={`flex items-center justify-between ${
+ isSelected ? "bg-neutral-800" : ""
+ }`}
+ >
+ <div className="flex items-center gap-2">
+ <img
+ className="w-4 h-4"
+ src={`https://www.google.com/s2/favicons?domain=${site.domain}&sz=64`}
+ alt={site.domain}
+ />
+ <span>{site.domain}</span>
+ </div>
+ {isSelected && <Check size={16} />}
+ </DropdownMenuItem>
+ );
+ })}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ );
+}
diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsx
index 4b12eee44..6ec847452 100644
--- a/client/src/app/[site]/layout.tsx
+++ b/client/src/app/[site]/layout.tsx
@@ -48,9 +48,9 @@ export default function SiteLayout({
<div className="flex flex-1 overflow-hidden">
<Sidebar />
<div className="flex-1 overflow-auto">
- <div className="px-4 py-4 max-w-[1400px] mx-auto w-full">
+ <div className="px-4 py-2 max-w-[1400px] mx-auto w-full">
<Header />
- <div className="mt-6">{children}</div>
+ <div>{children}</div>
</div>
</div>
</div>
diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsx
index 07099d162..c9e41f419 100644
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@ -41,20 +41,28 @@ import {
} from "@/api/admin/sites";
import { BACKEND_URL } from "@/lib/const";
-export function SiteSettings({ siteId }: { siteId: number }) {
+export function SiteSettings({
+ siteId,
+ trigger,
+}: {
+ siteId: number;
+ trigger?: React.ReactNode;
+}) {
const { siteMetadata } = useGetSiteMetadata(siteId);
if (!siteMetadata) {
return null;
}
- return <SiteSettingsInner siteMetadata={siteMetadata} />;
+ return <SiteSettingsInner siteMetadata={siteMetadata} trigger={trigger} />;
}
export function SiteSettingsInner({
siteMetadata,
+ trigger,
}: {
siteMetadata: GetSitesResponse[number];
+ trigger?: React.ReactNode;
}) {
const { refetch } = useGetSites();
const router = useRouter();
@@ -128,9 +136,11 @@ export function SiteSettingsInner({
return (
<Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
<DialogTrigger asChild>
- <Button variant="ghost" size="icon">
- <Settings className="h-4 w-4" />
- </Button>
+ {trigger ?? (
+ <Button variant="ghost" size="icon">
+ <Settings className="h-4 w-4" />
+ </Button>
+ )}
</DialogTrigger>
<DialogContent className="sm:max-w-[500px]">
<DialogHeader>
diff --git a/client/src/components/ui/dropdown-menu.tsx b/client/src/components/ui/dropdown-menu.tsx
index 85fa0e58d..16121d8cf 100644
--- a/client/src/components/ui/dropdown-menu.tsx
+++ b/client/src/components/ui/dropdown-menu.tsx
@@ -12,12 +12,14 @@ const DropdownMenu = DropdownMenuPrimitive.Root;
const DropdownMenuTrigger = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Trigger> &
- ButtonProps
->(({ className, variant, size, ...props }, ref) => (
+ ButtonProps & { unstyled?: boolean }
+>(({ className, variant, size, unstyled, ...props }, ref) => (
<DropdownMenuPrimitive.Trigger
ref={ref}
// className={cn(className)}
- className={cn(buttonVariants({ variant, size, className }))}
+ className={
+ unstyled ? className : cn(buttonVariants({ variant, size, className }))
+ }
{...props}
/>
));
@@ -78,7 +80,7 @@ const DropdownMenuContent = React.forwardRef<
ref={ref}
sideOffset={sideOffset}
className={cn(
- "z-50 min-w-[8rem] rounded-md border border-neutral-200 bg-white p-1 text-neutral-950 shadow-md dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-50",
+ "z-50 min-w-[8rem] rounded-md border border-neutral-200 bg-white p-1 text-neutral-950 shadow-md dark:border-neutral-850 dark:bg-neutral-900 dark:text-neutral-50",
"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-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
className
)}
diff --git a/client/src/components/ui/tooltip.tsx b/client/src/components/ui/tooltip.tsx
index 7dcea92f5..c787d1cfc 100644
--- a/client/src/components/ui/tooltip.tsx
+++ b/client/src/components/ui/tooltip.tsx
@@ -1,15 +1,15 @@
-"use client"
+"use client";
-import * as React from "react"
-import * as TooltipPrimitive from "@radix-ui/react-tooltip"
+import * as React from "react";
+import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const TooltipProvider = TooltipPrimitive.Provider
+const TooltipProvider = TooltipPrimitive.Provider;
-const Tooltip = TooltipPrimitive.Root
+const Tooltip = TooltipPrimitive.Root;
-const TooltipTrigger = TooltipPrimitive.Trigger
+const TooltipTrigger = TooltipPrimitive.Trigger;
const TooltipContent = React.forwardRef<
React.ElementRef<typeof TooltipPrimitive.Content>,
@@ -20,13 +20,13 @@ const TooltipContent = React.forwardRef<
ref={ref}
sideOffset={sideOffset}
className={cn(
- "z-50 overflow-hidden rounded-md bg-neutral-900 px-3 py-1.5 text-xs text-neutral-50 animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:bg-neutral-50 dark:text-neutral-900",
+ "z-50 overflow-hidden rounded-md bg-neutral-850 border border-neutral-750 px-3 py-1.5 text-xs text-neutral-50 animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
className
)}
{...props}
/>
</TooltipPrimitive.Portal>
-))
-TooltipContent.displayName = TooltipPrimitive.Content.displayName
+));
+TooltipContent.displayName = TooltipPrimitive.Content.displayName;
-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }
+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };