diff --git a/src/components/AddToCalendarButton.js b/src/components/AddToCalendarButton.js index cd8b1b5..e85e29e 100644 --- a/src/components/AddToCalendarButton.js +++ b/src/components/AddToCalendarButton.js @@ -117,7 +117,7 @@ export default function AddToCalendarButton({ return ( - )} @@ -110,7 +110,7 @@ const Navbar = () => { className="text-white text-[17.5px] font-medium hover:opacity-80 transition-opacity" style={{ fontFamily: "'Poppins', sans-serif" }} > - Dashboard + My Profile { - - Profile - + {/* Mobile Hamburger Button */} @@ -373,7 +366,7 @@ const Navbar = () => { className="w-full bg-background/20 hover:bg-background/30 text-white rounded-lg" style={{ fontFamily: "'Poppins', sans-serif" }} > - Admin Panel + Dashboard )} diff --git a/src/components/PublicNavbar.js b/src/components/PublicNavbar.js index ccd1431..6c7af8a 100644 --- a/src/components/PublicNavbar.js +++ b/src/components/PublicNavbar.js @@ -165,7 +165,7 @@ const PublicNavbar = () => { className={getDesktopLinkClasses(user ? "/dashboard" : "/become-a-member")} style={{ fontFamily: "'Nunito Sans', sans-serif" }} > - {user ? 'Dashboard' : 'Become a Member'} + {user ? 'My Profile' : 'Become a Member'} {!user && ( { className={getMobileLinkClasses(user ? "/dashboard" : "/become-a-member")} style={{ fontFamily: "'Nunito Sans', sans-serif" }} > - {user ? 'Dashboard' : 'Become a Member'} + {user ? 'My Profile' : 'Become a Member'} {!user && ( diff --git a/src/components/ui/dropdown-menu.jsx b/src/components/ui/dropdown-menu.jsx index 91d98a3..f848ec2 100644 --- a/src/components/ui/dropdown-menu.jsx +++ b/src/components/ui/dropdown-menu.jsx @@ -20,7 +20,7 @@ const DropdownMenuSubTrigger = React.forwardRef(({ className, inset, children, . svg]:size-4 [&>svg]:shrink-0", + "relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-brand-light-lavender focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0", inset && "pl-8", className )} diff --git a/src/pages/Dashboard.js b/src/pages/Dashboard.js index fe2b335..1b4f052 100644 --- a/src/pages/Dashboard.js +++ b/src/pages/Dashboard.js @@ -168,11 +168,11 @@ const Dashboard = () => { @@ -227,8 +227,7 @@ const Dashboard = () => { diff --git a/src/pages/EventDetails.js b/src/pages/EventDetails.js index 8422274..93afe40 100644 --- a/src/pages/EventDetails.js +++ b/src/pages/EventDetails.js @@ -155,7 +155,7 @@ const EventDetails = () => { disabled={rsvpLoading} className={`rounded-full px-8 py-6 flex items-center gap-2 ${event.user_rsvp_status === 'yes' ? 'bg-[var(--green-light)] text-white' - : 'bg-[var(--neutral-800)] text-[var(--purple-ink)] hover:bg-background' + : 'bg-[var(--neutral-800)] text-[var(--purple-ink)] hover:bg-brand-lavender' }`} data-testid="rsvp-yes-button" > diff --git a/src/pages/admin/AdminEventAttendance.js b/src/pages/admin/AdminEventAttendance.js index e93836c..2657756 100644 --- a/src/pages/admin/AdminEventAttendance.js +++ b/src/pages/admin/AdminEventAttendance.js @@ -254,7 +254,7 @@ const AdminEventAttendance = () => {