Admin Bugbash Fixes

apps/backend/src/auth/auth.service.ts

@@ -1,5 +1,6 @@
 import {
   ConflictException,
+  HttpException,
   Injectable,
   InternalServerErrorException,
   Logger,
@@ -75,10 +76,18 @@ export class AuthService {
 
       return sub ?? '';
     } catch (error) {
-      if (error instanceof Error && error.name == 'UsernameExistsException') {
+      if (error instanceof HttpException) {
+        throw error;
+      } else if (
+        error instanceof Error &&
+        error.name == 'UsernameExistsException'
+      ) {
         throw new ConflictException('A user with this email already exists');
       } else {
-        throw new InternalServerErrorException('Failed to create user');
+        const reason = error instanceof Error ? error.message : String(error);
+        throw new InternalServerErrorException(
+          `Failed to create user: ${reason}`,
+        );
       }
     }
   }
@@ -97,8 +106,9 @@ export class AuthService {
         `Failed to add user ${username} to group ${groupName}`,
         error,
       );
+      const reason = error instanceof Error ? error.message : String(error);
       throw new InternalServerErrorException(
-        `Failed to add user to group ${groupName}`,
+        `Failed to add user to group ${groupName}: ${reason}`,
       );
     }
   }

apps/backend/src/auth/dtos/sign-up.dto.ts

@@ -16,8 +16,7 @@ export class SignUpDto {
   @IsString()
   @IsNotEmpty()
   @IsPhoneNumber('US', {
-    message:
-      'phone must be a valid phone number (make sure all the digits are correct)',
+    message: 'Phone must be a valid US phone number.',
   })
   phone!: string;
 }

apps/backend/src/foodManufacturers/dtos/manufacturer-application.dto.ts

@@ -41,8 +41,7 @@ export class FoodManufacturerApplicationDto {
   @IsString()
   @IsNotEmpty()
   @IsPhoneNumber('US', {
-    message:
-      'contactPhone must be a valid phone number (make sure all the digits are correct)',
+    message: 'Phone must be a valid US phone number.',
   })
   contactPhone!: string;
 
@@ -67,8 +66,7 @@ export class FoodManufacturerApplicationDto {
   @IsOptional()
   @IsString()
   @IsPhoneNumber('US', {
-    message:
-      'secondaryContactPhone must be a valid phone number (make sure all the digits are correct)',
+    message: 'Secondary phone must be a valid US phone number.',
   })
   @IsNotEmpty()
   secondaryContactPhone?: string;

apps/backend/src/foodManufacturers/dtos/update-manufacturer-application.dto.ts

@@ -37,8 +37,7 @@ export class UpdateFoodManufacturerApplicationDto {
   @IsOptional()
   @IsString()
   @IsPhoneNumber('US', {
-    message:
-      'secondaryContactPhone must be a valid phone number (make sure all the digits are correct)',
+    message: 'Secondary phone contact must be a valid US phone number.',
   })
   @IsNotEmpty()
   secondaryContactPhone?: string;

apps/backend/src/foodManufacturers/manufacturers.controller.ts

@@ -159,7 +159,7 @@ export class FoodManufacturersController {
           type: 'string',
           format: 'phone',
           example: '(508) 508-6789',
-          description: 'Must be a valid US phone number',
+          description: 'Phone must be a valid US phone number',
         },
         secondaryContactFirstName: {
           type: 'string',
@@ -178,7 +178,7 @@ export class FoodManufacturersController {
           type: 'string',
           format: 'phone',
           example: '(508) 528-6789',
-          description: 'Must be a valid US phone number',
+          description: 'Phone must be a valid US phone number',
         },
         unlistedProductAllergens: {
           type: 'array',

apps/backend/src/pantries/dtos/pantry-application.dto.ts

@@ -40,8 +40,7 @@ export class PantryApplicationDto {
   @IsString()
   @IsNotEmpty()
   @IsPhoneNumber('US', {
-    message:
-      'contactPhone must be a valid phone number (make sure all the digits are correct)',
+    message: 'Phone must be a valid US phone number.',
   })
   contactPhone!: string;
 
@@ -74,8 +73,7 @@ export class PantryApplicationDto {
   @IsOptional()
   @IsString()
   @IsPhoneNumber('US', {
-    message:
-      'secondaryContactPhone must be a valid phone number (make sure all the digits are correct)',
+    message: 'Secondary phone must be a valid US phone number.',
   })
   @IsNotEmpty()
   secondaryContactPhone?: string;

apps/backend/src/pantries/dtos/update-pantry-application.dto.ts

@@ -44,8 +44,7 @@ export class UpdatePantryApplicationDto {
   @IsOptional()
   @IsString()
   @IsPhoneNumber('US', {
-    message:
-      'Secondary contact phone must be a valid phone number (make sure all the digits are correct)',
+    message: 'Secondary phone must be a valid US phone number.',
   })
   @IsNotEmpty()
   secondaryContactPhone?: string;

apps/backend/src/pantries/pantries.controller.ts

@@ -171,7 +171,7 @@ export class PantriesController {
           type: 'string',
           format: 'phone',
           example: '(508) 508-6789',
-          description: 'Must be a valid US phone number',
+          description: 'Phone must be a valid US phone number',
         },
         hasEmailContact: {
           type: 'boolean',
@@ -198,7 +198,7 @@ export class PantriesController {
           type: 'string',
           format: 'phone',
           example: '(508) 528-6789',
-          description: 'Must be a valid US phone number',
+          description: 'Phone must be a valid US phone number',
         },
         pantryName: {
           type: 'string',

apps/backend/src/users/dtos/update-user-info.dto.ts

@@ -23,8 +23,7 @@ export class UpdateUserInfoDto {
   @IsString()
   @IsNotEmpty()
   @IsPhoneNumber('US', {
-    message:
-      'phone must be a valid phone number (make sure all the digits are correct)',
+    message: 'Phone must be a valid US phone number.',
   })
   phone?: string;
 }

apps/backend/src/users/dtos/userSchema.dto.ts

@@ -27,8 +27,7 @@ export class userSchemaDto {
   @IsString()
   @IsNotEmpty()
   @IsPhoneNumber('US', {
-    message:
-      'phone must be a valid phone number (make sure all the digits are correct)',
+    message: 'Phone must be a valid US phone number.',
   })
   phone!: string;
 

apps/frontend/src/app.tsx

@@ -1,4 +1,8 @@
-import { createBrowserRouter, RouterProvider } from 'react-router-dom';
+import {
+  createBrowserRouter,
+  Navigate,
+  RouterProvider,
+} from 'react-router-dom';
 import Root from '@containers/root';
 import NotFound from '@containers/404';
 import FormRequests from '@containers/formRequests';
@@ -9,7 +13,6 @@ import ApprovePantries from '@containers/approvePantries';
 import PantryApplicationDetails from '@containers/pantryApplicationDetails';
 import VolunteerManagement from '@containers/userManagement';
 import AdminDonation from '@containers/adminDonation';
-import Homepage from '@containers/homepage';
 import AdminOrderManagement from '@containers/adminOrderManagement';
 import { Amplify } from 'aws-amplify';
 import CognitoAuthConfig from './aws-exports';
@@ -50,7 +53,7 @@ const router = createBrowserRouter([
       // Public routes (no auth needed)
       {
         index: true,
-        element: <Homepage />,
+        element: <Navigate to={ROUTES.LOGIN} replace />,
       },
       {
         path: ROUTES.LOGIN,

apps/frontend/src/components/Navbar.tsx

@@ -228,7 +228,7 @@ const Navbar: React.FC = () => {
       ApiClient.getMe()
         .then(setCurrentUser)
         .catch(() => setCurrentUser(null));
-    } else {
+    } else if (authStatus === 'unauthenticated') {
       setCurrentUser(null);
     }
   }, [authStatus]);
@@ -271,7 +271,6 @@ const Navbar: React.FC = () => {
     navigate(ROUTES.LOGIN, { replace: true });
   };
 
-  // Should be changed once other dashboards are implmented
   const ROLE_DASHBOARD_ROUTE: Record<Role, string> = {
     [Role.ADMIN]: ROUTES.ADMIN_DASHBOARD,
     [Role.FOODMANUFACTURER]: ROUTES.FM_DASHBOARD,
@@ -330,7 +329,7 @@ const Navbar: React.FC = () => {
               overflow="hidden"
               style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}
             >
-              {roleLabel ? `${roleLabel} Dashboard` : 'Dashboard'}
+              {roleLabel ? `${roleLabel}` : 'Profile'}
             </Text>
             <Text
               fontSize="10px"
@@ -345,12 +344,6 @@ const Navbar: React.FC = () => {
       </RouterLink>
 
       <VStack align="stretch" gap={2} flex={1} overflowY="auto">
-        <NavLink
-          to={ROUTES.HOME}
-          label="All Pages"
-          isActive={location.pathname === ROUTES.HOME}
-        />
-
         <NavLink
           to={ROLE_DASHBOARD_ROUTE[currentUser.role]}
           label="Dashboard"

apps/frontend/src/components/foodRequestManagement.tsx

@@ -4,18 +4,16 @@ import {
   Button,
   Table,
   Heading,
-  Pagination,
-  IconButton,
   VStack,
-  ButtonGroup,
   Checkbox,
   Link,
 } from '@chakra-ui/react';
-import { ArrowDownUp, ChevronRight, ChevronLeft, Funnel } from 'lucide-react';
+import { ArrowDownUp, Funnel } from 'lucide-react';
 import { capitalize, formatDate } from '@utils/utils';
 import { FloatingAlert } from '@components/floatingAlert';
 import { FoodRequestStatus, FoodRequestSummaryDto } from '../types/types';
 import PageEmptyState from '@components/pageEmptyState';
+import { PaginationControl } from '@components/pagination';
 import RequestDetailsModal from '@components/forms/requestDetailsModal';
 import PantryDeleteRequestActionModal from '@components/forms/pantryDeleteRequestModal';
 import VolunteerCloseRequestActionModal from '@components/forms/volunteerCloseRequestModal';
@@ -131,7 +129,6 @@ const RequestManagement: React.FC<RequestManagementProps> = ({
     );
 
   const itemsPerPage = 10;
-  const totalPages = Math.ceil(filteredRequests.length / itemsPerPage);
   const paginatedRequests = filteredRequests.slice(
     (currentPage - 1) * itemsPerPage,
     currentPage * itemsPerPage,
@@ -469,59 +466,14 @@ const RequestManagement: React.FC<RequestManagementProps> = ({
         </>
       )}
 
-      {totalPages > 1 && (
-        <Pagination.Root
+      <Box mt={12}>
+        <PaginationControl
           count={filteredRequests.length}
           pageSize={itemsPerPage}
           page={currentPage}
-          onPageChange={(e: { page: number }) => setCurrentPage(e.page)}
-        >
-          <ButtonGroup
-            display="flex"
-            justifyContent="center"
-            alignItems="center"
-            mt={12}
-            variant="outline"
-            size="sm"
-            gap={4}
-          >
-            <Pagination.PrevTrigger asChild>
-              <IconButton
-                variant="ghost"
-                disabled={currentPage === 1}
-                onClick={() => setCurrentPage((prev) => Math.max(prev - 1, 1))}
-              >
-                <ChevronLeft size={16} />
-              </IconButton>
-            </Pagination.PrevTrigger>
-
-            <Pagination.Items
-              render={(page) => (
-                <IconButton
-                  borderColor={{
-                    base: 'neutral.100',
-                    _selected: 'neutral.600',
-                  }}
-                >
-                  {page.value}
-                </IconButton>
-              )}
-            />
-
-            <Pagination.NextTrigger asChild>
-              <IconButton
-                variant="ghost"
-                disabled={currentPage === totalPages}
-                onClick={() =>
-                  setCurrentPage((prev) => Math.min(prev + 1, totalPages))
-                }
-              >
-                <ChevronRight size={16} />
-              </IconButton>
-            </Pagination.NextTrigger>
-          </ButtonGroup>
-        </Pagination.Root>
-      )}
+          onPageChange={setCurrentPage}
+        />
+      </Box>
     </Box>
   );
 };

apps/frontend/src/components/forms/addNewVolunteerModal.tsx

@@ -35,8 +35,10 @@ const NewVolunteerModal: React.FC<NewVolunteerModalProps> = ({
   const [isOpen, setIsOpen] = useState(false);
 
   const [alertState, setAlertMessage] = useAlert();
+  const [isSubmitting, setIsSubmitting] = useState(false);
 
   const handleSubmit = async () => {
+    if (isSubmitting) return;
     if (!firstName || !lastName || !email || !phone || phone === '+1') {
       setAlertMessage('Please fill in all fields. *', AlertStatus.ERROR);
       return;
@@ -50,6 +52,7 @@ const NewVolunteerModal: React.FC<NewVolunteerModalProps> = ({
       role: Role.VOLUNTEER,
     };
 
+    setIsSubmitting(true);
     try {
       await ApiClient.postUser(newVolunteer);
       if (onSubmitSuccess) onSubmitSuccess();
@@ -90,6 +93,8 @@ const NewVolunteerModal: React.FC<NewVolunteerModalProps> = ({
         if (onSubmitFail) onSubmitFail();
         handleClear();
       }
+    } finally {
+      setIsSubmitting(false);
     }
   };
 
@@ -226,6 +231,7 @@ const NewVolunteerModal: React.FC<NewVolunteerModalProps> = ({
                 bg={'blue.hover'}
                 color={'white'}
                 onClick={handleSubmit}
+                disabled={isSubmitting}
               >
                 Submit
               </Button>

apps/frontend/src/components/forms/assignVolunteersModal.tsx

@@ -52,6 +52,8 @@ const AssignVolunteersModal: React.FC<AssignVolunteersModalProps> = ({
 
   const [searchName, setSearchName] = useState<string>('');
 
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
   const handleSearchNameChange = (
     event: React.ChangeEvent<HTMLInputElement>,
   ) => {
@@ -99,6 +101,8 @@ const AssignVolunteersModal: React.FC<AssignVolunteersModalProps> = ({
   };
 
   const handleSave = async () => {
+    if (isSubmitting) return;
+    setIsSubmitting(true);
     try {
       const originalIds = new Set(pantry.volunteers.map((v) => v.userId));
 
@@ -120,6 +124,8 @@ const AssignVolunteersModal: React.FC<AssignVolunteersModalProps> = ({
       onClose();
     } catch {
       setAlertMessage('Error saving volunteer assignments', AlertStatus.ERROR);
+    } finally {
+      setIsSubmitting(false);
     }
   };
 
@@ -273,6 +279,7 @@ const AssignVolunteersModal: React.FC<AssignVolunteersModalProps> = ({
                     fontWeight={600}
                     onClick={handleSave}
                     px={10}
+                    disabled={isSubmitting}
                   >
                     Save Changes
                   </Button>