ATTUNE-HEART-THERAPY/website
6
0
Fork 0
Code Issues 7 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: ATTUNE-HEART-THERAPY:55ef70fabc82b1f922a61ba3f6969701b0b7fd7f
Branches Tags
ATTUNE-HEART-THERAPY:master
ATTUNE-HEART-THERAPY:feat/booking-panel
ATTUNE-HEART-THERAPY:feat/deliverables
ATTUNE-HEART-THERAPY:feat/authentication
ATTUNE-HEART-THERAPY:fix/landing
ATTUNE-HEART-THERAPY:fix/landing-page-issues
ATTUNE-HEART-THERAPY:fix/landing-page
ATTUNE-HEART-THERAPY:frontend/website
..
compare: ATTUNE-HEART-THERAPY:f04c8179511ff5c4c2c91d2bb5a04fa0e99938ff
Branches Tags
ATTUNE-HEART-THERAPY:master
ATTUNE-HEART-THERAPY:feat/booking-panel
ATTUNE-HEART-THERAPY:feat/deliverables
ATTUNE-HEART-THERAPY:feat/authentication
ATTUNE-HEART-THERAPY:fix/landing
ATTUNE-HEART-THERAPY:fix/landing-page-issues
ATTUNE-HEART-THERAPY:fix/landing-page
ATTUNE-HEART-THERAPY:frontend/website

No commits in common. "55ef70fabc82b1f922a61ba3f6969701b0b7fd7f" and "f04c8179511ff5c4c2c91d2bb5a04fa0e99938ff" have entirely different histories.
55ef70fabc ... f04c817951

1 changed files with 15 additions and 22 deletions
Show Stats Expand all files Collapse all files

37
components/Navbar.tsx
View File

@ -23,10 +23,7 @@ export function Navbar() {
const router = useRouter(); const router = useRouter();
const pathname = usePathname(); const pathname = usePathname();
const isUserDashboard = pathname?.startsWith("/user/dashboard"); const isUserDashboard = pathname?.startsWith("/user/dashboard");
const isAdminDashboard = pathname?.startsWith("/admin/dashboard");
const isUserSettings = pathname?.startsWith("/user/settings"); const isUserSettings = pathname?.startsWith("/user/settings");
const isAdminSettings = pathname?.startsWith("/admin/settings");
const isUserAppointmentDetails = pathname?.startsWith("/user/appointments/");
const isUserRoute = pathname?.startsWith("/user/"); const isUserRoute = pathname?.startsWith("/user/");
const { isAuthenticated, logout, user, isAdmin } = useAuth(); const { isAuthenticated, logout, user, isAdmin } = useAuth();
@ -143,15 +140,13 @@ export function Navbar() {
)} )}
{isAuthenticated && ( {isAuthenticated && (
<> <>
{!(isUserDashboard || isAdminDashboard || isUserSettings || isAdminSettings || isUserAppointmentDetails) && ( <Link
<Link href={isAdmin ? "/admin/dashboard" : "/user/dashboard"}
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'}`}
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" />
<LayoutGrid className="w-4 h-4 inline mr-1.5" /> Dashboard
Dashboard </Link>
</Link>
)}
<Button <Button
size="sm" size="sm"
variant="outline" variant="outline"
@ -259,16 +254,14 @@ export function Navbar() {
)} )}
{isAuthenticated && ( {isAuthenticated && (
<> <>
{!(isUserDashboard || isAdminDashboard || isUserSettings || isAdminSettings || isUserAppointmentDetails) && ( <Link
<Link href={isAdmin ? "/admin/dashboard" : "/user/dashboard"}
href={isAdmin ? "/admin/dashboard" : "/user/dashboard"} onClick={() => setMobileMenuOpen(false)}
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'}`}
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" />
<LayoutGrid className="w-4 h-4" /> Dashboard
Dashboard </Link>
</Link>
)}
<Button <Button
variant="outline" 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" 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"