Merge pull request 'Improve UX with navigation, attendance management, and calendar fixes' (#9) from dev into loaf-prod

Reviewed-on: #9

.env.development

@@ -1,3 +0,0 @@
-REACT_APP_BACKEND_URL=http://localhost:8000
-REACT_APP_BASENAME=/membership
-PUBLIC_URL=/membership

src/components/AdminSidebar.js

@@ -22,7 +22,7 @@ import {
   Scale,
   HardDrive,
   Repeat,
-  Heart,
+  Heart
 } from 'lucide-react';
 
 const AdminSidebar = ({ isOpen, onToggle, isMobile }) => {
@@ -269,7 +269,8 @@ const AdminSidebar = ({ isOpen, onToggle, isMobile }) => {
             <img
               src={`${process.env.PUBLIC_URL}/loaf-logo.png`}
               alt="LOAF Logo"
-              className={`object-contain transition-all duration-200 ${isOpen ? 'h-10 w-10' : 'h-8 w-8'
+              className={`object-contain transition-all duration-200 ${
+                isOpen ? 'h-10 w-10' : 'h-8 w-8'
               }`}
             />
             {isOpen && (
@@ -299,7 +300,7 @@ const AdminSidebar = ({ isOpen, onToggle, isMobile }) => {
         </div>
 
         {/* Navigation */}
-        <nav className="flex-1 overflow-y-auto p-4 scrollbar-dashboard scrollbar-x-dashboard">
+        <nav className="flex-1 overflow-y-auto p-4">
           {/* Dashboard - Standalone */}
           {renderNavItem(filteredNavItems.find(item => item.name === 'Dashboard'))}
 
@@ -369,7 +370,7 @@ const AdminSidebar = ({ isOpen, onToggle, isMobile }) => {
         {/* User Section */}
         <div className="border-t border-[#ddd8eb] p-4 space-y-2">
           {isOpen && user && (
-            <div className="px-4 py-3 mb-2 flex justify-between items-center">
+            <div className="px-4 py-3 mb-2">
               <div className="flex items-center gap-3">
                 <div className="h-10 w-10 rounded-full bg-[#DDD8EB] flex items-center justify-center text-[#422268] font-semibold">
                   {user.first_name?.[0]}{user.last_name?.[0]}
@@ -383,8 +384,6 @@ const AdminSidebar = ({ isOpen, onToggle, isMobile }) => {
                   </p>
                 </div>
               </div>
-              <Link to='/profile'><Settings size={16} />
-              </Link>
             </div>
           )}
 
@@ -398,7 +397,8 @@ const AdminSidebar = ({ isOpen, onToggle, isMobile }) => {
                 </div>
                 <div className="w-full bg-[#ddd8eb] rounded-full h-2">
                   <div
-                    className={`h-2 rounded-full transition-all ${storagePercentage > 90 ? 'bg-red-500' :
+                    className={`h-2 rounded-full transition-all ${
+                      storagePercentage > 90 ? 'bg-red-500' :
                       storagePercentage > 75 ? 'bg-yellow-500' :
                       'bg-[#81B29A]'
                     }`}
@@ -412,7 +412,8 @@ const AdminSidebar = ({ isOpen, onToggle, isMobile }) => {
             ) : (
               <div className="flex justify-center">
                 <div className="relative group">
-                  <HardDrive className={`h-5 w-5 ${storagePercentage > 90 ? 'text-red-500' :
+                  <HardDrive className={`h-5 w-5 ${
+                    storagePercentage > 90 ? 'text-red-500' :
                     storagePercentage > 75 ? 'text-yellow-500' :
                     'text-[#664fa3]'
                   }`} />

src/components/InviteStaffDialog.js

@@ -40,14 +40,15 @@ const InviteStaffDialog = ({ open, onOpenChange, onSuccess }) => {
   const fetchRoles = async () => {
     setLoadingRoles(true);
     try {
-      // New endpoint returns roles based on user's permission level
+      const response = await api.get('/admin/roles');
-      // Superadmin: all roles
+      // Filter to show only admin-type roles (not guest or member)
-      // Admin: admin, finance, and non-elevated custom roles
+      const staffRoles = response.data.filter(role =>
-      const response = await api.get('/admin/roles/assignable');
+        ['admin', 'superadmin', 'finance'].includes(role.code) || !role.is_system_role
-      setRoles(response.data);
+      );
+      setRoles(staffRoles);
     } catch (error) {
-      console.error('Failed to fetch assignable roles:', error);
+      console.error('Failed to fetch roles:', error);
-      toast.error('Failed to load roles. Please try again.');
+      toast.error('Failed to load roles');
     } finally {
       setLoadingRoles(false);
     }

src/components/registration/RegistrationStep4.js

@@ -86,7 +86,7 @@ const RegistrationStep4 = ({ formData, handleInputChange }) => {
             <label htmlFor="accepts_tos" className="text-sm text-gray-700" style={{ fontFamily: "'Nunito Sans', sans-serif" }}>
               I agree to the{' '}
               <a
-                href="/become-a-member/terms-of-service"
+                href="/membership/terms-of-service"
                 target="_blank"
                 rel="noopener noreferrer"
                 className="text-[#664fa3] hover:text-[#422268] font-semibold underline"
@@ -95,7 +95,7 @@ const RegistrationStep4 = ({ formData, handleInputChange }) => {
               </a>
               {' '}and{' '}
               <a
-                href="become-a-member/privacy-policy"
+                href="/membership/privacy-policy"
                 target="_blank"
                 rel="noopener noreferrer"
                 className="text-[#664fa3] hover:text-[#422268] font-semibold underline"

src/components/ui/tabs.jsx

@@ -1,33 +1,31 @@
-import * as React from "react";
+import * as React from "react"
-import * as TabsPrimitive from "@radix-ui/react-tabs";
+import * as TabsPrimitive from "@radix-ui/react-tabs"
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/lib/utils"
 
-const Tabs = TabsPrimitive.Root;
+const Tabs = TabsPrimitive.Root
 
 const TabsList = React.forwardRef(({ className, ...props }, ref) => (
   <TabsPrimitive.List
     ref={ref}
     className={cn(
-      "inline-flex h-full items-center justify-center rounded-lg gap-6 p-1 text-muted-foreground",
+      "inline-flex h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground",
       className
     )}
-    {...props}
+    {...props} />
-  />
+))
-));
+TabsList.displayName = TabsPrimitive.List.displayName
-TabsList.displayName = TabsPrimitive.List.displayName;
 
 const TabsTrigger = React.forwardRef(({ className, ...props }, ref) => (
   <TabsPrimitive.Trigger
     ref={ref}
     className={cn(
-      "inline-flex items-center justify-center whitespace-nowrap hover:bg-[#f1eef9] border-2 border-[#664fa3] rounded-2xl px-3 py-1 text-[#664fa3] text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-foreground data-[state=active]:text-background data-[state=active]:border-foreground data-[state=active]:shadow",
+      "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow",
       className
     )}
-    {...props}
+    {...props} />
-  />
+))
-));
+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName
-TabsTrigger.displayName = TabsPrimitive.Trigger.displayName;
 
 const TabsContent = React.forwardRef(({ className, ...props }, ref) => (
   <TabsPrimitive.Content
@@ -36,9 +34,8 @@ const TabsContent = React.forwardRef(({ className, ...props }, ref) => (
       "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
       className
     )}
-    {...props}
+    {...props} />
-  />
+))
-));
+TabsContent.displayName = TabsPrimitive.Content.displayName
-TabsContent.displayName = TabsPrimitive.Content.displayName;
 
-export { Tabs, TabsList, TabsTrigger, TabsContent };
+export { Tabs, TabsList, TabsTrigger, TabsContent }

src/index.css

@@ -116,27 +116,3 @@ code {
     border-bottom-color: inherit;
   }
 }
-
-@layer utilities {
-  @supports selector(::-webkit-scrollbar) {
-    .scrollbar-dashboard::-webkit-scrollbar {
-      width: 2px;
-    }
-
-    .scrollbar-dashboard::-webkit-scrollbar-thumb {
-      background-color: #ddd8eb;
-      border-radius: 9999px;
-    }
-    .scrollbar-x-dashboard::-webkit-scrollbar:horizontal {
-      height: 2px;
-    }
-
-    .scrollbar-x-dashboard::-webkit-scrollbar-thumb:horizontal {
-      background-color: #ddd8eb;
-      border-radius: 9999px;
-    }
-    .hide-scrollbar-x::-webkit-scrollbar:horizontal {
-      height: 0px;
-    }
-  }
-}

src/pages/BoardOfDirectors.js

@@ -12,10 +12,10 @@ const BoardOfDirectors = () => {
   ];
 
   const boardMembers = [
-    { name: 'Danita Cole', title: 'Director' },
+    { name: 'Danita Cole' },
-    { name: 'Roxanne Cherico', title: 'Director' },
+    { name: 'Roxanne Cherico' },
-    { name: 'Lucretia Copeland', title: 'Director' },
+    { name: 'Lucretia Copeland' },
-    { name: 'Julie Fischer', title: 'Director' }
+    { name: 'Julie Fischer' }
   ];
 
 

src/pages/TermsOfService.js

@@ -2,6 +2,8 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import PublicNavbar from '../components/PublicNavbar';
 import PublicFooter from '../components/PublicFooter';
+import ReactMarkdown from "react-markdown";
+import remarkGfm from "remark-gfm";
 
 
 export default function TermsOfService() {

src/pages/admin/AdminBylaws.js

@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import { useAuth } from '../../context/AuthContext';
 import api from '../../utils/api';
 import { Card } from '../../components/ui/card';
 import { Button } from '../../components/ui/button';
@@ -33,7 +32,6 @@ import {
 } from 'lucide-react';
 
 const AdminBylaws = () => {
-  const { hasPermission } = useAuth();
   const [bylaws, setBylaws] = useState([]);
   const [loading, setLoading] = useState(true);
   const [dialogOpen, setDialogOpen] = useState(false);
@@ -186,7 +184,6 @@ const AdminBylaws = () => {
             Manage LOAF governing bylaws and version history
           </p>
         </div>
-        {hasPermission('bylaws.create') && (
         <Button
           onClick={handleCreate}
           className="bg-[#664fa3] text-white hover:bg-[#533a82] rounded-full flex items-center gap-2"
@@ -194,7 +191,6 @@ const AdminBylaws = () => {
           <Plus className="h-4 w-4" />
           Add Version
         </Button>
-        )}
       </div>
 
       {/* Current Bylaws */}
@@ -230,7 +226,6 @@ const AdminBylaws = () => {
                 <ExternalLink className="h-4 w-4 mr-1" />
                 View
               </Button>
-              {hasPermission('bylaws.edit') && (
               <Button
                 variant="outline"
                 size="sm"
@@ -239,8 +234,6 @@ const AdminBylaws = () => {
               >
                 <Edit className="h-4 w-4" />
               </Button>
-              )}
-              {hasPermission('bylaws.delete') && (
               <Button
                 variant="outline"
                 size="sm"
@@ -249,7 +242,6 @@ const AdminBylaws = () => {
               >
                 <Trash2 className="h-4 w-4" />
               </Button>
-              )}
             </div>
           </div>
           <div className="flex items-center gap-4 text-sm text-[#664fa3]">
@@ -262,12 +254,10 @@ const AdminBylaws = () => {
         <Card className="p-12 text-center">
           <Scale className="h-16 w-16 text-[#ddd8eb] mx-auto mb-4" />
           <p className="text-[#664fa3] text-lg mb-4">No current bylaws set</p>
-          {hasPermission('bylaws.create') && (
           <Button onClick={handleCreate} className="bg-[#664fa3] text-white">
             <Plus className="h-4 w-4 mr-2" />
             Create Bylaws
           </Button>
-          )}
         </Card>
       )}
 
@@ -300,7 +290,6 @@ const AdminBylaws = () => {
                     >
                       <ExternalLink className="h-4 w-4" />
                     </Button>
-                    {hasPermission('bylaws.edit') && (
                     <Button
                       variant="outline"
                       size="sm"
@@ -309,8 +298,6 @@ const AdminBylaws = () => {
                     >
                       <Edit className="h-4 w-4" />
                     </Button>
-                    )}
-                    {hasPermission('bylaws.delete') && (
                     <Button
                       variant="outline"
                       size="sm"
@@ -319,7 +306,6 @@ const AdminBylaws = () => {
                     >
                       <Trash2 className="h-4 w-4" />
                     </Button>
-                    )}
                   </div>
                 </div>
               </Card>

src/pages/admin/AdminDashboard.js

@@ -4,7 +4,7 @@ import api from '../../utils/api';
 import { Card } from '../../components/ui/card';
 import { Button } from '../../components/ui/button';
 import { Badge } from '../../components/ui/badge';
-import { Users, Calendar, Clock, CheckCircle, Mail, AlertCircle,Globe } from 'lucide-react';
+import { Users, Calendar, Clock, CheckCircle, Mail, AlertCircle } from 'lucide-react';
 
 const AdminDashboard = () => {
   const [stats, setStats] = useState({
@@ -56,7 +56,6 @@ const AdminDashboard = () => {
 
   return (
     <>
-      <div className='flex justify-between items-center'>
       <div className="mb-8">
         <h1 className="text-4xl md:text-5xl font-semibold text-[#422268] mb-4" style={{ fontFamily: "'Inter', sans-serif" }}>
           Admin Dashboard
@@ -65,15 +64,6 @@ const AdminDashboard = () => {
           Manage users, events, and membership applications.
         </p>
       </div>
-        <Link to={'/'}>
-          <Button
-            className="bg-[#664fa3] text-white hover:bg-[#533a82] rounded-full flex items-center gap-2"
-          >
-            <Globe />
-            View Public Site
-          </Button>
-        </Link>
-      </div>
 
         {/* Stats Grid */}
         <div className="grid md:grid-cols-2 lg:grid-cols-3 gap-6 mb-12">

src/pages/admin/AdminDonations.js

@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from 'react';
-import { useAuth } from '../../context/AuthContext';
 import { Card } from '../../components/ui/card';
 import { Button } from '../../components/ui/button';
 import { Input } from '../../components/ui/input';
@@ -32,7 +31,6 @@ import {
 } from 'lucide-react';
 
 const AdminDonations = () => {
-  const { hasPermission } = useAuth();
   const [donations, setDonations] = useState([]);
   const [filteredDonations, setFilteredDonations] = useState([]);
   const [stats, setStats] = useState({});
@@ -271,7 +269,6 @@ const AdminDonations = () => {
                 className="pl-10 rounded-full border-2 border-[#ddd8eb] focus:border-[#664fa3]"
               />
             </div>
-            {hasPermission('donations.export') && (
             <DropdownMenu>
               <DropdownMenuTrigger asChild>
                 <Button
@@ -299,7 +296,6 @@ const AdminDonations = () => {
                 </DropdownMenuItem>
               </DropdownMenuContent>
             </DropdownMenu>
-            )}
           </div>
 
           {/* Filters Row */}

src/pages/admin/AdminFinancials.js

@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import { useAuth } from '../../context/AuthContext';
 import api from '../../utils/api';
 import { Card } from '../../components/ui/card';
 import { Button } from '../../components/ui/button';
@@ -32,7 +31,6 @@ import {
 } from 'lucide-react';
 
 const AdminFinancials = () => {
-  const { hasPermission } = useAuth();
   const [reports, setReports] = useState([]);
   const [loading, setLoading] = useState(true);
   const [dialogOpen, setDialogOpen] = useState(false);
@@ -164,7 +162,6 @@ const AdminFinancials = () => {
             Manage annual financial reports
           </p>
         </div>
-        {hasPermission('financials.create') && (
         <Button
           onClick={handleCreate}
           className="bg-[#664fa3] text-white hover:bg-[#533a82] rounded-full flex items-center gap-2"
@@ -172,7 +169,6 @@ const AdminFinancials = () => {
           <Plus className="h-4 w-4" />
           Add Report
         </Button>
-        )}
       </div>
 
       {/* Reports List */}
@@ -180,12 +176,10 @@ const AdminFinancials = () => {
         <Card className="p-12 text-center">
           <TrendingUp className="h-16 w-16 text-[#ddd8eb] mx-auto mb-4" />
           <p className="text-[#664fa3] text-lg mb-4">No financial reports yet</p>
-          {hasPermission('financials.create') && (
           <Button onClick={handleCreate} className="bg-[#664fa3] text-white">
             <Plus className="h-4 w-4 mr-2" />
             Create First Report
           </Button>
-          )}
         </Card>
       ) : (
         <div className="space-y-4">
@@ -215,9 +209,7 @@ const AdminFinancials = () => {
                     </Button>
                   </div>
                 </div>
-                {(hasPermission('financials.edit') || hasPermission('financials.delete')) && (
                 <div className="flex gap-2">
-                    {hasPermission('financials.edit') && (
                   <Button
                     variant="outline"
                     size="sm"
@@ -226,8 +218,6 @@ const AdminFinancials = () => {
                   >
                     <Edit className="h-4 w-4" />
                   </Button>
-                    )}
-                    {hasPermission('financials.delete') && (
                   <Button
                     variant="outline"
                     size="sm"
@@ -236,9 +226,7 @@ const AdminFinancials = () => {
                   >
                     <Trash2 className="h-4 w-4" />
                   </Button>
-                    )}
                 </div>
-                )}
               </div>
             </Card>
           ))}

src/pages/admin/AdminGallery.js

@@ -1,6 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { Link } from 'react-router-dom';
-import { useAuth } from '../../context/AuthContext';
 import api from '../../utils/api';
 import { Card } from '../../components/ui/card';
 import { Button } from '../../components/ui/button';
@@ -21,7 +20,6 @@ import { toast } from 'sonner';
 import moment from 'moment';
 
 const AdminGallery = () => {
-  const { hasPermission } = useAuth();
   const [events, setEvents] = useState([]);
   const [selectedEvent, setSelectedEvent] = useState(null);
   const [galleryImages, setGalleryImages] = useState([]);
@@ -208,7 +206,7 @@ const AdminGallery = () => {
             </div>
           )}
 
-          {selectedEvent && hasPermission('gallery.upload') && (
+          {selectedEvent && (
             <div className="pt-4">
               <input
                 type="file"
@@ -269,9 +267,7 @@ const AdminGallery = () => {
                   </div>
 
                   {/* Overlay with Actions */}
-                  {(hasPermission('gallery.edit') || hasPermission('gallery.delete')) && (
                   <div className="absolute inset-0 bg-black/60 opacity-0 group-hover:opacity-100 transition-opacity rounded-xl flex flex-col items-center justify-center gap-2">
-                      {hasPermission('gallery.edit') && (
                     <Button
                       onClick={() => openEditCaption(image)}
                       size="sm"
@@ -281,8 +277,6 @@ const AdminGallery = () => {
                       <Edit className="h-4 w-4 mr-1" />
                       Caption
                     </Button>
-                      )}
-                      {hasPermission('gallery.delete') && (
                     <Button
                       onClick={() => handleDeleteImage(image.id)}
                       size="sm"
@@ -292,9 +286,7 @@ const AdminGallery = () => {
                       <Trash2 className="h-4 w-4 mr-1" />
                       Delete
                     </Button>
-                      )}
                   </div>
-                  )}
 
                   {/* Caption Preview */}
                   {image.caption && (

src/pages/admin/AdminNewsletters.js

@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import { useAuth } from '../../context/AuthContext';
 import api from '../../utils/api';
 import { Card } from '../../components/ui/card';
 import { Button } from '../../components/ui/button';
@@ -33,7 +32,6 @@ import {
 } from 'lucide-react';
 
 const AdminNewsletters = () => {
-  const { hasPermission } = useAuth();
   const [newsletters, setNewsletters] = useState([]);
   const [loading, setLoading] = useState(true);
   const [dialogOpen, setDialogOpen] = useState(false);
@@ -192,7 +190,6 @@ const AdminNewsletters = () => {
             Create and manage newsletter archive
           </p>
         </div>
-        {hasPermission('newsletters.create') && (
         <Button
           onClick={handleCreate}
           className="bg-[#664fa3] text-white hover:bg-[#533a82] rounded-full flex items-center gap-2"
@@ -200,7 +197,6 @@ const AdminNewsletters = () => {
           <Plus className="h-4 w-4" />
           Add Newsletter
         </Button>
-        )}
       </div>
 
       {/* Newsletters List */}
@@ -208,12 +204,10 @@ const AdminNewsletters = () => {
         <Card className="p-12 text-center">
           <FileText className="h-16 w-16 text-[#ddd8eb] mx-auto mb-4" />
           <p className="text-[#664fa3] text-lg mb-4">No newsletters yet</p>
-          {hasPermission('newsletters.create') && (
           <Button onClick={handleCreate} className="bg-[#664fa3] text-white">
             <Plus className="h-4 w-4 mr-2" />
             Create First Newsletter
           </Button>
-          )}
         </Card>
       ) : (
         <div className="space-y-6">
@@ -252,9 +246,7 @@ const AdminNewsletters = () => {
                           </Button>
                         </div>
                       </div>
-                      {(hasPermission('newsletters.edit') || hasPermission('newsletters.delete')) && (
                       <div className="flex gap-2">
-                          {hasPermission('newsletters.edit') && (
                         <Button
                           variant="outline"
                           size="sm"
@@ -263,8 +255,6 @@ const AdminNewsletters = () => {
                         >
                           <Edit className="h-4 w-4" />
                         </Button>
-                          )}
-                          {hasPermission('newsletters.delete') && (
                         <Button
                           variant="outline"
                           size="sm"
@@ -273,9 +263,7 @@ const AdminNewsletters = () => {
                         >
                           <Trash2 className="h-4 w-4" />
                         </Button>
-                          )}
                       </div>
-                      )}
                     </div>
                   </Card>
                 ))}

src/pages/admin/AdminPlans.js

@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import { useAuth } from '../../context/AuthContext';
 import api from '../../utils/api';
 import { Card } from '../../components/ui/card';
 import { Button } from '../../components/ui/button';
@@ -25,7 +24,6 @@ import {
 } from 'lucide-react';
 
 const AdminPlans = () => {
-  const { hasPermission } = useAuth();
   const [plans, setPlans] = useState([]);
   const [filteredPlans, setFilteredPlans] = useState([]);
   const [loading, setLoading] = useState(true);
@@ -138,7 +136,6 @@ const AdminPlans = () => {
               Manage membership plans and pricing.
             </p>
           </div>
-          {hasPermission('subscriptions.plans') && (
           <Button
             onClick={handleCreatePlan}
             className="bg-[#DDD8EB] text-[#422268] hover:bg-white rounded-full px-6"
@@ -146,7 +143,6 @@ const AdminPlans = () => {
             <Plus className="h-4 w-4 mr-2" />
             Create Plan
           </Button>
-          )}
         </div>
       </div>
 
@@ -290,7 +286,6 @@ const AdminPlans = () => {
               </div>
 
               {/* Actions */}
-              {hasPermission('subscriptions.plans') && (
               <div className="flex flex-col sm:flex-row gap-2 pt-4 border-t border-[#ddd8eb]">
                 <Button
                   onClick={() => handleEditPlan(plan)}
@@ -312,7 +307,6 @@ const AdminPlans = () => {
                   Delete
                 </Button>
               </div>
-              )}
 
               {/* Warning for plans with subscribers */}
               {plan.subscriber_count > 0 && (
@@ -334,7 +328,7 @@ const AdminPlans = () => {
               ? 'Try adjusting your filters'
               : 'Create your first subscription plan to get started'}
           </p>
-          {!searchQuery && activeFilter === 'all' && hasPermission('subscriptions.plans') && (
+          {!searchQuery && activeFilter === 'all' && (
             <Button
               onClick={handleCreatePlan}
               className="bg-[#DDD8EB] text-[#422268] hover:bg-white rounded-full px-8"

src/pages/admin/AdminStaff.js

@@ -16,7 +16,7 @@ import { UserCog, Search, Shield, UserPlus, Mail, Edit, Eye, Trash2, UserCheck,
 
 const AdminStaff = () => {
   const navigate = useNavigate();
-  const { hasPermission, user } = useAuth();
+  const { hasPermission } = useAuth();
   const [users, setUsers] = useState([]);
   const [filteredUsers, setFilteredUsers] = useState([]);
   const [loading, setLoading] = useState(true);
@@ -142,7 +142,7 @@ const AdminStaff = () => {
             </p>
           </div>
           <div className="flex gap-3">
-            {hasPermission('users.create') && (
+            {hasPermission('users.invite') && (
               <Button
                 onClick={() => setInviteDialogOpen(true)}
                 className="bg-[#664fa3] hover:bg-[#422268] text-white rounded-xl h-12 px-6"

src/pages/admin/AdminSubscriptions.js

@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from 'react';
-import { useAuth } from '../../context/AuthContext';
 import { Card } from '../../components/ui/card';
 import { Button } from '../../components/ui/button';
 import { Input } from '../../components/ui/input';
@@ -45,7 +44,6 @@ import {
 } from '../../components/ui/dropdown-menu';
 
 const AdminSubscriptions = () => {
-  const { hasPermission } = useAuth();
   const [subscriptions, setSubscriptions] = useState([]);
   const [filteredSubscriptions, setFilteredSubscriptions] = useState([]);
   const [plans, setPlans] = useState([]);
@@ -414,7 +412,6 @@ Proceed with activation?`;
           </div>
 
           {/* Export Dropdown */}
-          {hasPermission('subscriptions.export') && (
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
               <Button
@@ -442,7 +439,6 @@ Proceed with activation?`;
               </DropdownMenuItem>
             </DropdownMenuContent>
           </DropdownMenu>
-          )}
         </div>
       </Card>
 
@@ -507,7 +503,6 @@ Proceed with activation?`;
 
                   {/* Actions */}
                   <div className="flex gap-2 pt-2">
-                    {hasPermission('subscriptions.edit') && (
                     <Button
                       size="sm"
                       variant="outline"
@@ -517,8 +512,7 @@ Proceed with activation?`;
                       <Edit className="h-4 w-4 mr-2" />
                       Edit
                     </Button>
-                    )}
+                    {sub.status === 'active' && (
-                    {sub.status === 'active' && hasPermission('subscriptions.cancel') && (
                       <Button
                         size="sm"
                         variant="outline"
@@ -613,7 +607,6 @@ Proceed with activation?`;
                     </td>
                     <td className="p-4">
                       <div className="flex items-center justify-center gap-2">
-                        {hasPermission('subscriptions.edit') && (
                         <Button
                           size="sm"
                           variant="outline"
@@ -622,8 +615,7 @@ Proceed with activation?`;
                         >
                           <Edit className="h-4 w-4" />
                         </Button>
-                        )}
+                        {sub.status === 'active' && (
-                        {sub.status === 'active' && hasPermission('subscriptions.cancel') && (
                           <Button
                             size="sm"
                             variant="outline"

src/pages/admin/AdminValidations.js

@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import { useAuth } from '../../context/AuthContext';
 import api from '../../utils/api';
 import { Card } from '../../components/ui/card';
 import { Button } from '../../components/ui/button';
@@ -36,7 +35,6 @@ import ConfirmationDialog from '../../components/ConfirmationDialog';
 import RejectionDialog from '../../components/RejectionDialog';
 
 const AdminValidations = () => {
-  const { hasPermission } = useAuth();
   const [pendingUsers, setPendingUsers] = useState([]);
   const [filteredUsers, setFilteredUsers] = useState([]);
   const [loading, setLoading] = useState(true);
@@ -421,7 +419,6 @@ const AdminValidations = () => {
                           </Button>
                         ) : user.status === 'pending_email' ? (
                           <>
-                            {hasPermission('users.approve') && (
                             <Button
                               onClick={() => handleBypassAndValidateRequest(user)}
                               disabled={actionLoading === user.id}
@@ -430,8 +427,6 @@ const AdminValidations = () => {
                             >
                               {actionLoading === user.id ? 'Validating...' : 'Bypass & Validate'}
                             </Button>
-                            )}
-                            {hasPermission('users.approve') && (
                             <Button
                               onClick={() => handleRejectUser(user)}
                               disabled={actionLoading === user.id}
@@ -442,11 +437,9 @@ const AdminValidations = () => {
                               <X className="h-4 w-4 mr-1" />
                               Reject
                             </Button>
-                            )}
                           </>
                         ) : user.status === 'payment_pending' ? (
                           <>
-                            {hasPermission('subscriptions.activate') && (
                             <Button
                               onClick={() => handleActivatePayment(user)}
                               size="sm"
@@ -455,8 +448,6 @@ const AdminValidations = () => {
                               <CheckCircle className="h-4 w-4 mr-1" />
                               Activate Payment
                             </Button>
-                            )}
-                            {hasPermission('users.approve') && (
                             <Button
                               onClick={() => handleRejectUser(user)}
                               disabled={actionLoading === user.id}
@@ -467,11 +458,9 @@ const AdminValidations = () => {
                               <X className="h-4 w-4 mr-1" />
                               Reject
                             </Button>
-                            )}
                           </>
                         ) : (
                           <>
-                            {hasPermission('users.approve') && (
                             <Button
                               onClick={() => handleValidateRequest(user)}
                               disabled={actionLoading === user.id}
@@ -480,8 +469,6 @@ const AdminValidations = () => {
                             >
                               {actionLoading === user.id ? 'Validating...' : 'Validate'}
                             </Button>
-                            )}
-                            {hasPermission('users.approve') && (
                             <Button
                               onClick={() => handleRejectUser(user)}
                               disabled={actionLoading === user.id}
@@ -492,7 +479,6 @@ const AdminValidations = () => {
                               <X className="h-4 w-4 mr-1" />
                               Reject
                             </Button>
-                            )}
                           </>
                         )}
                       </div>

src/pages/members/MembersDirectory.js

@@ -24,8 +24,6 @@ const MembersDirectory = () => {
   const [selectedMember, setSelectedMember] = useState(null);
   const [profileDialogOpen, setProfileDialogOpen] = useState(false);
   const { toast } = useToast();
-  const [currentPage, setCurrentPage] = useState(1);
-  const pageSize = 12;
 
   useEffect(() => {
     fetchMembers();
@@ -35,10 +33,6 @@ const MembersDirectory = () => {
     filterMembers();
   }, [searchQuery, members]);
 
-  useEffect(() => {
-    setCurrentPage(1);
-  }, [searchQuery, members]);
-
   const fetchMembers = async () => {
     try {
       const response = await api.get('/members/directory');
@@ -72,14 +66,6 @@ const MembersDirectory = () => {
     setFilteredMembers(filtered);
   };
 
-  const totalPages = Math.max(1, Math.ceil(filteredMembers.length / pageSize));
-
-  const pageStart = (currentPage - 1) * pageSize;
-
-  const paginatedMembers = filteredMembers.slice(pageStart, pageStart + pageSize);
-
-  const totalMembers = members.length;
-
   const getInitials = (firstName, lastName) => {
     return `${firstName.charAt(0)}${lastName.charAt(0)}`.toUpperCase();
   };
@@ -111,15 +97,9 @@ const MembersDirectory = () => {
     if (!dateString) return null;
     return new Date(dateString).toLocaleDateString('en-US', { month: 'long', day: 'numeric' });
   };
-  const Border = ({ yaxis = false }) => {
+
-    return (
-      yaxis ?
-        <div className=' border-2 w-full border-[#664FA3] my-24' />
-        : <div className=' border-2 w-full border-[#664FA3] mb-24' />
-    )
-  }
   const MemberCard = ({ member }) => (
-    <Card className="p-6 bg-white rounded-3xl border border-[#ddd8eb] hover:shadow-lg transition-all h-full">
+    <Card className="p-6 bg-white rounded-2xl border border-[#ddd8eb] hover:shadow-lg transition-all h-full">
       {/* Profile Photo */}
       <div className="flex justify-center mb-4">
         {member.profile_photo_url ? (
@@ -279,34 +259,30 @@ const MembersDirectory = () => {
   );
 
   return (
-    <div className="min-h-screen bg-gradient-to-bl from-[#F9FAFB] to-[#DDD8EB]">
+    <div className="min-h-screen bg-white">
       <Navbar />
 
-      <div className="max-w-7xl mx-auto py-12">
+      <div className="max-w-7xl mx-auto px-6 py-12">
-
-        {/* Header and Search bar */}
-        <div className='px-9'>
-
         {/* Header */}
-          <div className="m-8 mt-14 flex flex-col sm:flex-row justify-between items-center ">
+        <div className="mb-8">
-            <h1 className="text-4xl md:text-5xl font-bold text-[#422268] mb-4" style={{ fontFamily: "'Poppins', sans-serif" }}>
+          <h1 className="text-4xl md:text-5xl font-semibold text-[#422268] mb-4" style={{ fontFamily: "'Inter', sans-serif" }}>
-              LOAF Members
+            Members Directory
           </h1>
-            <p className="text-lg " style={{ fontFamily: "'Nunito Sans', sans-serif" }}>
+          <p className="text-lg text-[#664fa3]" style={{ fontFamily: "'Nunito Sans', sans-serif" }}>
-              <span className='text-foreground'>Number of current memebers in the directory: </span> <span className='text-[#664fa3] font-medium'>{totalMembers}</span>
+            Connect with fellow LOAF members in our community.
           </p>
         </div>
 
         {/* Search Bar */}
-          <div className="mb-24 mx-10">
+        <div className="mb-8">
-            <div className="relative w-full  ">
+          <div className="relative max-w-xl">
             <Search className="absolute left-4 top-1/2 transform -translate-y-1/2 h-5 w-5 text-[#664fa3]" />
             <Input
               type="text"
               placeholder="Search by name or bio..."
               value={searchQuery}
               onChange={(e) => setSearchQuery(e.target.value)}
-                className="pl-12 pr-4 py-6 text-3xl font-medium bg-background border-foreground rounded-full focus:border-[#664fa3] focus:ring-[#664fa3]"
+              className="pl-12 pr-4 py-6 text-lg border-[#ddd8eb] rounded-xl focus:border-[#664fa3] focus:ring-[#664fa3]"
               style={{ fontFamily: "'Nunito Sans', sans-serif" }}
             />
           </div>
@@ -317,11 +293,6 @@ const MembersDirectory = () => {
           )}
         </div>
 
-        </div>
-        {/* Border Decoration */}
-
-        <Border />
-
         {/* Members Grid */}
         {loading ? (
           <div className="text-center py-20">
@@ -329,7 +300,7 @@ const MembersDirectory = () => {
           </div>
         ) : filteredMembers.length > 0 ? (
           <div className="grid md:grid-cols-2 lg:grid-cols-3 gap-8">
-            {paginatedMembers.map((member) => (
+            {filteredMembers.map((member) => (
               <MemberCard key={member.id} member={member} />
             ))}
           </div>
@@ -347,11 +318,6 @@ const MembersDirectory = () => {
           </div>
         )}
 
-
-
-        {/* Border Decoration */}
-        <Border yaxis="true" />
-
         {/* Info Card */}
         {!loading && members.length > 0 && (
           <Card className="mt-12 p-6 bg-[#F8F7FB] border-[#ddd8eb]">
@@ -560,66 +526,6 @@ const MembersDirectory = () => {
         </DialogContent>
       </Dialog>
 
-
-
-      {/* Pagination */}
-      {!loading && filteredMembers.length > 0 && (
-        <div className="mt-10 flex flex-col items-center gap-4 pb-12">
-          <p className="text-sm text-[#664fa3]" style={{ fontFamily: "'Nunito Sans', sans-serif" }}>
-            Showing {pageStart + 1}–{Math.min(pageStart + pageSize, filteredMembers.length)} of {filteredMembers.length}
-          </p>
-          <div className="flex flex-wrap items-center justify-center gap-2">
-            <Button
-              onClick={() => setCurrentPage(1)}
-              disabled={currentPage === 1}
-              className="bg-[#DDD8EB] rounded-full text-[#422268] hover:bg-[#664fa3] hover:text-white"
-            >
-              First Page
-            </Button>
-            <Button
-              onClick={() => setCurrentPage((page) => Math.max(1, page - 1))}
-              disabled={currentPage === 1}
-              className="bg-[#DDD8EB] rounded-full text-[#422268] hover:bg-[#664fa3] hover:text-white"
-            >
-              Previous
-            </Button>
-
-            {Array.from({ length: totalPages }, (_, index) => {
-              const pageNumber = index + 1;
-              const isActive = pageNumber === currentPage;
-              return (
-                <Button
-                  key={pageNumber}
-                  onClick={() => setCurrentPage(pageNumber)}
-                  className={
-                    isActive
-                      ? "bg-[#664fa3] text-white hover:bg-[#422268] rounded-full"
-                      : "bg-[#DDD8EB] text-[#422268] hover:bg-[#664fa3] hover:text-white rounded-full"
-                  }
-                >
-                  {pageNumber}
-                </Button>
-              );
-            })}
-
-            <Button
-              onClick={() => setCurrentPage((page) => Math.min(totalPages, page + 1))}
-              disabled={currentPage === totalPages}
-              className="bg-[#DDD8EB] text-[#422268] hover:bg-[#664fa3] rounded-full hover:text-white"
-            >
-              Next
-            </Button>
-            <Button
-              onClick={() => setCurrentPage(totalPages)}
-              disabled={currentPage === totalPages}
-              className="bg-[#DDD8EB] text-[#422268] hover:bg-[#664fa3] rounded-full hover:text-white"
-            >
-              Last Page
-            </Button>
-          </div>
-        </div>
-      )}
-
       <MemberFooter />
     </div>
   );