🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
fix layouts
Bill Yang3c0957070bab
diff --git a/client/src/app/[site]/page.tsx b/client/src/app/[site]/page.tsxindex bf72bf552..1582c08c0 100644--- a/client/src/app/[site]/page.tsx+++ b/client/src/app/[site]/page.tsx@@ -10,21 +10,19 @@ import { Referrers } from "./components/sections/Referrers/Referrers";export default function SitePage() {return (- <main className="flex min-h-screen flex-col items-center p-4 pt-12">- <div className="w-full max-w-6xl">- <Header />- <MainSection />- <div className="grid grid-cols-2 gap-4 mt-4">- <OperatingSystems />- <Browsers />- <Devices />- <Pages />- <Referrers />- <Countries />- <Map />- {/* <Chloropleth /> */}- </div>+ <>+ <Header />+ <MainSection />+ <div className="grid grid-cols-2 gap-4 mt-4">+ <OperatingSystems />+ <Browsers />+ <Devices />+ <Pages />+ <Referrers />+ <Countries />+ <Map />+ {/* <Chloropleth /> */}</div>- </main>+ </>);}diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsxindex 022c50211..d08db8407 100644--- a/client/src/app/layout.tsx+++ b/client/src/app/layout.tsx@@ -47,7 +47,9 @@ export default function RootLayout({<QueryProvider><div className="min-h-full"><TopBar />- <main className="flex-1">{children}</main>+ <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>diff --git a/client/src/app/page.tsx b/client/src/app/page.tsxindex 6c6a52956..67235e437 100644--- a/client/src/app/page.tsx+++ b/client/src/app/page.tsx@@ -1,6 +1,6 @@export default function Home() {return (- <main className="flex min-h-screen flex-col items-center p-4 pt-12">+ <main className="flex min-h-screen flex-col items-center p-4 pt-1">home</main>);diff --git a/client/src/components/TopBar.tsx b/client/src/components/TopBar.tsxindex cc5ca86cd..d80dd4bbb 100644--- a/client/src/components/TopBar.tsx+++ b/client/src/components/TopBar.tsx@@ -12,46 +12,48 @@ import {export function TopBar() {return (- <div className="flex h-16 items-center px-4">- <div className="flex items-center space-x-4">- <Link href="/" className="font-bold text-xl">- 🐸 Frogstats- </Link>- </div>- <div className="ml-auto flex items-center space-x-4">- <NavigationMenu>- <NavigationMenuList>- <NavigationMenuItem>- <Link href="/">- <NavigationMenuLink className={navigationMenuTriggerStyle()}>- Dashboard- </NavigationMenuLink>- </Link>- </NavigationMenuItem>- <NavigationMenuItem>- <Link href="/settings">- <NavigationMenuLink className={navigationMenuTriggerStyle()}>- Settings- </NavigationMenuLink>- </Link>- </NavigationMenuItem>- </NavigationMenuList>- </NavigationMenu>- {/* <nav className="flex items-center space-x-4">+ <div className="flex pt-2 items-center w-full pb-4 bg-neutral-900 justify-center">+ <div className="flex items-center justify-between max-w-6xl flex-1">+ <div className="flex items-center space-x-4">+ <Link href="/" className="font-bold text-xl">+ 🐸 Frogstats+ </Link>+ </div>+ <div className="ml-auto flex items-center space-x-4">+ <NavigationMenu>+ <NavigationMenuList>+ <NavigationMenuItem>+ <Link href="/">+ <NavigationMenuLink className={navigationMenuTriggerStyle()}>+ Dashboard+ </NavigationMenuLink>+ </Link>+ </NavigationMenuItem>+ <NavigationMenuItem>+ <Link href="/settings">+ <NavigationMenuLink className={navigationMenuTriggerStyle()}>+ Settings+ </NavigationMenuLink>+ </Link>+ </NavigationMenuItem>+ </NavigationMenuList>+ </NavigationMenu>+ {/* <nav className="flex items-center space-x-4"><Link- href="/"- className="text-sm font-medium transition-colors hover:text-primary"+ href="/"+ className="text-sm font-medium transition-colors hover:text-primary">- Dashboard+ Dashboard</Link><Link- href="/settings"- className="text-sm font-medium text-muted-foreground transition-colors hover:text-primary"+ href="/settings"+ className="text-sm font-medium text-muted-foreground transition-colors hover:text-primary">- Settings+ Settings</Link>- </nav> */}- <ThemeToggle />+ </nav> */}+ <ThemeToggle />+ </div></div></div>);