From c18275bf9b61d78402c81899f2bec88cfe21280d Mon Sep 17 00:00:00 2001
From: iamkiddy <francisyoungson@gmail.com>
Date: Thu, 4 Dec 2025 19:44:27 +0000
Subject: [PATCH 1/2] Update Navbar component to conditionally render Dashboard
 links based on user roles and current route. This enhancement improves
 navigation clarity for authenticated users by preventing duplicate links in
 the Navbar.

---
 components/Navbar.tsx | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/components/Navbar.tsx b/components/Navbar.tsx
index 671db62..4e430f1 100644
--- a/components/Navbar.tsx
+++ b/components/Navbar.tsx
@@ -23,7 +23,9 @@ export function Navbar() {
   const router = useRouter();
   const pathname = usePathname();
   const isUserDashboard = pathname?.startsWith("/user/dashboard");
+  const isAdminDashboard = pathname?.startsWith("/admin/dashboard");
   const isUserSettings = pathname?.startsWith("/user/settings");
+  const isAdminSettings = pathname?.startsWith("/admin/settings");
   const isUserRoute = pathname?.startsWith("/user/");
   const { isAuthenticated, logout, user, isAdmin } = useAuth();
 
@@ -140,13 +142,15 @@ export function Navbar() {
             )}
             {isAuthenticated && (
               <>
-                <Link 
-                  href={isAdmin ? "/admin/dashboard" : "/user/dashboard"}
-                  className={`text-sm font-medium transition-colors cursor-pointer px-3 py-2 rounded-lg hover:opacity-90 ${isDark ? 'text-gray-300 hover:text-white' : 'text-gray-700 hover:text-rose-600'}`}
-                >
-                  <LayoutGrid className="w-4 h-4 inline mr-1.5" />
-                  Dashboard
-                </Link>
+                {!(isUserDashboard || isAdminDashboard || isUserSettings || isAdminSettings) && (
+                  <Link 
+                    href={isAdmin ? "/admin/dashboard" : "/user/dashboard"}
+                    className={`text-sm font-medium transition-colors cursor-pointer px-3 py-2 rounded-lg hover:opacity-90 ${isDark ? 'text-gray-300 hover:text-white' : 'text-gray-700 hover:text-rose-600'}`}
+                  >
+                    <LayoutGrid className="w-4 h-4 inline mr-1.5" />
+                    Dashboard
+                  </Link>
+                )}
                 <Button 
                   size="sm" 
                   variant="outline" 
@@ -254,14 +258,16 @@ export function Navbar() {
                   )}
                   {isAuthenticated && (
                     <>
-                      <Link
-                        href={isAdmin ? "/admin/dashboard" : "/user/dashboard"}
-                        onClick={() => setMobileMenuOpen(false)}
-                        className={`text-left text-sm sm:text-base font-medium py-2.5 sm:py-3 px-3 sm:px-4 rounded-lg transition-colors flex items-center gap-2 ${isDark ? 'text-gray-300 hover:bg-gray-800' : 'text-gray-700 hover:bg-gray-100'}`}
-                      >
-                        <LayoutGrid className="w-4 h-4" />
-                        Dashboard
-                      </Link>
+                      {!(isUserDashboard || isAdminDashboard || isUserSettings || isAdminSettings) && (
+                        <Link
+                          href={isAdmin ? "/admin/dashboard" : "/user/dashboard"}
+                          onClick={() => setMobileMenuOpen(false)}
+                          className={`text-left text-sm sm:text-base font-medium py-2.5 sm:py-3 px-3 sm:px-4 rounded-lg transition-colors flex items-center gap-2 ${isDark ? 'text-gray-300 hover:bg-gray-800' : 'text-gray-700 hover:bg-gray-100'}`}
+                        >
+                          <LayoutGrid className="w-4 h-4" />
+                          Dashboard
+                        </Link>
+                      )}
                       <Button
                         variant="outline"
                         className="w-full justify-start text-sm sm:text-base bg-red-600 hover:bg-red-700 text-white border-red-600 hover:border-red-700"
-- 
2.39.5


From 212ac70b5d9f2fa6869abf201024f812a1838dd9 Mon Sep 17 00:00:00 2001
From: iamkiddy <francisyoungson@gmail.com>
Date: Thu, 4 Dec 2025 19:46:24 +0000
Subject: [PATCH 2/2] Enhance Navbar component to include conditional rendering
 for the user appointment details route. This update improves navigation
 clarity for authenticated users by ensuring appropriate links are displayed
 based on the current route.

---
 components/Navbar.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/Navbar.tsx b/components/Navbar.tsx
index 4e430f1..2cff21f 100644
--- a/components/Navbar.tsx
+++ b/components/Navbar.tsx
@@ -26,6 +26,7 @@ export function Navbar() {
   const isAdminDashboard = pathname?.startsWith("/admin/dashboard");
   const isUserSettings = pathname?.startsWith("/user/settings");
   const isAdminSettings = pathname?.startsWith("/admin/settings");
+  const isUserAppointmentDetails = pathname?.startsWith("/user/appointments/");
   const isUserRoute = pathname?.startsWith("/user/");
   const { isAuthenticated, logout, user, isAdmin } = useAuth();
 
@@ -142,7 +143,7 @@ export function Navbar() {
             )}
             {isAuthenticated && (
               <>
-                {!(isUserDashboard || isAdminDashboard || isUserSettings || isAdminSettings) && (
+                {!(isUserDashboard || isAdminDashboard || isUserSettings || isAdminSettings || isUserAppointmentDetails) && (
                   <Link 
                     href={isAdmin ? "/admin/dashboard" : "/user/dashboard"}
                     className={`text-sm font-medium transition-colors cursor-pointer px-3 py-2 rounded-lg hover:opacity-90 ${isDark ? 'text-gray-300 hover:text-white' : 'text-gray-700 hover:text-rose-600'}`}
@@ -258,7 +259,7 @@ export function Navbar() {
                   )}
                   {isAuthenticated && (
                     <>
-                      {!(isUserDashboard || isAdminDashboard || isUserSettings || isAdminSettings) && (
+                      {!(isUserDashboard || isAdminDashboard || isUserSettings || isAdminSettings || isUserAppointmentDetails) && (
                         <Link
                           href={isAdmin ? "/admin/dashboard" : "/user/dashboard"}
                           onClick={() => setMobileMenuOpen(false)}
-- 
2.39.5