Hackathons/HoyaHax2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/main'

Browse Source
This commit is contained in:
Joseph J Helfenbein
2025-01-25 03:04:43 -05:00
parent a86b9d829b b2253d9b2d
commit f83f40741e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/layout.tsx
View File

@@ -15,7 +15,7 @@ export default function RootLayout({
<body>
<ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange>
<Navbar />
<main>{children}</main>
<main suppressHydrationWarning>{children}</main>
</ThemeProvider>
</body>
</html>

6
src/components/navbar.tsx
View File

@@ -19,7 +19,7 @@ export function Navbar() {
const { setTheme } = useTheme()
return (
<header className="sticky top-0 z-50 w-full border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60" suppressHydrationWarning>
<header className="sticky top-0 z-50 w-full border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
<div className="container flex h-14 items-center mx-auto">
<div className="mr-4 hidden md:flex">
<Link href="/" className="mr-6 flex items-center space-x-2">
@@ -55,14 +55,14 @@ export function Navbar() {
</DropdownMenu>
</nav>
<ClerkProvider>
<Button className="hidden md:flex" suppressHydrationWarning>
<div className="bg-primary text-primary-foreground shadow hover:bg-primary/90 h-9 px-4 py-2 rounded-md">
<SignedOut>
<SignInButton />
</SignedOut>
<SignedIn>
<UserButton />
</SignedIn>
</Button>
</div>
</ClerkProvider>
</div>
</div>