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 (
-
-
- 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 = () => {
- View Profile
+ Edit Profile
@@ -227,8 +227,7 @@ const Dashboard = () => {
View All
@@ -442,7 +441,7 @@ const Dashboard = () => {
Browse upcoming events and RSVP to start building your event history!
-
+
Browse Events
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 = () => {
@@ -282,7 +282,7 @@ const AdminEventAttendance = () => {
)}
-
+
{event.published ? 'Published' : 'Draft'}
@@ -302,7 +302,7 @@ const AdminEventAttendance = () => {
-
+
Yes
{stats.yesCount}
@@ -320,7 +320,7 @@ const AdminEventAttendance = () => {
-
+
@@ -350,7 +350,7 @@ const AdminEventAttendance = () => {
onClick={() => setActiveTab('all')}
variant={activeTab === 'all' ? 'default' : 'outline'}
className={`rounded-xl ${activeTab === 'all'
- ? 'bg-brand-purple hover:bg-[var(--purple-ink)] text-white'
+ ? 'bg-brand-purple hover:bg-[var(--purple-ink)] dark:bg-brand-dark-lavender text-white'
: 'border-[var(--neutral-800)] text-brand-purple hover:bg-[var(--lavender-500)]'
}`}
style={{ fontFamily: "'Inter', sans-serif" }}
@@ -361,7 +361,7 @@ const AdminEventAttendance = () => {
onClick={() => setActiveTab('yes')}
variant={activeTab === 'yes' ? 'default' : 'outline'}
className={`rounded-xl ${activeTab === 'yes'
- ? 'bg-[var(--green-light)] hover:bg-[var(--green-eucalyptus)] text-white'
+ ? 'bg-[var(--green-light)] hover:bg-[var(--green-eucalyptus)] dark:bg-[var(--green-forest)] text-white'
: 'border-[var(--neutral-800)] text-brand-purple hover:bg-[var(--lavender-500)]'
}`}
style={{ fontFamily: "'Inter', sans-serif" }}
@@ -383,7 +383,7 @@ const AdminEventAttendance = () => {
onClick={() => setActiveTab('maybe')}
variant={activeTab === 'maybe' ? 'default' : 'outline'}
className={`rounded-xl ${activeTab === 'maybe'
- ? 'bg-[var(--gold-warm)] hover:bg-[var(--gold-soft)] text-[var(--purple-ink)]'
+ ? 'bg-[var(--gold-warm)] dark:bg-orange-400 hover:bg-[var(--gold-soft)] text-white'
: 'border-[var(--neutral-800)] text-brand-purple hover:bg-[var(--lavender-500)]'
}`}
style={{ fontFamily: "'Inter', sans-serif" }}
@@ -483,7 +483,7 @@ const AdminEventAttendance = () => {
{
onClick={() => handleIndividualAttendance(rsvp.user_id, false)}
disabled={saving}
size="sm"
- className="bg-[var(--green-light)] hover:bg-[var(--green-eucalyptus)] text-white rounded-lg min-w-[120px]"
+ className="bg-[var(--green-light)] dark:bg-[var(--green-forest)] hover:bg-[var(--green-eucalyptus)] text-white rounded-lg min-w-[120px]"
style={{ fontFamily: "'Inter', sans-serif" }}
>
@@ -510,7 +510,7 @@ const AdminEventAttendance = () => {
disabled={saving}
size="sm"
variant="outline"
- className="border-[var(--neutral-800)] text-brand-purple hover:bg-[var(--green-light)] hover:text-white hover:border-[var(--green-light)] rounded-lg min-w-[120px]"
+ className="border-[var(--neutral-800)] text-brand-purple hover:bg-[var(--green-light)] dark:bg-[var(--green-forest)] hover:text-white hover:border-[var(--green-light)] dark:bg-[var(--green-forest)] rounded-lg min-w-[120px]"
style={{ fontFamily: "'Inter', sans-serif" }}
>
diff --git a/src/pages/members/NewsletterArchive.js b/src/pages/members/NewsletterArchive.js
index ef2b265..45576d4 100644
--- a/src/pages/members/NewsletterArchive.js
+++ b/src/pages/members/NewsletterArchive.js
@@ -128,7 +128,7 @@ export default function NewsletterArchive() {
onClick={clearFilter}
variant={selectedYear === null ? "default" : "outline"}
size="sm"
- className={selectedYear === null ? "bg-brand-purple text-white" : "border-brand-purple text-brand-purple "}
+ className={selectedYear === null ? "bg-brand-purple hover:bg-[var(--purple-muted)] text-white" : "border-brand-lavender text-brand-lavender "}
>
All Years
|