From 727c2bc7108a833703d1a76f79c2176ce2a75950 Mon Sep 17 00:00:00 2001 From: kayela Date: Fri, 9 Jan 2026 13:46:01 -0600 Subject: [PATCH] Refactor color classes to use new success color variable across admin and member pages; update Tailwind config to include success color definition. --- src/components/AdminSidebar.js | 2 +- src/components/AttendanceDialog.js | 2 +- src/components/ConfirmationDialog.js | 8 +- src/components/CreateMemberDialog.js | 2 +- src/components/CreateStaffDialog.js | 2 +- src/components/ImportMembersDialog.js | 16 +-- src/components/InviteStaffDialog.js | 4 +- src/components/MemberRoute.js | 4 +- src/components/Navbar.js | 20 +-- src/components/PaymentActivationDialog.js | 4 +- src/components/PendingInvitationsTable.js | 6 +- src/components/PlanDialog.js | 6 +- src/components/PublicFooter.js | 6 +- src/components/PublicNavbar.js | 36 +++--- src/components/RejectionDialog.js | 2 +- src/components/WordPressImportWizard.js | 6 +- .../registration/RegistrationStep1.js | 2 +- .../registration/RegistrationStepIndicator.js | 4 +- src/components/ui/password-input.jsx | 18 +-- src/index.css | 116 ++++++++++++++++-- src/pages/AcceptInvitation.js | 22 ++-- src/pages/BecomeMember.js | 30 ++--- src/pages/BoardOfDirectors.js | 20 +-- src/pages/ChangePasswordRequired.js | 2 +- src/pages/ContactUs.js | 24 ++-- src/pages/Dashboard.js | 12 +- src/pages/Donate.js | 22 ++-- src/pages/DonationSuccess.js | 4 +- src/pages/EventDetails.js | 4 +- src/pages/Events.js | 2 +- src/pages/History.js | 76 ++++++------ src/pages/Landing.js | 14 +-- src/pages/MissionValues.js | 6 +- src/pages/NotFound.js | 6 +- src/pages/PaymentSuccess.js | 10 +- src/pages/Plans.js | 10 +- src/pages/PrivacyPolicy.js | 24 ++-- src/pages/Profile.js | 4 +- src/pages/Resources.js | 16 +-- src/pages/TermsOfService.js | 96 +++++++-------- src/pages/VerifyEmail.js | 2 +- src/pages/admin/AdminBylaws.js | 2 +- src/pages/admin/AdminDashboard.js | 8 +- src/pages/admin/AdminDonations.js | 14 +-- src/pages/admin/AdminEventAttendance.js | 30 ++--- src/pages/admin/AdminEvents.js | 4 +- src/pages/admin/AdminMembers.js | 8 +- src/pages/admin/AdminPermissions.js | 8 +- src/pages/admin/AdminPlans.js | 2 +- src/pages/admin/AdminStaff.js | 6 +- src/pages/admin/AdminSubscriptions.js | 14 +-- src/pages/admin/AdminUserView.js | 4 +- src/pages/admin/AdminValidations.js | 6 +- src/pages/members/Bylaws.js | 2 +- src/pages/members/MemberCalendar.js | 6 +- tailwind.config.js | 63 ++++++++-- 56 files changed, 491 insertions(+), 358 deletions(-) diff --git a/src/components/AdminSidebar.js b/src/components/AdminSidebar.js index 35ec567..4375655 100644 --- a/src/components/AdminSidebar.js +++ b/src/components/AdminSidebar.js @@ -436,7 +436,7 @@ const AdminSidebar = ({ isOpen, onToggle, isMobile }) => {
90 ? 'bg-red-500' : storagePercentage > 75 ? 'bg-yellow-500' : - 'bg-[#81B29A]' + 'bg-success' }`} style={{ width: `${storagePercentage}%` }} /> diff --git a/src/components/AttendanceDialog.js b/src/components/AttendanceDialog.js index 3211c4a..92f27ba 100644 --- a/src/components/AttendanceDialog.js +++ b/src/components/AttendanceDialog.js @@ -83,7 +83,7 @@ export const AttendanceDialog = ({ event, open, onOpenChange, onSuccess }) => {

{rsvp.user_email}

{rsvp.attended && ( - + ✓ Attended )} diff --git a/src/components/ConfirmationDialog.js b/src/components/ConfirmationDialog.js index e62b087..0a0f7d3 100644 --- a/src/components/ConfirmationDialog.js +++ b/src/components/ConfirmationDialog.js @@ -39,7 +39,7 @@ const ConfirmationDialog = ({ warning: { icon: AlertTriangle, iconColor: 'text-accent', - confirmButtonClass: 'bg-accent text-white hover:bg-[#e88d66] rounded-full px-6', + confirmButtonClass: 'bg-accent text-white hover:bg-tangerine-dream rounded-full px-6', }, danger: { icon: AlertTriangle, @@ -49,12 +49,12 @@ const ConfirmationDialog = ({ info: { icon: Info, iconColor: 'text-muted-foreground', - confirmButtonClass: 'bg-muted-foreground text-white hover:bg-[#553d8a] rounded-full px-6', + confirmButtonClass: 'bg-muted-foreground text-white hover:bg-rebecca-purple rounded-full px-6', }, success: { icon: CheckCircle, - iconColor: 'text-[#81B29A]', - confirmButtonClass: 'bg-[#81B29A] text-white hover:bg-[#6fa188] rounded-full px-6', + iconColor: 'text-success', + confirmButtonClass: 'bg-success text-white hover:bg-muted-teal-base rounded-full px-6', }, }; diff --git a/src/components/CreateMemberDialog.js b/src/components/CreateMemberDialog.js index be144cc..33d8fa3 100644 --- a/src/components/CreateMemberDialog.js +++ b/src/components/CreateMemberDialog.js @@ -311,7 +311,7 @@ const CreateMemberDialog = ({ open, onOpenChange, onSuccess }) => { diff --git a/src/components/InviteStaffDialog.js b/src/components/InviteStaffDialog.js index ce3e131..5b6b050 100644 --- a/src/components/InviteStaffDialog.js +++ b/src/components/InviteStaffDialog.js @@ -275,7 +275,7 @@ const InviteStaffDialog = ({ open, onOpenChange, onSuccess }) => { diff --git a/src/components/MemberRoute.js b/src/components/MemberRoute.js index 566209a..39f4b73 100644 --- a/src/components/MemberRoute.js +++ b/src/components/MemberRoute.js @@ -19,8 +19,8 @@ const MemberRoute = ({ children }) => { if (loading) { return ( -
-

Loading...

+
+

Loading...

); } diff --git a/src/components/Navbar.js b/src/components/Navbar.js index 15062a3..bf40b89 100644 --- a/src/components/Navbar.js +++ b/src/components/Navbar.js @@ -26,7 +26,7 @@ const Navbar = () => { return ( <> {/* Top Header - Member Actions (Desktop Only) */} -
+
{user && ( Welcome, {user.first_name} @@ -53,7 +53,7 @@ const Navbar = () => { diff --git a/src/components/PendingInvitationsTable.js b/src/components/PendingInvitationsTable.js index 59ff314..21c6d29 100644 --- a/src/components/PendingInvitationsTable.js +++ b/src/components/PendingInvitationsTable.js @@ -74,7 +74,7 @@ const PendingInvitationsTable = () => { const getRoleBadge = (role) => { const config = { superadmin: { label: 'Superadmin', className: 'bg-muted-foreground text-white' }, - admin: { label: 'Admin', className: 'bg-[#81B29A] text-white' }, + admin: { label: 'Admin', className: 'bg-success text-white' }, member: { label: 'Member', className: 'bg-chart-6 text-primary' } }; @@ -148,7 +148,7 @@ const PendingInvitationsTable = () => { {invitations.map((invitation) => ( - + {invitation.email} @@ -176,7 +176,7 @@ const PendingInvitationsTable = () => { size="sm" onClick={() => handleResend(invitation.id)} disabled={resending === invitation.id} - className="rounded-xl border-[#81B29A] text-[#81B29A] hover:bg-[#81B29A] hover:text-white" + className="rounded-xl border-success text-success hover:bg-success hover:text-white" > {resending === invitation.id ? ( 'Resending...' diff --git a/src/components/PlanDialog.js b/src/components/PlanDialog.js index 1c9308c..e840185 100644 --- a/src/components/PlanDialog.js +++ b/src/components/PlanDialog.js @@ -252,7 +252,7 @@ const PlanDialog = ({ open, onOpenChange, plan, onSuccess }) => { onChange={(e) => setFormData({ ...formData, allow_donation: e.target.checked })} className="sr-only peer" /> -
+
@@ -349,7 +349,7 @@ const PlanDialog = ({ open, onOpenChange, plan, onSuccess }) => { -
+

Example: Jan 1 - Dec 31 for calendar year, or Jul 1 - Jun 30 for fiscal year

@@ -373,7 +373,7 @@ const PlanDialog = ({ open, onOpenChange, plan, onSuccess }) => { onChange={(e) => setFormData({ ...formData, active: e.target.checked })} className="sr-only peer" /> -
+
diff --git a/src/components/PublicFooter.js b/src/components/PublicFooter.js index 79d9b85..48bf75e 100644 --- a/src/components/PublicFooter.js +++ b/src/components/PublicFooter.js @@ -8,7 +8,7 @@ const PublicFooter = () => { return ( <> {/* Main Footer */} -