From aca2a8424a5400889c85c41fe861d517502e2221 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Wed, 3 Dec 2025 20:45:33 -0500
Subject: [PATCH 01/11] Final commit

---
 apps/backend/src/auth/auth.controller.ts      |   2 +-
 apps/backend/src/auth/auth.service.ts         |   2 +-
 apps/backend/src/config/typeorm.ts            |   2 +
 ...4811878152-RemoveMultipleVolunteerTypes.ts |  43 +++++++
 apps/backend/src/users/types.ts               |  10 +-
 apps/backend/src/users/user.entity.ts         |   2 +-
 .../src/users/users.controller.spec.ts        |   9 +-
 apps/backend/src/users/users.controller.ts    |   3 +-
 apps/backend/src/users/users.service.spec.ts  |   4 +-
 .../src/containers/volunteerManagement.tsx    | 106 ------------------
 apps/frontend/src/types/types.ts              |   8 +-
 11 files changed, 57 insertions(+), 134 deletions(-)
 create mode 100644 apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts

diff --git a/apps/backend/src/auth/auth.controller.ts b/apps/backend/src/auth/auth.controller.ts
index 7f603f00..ec741008 100644
--- a/apps/backend/src/auth/auth.controller.ts
+++ b/apps/backend/src/auth/auth.controller.ts
@@ -34,7 +34,7 @@ export class AuthController {
       signUpDto.firstName,
       signUpDto.lastName,
       signUpDto.phone,
-      Role.STANDARD_VOLUNTEER,
+      Role.VOLUNTEER,
     );
 
     return user;
diff --git a/apps/backend/src/auth/auth.service.ts b/apps/backend/src/auth/auth.service.ts
index 2d56324c..a0bae3ad 100644
--- a/apps/backend/src/auth/auth.service.ts
+++ b/apps/backend/src/auth/auth.service.ts
@@ -60,7 +60,7 @@ export class AuthService {
 
   async signup(
     { firstName, lastName, email, password }: SignUpDto,
-    role: Role = Role.STANDARD_VOLUNTEER,
+    role: Role = Role.VOLUNTEER,
   ): Promise<boolean> {
     // Needs error handling
     const signUpCommand = new SignUpCommand({
diff --git a/apps/backend/src/config/typeorm.ts b/apps/backend/src/config/typeorm.ts
index b356b698..a10391d2 100644
--- a/apps/backend/src/config/typeorm.ts
+++ b/apps/backend/src/config/typeorm.ts
@@ -22,6 +22,7 @@ import { UpdatePantriesTable1742739750279 } from '../migrations/1742739750279-up
 import { RemoveOrdersDonationId1761500262238 } from '../migrations/1761500262238-RemoveOrdersDonationId';
 import { AllergyFriendlyToBoolType1763963056712 } from '../migrations/1763963056712-AllergyFriendlyToBoolType';
 import { UpdatePantryUserFieldsFixed1764350314832 } from '../migrations/1764350314832-UpdatePantryUserFieldsFixed';
+import { RemoveMultipleVolunteerTypes1764811878152 } from '../migrations/1764811878152-RemoveMultipleVolunteerTypes';
 
 const config = {
   type: 'postgres',
@@ -57,6 +58,7 @@ const config = {
     RemoveOrdersDonationId1761500262238,
     AllergyFriendlyToBoolType1763963056712,
     UpdatePantryUserFieldsFixed1764350314832,
+    RemoveMultipleVolunteerTypes1764811878152,
   ],
 };
 
diff --git a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
new file mode 100644
index 00000000..79f16ea4
--- /dev/null
+++ b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
@@ -0,0 +1,43 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RemoveMultipleVolunteerTypes1764811878152 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`
+            ALTER TABLE users
+            DROP COLUMN role;
+            DROP TYPE IF EXISTS users_role_enum;
+
+            CREATE TYPE "users_role_enum" AS ENUM (
+                'admin',
+                'volunteer',
+                'pantry',
+                'food_manufacturer'
+            );
+
+            ALTER TABLE users
+            ADD COLUMN role users_role_enum NOT NULL DEFAULT 'volunteer';
+        `);
+
+
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`
+            ALTER TABLE users
+            DROP COLUMN role;
+            DROP TYPE IF EXISTS users_role_enum;
+
+            CREATE TYPE "users_role_enum" AS ENUM (
+                'admin',
+                'lead_volunteer',
+                'standard_volunteer',
+                'pantry',
+                'food_manufacturer'
+            );
+
+            ALTER TABLE users
+            ADD COLUMN role users_role_enum NOT NULL DEFAULT 'standard_volunteer';
+        `);
+    }
+
+}
diff --git a/apps/backend/src/users/types.ts b/apps/backend/src/users/types.ts
index 4eb7f295..695cbc44 100644
--- a/apps/backend/src/users/types.ts
+++ b/apps/backend/src/users/types.ts
@@ -1,14 +1,6 @@
 export enum Role {
   ADMIN = 'admin',
-  LEAD_VOLUNTEER = 'lead_volunteer',
-  STANDARD_VOLUNTEER = 'standard_volunteer',
+  VOLUNTEER = 'volunteer',
   PANTRY = 'pantry',
   FOODMANUFACTURER = 'food_manufacturer',
 }
-
-export const VOLUNTEER_ROLES: Role[] = [
-  Role.LEAD_VOLUNTEER,
-  Role.STANDARD_VOLUNTEER,
-];
-
-export type VolunteerType = (typeof VOLUNTEER_ROLES)[number];
diff --git a/apps/backend/src/users/user.entity.ts b/apps/backend/src/users/user.entity.ts
index b0d95316..1679e986 100644
--- a/apps/backend/src/users/user.entity.ts
+++ b/apps/backend/src/users/user.entity.ts
@@ -12,7 +12,7 @@ export class User {
     name: 'role',
     enum: Role,
     enumName: 'users_role_enum',
-    default: Role.STANDARD_VOLUNTEER,
+    default: Role.VOLUNTEER,
   })
   role: Role;
 
diff --git a/apps/backend/src/users/users.controller.spec.ts b/apps/backend/src/users/users.controller.spec.ts
index 78d116a3..48d0f14d 100644
--- a/apps/backend/src/users/users.controller.spec.ts
+++ b/apps/backend/src/users/users.controller.spec.ts
@@ -16,7 +16,7 @@ const mockUser1: User = {
   firstName: 'John',
   lastName: 'Doe',
   phone: '1234567890',
-  role: Role.STANDARD_VOLUNTEER,
+  role: Role.VOLUNTEER,
 };
 
 const mockUser2: User = {
@@ -25,7 +25,7 @@ const mockUser2: User = {
   firstName: 'Bob',
   lastName: 'Smith',
   phone: '9876',
-  role: Role.LEAD_VOLUNTEER,
+  role: Role.VOLUNTEER,
 };
 
 describe('UsersController', () => {
@@ -67,8 +67,7 @@ describe('UsersController', () => {
 
       expect(result).toEqual(volunteers);
       expect(mockUserService.findUsersByRoles).toHaveBeenCalledWith([
-        Role.LEAD_VOLUNTEER,
-        Role.STANDARD_VOLUNTEER,
+        Role.VOLUNTEER
       ]);
     });
   });
@@ -147,7 +146,7 @@ describe('UsersController', () => {
         firstName: 'Jane',
         lastName: 'Smith',
         phone: '9876543210',
-        role: Role.STANDARD_VOLUNTEER,
+        role: Role.VOLUNTEER,
       };
 
       const error = new Error('Database error');
diff --git a/apps/backend/src/users/users.controller.ts b/apps/backend/src/users/users.controller.ts
index 93a4dc01..9df01afc 100644
--- a/apps/backend/src/users/users.controller.ts
+++ b/apps/backend/src/users/users.controller.ts
@@ -15,7 +15,6 @@ import { UsersService } from './users.service';
 //import { AuthGuard } from '@nestjs/passport';
 import { User } from './user.entity';
 import { Role } from './types';
-import { VOLUNTEER_ROLES } from './types';
 import { userSchemaDto } from './dtos/userSchema.dto';
 //import { CurrentUserInterceptor } from '../interceptors/current-user.interceptor';
 
@@ -26,7 +25,7 @@ export class UsersController {
 
   @Get('/volunteers')
   async getAllVolunteers(): Promise<User[]> {
-    return this.usersService.findUsersByRoles(VOLUNTEER_ROLES);
+    return this.usersService.findUsersByRoles([Role.VOLUNTEER]);
   }
 
   // @UseGuards(AuthGuard('jwt'))
diff --git a/apps/backend/src/users/users.service.spec.ts b/apps/backend/src/users/users.service.spec.ts
index 8388a79a..c30b8628 100644
--- a/apps/backend/src/users/users.service.spec.ts
+++ b/apps/backend/src/users/users.service.spec.ts
@@ -17,7 +17,7 @@ const mockUser: User = {
   firstName: 'John',
   lastName: 'Doe',
   phone: '1234567890',
-  role: Role.STANDARD_VOLUNTEER,
+  role: Role.VOLUNTEER,
 };
 
 describe('UsersService', () => {
@@ -189,7 +189,7 @@ describe('UsersService', () => {
 
   describe('findUsersByRoles', () => {
     it('should return users by roles', async () => {
-      const roles = [Role.ADMIN, Role.LEAD_VOLUNTEER];
+      const roles = [Role.ADMIN, Role.VOLUNTEER];
       const users = [mockUser];
       mockUserRepository.find.mockResolvedValue(users);
 
diff --git a/apps/frontend/src/containers/volunteerManagement.tsx b/apps/frontend/src/containers/volunteerManagement.tsx
index b2c9a43f..b241d316 100644
--- a/apps/frontend/src/containers/volunteerManagement.tsx
+++ b/apps/frontend/src/containers/volunteerManagement.tsx
@@ -7,17 +7,10 @@ import {
   Button,
   Flex,
   Input,
-  Menu,
-  Checkbox,
   VStack,
   Box,
-  Portal,
-  NativeSelect,
-  NativeSelectIndicator,
 } from '@chakra-ui/react';
-import { VolunteerType } from '../types/types';
 import { Link } from 'react-router-dom';
-import { ChevronDownIcon } from 'lucide-react';
 import { User } from '../types/types';
 import ApiClient from '@api/apiClient';
 
@@ -50,53 +43,12 @@ const VolunteerManagement: React.FC = () => {
     );
   });
 
-  const volunteerTypeDropdown = ({
-    volunteerType,
-    volunteerId,
-  }: {
-    volunteerType: VolunteerType;
-    volunteerId: number;
-  }) => {
-    return (
-      <NativeSelect.Root>
-        <NativeSelect.Field
-          value={volunteerType}
-          onChange={(e) =>
-            handleVolunteerTypeChange(
-              e.target.value as VolunteerType,
-              volunteerId,
-            )
-          }
-        >
-          {Object.entries(DISPLAY_VOLUNTEER_TYPES).map(([key, label]) => (
-            <option value={VolunteerType[key as keyof typeof VolunteerType]}>
-              {label}
-            </option>
-          ))}
-        </NativeSelect.Field>
-        <NativeSelectIndicator />
-      </NativeSelect.Root>
-    );
-  };
-
   const handleSearchNameChange = (
     event: React.ChangeEvent<HTMLInputElement>,
   ) => {
     setSearchName(event.target.value);
   };
 
-  const handleVolunteerFilterChange = (type: string, checked: boolean) => {
-    if (checked) {
-      setCheckedTypes([...checkedTypes, type.toUpperCase()]);
-    } else {
-      setCheckedTypes(
-        checkedTypes.filter(
-          (checkedType) => checkedType !== type.toUpperCase(),
-        ),
-      );
-    }
-  };
-
   const handleReset = () => {
     setSearchName('');
     setCheckedTypes([]);
@@ -121,20 +73,6 @@ const VolunteerManagement: React.FC = () => {
     }
   };
 
-  const handleVolunteerTypeChange = (
-    type: VolunteerType,
-    volunteerId: number,
-  ) => {
-    setChangedVolunteers((prev) =>
-      prev.map((a) => (a.id === volunteerId ? { ...a, role: type } : a)),
-    );
-  };
-
-  const DISPLAY_VOLUNTEER_TYPES: Record<string, string> = {
-    LEAD_VOLUNTEER: 'Lead Volunteer',
-    STANDARD_VOLUNTEER: 'Standard Volunteer',
-  };
-
   return (
     <Center flexDirection="column" p={4}>
       <Text fontSize="2xl">Pantry Volunteer Management</Text>
@@ -152,40 +90,6 @@ const VolunteerManagement: React.FC = () => {
             value={searchName}
             onChange={handleSearchNameChange}
           />
-          <Menu.Root closeOnSelect={false}>
-            <Menu.Trigger asChild>
-              <Button>
-                Filter by Volunteer Type
-                <ChevronDownIcon />
-              </Button>
-            </Menu.Trigger>
-            <Portal>
-              <Menu.Positioner>
-                <Menu.Content>
-                  {Object.values(VolunteerType).map((volunteerType) => (
-                    <Menu.Item key={volunteerType}>
-                      <Checkbox.Root
-                        checked={checkedTypes.includes(
-                          volunteerType.toUpperCase(),
-                        )}
-                        onCheckedChange={(e: { checked: boolean }) =>
-                          handleVolunteerFilterChange(volunteerType, e.checked)
-                        }
-                      >
-                        <Checkbox.HiddenInput />
-                        <Checkbox.Control />
-                        <Checkbox.Label>
-                          {DISPLAY_VOLUNTEER_TYPES[
-                            volunteerType.toUpperCase()
-                          ] || volunteerType}
-                        </Checkbox.Label>
-                      </Checkbox.Root>
-                    </Menu.Item>
-                  ))}
-                </Menu.Content>
-              </Menu.Positioner>
-            </Portal>
-          </Menu.Root>
         </VStack>
         <Table.Root variant="line">
           <TableCaption>
@@ -202,7 +106,6 @@ const VolunteerManagement: React.FC = () => {
               <Table.ColumnHeader>Volunteer Name</Table.ColumnHeader>
               <Table.ColumnHeader>Email</Table.ColumnHeader>
               <Table.ColumnHeader>Phone</Table.ColumnHeader>
-              <Table.ColumnHeader>Type</Table.ColumnHeader>
               <Table.ColumnHeader>Assigned Pantries</Table.ColumnHeader>
             </Table.Row>
           </Table.Header>
@@ -214,15 +117,6 @@ const VolunteerManagement: React.FC = () => {
                 </Table.Cell>
                 <Table.Cell>{volunteer.email}</Table.Cell>
                 <Table.Cell>{volunteer.phone}</Table.Cell>
-                <Table.Cell>
-                  {volunteerTypeDropdown({
-                    volunteerType:
-                      VolunteerType[
-                        volunteer.role.toUpperCase() as keyof typeof VolunteerType
-                      ],
-                    volunteerId: volunteer.id,
-                  })}
-                </Table.Cell>
                 <Table.Cell>
                   <Button asChild>
                     <Link to={`/pantry-management/${volunteer.id}`}>
diff --git a/apps/frontend/src/types/types.ts b/apps/frontend/src/types/types.ts
index cb901272..ed8adc9d 100644
--- a/apps/frontend/src/types/types.ts
+++ b/apps/frontend/src/types/types.ts
@@ -168,11 +168,6 @@ export interface Allocation {
   status: string;
 }
 
-export enum VolunteerType {
-  LEAD_VOLUNTEER = 'lead_volunteer',
-  STANDARD_VOLUNTEER = 'standard_volunteer',
-}
-
 export interface VolunteerPantryAssignment {
   assignmentId: number;
   volunteer: {
@@ -191,8 +186,7 @@ export interface VolunteerPantryAssignment {
 
 export enum Role {
   ADMIN = 'admin',
-  LEAD_VOLUNTEER = 'lead_volunteer',
-  STANDARD_VOLUNTEER = 'standard_volunteer',
+  VOLUNTEER = 'volunteer',
   PANTRY = 'pantry',
   FOODMANUFACTURER = 'food_manufacturer',
 }

From e3d8063621a970fe33e5a2a3a1de62a8d1c62e5b Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Wed, 3 Dec 2025 20:45:57 -0500
Subject: [PATCH 02/11] Final commit

---
 .../donationItems/donationItems.controller.ts |  9 ++++---
 .../src/donations/donations.controller.ts     |  4 +--
 apps/backend/src/donations/types.ts           |  2 +-
 .../src/foodRequests/request.controller.ts    |  9 ++++---
 ...1763963056712-AllergyFriendlyToBoolType.ts | 20 +++++++-------
 ...4811878152-RemoveMultipleVolunteerTypes.ts | 21 +++++++--------
 apps/backend/src/orders/order.service.spec.ts |  8 +++++-
 apps/backend/src/pantries/types.ts            |  2 +-
 .../src/users/users.controller.spec.ts        |  2 +-
 .../forms/pantryApplicationForm.tsx           | 27 +++++++++++++------
 .../src/components/forms/requestFormModal.tsx |  4 +--
 apps/frontend/src/main.tsx                    |  2 +-
 apps/frontend/src/theme.ts                    | 13 ++++++---
 apps/frontend/src/types/pantryEnums.ts        |  4 +--
 apps/frontend/src/types/types.ts              | 11 ++++----
 15 files changed, 81 insertions(+), 57 deletions(-)

diff --git a/apps/backend/src/donationItems/donationItems.controller.ts b/apps/backend/src/donationItems/donationItems.controller.ts
index 96381fc0..96be5673 100644
--- a/apps/backend/src/donationItems/donationItems.controller.ts
+++ b/apps/backend/src/donationItems/donationItems.controller.ts
@@ -38,8 +38,8 @@ export class DonationItemsController {
         status: { type: 'string', example: 'available' },
         ozPerItem: { type: 'integer', example: 5 },
         estimatedValue: { type: 'integer', example: 100 },
-        foodType: { 
-          type: 'string', 
+        foodType: {
+          type: 'string',
           enum: Object.values(FoodType),
           example: FoodType.DAIRY_FREE_ALTERNATIVES,
         },
@@ -59,7 +59,10 @@ export class DonationItemsController {
       foodType: FoodType;
     },
   ): Promise<DonationItem> {
-    if (body.foodType && !Object.values(FoodType).includes(body.foodType as FoodType)) {
+    if (
+      body.foodType &&
+      !Object.values(FoodType).includes(body.foodType as FoodType)
+    ) {
       throw new BadRequestException('Invalid foodtype');
     }
     return this.donationItemsService.create(
diff --git a/apps/backend/src/donations/donations.controller.ts b/apps/backend/src/donations/donations.controller.ts
index d748df66..6bcd2a7e 100644
--- a/apps/backend/src/donations/donations.controller.ts
+++ b/apps/backend/src/donations/donations.controller.ts
@@ -46,8 +46,8 @@ export class DonationsController {
           type: 'string',
           format: 'date-time',
         },
-        status: { 
-          type: 'string', 
+        status: {
+          type: 'string',
           enum: Object.values(DonationStatus),
           example: DonationStatus.AVAILABLE,
         },
diff --git a/apps/backend/src/donations/types.ts b/apps/backend/src/donations/types.ts
index 549ee6c6..16387987 100644
--- a/apps/backend/src/donations/types.ts
+++ b/apps/backend/src/donations/types.ts
@@ -2,4 +2,4 @@ export enum DonationStatus {
   AVAILABLE = 'available',
   FULFILLED = 'fulfilled',
   MATCHING = 'matching',
-}
\ No newline at end of file
+}
diff --git a/apps/backend/src/foodRequests/request.controller.ts b/apps/backend/src/foodRequests/request.controller.ts
index c01eda5b..e3a93727 100644
--- a/apps/backend/src/foodRequests/request.controller.ts
+++ b/apps/backend/src/foodRequests/request.controller.ts
@@ -58,8 +58,8 @@ export class FoodRequestsController {
       type: 'object',
       properties: {
         pantryId: { type: 'integer', example: 1 },
-        requestedSize: { 
-          type: 'string', 
+        requestedSize: {
+          type: 'string',
           enum: Object.values(RequestSize),
           example: RequestSize.LARGE,
         },
@@ -166,7 +166,10 @@ export class FoodRequestsController {
     );
 
     const request = await this.requestsService.findOne(requestId);
-    await this.ordersService.updateStatus(request.order.orderId, OrderStatus.DELIVERED);
+    await this.ordersService.updateStatus(
+      request.order.orderId,
+      OrderStatus.DELIVERED,
+    );
 
     return this.requestsService.updateDeliveryDetails(
       requestId,
diff --git a/apps/backend/src/migrations/1763963056712-AllergyFriendlyToBoolType.ts b/apps/backend/src/migrations/1763963056712-AllergyFriendlyToBoolType.ts
index 079362d6..3a14c4d4 100644
--- a/apps/backend/src/migrations/1763963056712-AllergyFriendlyToBoolType.ts
+++ b/apps/backend/src/migrations/1763963056712-AllergyFriendlyToBoolType.ts
@@ -1,21 +1,21 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
+import { MigrationInterface, QueryRunner } from 'typeorm';
 
-export class AllergyFriendlyToBoolType1763963056712 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
+export class AllergyFriendlyToBoolType1763963056712
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
             ALTER TABLE pantries 
             ALTER COLUMN dedicated_allergy_friendly TYPE BOOLEAN USING (FALSE),
             ALTER COLUMN dedicated_allergy_friendly SET NOT NULL;
         `);
-    }
+  }
 
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
             ALTER TABLE pantries 
             ALTER COLUMN dedicated_allergy_friendly TYPE VARCHAR(255),
             ALTER COLUMN dedicated_allergy_friendly DROP NOT NULL;
         `);
-    }
-
+  }
 }
diff --git a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
index 79f16ea4..55090840 100644
--- a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
+++ b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
@@ -1,8 +1,10 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
+import { MigrationInterface, QueryRunner } from 'typeorm';
 
-export class RemoveMultipleVolunteerTypes1764811878152 implements MigrationInterface {
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
+export class RemoveMultipleVolunteerTypes1764811878152
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
             ALTER TABLE users
             DROP COLUMN role;
             DROP TYPE IF EXISTS users_role_enum;
@@ -17,12 +19,10 @@ export class RemoveMultipleVolunteerTypes1764811878152 implements MigrationInter
             ALTER TABLE users
             ADD COLUMN role users_role_enum NOT NULL DEFAULT 'volunteer';
         `);
+  }
 
-
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
             ALTER TABLE users
             DROP COLUMN role;
             DROP TYPE IF EXISTS users_role_enum;
@@ -38,6 +38,5 @@ export class RemoveMultipleVolunteerTypes1764811878152 implements MigrationInter
             ALTER TABLE users
             ADD COLUMN role users_role_enum NOT NULL DEFAULT 'standard_volunteer';
         `);
-    }
-
+  }
 }
diff --git a/apps/backend/src/orders/order.service.spec.ts b/apps/backend/src/orders/order.service.spec.ts
index 4c64ac10..b65e335b 100644
--- a/apps/backend/src/orders/order.service.spec.ts
+++ b/apps/backend/src/orders/order.service.spec.ts
@@ -6,7 +6,13 @@ import { OrdersService } from './order.service';
 import { mock } from 'jest-mock-extended';
 import { Pantry } from '../pantries/pantries.entity';
 import { User } from '../users/user.entity';
-import { AllergensConfidence, ClientVisitFrequency, PantryStatus, RefrigeratedDonation, ServeAllergicChildren } from '../pantries/types';
+import {
+  AllergensConfidence,
+  ClientVisitFrequency,
+  PantryStatus,
+  RefrigeratedDonation,
+  ServeAllergicChildren,
+} from '../pantries/types';
 import { OrderStatus } from './types';
 
 const mockOrdersRepository = mock<Repository<Order>>();
diff --git a/apps/backend/src/pantries/types.ts b/apps/backend/src/pantries/types.ts
index f776991b..cdf8b671 100644
--- a/apps/backend/src/pantries/types.ts
+++ b/apps/backend/src/pantries/types.ts
@@ -33,7 +33,7 @@ export enum PantryStatus {
 export enum Activity {
   CREATE_LABELED_SHELF = 'Create labeled shelf',
   PROVIDE_EDUCATIONAL_PAMPHLETS = 'Provide educational pamphlets',
-  TRACK_DIETARY_NEEDS ='Spreadsheet to track dietary needs',
+  TRACK_DIETARY_NEEDS = 'Spreadsheet to track dietary needs',
   POST_RESOURCE_FLYERS = 'Post allergen-free resource flyers',
   SURVEY_CLIENTS = 'Survey clients to determine medical dietary needs',
   COLLECT_FEEDBACK = 'Collect feedback from allergen-avoidant clients',
diff --git a/apps/backend/src/users/users.controller.spec.ts b/apps/backend/src/users/users.controller.spec.ts
index 48d0f14d..15fee421 100644
--- a/apps/backend/src/users/users.controller.spec.ts
+++ b/apps/backend/src/users/users.controller.spec.ts
@@ -67,7 +67,7 @@ describe('UsersController', () => {
 
       expect(result).toEqual(volunteers);
       expect(mockUserService.findUsersByRoles).toHaveBeenCalledWith([
-        Role.VOLUNTEER
+        Role.VOLUNTEER,
       ]);
     });
   });
diff --git a/apps/frontend/src/components/forms/pantryApplicationForm.tsx b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
index 4c7325bf..70f49e97 100644
--- a/apps/frontend/src/components/forms/pantryApplicationForm.tsx
+++ b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
@@ -515,12 +515,18 @@ export const submitPantryApplicationForm: ActionFunction = async ({
   const pantryApplicationData = new Map();
 
   const ActivityStorageMap: Record<string, string> = {
-    'Create a labeled, allergy-friendly shelf or shelves': Activity.CREATE_LABELED_SHELF,
-    'Provide clients and staff/volunteers with educational pamphlets': Activity.PROVIDE_EDUCATIONAL_PAMPHLETS,
-    "Use a spreadsheet to track clients' medical dietary needs and distribution of SSF items per month": Activity.TRACK_DIETARY_NEEDS,
-    'Post allergen-free resource flyers throughout pantry': Activity.POST_RESOURCE_FLYERS,
-    'Survey your clients to determine their medical dietary needs': Activity.SURVEY_CLIENTS,
-    'Collect feedback from allergen-avoidant clients on SSF foods': Activity.COLLECT_FEEDBACK,
+    'Create a labeled, allergy-friendly shelf or shelves':
+      Activity.CREATE_LABELED_SHELF,
+    'Provide clients and staff/volunteers with educational pamphlets':
+      Activity.PROVIDE_EDUCATIONAL_PAMPHLETS,
+    "Use a spreadsheet to track clients' medical dietary needs and distribution of SSF items per month":
+      Activity.TRACK_DIETARY_NEEDS,
+    'Post allergen-free resource flyers throughout pantry':
+      Activity.POST_RESOURCE_FLYERS,
+    'Survey your clients to determine their medical dietary needs':
+      Activity.SURVEY_CLIENTS,
+    'Collect feedback from allergen-avoidant clients on SSF foods':
+      Activity.COLLECT_FEEDBACK,
     'Something else': Activity.SOMETHING_ELSE,
   };
 
@@ -538,11 +544,16 @@ export const submitPantryApplicationForm: ActionFunction = async ({
   form.delete('restrictions');
 
   const selectedActivities = form.getAll('activities') as string[];
-  const convertedActivities = selectedActivities.map((activity) => ActivityStorageMap[activity]);
+  const convertedActivities = selectedActivities.map(
+    (activity) => ActivityStorageMap[activity],
+  );
   pantryApplicationData.set('activities', convertedActivities);
   form.delete('activities');
 
-  pantryApplicationData.set('dedicatedAllergyFriendly', form.get('dedicatedAllergyFriendly'));
+  pantryApplicationData.set(
+    'dedicatedAllergyFriendly',
+    form.get('dedicatedAllergyFriendly'),
+  );
   form.delete('dedicatedAllergyFriendly');
 
   // Handle all other questions
diff --git a/apps/frontend/src/components/forms/requestFormModal.tsx b/apps/frontend/src/components/forms/requestFormModal.tsx
index cb12dc51..9861327a 100644
--- a/apps/frontend/src/components/forms/requestFormModal.tsx
+++ b/apps/frontend/src/components/forms/requestFormModal.tsx
@@ -132,9 +132,7 @@ const FoodRequestFormModal: React.FC<FoodRequestFormModalProps> = ({
                       <RadioGroup.Item key={option} value={option}>
                         <RadioGroup.ItemHiddenInput />
                         <RadioGroup.ItemControl />
-                        <RadioGroup.ItemText>
-                          {option}
-                        </RadioGroup.ItemText>
+                        <RadioGroup.ItemText>{option}</RadioGroup.ItemText>
                       </RadioGroup.Item>
                     ))}
                   </HStack>
diff --git a/apps/frontend/src/main.tsx b/apps/frontend/src/main.tsx
index 10110223..7f571895 100644
--- a/apps/frontend/src/main.tsx
+++ b/apps/frontend/src/main.tsx
@@ -14,4 +14,4 @@ root.render(
       <App />
     </ChakraProvider>
   </StrictMode>,
-);
\ No newline at end of file
+);
diff --git a/apps/frontend/src/theme.ts b/apps/frontend/src/theme.ts
index c472e41f..c504bb84 100644
--- a/apps/frontend/src/theme.ts
+++ b/apps/frontend/src/theme.ts
@@ -1,4 +1,9 @@
-import { createSystem, defaultConfig, defineConfig, defineTextStyles } from '@chakra-ui/react';
+import {
+  createSystem,
+  defaultConfig,
+  defineConfig,
+  defineTextStyles,
+} from '@chakra-ui/react';
 
 const textStyles = defineTextStyles({
   body: {
@@ -10,7 +15,7 @@ const textStyles = defineTextStyles({
     value: {
       fontFamily: 'instrument',
       fontSize: '32px',
-      fontWeight: '400'
+      fontWeight: '400',
     },
   },
   h2: {
@@ -53,7 +58,7 @@ const customConfig = defineConfig({
       colors: {
         white: { value: '#fff' },
         black: { value: '#000' },
-        blue: { 
+        blue: {
           ssf: { value: '#2B5061' },
           100: { value: '#bee3f8' },
         },
@@ -79,4 +84,4 @@ const customConfig = defineConfig({
   },
 });
 
-export const system = createSystem(defaultConfig, customConfig); 
\ No newline at end of file
+export const system = createSystem(defaultConfig, customConfig);
diff --git a/apps/frontend/src/types/pantryEnums.ts b/apps/frontend/src/types/pantryEnums.ts
index e5f13a6f..cdf8b671 100644
--- a/apps/frontend/src/types/pantryEnums.ts
+++ b/apps/frontend/src/types/pantryEnums.ts
@@ -33,7 +33,7 @@ export enum PantryStatus {
 export enum Activity {
   CREATE_LABELED_SHELF = 'Create labeled shelf',
   PROVIDE_EDUCATIONAL_PAMPHLETS = 'Provide educational pamphlets',
-  TRACK_DIETARY_NEEDS ='Spreadsheet to track dietary needs',
+  TRACK_DIETARY_NEEDS = 'Spreadsheet to track dietary needs',
   POST_RESOURCE_FLYERS = 'Post allergen-free resource flyers',
   SURVEY_CLIENTS = 'Survey clients to determine medical dietary needs',
   COLLECT_FEEDBACK = 'Collect feedback from allergen-avoidant clients',
@@ -44,4 +44,4 @@ export enum ReserveFoodForAllergic {
   YES = 'Yes',
   SOME = 'Some',
   NO = 'No',
-}
\ No newline at end of file
+}
diff --git a/apps/frontend/src/types/types.ts b/apps/frontend/src/types/types.ts
index ed8adc9d..0dda7d21 100644
--- a/apps/frontend/src/types/types.ts
+++ b/apps/frontend/src/types/types.ts
@@ -1,12 +1,12 @@
-import { 
-  RefrigeratedDonation, 
-  ReserveFoodForAllergic, 
-  ClientVisitFrequency, 
+import {
+  RefrigeratedDonation,
+  ReserveFoodForAllergic,
+  ClientVisitFrequency,
   ServeAllergicChildren,
   AllergensConfidence,
   PantryStatus,
   Activity,
-} from "./pantryEnums";
+} from './pantryEnums';
 
 // Note: The API calls as currently written do not
 // return a pantry's SSF representative or pantry
@@ -217,4 +217,3 @@ export enum DonationStatus {
   FULFILLED = 'fulfilled',
   MATCHING = 'matching',
 }
-

From aff1c4b271e070a1fa61405250b0a430d62bcb97 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sat, 6 Dec 2025 16:42:50 -0500
Subject: [PATCH 03/11] Fixed merge conflicts

---
 .../pantries/dtos/pantry-application.dto.ts   |   2 +-
 .../forms/pantryApplicationForm.tsx           | 658 ++++++++++--------
 .../src/components/forms/requestFormModal.tsx |  22 -
 .../src/components/forms/usPhoneInput.tsx     |   5 +-
 apps/frontend/src/theme.ts                    |   6 +-
 5 files changed, 394 insertions(+), 299 deletions(-)

diff --git a/apps/backend/src/pantries/dtos/pantry-application.dto.ts b/apps/backend/src/pantries/dtos/pantry-application.dto.ts
index 42510915..c7473b0f 100644
--- a/apps/backend/src/pantries/dtos/pantry-application.dto.ts
+++ b/apps/backend/src/pantries/dtos/pantry-application.dto.ts
@@ -52,7 +52,7 @@ export class PantryApplicationDto {
   @IsNotEmpty()
   @MaxLength(255)
   emailContactOther?: string;
-  
+
   @IsOptional()
   @IsString()
   @IsNotEmpty()
diff --git a/apps/frontend/src/components/forms/pantryApplicationForm.tsx b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
index 48b693e0..df185caa 100644
--- a/apps/frontend/src/components/forms/pantryApplicationForm.tsx
+++ b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
@@ -67,18 +67,22 @@ const activityOptions = [
 
 const PantryApplicationForm: React.FC = () => {
   const [contactPhone, setContactPhone] = useState<string>('');
-  const [secondaryContactPhone, setSecondaryContactPhone] = useState<string>('');
+  const [secondaryContactPhone, setSecondaryContactPhone] =
+    useState<string>('');
   const [activities, setActivities] = useState<string[]>([]);
   const allergenClientsExactOption: string = 'I have an exact number';
 
   const [allergenClients, setAllergenClients] = useState<string | undefined>();
   const [restrictions, setRestrictions] = useState<string[]>([]);
-  const [reserveFoodForAllergic, setReserveFoodForAllergic] = useState<string>();
-  const [differentMailingAddress, setDifferentMailingAddress] = useState<boolean | null>();
+  const [reserveFoodForAllergic, setReserveFoodForAllergic] =
+    useState<string>();
+  const [differentMailingAddress, setDifferentMailingAddress] = useState<
+    boolean | null
+  >();
   const [otherEmailContact, setOtherEmailContact] = useState<boolean>(false);
 
   const sectionTitleStyles = {
-    fontFamily: "inter",
+    fontFamily: 'inter',
     fontWeight: '600',
     fontSize: 'md',
     color: 'gray.dark',
@@ -86,16 +90,16 @@ const PantryApplicationForm: React.FC = () => {
   };
 
   const sectionSubtitleStyles = {
-    fontFamily: "inter",
+    fontFamily: 'inter',
     fontWeight: '400',
     color: 'gray.light',
     mb: '2.25em',
     fontSize: 'sm',
-  }
+  };
 
   const fieldHeaderStyles = {
     color: 'neutral.800',
-    fontFamily: "inter",
+    fontFamily: 'inter',
     fontSize: 'sm',
     fontWeight: '600',
   };
@@ -103,96 +107,121 @@ const PantryApplicationForm: React.FC = () => {
   return (
     <Box width="100%" mx="11em" my="4em">
       <Box as="section" mb="2.75em">
-        <Heading textStyle="h1" fontWeight="normal" mb=".5em" >
+        <Heading textStyle="h1" fontWeight="normal" mb=".5em">
           Partner Pantry Application
         </Heading>
         <Text textStyle="p" color="gray.light">
-          Thank you for your interest in partnering with Securing Safe Food (SSF) to help 
-          serve clients with food allergies and other adverse reactions to foods.
+          Thank you for your interest in partnering with Securing Safe Food
+          (SSF) to help serve clients with food allergies and other adverse
+          reactions to foods.
         </Text>
       </Box>
-      <Box 
-        as="section" bg="#FEFEFE" p="2em" 
-        border="1px solid" borderColor="neutral.200" rounded="sm"
+      <Box
+        as="section"
+        bg="#FEFEFE"
+        p="2em"
+        border="1px solid"
+        borderColor="neutral.200"
+        rounded="sm"
       >
         <Form method="post" action="/pantry-application">
-          <Heading textStyle="h3" mb="1em" color="gray.dark" >
+          <Heading textStyle="h3" mb="1em" color="gray.dark">
             Pantry Application Form
           </Heading>
-          <Stack gap="1em" mb="2em" color="gray.light" textStyle="p" fontWeight="400">
+          <Stack
+            gap="1em"
+            mb="2em"
+            color="gray.light"
+            textStyle="p"
+            fontWeight="400"
+          >
             <Text>
-              This application helps us understand your pantry’s capacity and interest in 
-              distributing allergen-friendly food. We’ll ask about your pantry’s current 
-              practices, storage capabilities, and communication preferences.
+              This application helps us understand your pantry’s capacity and
+              interest in distributing allergen-friendly food. We’ll ask about
+              your pantry’s current practices, storage capabilities, and
+              communication preferences.
             </Text>
             <Text mb=".5em">
-              Please answer as accurately as possible. If you have any questions or need help, 
-              don’t hesitate to contact the SSF team.
+              Please answer as accurately as possible. If you have any questions
+              or need help, don’t hesitate to contact the SSF team.
             </Text>
             <Separator size="sm" color="neutral.100" />
           </Stack>
-          
-          <Text {...sectionTitleStyles}>
-            Primary Contact Information
-          </Text>
+
+          <Text {...sectionTitleStyles}>Primary Contact Information</Text>
           <SimpleGrid columns={2} columnGap={9} rowGap={10} mb="2.5em">
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 First Name
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="contactFirstName" type="text" borderColor="neutral.100" />
+              <Input
+                name="contactFirstName"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 Last Name
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="contactLastName" type="text" borderColor="neutral.100" />
+              <Input
+                name="contactLastName"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 Phone Number
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
               <USPhoneInput
                 value={contactPhone}
                 onChange={setContactPhone}
-                inputProps={{ name: 'contactPhone', borderColor: 'neutral.100' }}
+                inputProps={{
+                  name: 'contactPhone',
+                  borderColor: 'neutral.100',
+                }}
               />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 Email Address
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="contactEmail" type="email" borderColor="neutral.100" />
+              <Input
+                name="contactEmail"
+                type="email"
+                borderColor="neutral.100"
+              />
             </Field.Root>
           </SimpleGrid>
           <Field.Root required mb=".75em">
             <Field.Label {...fieldHeaderStyles} mb=".5em">
-              Is there someone at your pantry who can regularly check and respond to emails from SSF as needed?{' '}
-              <Field.RequiredIndicator color="red"/>
+              Is there someone at your pantry who can regularly check and
+              respond to emails from SSF as needed?{' '}
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <RadioGroup.Root 
+            <RadioGroup.Root
               name="hasEmailContact"
               variant="solid"
-              onValueChange={(e: {value: string}) => setOtherEmailContact(e.value === 'Other')}
+              onValueChange={(e: { value: string }) =>
+                setOtherEmailContact(e.value === 'Other')
+              }
             >
               <Stack>
                 {['Yes', 'No', 'Other'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
-                    <RadioGroup.ItemHiddenInput required/>
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemHiddenInput required />
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText 
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -201,127 +230,151 @@ const PantryApplicationForm: React.FC = () => {
             </RadioGroup.Root>
           </Field.Root>
           <Field.Root required={otherEmailContact} mb="2.5em">
-            <Input 
-              name="emailContactOther" 
-              type="text" 
-              borderColor="neutral.100" 
+            <Input
+              name="emailContactOther"
+              type="text"
+              borderColor="neutral.100"
               placeholder="If you selected other, please specify."
-              _placeholder={{ color: "neutral.800" }}
+              _placeholder={{ color: 'neutral.800' }}
               maxW="30em"
             />
           </Field.Root>
 
-          <Separator size="sm" color="neutral.100" mb="3em"/>
+          <Separator size="sm" color="neutral.100" mb="3em" />
 
-          <Text {...sectionTitleStyles}>
-            Secondary Contact Information
-          </Text>
+          <Text {...sectionTitleStyles}>Secondary Contact Information</Text>
           <SimpleGrid columns={2} columnGap={9} rowGap={9} mb="4em">
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                First Name
-              </Field.Label>
-              <Input name="secondaryContactFirstName" type="text" borderColor="neutral.100" />
+              <Field.Label {...fieldHeaderStyles}>First Name</Field.Label>
+              <Input
+                name="secondaryContactFirstName"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                Last Name
-              </Field.Label>
-              <Input name="secondaryContactLastName" type="text" borderColor="neutral.100" />
+              <Field.Label {...fieldHeaderStyles}>Last Name</Field.Label>
+              <Input
+                name="secondaryContactLastName"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                Phone Number
-              </Field.Label>
+              <Field.Label {...fieldHeaderStyles}>Phone Number</Field.Label>
               <USPhoneInput
                 value={secondaryContactPhone}
                 onChange={setSecondaryContactPhone}
                 allowEmpty={true}
-                inputProps={{ name: 'secondaryContactPhone', borderColor: 'neutral.100' }}
+                inputProps={{
+                  name: 'secondaryContactPhone',
+                  borderColor: 'neutral.100',
+                }}
               />
             </Field.Root>
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                Email Address
-              </Field.Label>
-              <Input name="secondaryContactEmail" type="email" borderColor="neutral.100" />
+              <Field.Label {...fieldHeaderStyles}>Email Address</Field.Label>
+              <Input
+                name="secondaryContactEmail"
+                type="email"
+                borderColor="neutral.100"
+              />
             </Field.Root>
           </SimpleGrid>
 
-          <Separator size="sm" color="neutral.100" mb="3em"/>
-          
+          <Separator size="sm" color="neutral.100" mb="3em" />
+
           <Text {...sectionTitleStyles} mb="0">
             Food Shipment Address
           </Text>
           <Text {...sectionSubtitleStyles}>
             Please list your address for <b>food shipments</b>.
           </Text>
-          <SimpleGrid columns={2} columnGap={9} rowGap={9} mb="2em" >
+          <SimpleGrid columns={2} columnGap={9} rowGap={9} mb="2em">
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 Address Line 1
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="shipmentAddressLine1" type="text" borderColor="neutral.100" />
+              <Input
+                name="shipmentAddressLine1"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                Address Line 2
-              </Field.Label>
-              <Input name="shipmentAddressLine2" type="text" borderColor="neutral.100" />
+              <Field.Label {...fieldHeaderStyles}>Address Line 2</Field.Label>
+              <Input
+                name="shipmentAddressLine2"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 City/Town
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="shipmentAddressCity" type="text" borderColor="neutral.100" />
+              <Input
+                name="shipmentAddressCity"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 State/Region/Province
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="shipmentAddressState" type="text" borderColor="neutral.100" />
+              <Input
+                name="shipmentAddressState"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 Zip/Post Code
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="shipmentAddressZip" type="text" borderColor="neutral.100" />
+              <Input
+                name="shipmentAddressZip"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                Country
-              </Field.Label>
-              <Input name="shipmentAddressCountry" type="text" borderColor="neutral.100" />
+              <Field.Label {...fieldHeaderStyles}>Country</Field.Label>
+              <Input
+                name="shipmentAddressCountry"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
           </SimpleGrid>
           <Field.Root required mb="2em">
             <Field.Label {...fieldHeaderStyles} mb=".5em">
-              Does this address differ from your pantry's mailing address for documents?{' '}
-              <Field.RequiredIndicator color="red"/>
+              Does this address differ from your pantry's mailing address for
+              documents? <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <RadioGroup.Root 
+            <RadioGroup.Root
               variant="solid"
-              onValueChange={(e: {value: string}) => setDifferentMailingAddress(e.value === 'Yes')}
+              onValueChange={(e: { value: string }) =>
+                setDifferentMailingAddress(e.value === 'Yes')
+              }
               name="differentMailingAddress"
             >
               <Stack>
                 {['Yes', 'No'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
-                    <RadioGroup.ItemHiddenInput required/>
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemHiddenInput required />
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText 
-                      color="neutral.700" 
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -331,28 +384,22 @@ const PantryApplicationForm: React.FC = () => {
           </Field.Root>
           <Field.Root required mb="2em">
             <Field.Label {...fieldHeaderStyles} mb=".5em">
-              Would your pantry be able to accept food deliveries 
-              during standard business hours Mon-Fri?{' '}
-              <Field.RequiredIndicator color="red"/>
+              Would your pantry be able to accept food deliveries during
+              standard business hours Mon-Fri?{' '}
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <RadioGroup.Root 
-              name="acceptFoodDeliveries"
-              variant="solid"
-            >
+            <RadioGroup.Root name="acceptFoodDeliveries" variant="solid">
               <Stack>
                 {['Yes', 'No'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
                     <RadioGroup.ItemHiddenInput required />
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -364,10 +411,13 @@ const PantryApplicationForm: React.FC = () => {
             <Field.Label {...fieldHeaderStyles}>
               Please note any delivery window restrictions.
             </Field.Label>
-            <Textarea name="deliveryWindowInstructions" borderColor="neutral.100" />
+            <Textarea
+              name="deliveryWindowInstructions"
+              borderColor="neutral.100"
+            />
           </Field.Root>
 
-          <Separator size="sm" color="neutral.100" my="3em"/>
+          <Separator size="sm" color="neutral.100" my="3em" />
 
           {differentMailingAddress && (
             <>
@@ -377,61 +427,81 @@ const PantryApplicationForm: React.FC = () => {
               <Text {...sectionSubtitleStyles}>
                 Please list your mailing address for <b>documents</b>.
               </Text>
-              <SimpleGrid columns={2} columnGap={9} rowGap={9} mb="4em" >
+              <SimpleGrid columns={2} columnGap={9} rowGap={9} mb="4em">
                 <Field.Root required={differentMailingAddress}>
                   <Field.Label {...fieldHeaderStyles}>
                     Address Line 1
-                    <Field.RequiredIndicator color="red"/>
+                    <Field.RequiredIndicator color="red" />
                   </Field.Label>
-                  <Input name="mailingAddressLine1" type="text" borderColor="neutral.100" />
+                  <Input
+                    name="mailingAddressLine1"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
                 <Field.Root>
                   <Field.Label {...fieldHeaderStyles}>
                     Address Line 2
                   </Field.Label>
-                  <Input name="mailingAddressLine2" type="text" borderColor="neutral.100" />
+                  <Input
+                    name="mailingAddressLine2"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
                 <Field.Root required={differentMailingAddress}>
                   <Field.Label {...fieldHeaderStyles}>
                     City/Town
-                    <Field.RequiredIndicator color="red"/>
+                    <Field.RequiredIndicator color="red" />
                   </Field.Label>
-                  <Input name="mailingAddressCity" type="text" borderColor="neutral.100" />
+                  <Input
+                    name="mailingAddressCity"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
                 <Field.Root required={differentMailingAddress}>
                   <Field.Label {...fieldHeaderStyles}>
                     State/Region/Province
-                    <Field.RequiredIndicator color="red"/>
+                    <Field.RequiredIndicator color="red" />
                   </Field.Label>
-                  <Input name="mailingAddressState" type="text" borderColor="neutral.100" />
+                  <Input
+                    name="mailingAddressState"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
                 <Field.Root required={differentMailingAddress}>
                   <Field.Label {...fieldHeaderStyles}>
                     Zip/Post Code
-                    <Field.RequiredIndicator color="red"/>
+                    <Field.RequiredIndicator color="red" />
                   </Field.Label>
-                  <Input name="mailingAddressZip" type="text" borderColor="neutral.100" />
+                  <Input
+                    name="mailingAddressZip"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
                 <Field.Root>
-                  <Field.Label {...fieldHeaderStyles}>
-                    Country
-                  </Field.Label>
-                  <Input name="mailingAddressCountry" type="text" borderColor="neutral.100" />
+                  <Field.Label {...fieldHeaderStyles}>Country</Field.Label>
+                  <Input
+                    name="mailingAddressCountry"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
               </SimpleGrid>
 
-              <Separator size="sm" color="neutral.100" my="3em"/>
+              <Separator size="sm" color="neutral.100" my="3em" />
             </>
           )}
-          
-          <Text {...sectionTitleStyles}>
-            Pantry Details
-          </Text>
+
+          <Text {...sectionTitleStyles}>Pantry Details</Text>
           <Field.Root required mb="2em">
             <Field.Label asChild>
               <Text {...fieldHeaderStyles}>
                 Pantry Name
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Text>
             </Field.Label>
             <Input name="pantryName" type="text" borderColor="neutral.100" />
@@ -440,7 +510,7 @@ const PantryApplicationForm: React.FC = () => {
             <Field.Label {...fieldHeaderStyles}>
               Approximately how many allergen-avoidant clients does your pantry
               serve?
-              <Field.RequiredIndicator color="red"/>
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
             <NativeSelect.Root>
               <NativeSelect.Field
@@ -465,7 +535,7 @@ const PantryApplicationForm: React.FC = () => {
                   </option>
                 ))}
               </NativeSelect.Field>
-              <NativeSelectIndicator/>
+              <NativeSelectIndicator />
             </NativeSelect.Root>
           </Field.Root>
           {allergenClients === allergenClientsExactOption && (
@@ -492,7 +562,12 @@ const PantryApplicationForm: React.FC = () => {
             </Field.Label>
 
             {restrictions.map((value) => (
-              <input type="hidden" name="restrictions" key={value} value={value} />
+              <input
+                type="hidden"
+                name="restrictions"
+                key={value}
+                value={value}
+              />
             ))}
 
             <Menu.Root closeOnSelect={false}>
@@ -502,7 +577,7 @@ const PantryApplicationForm: React.FC = () => {
                   pr={2}
                   w="full"
                   bgColor="white"
-                  color='neutral.800'
+                  color="neutral.800"
                   borderColor="neutral.100"
                   justifyContent="space-between"
                   textStyle="p2"
@@ -513,15 +588,15 @@ const PantryApplicationForm: React.FC = () => {
                     : 'Select restrictions'}
                   <ChevronDownIcon />
 
-                  <input 
+                  <input
                     type="text"
                     name="restrictions-required"
                     value={restrictions.length > 0 ? 'selected' : ''}
                     required
-                    style={{ 
+                    style={{
                       position: 'absolute',
                       opacity: 0,
-                      pointerEvents: 'none'
+                      pointerEvents: 'none',
                     }}
                   />
                 </Button>
@@ -574,7 +649,7 @@ const PantryApplicationForm: React.FC = () => {
             {restrictions.length > 0 && (
               <Flex wrap="wrap" mt={1} gap={2}>
                 {restrictions.map((value) => (
-                  <Tag.Root 
+                  <Tag.Root
                     key={value}
                     bg="teal.100"
                     p={2}
@@ -583,10 +658,10 @@ const PantryApplicationForm: React.FC = () => {
                   >
                     <Tag.Label>{value}</Tag.Label>
                     <Tag.EndElement ml={4}>
-                      <Tag.CloseTrigger 
+                      <Tag.CloseTrigger
                         onClick={() =>
                           setRestrictions((prev) =>
-                            prev.filter((item) => item !== value)
+                            prev.filter((item) => item !== value),
                           )
                         }
                         style={{ cursor: 'pointer' }}
@@ -601,8 +676,10 @@ const PantryApplicationForm: React.FC = () => {
           {restrictions.find((option) =>
             otherRestrictionsOptions.includes(option),
           ) && (
-            <Field.Root 
-              required={restrictions.find((option) => otherRestrictionsOptions.includes(option))}
+            <Field.Root
+              required={restrictions.find((option) =>
+                otherRestrictionsOptions.includes(option),
+              )}
               mb="2em"
             >
               <Field.Label {...fieldHeaderStyles}>
@@ -614,27 +691,26 @@ const PantryApplicationForm: React.FC = () => {
           )}
           <Field.Root required mb="2em">
             <Field.Label {...fieldHeaderStyles}>
-              Would you be able to accept frozen donations that require refrigeration or freezing?
-              <Field.RequiredIndicator color="red"/>
+              Would you be able to accept frozen donations that require
+              refrigeration or freezing?
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <RadioGroup.Root 
-              name="refrigeratedDonation"
-              variant="solid"
-            >
+            <RadioGroup.Root name="refrigeratedDonation" variant="solid">
               <Stack>
-                {['Yes, always', 'No', 'Sometimes (check in before sending)'].map((value) => (
+                {[
+                  'Yes, always',
+                  'No',
+                  'Sometimes (check in before sending)',
+                ].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
-                    <RadioGroup.ItemHiddenInput required/>
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemHiddenInput required />
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText 
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -647,26 +723,20 @@ const PantryApplicationForm: React.FC = () => {
             <Field.Label {...fieldHeaderStyles}>
               Do you have a dedicated shelf or section of your pantry for
               allergy-friendly items?
-              <Field.RequiredIndicator color="red"/>
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <RadioGroup.Root 
-              name="dedicatedAllergyFriendly"
-              variant="solid"
-            >
+            <RadioGroup.Root name="dedicatedAllergyFriendly" variant="solid">
               <Stack>
                 {['Yes', 'No'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
-                    <RadioGroup.ItemHiddenInput required/>
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemHiddenInput required />
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText 
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -677,34 +747,33 @@ const PantryApplicationForm: React.FC = () => {
 
           <Field.Root required mb="2em">
             <Field.Label {...fieldHeaderStyles}>
-              Are you willing to reserve our food shipments for allergen-avoidant
-              individuals?{' '}
-              <Field.RequiredIndicator color="red"/>
+              Are you willing to reserve our food shipments for
+              allergen-avoidant individuals?{' '}
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
             <Field.HelperText color="neutral.600" mb=".5em">
-              For example, grouping allergen-friendly items on a separate shelf or 
-              in separate bins and encouraging non-allergic clients to save these 
-              items for clients who do not have other safe food options.
+              For example, grouping allergen-friendly items on a separate shelf
+              or in separate bins and encouraging non-allergic clients to save
+              these items for clients who do not have other safe food options.
             </Field.HelperText>
-            <RadioGroup.Root 
+            <RadioGroup.Root
               name="reserveFoodForAllergic"
               variant="solid"
-              onValueChange={(e: {value: string}) => setReserveFoodForAllergic(e.value)}
+              onValueChange={(e: { value: string }) =>
+                setReserveFoodForAllergic(e.value)
+              }
             >
               <Stack>
                 {['Yes', 'Some', 'No'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
-                    <RadioGroup.ItemHiddenInput required/>
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemHiddenInput required />
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText 
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -716,10 +785,15 @@ const PantryApplicationForm: React.FC = () => {
           {reserveFoodForAllergic === 'Yes' && (
             <Field.Root mb="2em">
               <Field.Label {...fieldHeaderStyles}>
-                How would you work to ensure that allergen-friendly foods are distributed to 
-                clients with food allergies or other adverse reactions to foods?
+                How would you work to ensure that allergen-friendly foods are
+                distributed to clients with food allergies or other adverse
+                reactions to foods?
               </Field.Label>
-              <Textarea name="reservationExplanation" borderColor="neutral.100" autoresize />
+              <Textarea
+                name="reservationExplanation"
+                borderColor="neutral.100"
+                autoresize
+              />
             </Field.Root>
           )}
 
@@ -728,7 +802,11 @@ const PantryApplicationForm: React.FC = () => {
               <Field.Label {...fieldHeaderStyles}>
                 Please explain why you selected "Some."
               </Field.Label>
-              <Textarea name="reservationExplanation" borderColor="neutral.100" autoresize />
+              <Textarea
+                name="reservationExplanation"
+                borderColor="neutral.100"
+                autoresize
+              />
             </Field.Root>
           )}
 
@@ -736,7 +814,7 @@ const PantryApplicationForm: React.FC = () => {
             <Field.Label {...fieldHeaderStyles}>
               How often do allergen-avoidant clients visit your food pantry?
             </Field.Label>
-            <NativeSelect.Root >
+            <NativeSelect.Root>
               <NativeSelect.Field
                 placeholder="Select an option"
                 name="clientVisitFrequency"
@@ -763,7 +841,7 @@ const PantryApplicationForm: React.FC = () => {
               Are you confident in identifying the top 9 allergens in an
               ingredient list?
             </Field.Label>
-            <NativeSelect.Root >
+            <NativeSelect.Root>
               <NativeSelect.Field
                 placeholder="Select an option"
                 name="identifyAllergensConfidence"
@@ -792,18 +870,20 @@ const PantryApplicationForm: React.FC = () => {
               Do you serve allergen-avoidant or food-allergic children at your
               pantry?
             </Field.Label>
-            <NativeSelect.Root >
+            <NativeSelect.Root>
               <NativeSelect.Field
                 placeholder="Select an option"
                 name="serveAllergicChildren"
                 borderColor="neutral.100"
                 color="neutral.800"
               >
-                {['Yes, many (> 10)', 'Yes, a few (< 10)', 'No'].map((value) => (
-                  <option key={value} value={value}>
-                    {value}
-                  </option>
-                ))}
+                {['Yes, many (> 10)', 'Yes, a few (< 10)', 'No'].map(
+                  (value) => (
+                    <option key={value} value={value}>
+                      {value}
+                    </option>
+                  ),
+                )}
               </NativeSelect.Field>
               <NativeSelectIndicator />
             </NativeSelect.Root>
@@ -819,7 +899,12 @@ const PantryApplicationForm: React.FC = () => {
             </Field.Label>
 
             {activities.map((value) => (
-              <input type="hidden" name="activities" key={value} value={value} />
+              <input
+                type="hidden"
+                name="activities"
+                key={value}
+                value={value}
+              />
             ))}
 
             <Menu.Root closeOnSelect={false}>
@@ -829,7 +914,7 @@ const PantryApplicationForm: React.FC = () => {
                   pr={2}
                   w="full"
                   bgColor="white"
-                  color='neutral.800'
+                  color="neutral.800"
                   borderColor="neutral.100"
                   justifyContent="space-between"
                   textStyle="p2"
@@ -840,15 +925,15 @@ const PantryApplicationForm: React.FC = () => {
                     : 'Select activities'}
                   <ChevronDownIcon />
 
-                  <input 
+                  <input
                     type="text"
                     name="activities-required"
                     value={activities.length > 0 ? 'selected' : ''}
                     required
-                    style={{ 
+                    style={{
                       position: 'absolute',
                       opacity: 0,
-                      pointerEvents: 'none'
+                      pointerEvents: 'none',
                     }}
                   />
                 </Button>
@@ -901,7 +986,7 @@ const PantryApplicationForm: React.FC = () => {
             {activities.length > 0 && (
               <Flex wrap="wrap" mt={1} gap={2}>
                 {activities.map((value) => (
-                  <Tag.Root 
+                  <Tag.Root
                     key={value}
                     bg="teal.100"
                     p={2}
@@ -910,10 +995,10 @@ const PantryApplicationForm: React.FC = () => {
                   >
                     <Tag.Label>{value}</Tag.Label>
                     <Tag.EndElement ml={4}>
-                      <Tag.CloseTrigger 
+                      <Tag.CloseTrigger
                         onClick={() =>
                           setActivities((prev) =>
-                            prev.filter((item) => item !== value)
+                            prev.filter((item) => item !== value),
                           )
                         }
                         style={{ cursor: 'pointer' }}
@@ -928,17 +1013,18 @@ const PantryApplicationForm: React.FC = () => {
               following are additional ways to help us better support you!
               Please select all that apply.
             </Field.HelperText>
-          </Field.Root>       
+          </Field.Root>
           <Field.Root required={activities.includes('Something else')} mb="2em">
             <Field.Label {...fieldHeaderStyles}>
-              Please list any comments/concerns related to the previous question.
+              Please list any comments/concerns related to the previous
+              question.
               {activities.includes('Something else') && (
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               )}
             </Field.Label>
-            <Textarea 
-              name="activitiesComments" 
-              borderColor="neutral.100" 
+            <Textarea
+              name="activitiesComments"
+              borderColor="neutral.100"
               autoresize
             />
             <Field.HelperText color="neutral.600">
@@ -947,48 +1033,51 @@ const PantryApplicationForm: React.FC = () => {
           </Field.Root>
           <Field.Root required mb="2em">
             <Field.Label {...fieldHeaderStyles}>
-              What types of allergen-free items, if any, do you currently have in
-              stock?
-              <Field.RequiredIndicator color="red"/>
+              What types of allergen-free items, if any, do you currently have
+              in stock?
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <Textarea name="itemsInStock" borderColor="neutral.100" autoresize />
+            <Textarea
+              name="itemsInStock"
+              borderColor="neutral.100"
+              autoresize
+            />
             <Field.HelperText color="neutral.600">
-              For example, gluten-free breads, sunflower seed butters, nondairy beverages, etc.
+              For example, gluten-free breads, sunflower seed butters, nondairy
+              beverages, etc.
             </Field.HelperText>
           </Field.Root>
           <Field.Root required mb="4em">
             <Field.Label {...fieldHeaderStyles}>
               Do allergen-avoidant clients at your pantry ever request a greater
               variety of items or not have enough options? Please explain.
-              <Field.RequiredIndicator color="red"/>
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <Textarea name="needMoreOptions" borderColor="neutral.100" autoresize />
+            <Textarea
+              name="needMoreOptions"
+              borderColor="neutral.100"
+              autoresize
+            />
           </Field.Root>
 
-          <Separator size="sm" color="neutral.100" my="3em"/>
+          <Separator size="sm" color="neutral.100" my="3em" />
 
           <Field.Root mb="2em">
             <Field.Label {...fieldHeaderStyles}>
               Would you like to subscribe to our quarterly newsletter?
             </Field.Label>
-            <RadioGroup.Root 
-              name="newsletterSubscription"
-              variant="solid"
-            >
+            <RadioGroup.Root name="newsletterSubscription" variant="solid">
               <Stack>
                 {['Yes', 'No'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
                     <RadioGroup.ItemHiddenInput />
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -998,32 +1087,29 @@ const PantryApplicationForm: React.FC = () => {
           </Field.Root>
           <Field.Root required mb="4em">
             <Checkbox.Root>
-              <Checkbox.HiddenInput/>
-              <Checkbox.Control 
-                border="1px solid" 
-                borderColor="neutral.100" 
+              <Checkbox.HiddenInput />
+              <Checkbox.Control
+                border="1px solid"
+                borderColor="neutral.100"
                 _checked={{ bg: 'neutral.800' }}
               />
               <Checkbox.Label {...fieldHeaderStyles}>
                 By submitting this form, you agree to our Privacy Policy.{' '}
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Checkbox.Label>
             </Checkbox.Root>
           </Field.Root>
           <Box display="flex" gap={2} justifyContent="flex-end" mb={6}>
             <Button
-              border="1px solid" 
-              color="neutral.800" 
+              border="1px solid"
+              color="neutral.800"
               borderColor="neutral.200"
               fontWeight={600}
               bg="white"
             >
               Cancel
             </Button>
-            <Button 
-              type="submit" bg="blue.ssf" 
-              fontWeight={600} px={8}
-            >
+            <Button type="submit" bg="blue.ssf" fontWeight={600} px={8}>
               Submit Application
             </Button>
           </Box>
@@ -1061,7 +1147,7 @@ export const submitPantryApplicationForm: ActionFunction = async ({
     restrictions.push(restrictionsOther as string);
   }
   pantryApplicationData.set('restrictions', restrictions);
-  form.delete('restrictions')
+  form.delete('restrictions');
   form.delete('restrictionsOther');
 
   const selectedActivities = form.getAll('activities') as string[];
@@ -1071,31 +1157,59 @@ export const submitPantryApplicationForm: ActionFunction = async ({
   pantryApplicationData.set('activities', convertedActivities);
   form.delete('activities');
 
-  pantryApplicationData.set('newsletterSubscription', form.get("newsletterSubscription") === "Yes");
-  pantryApplicationData.set('acceptFoodDeliveries', form.get("acceptFoodDeliveries") === "Yes");
-  pantryApplicationData.set('dedicatedAllergyFriendly', form.get("dedicatedAllergyFriendly") === "Yes");
-  pantryApplicationData.set('hasEmailContact', form.get("hasEmailContact") === "Yes");
-  form.delete('newsletterSubscription')
-  form.delete('acceptFoodDeliveries')
-  form.delete('dedicatedAllergyFriendly')
-  form.delete('hasEmailContact')
+  pantryApplicationData.set(
+    'newsletterSubscription',
+    form.get('newsletterSubscription') === 'Yes',
+  );
+  pantryApplicationData.set(
+    'acceptFoodDeliveries',
+    form.get('acceptFoodDeliveries') === 'Yes',
+  );
+  pantryApplicationData.set(
+    'dedicatedAllergyFriendly',
+    form.get('dedicatedAllergyFriendly') === 'Yes',
+  );
+  pantryApplicationData.set(
+    'hasEmailContact',
+    form.get('hasEmailContact') === 'Yes',
+  );
+  form.delete('newsletterSubscription');
+  form.delete('acceptFoodDeliveries');
+  form.delete('dedicatedAllergyFriendly');
+  form.delete('hasEmailContact');
 
   // Handle mailing address
-  if (form.get("differentMailingAddress") === "No") {
-    pantryApplicationData.set('mailingAddressLine1', form.get('shipmentAddressLine1'));
-    pantryApplicationData.set('mailingAddressLine2', form.get('shipmentAddressLine2') || null);
-    pantryApplicationData.set('mailingAddressCity', form.get('shipmentAddressCity'));
-    pantryApplicationData.set('mailingAddressState', form.get('shipmentAddressState'));
-    pantryApplicationData.set('mailingAddressZip', form.get('shipmentAddressZip'));
-    pantryApplicationData.set('mailingAddressCountry', form.get('shipmentAddressCountry') || null);
+  if (form.get('differentMailingAddress') === 'No') {
+    pantryApplicationData.set(
+      'mailingAddressLine1',
+      form.get('shipmentAddressLine1'),
+    );
+    pantryApplicationData.set(
+      'mailingAddressLine2',
+      form.get('shipmentAddressLine2') || null,
+    );
+    pantryApplicationData.set(
+      'mailingAddressCity',
+      form.get('shipmentAddressCity'),
+    );
+    pantryApplicationData.set(
+      'mailingAddressState',
+      form.get('shipmentAddressState'),
+    );
+    pantryApplicationData.set(
+      'mailingAddressZip',
+      form.get('shipmentAddressZip'),
+    );
+    pantryApplicationData.set(
+      'mailingAddressCountry',
+      form.get('shipmentAddressCountry') || null,
+    );
   }
-  form.delete('differentMailingAddress')
+  form.delete('differentMailingAddress');
 
   // Replace the answer for allergenClients with the answer
   // for allergenClientsExact if it is given
-  const allergenClientsExact = form.get(
-    'allergenClientsExact',
-  );
+  const allergenClientsExact = form.get('allergenClientsExact');
   if ((allergenClientsExact ?? '') !== '') {
     pantryApplicationData.set('allergenClients', allergenClientsExact);
   }
@@ -1106,7 +1220,7 @@ export const submitPantryApplicationForm: ActionFunction = async ({
     if (value === '') {
       pantryApplicationData.set(key, null);
     } else {
-      pantryApplicationData.set(key, value)
+      pantryApplicationData.set(key, value);
     }
   });
 
@@ -1128,12 +1242,14 @@ export const submitPantryApplicationForm: ActionFunction = async ({
         );
       } else {
         alert('Form submission failed; please try again');
-        console.log(error)
+        console.log(error);
       }
     },
   );
 
-  return submissionSuccessful ? redirect('/pantry-application/submitted') : null;
+  return submissionSuccessful
+    ? redirect('/pantry-application/submitted')
+    : null;
 };
 
 export default PantryApplicationForm;
diff --git a/apps/frontend/src/components/forms/requestFormModal.tsx b/apps/frontend/src/components/forms/requestFormModal.tsx
index 74c0f55b..348cb247 100644
--- a/apps/frontend/src/components/forms/requestFormModal.tsx
+++ b/apps/frontend/src/components/forms/requestFormModal.tsx
@@ -125,27 +125,6 @@ const FoodRequestFormModal: React.FC<FoodRequestFormModalProps> = ({
                     Size of Shipment
                   </Text>
                 </Field.Label>
-<<<<<<< HEAD
-                <RadioGroup.Root
-                  value={requestedSize}
-                  onValueChange={(e: { value: string }) =>
-                    setRequestedSize(e.value)
-                  }
-                  name="size"
-                  disabled={readOnly}
-                  required
-                >
-                  <HStack gap="24px">
-                    {Object.values(RequestSize).map((option) => (
-                      <RadioGroup.Item key={option} value={option}>
-                        <RadioGroup.ItemHiddenInput />
-                        <RadioGroup.ItemControl />
-                        <RadioGroup.ItemText>{option}</RadioGroup.ItemText>
-                      </RadioGroup.Item>
-                    ))}
-                  </HStack>
-                </RadioGroup.Root>
-=======
                 <input type="hidden" name="size" value={requestedSize} />
                 <Menu.Root>
                   <Menu.Trigger asChild>
@@ -189,7 +168,6 @@ const FoodRequestFormModal: React.FC<FoodRequestFormModalProps> = ({
                     </Menu.Content>
                   </Menu.Positioner>
                 </Menu.Root>
->>>>>>> main
               </Field.Root>
 
               <Field.Root mb={4}>
diff --git a/apps/frontend/src/components/forms/usPhoneInput.tsx b/apps/frontend/src/components/forms/usPhoneInput.tsx
index 7dd3dc16..dd172c16 100644
--- a/apps/frontend/src/components/forms/usPhoneInput.tsx
+++ b/apps/frontend/src/components/forms/usPhoneInput.tsx
@@ -46,8 +46,9 @@ export const USPhoneInput: React.FC<USPhoneInputProps> = ({
       // +1 country code is automatically added to data.phone, so after removing
       // all non-digits, a length of 0-1 means the field is empty
       // (the input does not allow non-digit characters)
-      const digits = data.phone.replace(/\D/g, '')
-      const isEmpty = !data.phone || data.phone.trim() === '' || digits.length <= 1;
+      const digits = data.phone.replace(/\D/g, '');
+      const isEmpty =
+        !data.phone || data.phone.trim() === '' || digits.length <= 1;
 
       onChange(isEmpty ? '' : data.phone);
 
diff --git a/apps/frontend/src/theme.ts b/apps/frontend/src/theme.ts
index b2df6c8d..874fae37 100644
--- a/apps/frontend/src/theme.ts
+++ b/apps/frontend/src/theme.ts
@@ -82,14 +82,14 @@ const customConfig = defineConfig({
           800: { value: '#414141' },
           900: { value: '#212529' },
         },
-        gray: { 
+        gray: {
           light: { value: '#515151' },
           dark: { value: '#111' },
         },
         teal: {
           400: { value: '#A9D5DB' },
           100: { value: '#E9F4F6' },
-        }
+        },
       },
       fonts: {
         instrument: { value: `'Instrument Serif', serif` },
@@ -105,7 +105,7 @@ const customConfig = defineConfig({
     'h1, h2, h3, h4, h5, h6': {
       fontFamily: 'heading',
     },
-    'body': {
+    body: {
       bg: '#FAFAFA',
     },
   },

From cae6a265136f13d456d9cd86e165290b14ccc810 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sat, 6 Dec 2025 17:02:44 -0500
Subject: [PATCH 04/11] Resolved merge conflicts and rewrote unit test

---
 .../src/users/users.controller.spec.ts        | 30 ++++++++++++-------
 apps/backend/src/users/users.service.ts       |  6 ++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/apps/backend/src/users/users.controller.spec.ts b/apps/backend/src/users/users.controller.spec.ts
index c9de7f76..b27e7a7e 100644
--- a/apps/backend/src/users/users.controller.spec.ts
+++ b/apps/backend/src/users/users.controller.spec.ts
@@ -78,18 +78,26 @@ describe('UsersController', () => {
 
   describe('GET /volunteers', () => {
     it('should return all volunteers', async () => {
-      const volunteers = [mockUser1, mockUser2];
-      mockUserService.findUsersByRoles.mockResolvedValue(volunteers as User[]);
+      const volunteers: Partial<User>[] = [
+        {
+          id: 1,
+          role: Role.VOLUNTEER,
+          pantries: [{ pantryId: 1 }] as Pantry[],
+        },
+        {
+          id: 2,
+          role: Role.VOLUNTEER,
+          pantries: [{ pantryId: 2 }] as Pantry[],
+        },
+      ];
 
-      const result = await controller.getAllVolunteers();
+      mockUserService.getVolunteersAndPantryAssignments.mockResolvedValue(volunteers as (Omit<User, 'pantries'> & { pantryIds: number[] })[],);
 
-      const hasAdmin = result.some((user) => user.role === Role.ADMIN);
-      expect(hasAdmin).toBe(false);
+      const result = await controller.getAllVolunteers();
 
       expect(result).toEqual(volunteers);
-      expect(mockUserService.findUsersByRoles).toHaveBeenCalledWith([
-        Role.VOLUNTEER,
-      ]);
+      expect(result.some((u) => u.role === Role.ADMIN)).toBe(false);
+      expect(mockUserService.getVolunteersAndPantryAssignments).toHaveBeenCalled();
     });
   });
 
@@ -196,11 +204,11 @@ describe('UsersController', () => {
       expect(result).toEqual(assignments);
       expect(result).toHaveLength(3);
       expect(result[0].id).toBe(1);
-      expect(result[0].pantries).toEqual([1, 2]);
+      expect(result[0].pantryIds).toEqual([1, 2]);
       expect(result[1].id).toBe(2543210);
-      expect(result[1].pantries).toEqual([1]);
+      expect(result[1].pantryIds).toEqual([1]);
       expect(result[2].id).toBe(3);
-      expect(result[2].pantries).toEqual([]);
+      expect(result[2].pantryIds).toEqual([]);
       expect(
         mockUserService.getVolunteersAndPantryAssignments,
       ).toHaveBeenCalled();
diff --git a/apps/backend/src/users/users.service.ts b/apps/backend/src/users/users.service.ts
index 1f0984e3..65f90ae1 100644
--- a/apps/backend/src/users/users.service.ts
+++ b/apps/backend/src/users/users.service.ts
@@ -7,7 +7,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { In, Repository } from 'typeorm';
 
 import { User } from './user.entity';
-import { Role, VOLUNTEER_ROLES } from './types';
+import { Role } from './types';
 import { validateId } from '../utils/validation.utils';
 import { Pantry } from '../pantries/pantries.entity';
 import { PantriesService } from '../pantries/pantries.service';
@@ -60,7 +60,7 @@ export class UsersService {
 
     if (!volunteer)
       throw new NotFoundException(`User ${volunteerId} not found`);
-    if (!VOLUNTEER_ROLES.includes(volunteer.role)) {
+    if (volunteer.role !== Role.VOLUNTEER) {
       throw new BadRequestException(`User ${volunteerId} is not a volunteer`);
     }
     return volunteer;
@@ -106,7 +106,7 @@ export class UsersService {
   async getVolunteersAndPantryAssignments(): Promise<
     (Omit<User, 'pantries'> & { pantryIds: number[] })[]
   > {
-    const volunteers = await this.findUsersByRoles(VOLUNTEER_ROLES);
+    const volunteers = await this.findUsersByRoles([Role.VOLUNTEER]);
 
     return volunteers.map((v) => {
       const { pantries, ...volunteerWithoutPantries } = v;

From c17e81fd9b68b9e6abaf048c6355dbea0e4b235d Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sat, 6 Dec 2025 17:11:14 -0500
Subject: [PATCH 05/11] prettier

---
 apps/backend/src/users/users.controller.spec.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/backend/src/users/users.controller.spec.ts b/apps/backend/src/users/users.controller.spec.ts
index b27e7a7e..e8f0172e 100644
--- a/apps/backend/src/users/users.controller.spec.ts
+++ b/apps/backend/src/users/users.controller.spec.ts
@@ -91,13 +91,17 @@ describe('UsersController', () => {
         },
       ];
 
-      mockUserService.getVolunteersAndPantryAssignments.mockResolvedValue(volunteers as (Omit<User, 'pantries'> & { pantryIds: number[] })[],);
+      mockUserService.getVolunteersAndPantryAssignments.mockResolvedValue(
+        volunteers as (Omit<User, 'pantries'> & { pantryIds: number[] })[],
+      );
 
       const result = await controller.getAllVolunteers();
 
       expect(result).toEqual(volunteers);
       expect(result.some((u) => u.role === Role.ADMIN)).toBe(false);
-      expect(mockUserService.getVolunteersAndPantryAssignments).toHaveBeenCalled();
+      expect(
+        mockUserService.getVolunteersAndPantryAssignments,
+      ).toHaveBeenCalled();
     });
   });
 

From d3cb538cbfa4b06bfae032871918ef095333dfe3 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sun, 7 Dec 2025 10:34:09 -0500
Subject: [PATCH 06/11] Fixed migration

---
 ...4811878152-RemoveMultipleVolunteerTypes.ts | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
index 55090840..97007c41 100644
--- a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
+++ b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
@@ -1,42 +1,46 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
 
-export class RemoveMultipleVolunteerTypes1764811878152
-  implements MigrationInterface
-{
+export class RemoveMultipleVolunteerTypes1764811878152 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(`
-            ALTER TABLE users
-            DROP COLUMN role;
-            DROP TYPE IF EXISTS users_role_enum;
+      ALTER TABLE users ALTER COLUMN role DROP DEFAULT;
 
-            CREATE TYPE "users_role_enum" AS ENUM (
-                'admin',
-                'volunteer',
-                'pantry',
-                'food_manufacturer'
-            );
+      CREATE TYPE "users_role_enum_new" AS ENUM (
+        'admin',
+        'volunteer',
+        'pantry',
+        'food_manufacturer'
+      );
 
-            ALTER TABLE users
-            ADD COLUMN role users_role_enum NOT NULL DEFAULT 'volunteer';
-        `);
+      ALTER TABLE users
+      ALTER COLUMN role
+      TYPE users_role_enum_new
+      USING role::text::users_role_enum_new;
+      DROP TYPE users_role_enum;
+      ALTER TYPE users_role_enum_new
+      RENAME TO users_role_enum;
+    `);
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(`
-            ALTER TABLE users
-            DROP COLUMN role;
-            DROP TYPE IF EXISTS users_role_enum;
+      ALTER TABLE users ALTER COLUMN role DROP DEFAULT;
 
-            CREATE TYPE "users_role_enum" AS ENUM (
-                'admin',
-                'lead_volunteer',
-                'standard_volunteer',
-                'pantry',
-                'food_manufacturer'
-            );
+      CREATE TYPE "users_role_enum_old" AS ENUM (
+        'admin',
+        'lead_volunteer',
+        'standard_volunteer',
+        'pantry',
+        'food_manufacturer'
+      );
 
-            ALTER TABLE users
-            ADD COLUMN role users_role_enum NOT NULL DEFAULT 'standard_volunteer';
-        `);
+      ALTER TABLE users
+      ALTER COLUMN role
+      TYPE users_role_enum_old
+      USING role::text::users_role_enum_old;
+      DROP TYPE users_role_enum;
+      ALTER TYPE users_role_enum_old
+      RENAME TO users_role_enum;
+    `);
   }
 }

From c9682d259ef3a4ea6d8cf2d88f73dde148af5956 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sun, 7 Dec 2025 10:34:29 -0500
Subject: [PATCH 07/11] prettier

---
 .../migrations/1764811878152-RemoveMultipleVolunteerTypes.ts  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
index 97007c41..5a223bbb 100644
--- a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
+++ b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
@@ -1,6 +1,8 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
 
-export class RemoveMultipleVolunteerTypes1764811878152 implements MigrationInterface {
+export class RemoveMultipleVolunteerTypes1764811878152
+  implements MigrationInterface
+{
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(`
       ALTER TABLE users ALTER COLUMN role DROP DEFAULT;

From ecc10d8feafceabbd68d8afb39c862375d955de9 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Tue, 9 Dec 2025 19:32:38 -0500
Subject: [PATCH 08/11] prettier

---
 .../1764816885341-RemoveUnusedStatuses.ts     | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/apps/backend/src/migrations/1764816885341-RemoveUnusedStatuses.ts b/apps/backend/src/migrations/1764816885341-RemoveUnusedStatuses.ts
index 6419e233..4c35fd0f 100644
--- a/apps/backend/src/migrations/1764816885341-RemoveUnusedStatuses.ts
+++ b/apps/backend/src/migrations/1764816885341-RemoveUnusedStatuses.ts
@@ -1,25 +1,24 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
+import { MigrationInterface, QueryRunner } from 'typeorm';
 
 export class RemoveUnusedStatuses1764816885341 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE allocations DROP COLUMN IF EXISTS status;`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE donation_items DROP COLUMN IF EXISTS status;`,
+    );
+  }
 
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(
-            `ALTER TABLE allocations DROP COLUMN IF EXISTS status;`
-        );
-        await queryRunner.query(
-            `ALTER TABLE donation_items DROP COLUMN IF EXISTS status;`
-        );
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
             ALTER TABLE allocations
             ADD COLUMN status VARCHAR(25) NOT NULL DEFAULT 'pending';
         `);
 
-        await queryRunner.query(`
+    await queryRunner.query(`
             ALTER TABLE donation_items
             ADD COLUMN status VARCHAR(25) NOT NULL DEFAULT 'available';
         `);
-    }
+  }
 }

From d52cb58ac8f672bc12f9c152e9de4473a2c733e8 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Sat, 27 Dec 2025 13:16:46 -0500
Subject: [PATCH 09/11] Adjusted comments

---
 ...4811878152-RemoveMultipleVolunteerTypes.ts | 73 ++++++++++---------
 .../src/users/users.controller.spec.ts        | 18 ++++-
 2 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
index 5a223bbb..b15bf1c4 100644
--- a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
+++ b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
@@ -5,44 +5,47 @@ export class RemoveMultipleVolunteerTypes1764811878152
 {
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(`
-      ALTER TABLE users ALTER COLUMN role DROP DEFAULT;
-
-      CREATE TYPE "users_role_enum_new" AS ENUM (
-        'admin',
-        'volunteer',
-        'pantry',
-        'food_manufacturer'
-      );
-
-      ALTER TABLE users
-      ALTER COLUMN role
-      TYPE users_role_enum_new
-      USING role::text::users_role_enum_new;
-      DROP TYPE users_role_enum;
-      ALTER TYPE users_role_enum_new
-      RENAME TO users_role_enum;
-    `);
+            ALTER TABLE users ALTER COLUMN role DROP DEFAULT;
+
+            CREATE TYPE "users_role_enum_new" AS ENUM (
+              'admin',
+              'volunteer',
+              'pantry',
+              'food_manufacturer'
+            );
+
+            ALTER TABLE users
+              ALTER COLUMN role
+              TYPE users_role_enum_new
+              USING role::text::users_role_enum_new;
+              DROP TYPE users_role_enum;
+
+            ALTER TYPE users_role_enum_new
+              RENAME TO users_role_enum;
+        `);
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(`
-      ALTER TABLE users ALTER COLUMN role DROP DEFAULT;
-
-      CREATE TYPE "users_role_enum_old" AS ENUM (
-        'admin',
-        'lead_volunteer',
-        'standard_volunteer',
-        'pantry',
-        'food_manufacturer'
-      );
-
-      ALTER TABLE users
-      ALTER COLUMN role
-      TYPE users_role_enum_old
-      USING role::text::users_role_enum_old;
-      DROP TYPE users_role_enum;
-      ALTER TYPE users_role_enum_old
-      RENAME TO users_role_enum;
-    `);
+            ALTER TABLE users ALTER COLUMN role DROP DEFAULT;
+
+            CREATE TYPE "users_role_enum_old" AS ENUM (
+              'admin',
+              'lead_volunteer',
+              'standard_volunteer',
+              'pantry',
+              'food_manufacturer'
+            );
+
+            ALTER TABLE users
+              ALTER COLUMN role
+              TYPE users_role_enum_old
+              USING role::text::users_role_enum_old;
+
+            DROP TYPE users_role_enum;
+
+            ALTER TYPE users_role_enum_old
+              RENAME TO users_role_enum;
+        `);
   }
 }
diff --git a/apps/backend/src/users/users.controller.spec.ts b/apps/backend/src/users/users.controller.spec.ts
index e8f0172e..97811a0e 100644
--- a/apps/backend/src/users/users.controller.spec.ts
+++ b/apps/backend/src/users/users.controller.spec.ts
@@ -78,19 +78,28 @@ describe('UsersController', () => {
 
   describe('GET /volunteers', () => {
     it('should return all volunteers', async () => {
-      const volunteers: Partial<User>[] = [
+      const users: (Omit<Partial<User>, 'pantries'> & {
+        pantryIds: number[];
+      })[] = [
         {
           id: 1,
           role: Role.VOLUNTEER,
-          pantries: [{ pantryId: 1 }] as Pantry[],
+          pantryIds: [1],
         },
         {
           id: 2,
           role: Role.VOLUNTEER,
-          pantries: [{ pantryId: 2 }] as Pantry[],
+          pantryIds: [2],
+        },
+        {
+          id: 3,
+          role: Role.ADMIN,
+          pantryIds: [3],
         },
       ];
 
+      const volunteers = users.slice(0, 2);
+
       mockUserService.getVolunteersAndPantryAssignments.mockResolvedValue(
         volunteers as (Omit<User, 'pantries'> & { pantryIds: number[] })[],
       );
@@ -98,7 +107,8 @@ describe('UsersController', () => {
       const result = await controller.getAllVolunteers();
 
       expect(result).toEqual(volunteers);
-      expect(result.some((u) => u.role === Role.ADMIN)).toBe(false);
+      expect(result.length).toBe(2);
+      expect(result.every((u) => u.role === Role.VOLUNTEER)).toBe(true);
       expect(
         mockUserService.getVolunteersAndPantryAssignments,
       ).toHaveBeenCalled();

From e9552168a401c48e1377d1e45b9bfddf3c5bbf63 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Wed, 31 Dec 2025 01:51:49 -0500
Subject: [PATCH 10/11] Added default role back into revert

---
 .../migrations/1764811878152-RemoveMultipleVolunteerTypes.ts   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
index b15bf1c4..f8455a56 100644
--- a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
+++ b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
@@ -46,6 +46,9 @@ export class RemoveMultipleVolunteerTypes1764811878152
 
             ALTER TYPE users_role_enum_old
               RENAME TO users_role_enum;
+
+            ALTER TABLE users
+              ALTER COLUMN role SET DEFAULT 'standard_volunteer';
         `);
   }
 }

From 9851938e2cda5d3538a5766dbc8d28932bada3d6 Mon Sep 17 00:00:00 2001
From: Dalton Burkhart <daltonburkhart.75@gmail.com>
Date: Fri, 2 Jan 2026 02:00:56 -0500
Subject: [PATCH 11/11] Fixed migration

---
 ...4811878152-RemoveMultipleVolunteerTypes.ts | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
index f8455a56..ae661a95 100644
--- a/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
+++ b/apps/backend/src/migrations/1764811878152-RemoveMultipleVolunteerTypes.ts
@@ -5,9 +5,10 @@ export class RemoveMultipleVolunteerTypes1764811878152
 {
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(`
-            ALTER TABLE users ALTER COLUMN role DROP DEFAULT;
+            ALTER TABLE users
+              ALTER COLUMN role DROP DEFAULT;
 
-            CREATE TYPE "users_role_enum_new" AS ENUM (
+            CREATE TYPE users_role_enum_new AS ENUM (
               'admin',
               'volunteer',
               'pantry',
@@ -17,19 +18,31 @@ export class RemoveMultipleVolunteerTypes1764811878152
             ALTER TABLE users
               ALTER COLUMN role
               TYPE users_role_enum_new
-              USING role::text::users_role_enum_new;
-              DROP TYPE users_role_enum;
+              USING (
+                CASE
+                  WHEN role IN ('standard_volunteer', 'lead_volunteer')
+                    THEN 'volunteer'
+                  ELSE role::text
+                END
+              )::users_role_enum_new;
+
+            DROP TYPE users_role_enum;
 
             ALTER TYPE users_role_enum_new
               RENAME TO users_role_enum;
-        `);
+
+            ALTER TABLE users
+              ALTER COLUMN role
+              SET DEFAULT 'volunteer';
+    `);
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.query(`
-            ALTER TABLE users ALTER COLUMN role DROP DEFAULT;
+            ALTER TABLE users
+              ALTER COLUMN role DROP DEFAULT;
 
-            CREATE TYPE "users_role_enum_old" AS ENUM (
+            CREATE TYPE users_role_enum_old AS ENUM (
               'admin',
               'lead_volunteer',
               'standard_volunteer',
@@ -40,7 +53,13 @@ export class RemoveMultipleVolunteerTypes1764811878152
             ALTER TABLE users
               ALTER COLUMN role
               TYPE users_role_enum_old
-              USING role::text::users_role_enum_old;
+              USING (
+                CASE
+                  WHEN role = 'volunteer'
+                    THEN 'standard_volunteer'
+                  ELSE role::text
+                END
+              )::users_role_enum_old;
 
             DROP TYPE users_role_enum;
 
@@ -48,7 +67,8 @@ export class RemoveMultipleVolunteerTypes1764811878152
               RENAME TO users_role_enum;
 
             ALTER TABLE users
-              ALTER COLUMN role SET DEFAULT 'standard_volunteer';
-        `);
+              ALTER COLUMN role
+              SET DEFAULT 'standard_volunteer';
+    `);
   }
 }