Merge from dev to loaf-prod for DEMO #25

andika · 2026-02-02T11:12:44Z

andika commented

2026-02-02 11:12:44 +00:00

Major Changes Update for Demo to LOAF

Theme Provider
Custom Registration Flow
Member Directory Update
Add Payment Method
UI/UX Update

## Major Changes Update for Demo to LOAF - Theme Provider - Custom Registration Flow - Member Directory Update - Add Payment Method - UI/UX Update

andika added 45 commits 2026-02-02 11:12:44 +00:00

feat: add @tailwindcss/line-clamp dependency and integrate responsive layout adjustments in Admin components for improved UI 6c844c0e19

feat: Introduce StatusBadge component for consistent status representation ac879b69b4

- Added StatusBadge component to standardize the display of user and membership statuses across various admin pages.
- Refactored AdminMembers, AdminPlans, AdminStaff, AdminSubscriptions, AdminUserView, AdminValidations, and MembersDirectory to utilize the new StatusBadge component.
- Removed redundant status badge logic from AdminMembers, AdminStaff, and AdminValidations.
- Updated AdminLayout to include a mobile-friendly sidebar toggle button with Menu icon.
- Created MemberCard component to encapsulate member display logic, improving code reusability.
- Adjusted various components to enhance user experience and maintain consistent styling.

feat: refactor AdminMembers and AdminStaff to utilize useMembers hook for improved member management 554b599599

feat: enhance AdminRoles to manage permissions with loading state and role slug updates f2dd053320

feat: implement UsersContext and refactor user management hooks for improved user data handling 4548d959d7

feat: update AdminMembers and AdminStaff components for improved statistics display and fix typo in MembersDirectory 7ee5cb0d9c

feat: add AdminMemberTiers page, MemberBadge component, and SettingsLayout; refactor routes and sidebar for improved navigation ac8d40112e

fix: badge text styling on hover in settings 1ae82fc4e4

feat: enhance dialog components with overflow handling and update placeholder text for consistency 3c0b1396bc

feat: add year filtering and search functionality to Bylaws and Financials pages; enhance report grouping by year 333ce62710

feat: enhance Dashboard with transaction history and membership info; refactor layout for improved user experience 91e264bf7a

Merge branch 'dev' into theme-provider a88388ed5d

Merge pull request 'theme-provider' (#20 ) from theme-provider into dev 9dcb8e3185

Reviewed-on: #20

Update Footer to get current year 85070cf77b

- - New ThemeConfigContext provider that fetches theme on app load and applies it to the DOM (title, meta description, favicon, CSS variables, 467f34b42a

theme-color)/- - Admin Theme settings page under Settings > Theme tab/- All logo references (5 components) now pull from the theme config with fallback to default

feat: integrate TransactionHistory component into Dashboard and update styles for better UI consistency 97aa7860a9

Updated stat cards to be consistent with rest of codebase 0c3d4a4edd

tweaked statcard for better styling when digits are greater than 2 0d7e3a1286

Member tiers implementation intact. Icons updated to be Lucide React. Create/edit member tiers. Display member badge. Transaction history now in My profile dashboard. Adjusted Icons for badges. Added badges on my profile page 4ad1997bd5

removed transaction history from Profile.js 378b909398

updated badge glitch 01722edad9

Merge pull request 'theme-provider' (#22 ) from theme-provider into dev a1c68eedc2

Reviewed-on: #22

feat: added theme success and warning colors a247ac5219

fix: invite member dialog box
feat: email expiry date column
feat: resend email verification button
fix: select item text can be seen

add column for email expiry date d638afcdb2

Members > Invite member says invite Staff in dialog
 resend email button
 Update form member form to say member and not staff
 review application function
 manual payment functionality
 basic implementation of theme
 actions dropdown

styling improvements a77fbc47e3

Merge branch 'theme-provider' into dev 4423576fa2

Members -removed un used selection options. Profile added back button 64d631d890

Componentized subscription table 27d5c48805

refactor subscriptionsTable.jsx de719d9d69

Donation status badge upates, admin validation tootips d5152609b6

feat: tabs layout for edit profile f70a133e18

feat: staff can edit registration responses 7eef62560e

Merge branch 'theme-provider' into dev 529d3d4697

fix: member directory link works and stat card changes 7152382dca

fix: button text now visable 01a3c38085

1. New Components- src/components/PaymentMethodCard.js - Displays individual payment method- src/components/AddPaymentMethodDialog.js - Stripe Elements dialog for adding cards- src/components/PaymentMethodsSection.js - Main payment methods UI- src/components/PasswordConfirmDialog.js - Admin password re-entry dialog- src/components/admin/AdminPaymentMethodsPanel.js - Admin panel for user payment methods2. Profile Integration (src/pages/Profile.js)- Replaced placeholder Payment Method section with PaymentMethodsSection3. Admin Integration (src/pages/admin/AdminUserView.js)- Added AdminPaymentMethodsPanel to user detail view 5d085153f6

Changes 68ee22c124

Merge branch 'features' into dev 235156a9ee

Phone formatting works, start card moved, registration styling changed af27190e29

fix: fixed total pending display da366272b4

feat: restruction of admin sidebar, button slightly adjusted, member tiers header added, routing for sidbar adjusted 21338f1541

- Created useDirectoryConfig hook (src/hooks/use-directory-config.js) d4acef8d90

- Updated Profile.js - conditional rendering with isFieldEnabled()
- Updated MemberCard.js - conditional rendering for directory fields
- Updated MembersDirectory.js - conditional rendering in profile dialog
- Created AdminDirectorySettings.js - Admin UI for toggling fields
- Updated SettingsSidebar.js - Added Directory and Registration tabs
- Updated App.js - Added routes for new settings pages

no message b3e6cfba84

Conditional Rules in Registration Builder Fix 82ef36b439

1. Trigger Field Selection - Dropdown to select which field triggers the rule (filters to checkbox, dropdown, radio, text fields)
2. Operator Selection - Dropdown with options:
	- equals
	- not equals
	- contains
	- is not empty
	- is empty
3. Value Input - Smart input based on field type:
	- Checkbox fields → dropdown with "Checked (true)" / "Unchecked (false)"
	- empty/not_empty operators → disabled (no value needed)
	- Other fields → text input
4. Action Selection - Dropdown with options:
	- Show fields
	- Hide fields
	- Make required
	- Make optional
5. Target Fields - Checkbox list of all fields (excluding the trigger field) to select which fields are affected
6. Rule Summary - A blue info box at the bottom of each rule showing a human-readable summary of the configured rule

Update Stripe publishable key storage in Stripe Settings 68fc34d0a5

1. Created src/hooks/use-stripe-config.js - New hook that:
	- Fetches publishable key from /api/config/stripe
	- Returns a pre-initialized stripePromise for use with Stripe Elements
	- Caches the result to avoid multiple API calls
	- Falls back to REACT_APP_STRIPE_PUBLISHABLE_KEY env var if API fails
2. Updated AdminSettings.js - Added publishable key input field in the Stripe settings form
3. Updated AdminPaymentMethodsPanel.js - Uses useStripeConfig hook instead of env variable
4. Updated PaymentMethodsSection.js - Uses useStripeConfig hook instead of env variable

andika merged commit 691dbad1b4 into loaf-prod

2026-02-02 11:12:58 +00:00

andika referenced this issue from a commit

2026-02-02 11:12:59 +00:00

Merge pull request 'Merge from dev to loaf-prod for DEMO' (#25) from dev into loaf-prod

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: andika/membership-fe#25