Admin Bugbash Fixes

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

@@ -1,5 +1,6 @@
 import {
   ConflictException,
+  HttpException,
   Injectable,
   InternalServerErrorException,
   Logger,
@@ -16,7 +17,6 @@ import {
 import CognitoAuthConfig from './aws-exports';
 import { SignUpDto } from './dtos/sign-up.dto';
 import { createHmac } from 'crypto';
-import { Role } from '../users/types';
 import { validateEnv } from '../utils/validation.utils';
 
 @Injectable()
@@ -52,7 +52,7 @@ export class AuthService {
     lastName,
     email,
     role,
-  }: Omit<SignUpDto, 'password' | 'phone'> & { role: Role }): Promise<string> {
+  }: SignUpDto): Promise<string> {
     const createUserCommand = new AdminCreateUserCommand({
       UserPoolId: CognitoAuthConfig.userPoolId,
       Username: email,
@@ -75,10 +75,18 @@ export class AuthService {
 
       return sub ?? '';
     } catch (error) {
-      if (error instanceof Error && error.name == 'UsernameExistsException') {
+      if (error instanceof HttpException) {
+        throw error;
+      } else if (
+        error instanceof Error &&
+        error.name == 'UsernameExistsException'
+      ) {
         throw new ConflictException('A user with this email already exists');
       } else {
-        throw new InternalServerErrorException('Failed to create user');
+        const reason = error instanceof Error ? error.message : String(error);
+        throw new InternalServerErrorException(
+          `Failed to create user: ${reason}`,
+        );
       }
     }
   }
@@ -97,8 +105,9 @@ export class AuthService {
         `Failed to add user ${username} to group ${groupName}`,
         error,
       );
+      const reason = error instanceof Error ? error.message : String(error);
       throw new InternalServerErrorException(
-        `Failed to add user to group ${groupName}`,
+        `Failed to add user to group ${groupName}: ${reason}`,
       );
     }
   }

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

@@ -1,4 +1,5 @@
-import { IsEmail, IsNotEmpty, IsString, IsPhoneNumber } from 'class-validator';
+import { IsEmail, IsEnum, IsString } from 'class-validator';
+import { Role } from '../../users/types';
 
 export class SignUpDto {
   @IsString()
@@ -10,14 +11,6 @@ export class SignUpDto {
   @IsEmail()
   email!: string;
 
-  @IsString()
-  password!: string;
-
-  @IsString()
-  @IsNotEmpty()
-  @IsPhoneNumber('US', {
-    message:
-      'phone must be a valid phone number (make sure all the digits are correct)',
-  })
-  phone!: string;
+  @IsEnum(Role)
+  role!: Role;
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

apps/backend/src/users/users.service.ts

@@ -15,6 +15,7 @@ import { validateId } from '../utils/validation.utils';
 import { UpdateUserInfoDto } from './dtos/update-user-info.dto';
 import { AuthService } from '../auth/auth.service';
 import { userSchemaDto } from './dtos/userSchema.dto';
+import { SignUpDto } from '../auth/dtos/sign-up.dto';
 import { emailTemplates } from '../emails/emailTemplates';
 import { EmailsService } from '../emails/email.service';
 import { FoodRequest } from '../foodRequests/request.entity';
@@ -90,22 +91,16 @@ export class UsersService {
       }
 
       const applicationUser = usersWithEmail[0];
-      applicationUser.userCognitoSub = await this.authService.adminCreateUser({
-        firstName,
-        lastName,
-        email,
-        role,
-      });
+      const signUpDto: SignUpDto = { firstName, lastName, email, role };
+      applicationUser.userCognitoSub = await this.authService.adminCreateUser(
+        signUpDto,
+      );
       return this.repo.save(applicationUser);
     }
 
     // Create Cognito user and save to DB
-    const userCognitoSub = await this.authService.adminCreateUser({
-      firstName,
-      lastName,
-      email,
-      role,
-    });
+    const signUpDto: SignUpDto = { firstName, lastName, email, role };
+    const userCognitoSub = await this.authService.adminCreateUser(signUpDto);
     const user = this.repo.create({
       role,
       firstName,

apps/frontend/src/app.tsx

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

apps/frontend/src/components/Navbar.tsx

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

apps/frontend/src/components/dashboardCard.tsx

@@ -121,6 +121,7 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
         display="flex"
         alignItems="flex-start"
         justifyContent="space-between"
+        flexWrap="wrap"
         gap={3}
       >
         <Box display="flex" alignItems="center" gap={4} mb={2}>