🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor components for improved layout and responsiveness
Bill Yang989ebf607100
diff --git a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsxindex 811954bb8..b29c42dfe 100644--- a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx+++ b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx@@ -58,7 +58,7 @@ export function NewFilterButton() {><DropdownMenuTrigger asChild><Button- className="px-3"+ className="text-xs sm:text-sm h-8 sm:h-9 px-3 p-2 sm:p-3"onClick={() => {if (localFilters.length === 0) {addLocalFilter();diff --git a/client/src/app/[site]/components/SubHeader/SubHeader.tsx b/client/src/app/[site]/components/SubHeader/SubHeader.tsxindex 61299cc1d..bc82f4495 100644--- a/client/src/app/[site]/components/SubHeader/SubHeader.tsx+++ b/client/src/app/[site]/components/SubHeader/SubHeader.tsx@@ -54,14 +54,20 @@ export function SubHeader({<div className="flex items-center gap-2"><DateSelector time={time} setTime={setTime} /><div className="flex items-center">- <Button variant="default" size="icon" onClick={goBack}>+ <Button+ variant="outline"+ size="icon"+ onClick={goBack}+ className="rounded-r-none h-8 w-8 sm:h-9 sm:w-9"+ ><ChevronLeft /></Button><Button- variant="default"+ variant="outline"size="icon"onClick={goForward}disabled={!canGoForward(time)}+ className="rounded-l-none -ml-px h-8 w-8 sm:h-9 sm:w-9"><ChevronRight /></Button>diff --git a/client/src/app/[site]/main/components/MainSection/Chart.tsx b/client/src/app/[site]/main/components/MainSection/Chart.tsxindex 4379f4be6..be13d93c6 100644--- a/client/src/app/[site]/main/components/MainSection/Chart.tsx+++ b/client/src/app/[site]/main/components/MainSection/Chart.tsx@@ -179,6 +179,10 @@ export function Chart({return DateTime.fromJSDate(value).toFormat("MMM d");} else if (time.mode === "month") {return DateTime.fromJSDate(value).toFormat("MMM d");+ } else if (time.mode === "year") {+ return DateTime.fromJSDate(value).toFormat("MMM d");+ } else if (time.mode === "all-time") {+ return DateTime.fromJSDate(value).toFormat("MMM d");}},}}diff --git a/client/src/app/[site]/user/[userId]/components/Calendar.tsx b/client/src/app/[site]/user/[userId]/components/Calendar.tsxindex 69f795293..5ffe4a517 100644--- a/client/src/app/[site]/user/[userId]/components/Calendar.tsx+++ b/client/src/app/[site]/user/[userId]/components/Calendar.tsx@@ -50,7 +50,7 @@ export const VisitCalendar = ({<div className="bg-neutral-900 p-2 rounded-md border border-neutral-800 text-sm">{value}{" "}<span className="text-neutral-300">- battle{Number(value) > 1 && "s"} on+ session{Number(value) > 1 && "s"} on</span>{" "}{day}</div>diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsxindex 74c148b1b..37ee1f42f 100644--- a/client/src/app/[site]/user/[userId]/page.tsx+++ b/client/src/app/[site]/user/[userId]/page.tsx@@ -52,7 +52,7 @@ export default function UserPage() {/>{userId?.slice(0, 10)}</h1>- <div className="bg-neutral-850 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 text-sm mb-3">+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 text-sm mb-3"><div className="grid grid-cols-1 md:grid-cols-2 gap-2"><div className="grid grid-cols-[100px_auto] gap-2"><span className=" text-neutral-100">User ID:</span>@@ -113,7 +113,7 @@ export default function UserPage() {</div></div><div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-6 gap-3 justify-between">- <div className="bg-neutral-850 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 flex-grow">+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 flex-grow"><div className="text-xs text-neutral-400 flex items-center gap-1"><Clock className="w-4 h-4" />Avg. Session Duration@@ -122,28 +122,28 @@ export default function UserPage() {{data?.duration ? formatDuration(data.duration) : "N/A"}</div></div>- <div className="bg-neutral-850 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 flex-grow">+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow"><div className="text-xs text-neutral-400 flex items-center gap-1"><Files className="w-4 h-4" />Sessions</div><div className="font-semibold">{data?.sessions}</div></div>- <div className="bg-neutral-850 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 flex-grow">+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow"><div className="text-xs text-neutral-400 flex items-center gap-1"><FileText className="w-4 h-4" />Pageviews</div><div className="font-semibold">{data?.pageviews}</div></div>- <div className="bg-neutral-850 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 flex-grow">+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow"><div className="text-xs text-neutral-400 flex items-center gap-1"><MousePointerClick className="w-4 h-4" />Events</div><div className="font-semibold">{data?.events}</div></div>- <div className="bg-neutral-850 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 flex-grow">+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow"><div className="text-xs text-neutral-400 flex items-center gap-1"><Calendar className="w-4 h-4" />First Seen@@ -154,7 +154,7 @@ export default function UserPage() {)}</div></div>- <div className="bg-neutral-850 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 flex-grow">+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow"><div className="text-xs text-neutral-400 flex items-center gap-1"><CalendarCheck className="w-4 h-4" />Last Seen@@ -167,7 +167,7 @@ export default function UserPage() {</div></div></div>- <div className="bg-neutral-850 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 h-[150px]">+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 h-[150px]"><VisitCalendar sessionCount={sessionCount?.data ?? []} /></div>diff --git a/client/src/components/DateSelector/DateSelector.tsx b/client/src/components/DateSelector/DateSelector.tsxindex 763e82506..c0ebcd0ce 100644--- a/client/src/components/DateSelector/DateSelector.tsx+++ b/client/src/components/DateSelector/DateSelector.tsx@@ -81,8 +81,11 @@ export function DateSelector({}) {return (<DropdownMenu>- <DropdownMenuTrigger>- <Calendar className="w-4 h-4" />+ <DropdownMenuTrigger+ className="text-xs sm:text-sm p-2 sm:p-3 h-8 sm:h-9"+ variant={"default"}+ >+ <Calendar className="hidden sm:block w-4 h-4" />{getLabel(time)}</DropdownMenuTrigger><DropdownMenuContent align="end">diff --git a/client/src/components/MobileSidebar.tsx b/client/src/components/MobileSidebar.tsxindex c95ccf5fb..f24343efb 100644--- a/client/src/components/MobileSidebar.tsx+++ b/client/src/components/MobileSidebar.tsx@@ -1,5 +1,7 @@"use client";+import { usePathname, useRouter } from "next/navigation";+import { useGetSites } from "../api/admin/sites";import { Sidebar } from "../app/[site]/components/Sidebar/Sidebar";import { Button } from "./ui/button";import {@@ -14,8 +16,14 @@ import { Menu } from "lucide-react";import { VisuallyHidden } from "radix-ui";export function MobileSidebar() {+ const { data: sites } = useGetSites();+ const pathname = usePathname();+ const currentSiteId = Number(pathname.split("/")[1]);++ const site = sites?.find((site) => site.siteId === currentSiteId);+return (- <div className="md:hidden">+ <div className="md:hidden flex items-center gap-2"><Sheet><SheetTrigger asChild><Button size="icon" variant="outline">@@ -31,6 +39,13 @@ export function MobileSidebar() {<Sidebar /></SheetContent></Sheet>+ {site && (+ <img+ className="w-6 h-6"+ src={`https://www.google.com/s2/favicons?domain=${site.domain}&sz=64`}+ alt={site.domain}+ />+ )}</div>);}diff --git a/client/src/components/ui/button.tsx b/client/src/components/ui/button.tsxindex c5e7f3e99..b5e74b9ae 100644--- a/client/src/components/ui/button.tsx+++ b/client/src/components/ui/button.tsx@@ -33,6 +33,7 @@ const buttonVariants = cva(xs: "h-6 rounded-sm px-2 text-xs",lg: "h-10 rounded-md px-8",icon: "h-9 w-9",+ smIcon: "h-7 w-7",},},defaultVariants: {