From 0920b7a68636406d4fdff8d5b0cd7e809e5bd10f Mon Sep 17 00:00:00 2001 From: Atul Gunjal Date: Tue, 27 May 2025 09:59:02 +0530 Subject: [PATCH] minor --- src/app/components/Navbar.js | 8 +-- src/app/layout.js | 59 ++++++++++++------- src/app/middleware.js | 16 ----- .../page.js | 6 +- 4 files changed, 45 insertions(+), 44 deletions(-) delete mode 100644 src/app/middleware.js rename src/app/pages/{register-student => register-employee}/page.js (88%) diff --git a/src/app/components/Navbar.js b/src/app/components/Navbar.js index 4eaefed..dd7a030 100644 --- a/src/app/components/Navbar.js +++ b/src/app/components/Navbar.js @@ -34,7 +34,7 @@ useEffect(() => { try { await account.deleteSession('current'); // Redirect to login page or home page after sign out - window.location.href = '/login'; // or your preferred redirect + window.location.href = '/'; // or your preferred redirect } catch (error) { console.error("Error signing out:", error); } @@ -241,9 +241,9 @@ useEffect(() => { className="flex items-center text-gray-700 dark:text-gray-400" onClick={() => setDropdownOpen(!dropdownOpen)} > - + {user?.name ? ( -
+
{user.name.charAt(0).toUpperCase()}
) : ( @@ -255,7 +255,7 @@ useEffect(() => { )} - + {loading ? "Loading..." : user?.name || "Guest"} diff --git a/src/app/layout.js b/src/app/layout.js index 44f030f..1da0ed9 100644 --- a/src/app/layout.js +++ b/src/app/layout.js @@ -5,34 +5,51 @@ import { usePathname } from "next/navigation"; import Navbar from "./components/Navbar"; import Sidebar from "./components/Sidebar"; import { AuthProvider } from "./context/AuthContext"; -import { ThemeProvider } from "./context/ThemeContext"; -export default function RootLayout({ children }) { +import { ThemeProvider,useTheme } from "./context/ThemeContext"; + +function LayoutContent({ children }) { + const { darkMode } = useTheme(); const pathname = usePathname(); const isAuthPage = pathname === '/' || pathname.startsWith('/login'); + return ( + + + {!isAuthPage ? ( + <> + +
+ +
+ {children} +
+
+ + ) : ( + children + )} + + + ); +} + +export default function RootLayout({ children }) { return ( Employee Portal - - - - - {!isAuthPage ? ( - <> - -
- -
{children}
-
- - ) : ( - children - )} - - - + + + + {children} + ); -} \ No newline at end of file +} diff --git a/src/app/middleware.js b/src/app/middleware.js deleted file mode 100644 index 5493fc9..0000000 --- a/src/app/middleware.js +++ /dev/null @@ -1,16 +0,0 @@ -// import { NextResponse } from 'next/server'; - -// export function middleware(request) { -// const isLoggedIn = request.cookies.get('appwrite-session'); // Set manually if needed -// const url = request.nextUrl; - -// if (!isLoggedIn && url.pathname.startsWith('/pages')) { -// return NextResponse.redirect(new URL('/login', request.url)); -// } - -// return NextResponse.next(); -// } - -// export const config = { -// matcher: ['/pages/:path*'], -// }; diff --git a/src/app/pages/register-student/page.js b/src/app/pages/register-employee/page.js similarity index 88% rename from src/app/pages/register-student/page.js rename to src/app/pages/register-employee/page.js index e12fe36..108d326 100644 --- a/src/app/pages/register-student/page.js +++ b/src/app/pages/register-employee/page.js @@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react'; import { account } from '../../lib/appwrite'; // adjust path as needed -const RegisterStudent = () => { +const RegisterEmployee = () => { const [user, setUser] = useState(null); const [loading, setLoading] = useState(true); @@ -24,7 +24,7 @@ const RegisterStudent = () => { return (