Skip to content

Commit 824c2aa

Browse files
authored
Merge pull request #156 from CS3219-AY2425S1/refactor/frontend-layout-files
Refactor frontend layout files
2 parents 9f62784 + 53eb772 commit 824c2aa

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

frontend/app/app/layout.tsx

Lines changed: 0 additions & 16 deletions
This file was deleted.

frontend/app/layout.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import "./globals.css";
44
import { ThemeProvider } from "@/components/theme-provider";
55
import { Toaster } from "@/components/ui/toaster";
66
import AuthProvider from "@/app/auth/auth-context";
7+
import { Navbar } from "@/components/navbar";
78

89
const geistSans = localFont({
910
src: "./fonts/GeistVF.woff",
@@ -37,7 +38,10 @@ export default function RootLayout({
3738
enableSystem
3839
disableTransitionOnChange
3940
>
40-
<AuthProvider>{children}</AuthProvider>
41+
<AuthProvider>
42+
<Navbar />
43+
{children}
44+
</AuthProvider>
4145
<Toaster />
4246
</ThemeProvider>
4347
</body>

frontend/components/navbar.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
"use client";
2+
13
import { useAuth } from "@/app/auth/auth-context";
24
import { usePathname } from "next/navigation";
35

0 commit comments

Comments
 (0)