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

clerk in the right place

Browse Source
This commit is contained in:
Joseph J Helfenbein
2025-01-25 08:14:10 -05:00
parent ff4eff1ec0
commit 4cc38b4860
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/(web)/layout.tsx
View File

@@ -4,6 +4,7 @@ import React from 'react';
import { Navbar } from '@/components/navbar';
import { Footer } from '@/components/footer';
import { ThemeProvider } from '@/components/theme-provider';
import { ClerkProvider } from '@clerk/nextjs';
import '../globals.css'
@@ -11,11 +12,13 @@ export default function RootLayout({ children }: { children: React.ReactNode })
return (
<html lang="en">
<body>
<ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange>
<Navbar />
<main suppressHydrationWarning>{children}</main>
<Footer />
</ThemeProvider>
<ClerkProvider>
<ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange>
<Navbar />
<main suppressHydrationWarning>{children}</main>
<Footer />
</ThemeProvider>
</ClerkProvider>
</body>
</html>
)

19
src/components/navbar.tsx
View File

@@ -4,7 +4,6 @@ import * as React from "react"
import Link from "next/link"
import {
ClerkProvider,
SignInButton,
SignedIn,
SignedOut,
@@ -33,16 +32,14 @@ export function Navbar() {
</div>
<div className="flex flex-1 items-center justify-between space-x-2 md:justify-end">
<ModeToggle />
<ClerkProvider>
<div className="bg-primary text-primary-foreground shadow hover:bg-primary/90 px-4 py-2 rounded-md">
<SignedOut>
<SignInButton />
</SignedOut>
<SignedIn>
<UserButton />
</SignedIn>
</div>
</ClerkProvider>
<div className="bg-primary text-primary-foreground shadow hover:bg-primary/90 px-4 py-2 rounded-md">
<SignedOut>
<SignInButton />
</SignedOut>
<SignedIn>
<UserButton />
</SignedIn>
</div>
</div>
</div>
</header>