diff --git a/src/components/ui/badge.jsx b/src/components/ui/badge.jsx index ede76de..3da4bcf 100644 --- a/src/components/ui/badge.jsx +++ b/src/components/ui/badge.jsx @@ -28,6 +28,7 @@ const badgeVariants = cva( gray2: "border-transparent bg-gray-400 text-white hover:bg-gray-400/80", gray3: "border-transparent bg-gray-300 text-gray-600 hover:bg-gray-300/80", + purple: "bg-light-lavender", }, }, defaultVariants: { diff --git a/src/components/ui/button.jsx b/src/components/ui/button.jsx index a59bdf6..ced3c5f 100644 --- a/src/components/ui/button.jsx +++ b/src/components/ui/button.jsx @@ -14,6 +14,7 @@ const buttonVariants = cva("btn", { accent: "btn-accent", destructive: "btn-destructive", link: "btn-link", + }, size: { default: "btn-md", diff --git a/src/components/ui/tabs.jsx b/src/components/ui/tabs.jsx index 5b36bcf..c646f8e 100644 --- a/src/components/ui/tabs.jsx +++ b/src/components/ui/tabs.jsx @@ -21,7 +21,7 @@ const TabsTrigger = React.forwardRef(({ className, ...props }, ref) => ( { value={formData.email} onChange={handleInputChange} placeholder="your.email@example.com" - className="h-14 rounded-xl border-2 border-[var(--neutral-800)] focus:border-brand-purple " - data-testid="login-email-input" + className="h-14 rounded-xl border-2 focus:border-brand-purple " + data-testid="login-email-input " /> @@ -114,7 +114,7 @@ const Login = () => { @@ -482,9 +482,9 @@ const AdminBylaws = () => { Cancel diff --git a/src/pages/admin/AdminDashboard.js b/src/pages/admin/AdminDashboard.js index c8c73ce..dffb129 100644 --- a/src/pages/admin/AdminDashboard.js +++ b/src/pages/admin/AdminDashboard.js @@ -61,7 +61,7 @@ const AdminDashboard = () => {

Admin Dashboard

-

+

Manage users, events, and membership applications.

@@ -80,13 +80,13 @@ const AdminDashboard = () => {
- +

{loading ? '-' : stats.totalMembers}

-

Total Members

+

Total Members

@@ -98,7 +98,7 @@ const AdminDashboard = () => {

{loading ? '-' : stats.pendingValidations}

-

Pending Validations

+

Pending Validations

@@ -110,7 +110,7 @@ const AdminDashboard = () => {

{loading ? '-' : stats.activeMembers}

-

Active Members

+

Active Members

@@ -118,15 +118,15 @@ const AdminDashboard = () => {
- +

Manage Members

-

+

View and manage paying members and their subscription status.

@@ -185,7 +185,7 @@ const AdminDashboard = () => { {user.totalReminders} reminder{user.totalReminders !== 1 ? 's' : ''} -
+

Email: {user.email}

Phone: {user.phone || 'N/A'}

Status: {user.status.replace('_', ' ')}

@@ -225,7 +225,7 @@ const AdminDashboard = () => {
-

+

💡 Tip for helping older members: Many of our members are older ladies who may struggle with email. A friendly phone call can help them complete the registration process and feel more welcomed to the community.

diff --git a/src/pages/admin/AdminEvents.js b/src/pages/admin/AdminEvents.js index 5f6801c..a7bac7b 100644 --- a/src/pages/admin/AdminEvents.js +++ b/src/pages/admin/AdminEvents.js @@ -150,7 +150,7 @@ const AdminEvents = () => { resetForm(); setEditingEvent(null); }} - className="bg-[var(--neutral-800)] text-[var(--purple-ink)] hover:bg-background rounded-full px-6" + className="btn-lavender " data-testid="create-event-button" > diff --git a/src/pages/admin/AdminFinancials.js b/src/pages/admin/AdminFinancials.js index ff4b3b4..d854dc4 100644 --- a/src/pages/admin/AdminFinancials.js +++ b/src/pages/admin/AdminFinancials.js @@ -167,7 +167,7 @@ const AdminFinancials = () => { {hasPermission('financials.create') && (
diff --git a/src/pages/admin/AdminNewsletters.js b/src/pages/admin/AdminNewsletters.js index c330b46..5f3a4e3 100644 --- a/src/pages/admin/AdminNewsletters.js +++ b/src/pages/admin/AdminNewsletters.js @@ -195,7 +195,7 @@ const AdminNewsletters = () => { {hasPermission('newsletters.create') && (
- diff --git a/src/pages/admin/AdminStaff.js b/src/pages/admin/AdminStaff.js index 1a4645b..f9a2bed 100644 --- a/src/pages/admin/AdminStaff.js +++ b/src/pages/admin/AdminStaff.js @@ -99,16 +99,16 @@ const AdminStaff = () => { const getRoleBadge = (role) => { const config = { - superadmin: { label: 'Superadmin', className: 'bg-brand-purple text-white' }, - admin: { label: 'Admin', className: 'bg-[var(--green-light)] text-white' }, - moderator: { label: 'Moderator', className: 'bg-[var(--neutral-800)] text-[var(--purple-ink)]' }, - staff: { label: 'Staff', className: 'bg-gray-200 text-gray-700' }, - media: { label: 'Media', className: 'bg-gray-400 text-white' } + superadmin: { label: 'Superadmin', variant: 'purple' }, + admin: { label: 'Admin', variant: 'green' }, + moderator: { label: 'Moderator', variant: 'bg-[var(--neutral-800)] text-[var(--purple-ink)]' }, + staff: { label: 'Staff', variant: 'gray' }, + media: { label: 'Media', variant: 'gray2' } }; const roleConfig = config[role] || { label: role, className: 'bg-gray-500 text-white' }; return ( - + {roleConfig.label} @@ -117,13 +117,13 @@ const AdminStaff = () => { const getStatusBadge = (status) => { const config = { - active: { label: 'Active', className: 'bg-[var(--green-light)] text-white' }, + active: { label: 'Active', variant: 'green' }, inactive: { label: 'Inactive', className: 'bg-gray-400 text-white ' } }; const statusConfig = config[status] || config.inactive; return ( - + {statusConfig.label} ); @@ -145,7 +145,7 @@ const AdminStaff = () => { {hasPermission('users.create') && (