From 0ebfe71361a9cdbfed3a9aeac10c93f3e2de9d96 Mon Sep 17 00:00:00 2001
From: kayela <kayela@konceptkit.com>
Date: Wed, 14 Jan 2026 13:23:52 -0600
Subject: [PATCH] refactor: update button styles and text for improved
 consistency and theming

---
 src/components/AddToCalendarButton.js   |  2 +-
 src/components/Navbar.js                | 15 ++++-----------
 src/components/PublicNavbar.js          |  4 ++--
 src/components/ui/dropdown-menu.jsx     |  4 ++--
 src/pages/Dashboard.js                  |  9 ++++-----
 src/pages/EventDetails.js               |  2 +-
 src/pages/admin/AdminEventAttendance.js | 20 ++++++++++----------
 src/pages/members/NewsletterArchive.js  |  2 +-
 8 files changed, 25 insertions(+), 33 deletions(-)

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 (
     <DropdownMenu open={isOpen} onOpenChange={setIsOpen}>
       <DropdownMenuTrigger asChild>
-        <Button variant={variant} size={size} className="gap-2">
+        <Button variant={variant} size={size} className="bg-[var(--purple-lavender)] text-white hover:bg-[var(--purple-muted)] rounded-full gap-2 dark:hover:bg-brand-lavender dark:hover:text-brand-dark-lavender">
           <Calendar className="h-4 w-4" />
           Add to Calendar
           <ChevronDown className="h-4 w-4" />
diff --git a/src/components/Navbar.js b/src/components/Navbar.js
index 9d529a5..2431c3b 100644
--- a/src/components/Navbar.js
+++ b/src/components/Navbar.js
@@ -39,7 +39,7 @@ const Navbar = () => {
               style={{ fontFamily: "'Poppins', sans-serif" }}
               data-testid="admin-nav-button"
             >
-              Admin Panel
+              Dashboard
             </button>
           </Link>
         )}
@@ -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
           </Link>
           <Link
             to="/events"
@@ -170,14 +170,7 @@ const Navbar = () => {
               </DropdownMenuItem>
             </DropdownMenuContent>
           </DropdownMenu>
-          <Link
-            to="/profile"
-            className="text-white text-[17.5px] font-medium hover:opacity-80 transition-opacity"
-            style={{ fontFamily: "'Poppins', sans-serif" }}
-            data-testid="profile-nav-button"
-          >
-            Profile
-          </Link>
+
         </nav>
 
         {/* 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
                   </Button>
                 </Link>
               )}
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'}
             </Link>
             {!user && (
               <Link
@@ -270,7 +270,7 @@ const PublicNavbar = () => {
                 className={getMobileLinkClasses(user ? "/dashboard" : "/become-a-member")}
                 style={{ fontFamily: "'Nunito Sans', sans-serif" }}
               >
-                {user ? 'Dashboard' : 'Become a Member'}
+                {user ? 'My Profile' : 'Become a Member'}
               </Link>
 
               {!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, .
   <DropdownMenuPrimitive.SubTrigger
     ref={ref}
     className={cn(
-      "flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
+      "flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-brand-light-lavender data-[state=open]:bg-accent [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
       inset && "pl-8",
       className
     )}
@@ -63,7 +63,7 @@ const DropdownMenuItem = React.forwardRef(({ className, inset, ...props }, ref)
   <DropdownMenuPrimitive.Item
     ref={ref}
     className={cn(
-      "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-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>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 = () => {
             </div>
             <Link to="/profile">
               <Button
-                className="bg-[var(--neutral-800)] text-[var(--purple-ink)] hover:bg-background rounded-full px-6"
+                className="btn-lavender"
                 data-testid="view-profile-button"
               >
                 <User className="h-4 w-4 mr-2" />
-                View Profile
+                Edit Profile
               </Button>
             </Link>
           </div>
@@ -227,8 +227,7 @@ const Dashboard = () => {
               </h3>
               <Link to="/events">
                 <Button
-                  variant="ghost"
-                  className="text-[var(--orange-light)] hover:text-brand-purple "
+                  className="btn-lavender "
                   data-testid="view-all-events-button"
                 >
                   View All
@@ -442,7 +441,7 @@ const Dashboard = () => {
                         Browse upcoming events and RSVP to start building your event history!
                       </p>
                       <Link to="/events">
-                        <Button className="bg-[var(--neutral-800)] text-[var(--purple-ink)] hover:bg-background rounded-full px-6">
+                        <Button className="bg-[var(--purple-lavender)] text-white hover:bg-[var(--purple-muted)] rounded-full dark:hover:bg-brand-lavender dark:hover:text-brand-dark-lavender px-6">
                           <Calendar className="h-4 w-4 mr-2" />
                           Browse Events
                         </Button>
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 = () => {
         </div>
         <Button
           onClick={exportToCSV}
-          className="bg-[var(--green-light)] hover:bg-[var(--green-eucalyptus)] text-white rounded-xl"
+          className="bg-[var(--green-light)] hover:bg-[var(--green-eucalyptus)] dark:bg-[var(--green-forest)] text-white rounded-xl"
           style={{ fontFamily: "'Inter', sans-serif" }}
         >
           <Download className="h-4 w-4 mr-2" />
@@ -282,7 +282,7 @@ const AdminEventAttendance = () => {
               )}
             </div>
           </div>
-          <Badge className={`${event.published ? 'bg-[var(--green-light)]' : 'bg-[var(--neutral-800)]'} text-white px-3 py-1`}>
+          <Badge className={`${event.published ? 'bg-[var(--green-light)] dark:bg-[var(--green-forest)]' : 'bg-[var(--neutral-800)]'} text-white px-3 py-1`}>
             {event.published ? 'Published' : 'Draft'}
           </Badge>
         </div>
@@ -302,7 +302,7 @@ const AdminEventAttendance = () => {
 
         <Card className="p-4 bg-background border-[var(--neutral-800)] rounded-xl">
           <div className="flex items-center gap-3">
-            <UserCheck className="h-8 w-8 text-[var(--green-light)]" />
+            <UserCheck className="h-8 w-8 text-[var(--green-light)] dark:text-[var(--green-forest)]" />
             <div>
               <p className="text-sm text-brand-purple " style={{ fontFamily: "'Nunito Sans', sans-serif" }}>Yes</p>
               <p className="text-2xl font-semibold text-[var(--purple-ink)]" style={{ fontFamily: "'Inter', sans-serif" }}>{stats.yesCount}</p>
@@ -320,7 +320,7 @@ const AdminEventAttendance = () => {
           </div>
         </Card>
 
-        <Card className="p-4 bg-background border-[var(--neutral-800)] rounded-xl">
+        <Card className="p-4 bg-background border-[var(--neutral-800)]  rounded-xl">
           <div className="flex items-center gap-3">
             <HelpCircle className="h-8 w-8 text-[var(--gold-warm)]" />
             <div>
@@ -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 = () => {
                     <td className="px-4 py-3">
                       <Badge
                         className={`${rsvp.rsvp_status === 'yes'
-                          ? 'bg-[var(--green-light)]'
+                          ? 'bg-[var(--green-light)] dark:bg-[var(--green-forest)]'
                           : rsvp.rsvp_status === 'no'
                             ? 'bg-[var(--orange-soft)]'
                             : 'bg-[var(--gold-warm)] text-[var(--purple-ink)]'
@@ -498,7 +498,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" }}
                         >
                           <Check className="h-3 w-3 mr-1" />
@@ -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" }}
                         >
                           <X className="h-3 w-3 mr-1" />
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
               </Button>