Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"git.ignoreLimitWarning": true
}
119 changes: 29 additions & 90 deletions apps/frontend/src/app.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
import { createBrowserRouter, RouterProvider } from 'react-router-dom';
import Root from '@containers/root';
import NotFound from '@containers/404';
import PantryPastOrders from '@containers/pantryPastOrders';
import Pantries from '@containers/pantries';
import Orders from '@containers/orders';
import PantryDashboard from '@containers/pantryDashboard';
import FormRequests from '@containers/formRequests';
import PantryApplication from '@containers/pantryApplication';
import ApplicationSubmitted from '@containers/applicationSubmitted';
import { submitPantryApplicationForm } from '@components/forms/pantryApplicationForm';
import ApprovePantries from '@containers/approvePantries';
import PantryApplicationDetails from '@containers/pantryApplicationDetails';
import VolunteerManagement from '@containers/volunteerManagement';
import FoodManufacturerOrderDashboard from '@containers/foodManufacturerOrderDashboard';
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';
import { ROUTES } from './routes';
import FoodManufacturerDonationManagement from '@containers/foodManufacturerDonationManagement';
import LoginPage from '@containers/loginPage';
import SignupPage from '@containers/signupPage';
Expand All @@ -42,7 +38,7 @@ Amplify.configure(CognitoAuthConfig);

const router = createBrowserRouter([
{
path: '/',
path: ROUTES.HOME,
element: <Root />,
errorElement: <NotFound />,
children: [
Expand All @@ -52,222 +48,165 @@ const router = createBrowserRouter([
element: <Homepage />,
},
{
path: '/login',
path: ROUTES.LOGIN,
element: <LoginPage />,
},
{
path: '/signup',
path: ROUTES.SIGNUP,
element: <SignupPage />,
},
{
path: '/forgot-password',
path: ROUTES.FORGOT_PASSWORD,
element: <ForgotPasswordPage />,
},
{
path: '/pantry-application',
path: ROUTES.PANTRY_APPLICATION,
element: <PantryApplication />,
action: submitPantryApplicationForm,
},
{
path: '/food-manufacturer-application',
path: ROUTES.FOOD_MANUFACTURER_APPLICATION,
element: <FoodManufacturerApplication />,
action: submitManufacturerApplicationForm,
},
{
path: '/application-submitted',
path: ROUTES.APPLICATION_SUBMITTED,
element: <ApplicationSubmitted />,
},
{
path: '/unauthorized',
path: ROUTES.UNAUTHORIZED,
element: <Unauthorized />,
},
// Private routes (protected by auth)
{
path: '/pantry-past-orders',
element: (
<ProtectedRoute>
<PantryPastOrders />
</ProtectedRoute>
),
},
{
path: '/pantries',
element: (
<ProtectedRoute>
<Pantries />
Comment thread
dburkhart07 marked this conversation as resolved.
</ProtectedRoute>
),
},
{
path: '/pantry-dashboard',
element: (
<ProtectedRoute>
<PantryDashboard />
</ProtectedRoute>
),
},
{
path: '/pantry-past-orders',
element: (
<ProtectedRoute>
<PantryPastOrders />
</ProtectedRoute>
),
},
{
path: '/pantries',
element: (
<ProtectedRoute>
<Pantries />
</ProtectedRoute>
),
},
{
path: '/food-manufacturer-order-dashboard',
element: (
<ProtectedRoute>
<FoodManufacturerOrderDashboard />
</ProtectedRoute>
),
},
{
path: '/orders',
element: (
<ProtectedRoute>
<Orders />
</ProtectedRoute>
),
},
{
path: '/request-form',
path: ROUTES.REQUEST_FORM,
element: (
<ProtectedRoute>
<FormRequests />
</ProtectedRoute>
),
},
{
path: '/fm-donation-management',
path: ROUTES.FM_DONATION_MANAGEMENT,
element: (
<ProtectedRoute>
<FoodManufacturerDonationManagement />
</ProtectedRoute>
),
},
{
path: '/approve-pantries',
path: ROUTES.APPROVE_PANTRIES,
element: (
<ProtectedRoute>
<ApprovePantries />
</ProtectedRoute>
),
},
{
path: '/approve-food-manufacturers',
path: ROUTES.APPROVE_FOOD_MANUFACTURERS,
element: (
<ProtectedRoute>
<ApproveFoodManufacturers />
</ProtectedRoute>
),
},
{
path: '/pantry-application-details/:applicationId',
path: ROUTES.PANTRY_APPLICATION_DETAILS,
element: (
<ProtectedRoute>
<PantryApplicationDetails />
</ProtectedRoute>
),
},
{
path: '/food-manufacturer-application-details/:applicationId',
path: ROUTES.FOOD_MANUFACTURER_APPLICATION_DETAILS,
element: (
<ProtectedRoute>
<FoodManufacturerApplicationDetails />
</ProtectedRoute>
),
},
{
path: '/admin-donation',
path: ROUTES.ADMIN_DONATION,
element: (
<ProtectedRoute>
<AdminDonation />
</ProtectedRoute>
),
},
{
path: '/admin-donation-stats',
path: ROUTES.ADMIN_DONATION_STATS,
element: (
<ProtectedRoute>
<AdminDonationStats />
</ProtectedRoute>
),
},
{
path: '/test-admin-dashboard',
path: ROUTES.VOLUNTEER_MANAGEMENT,
element: (
<ProtectedRoute>
<TestAdminDashboard />
<VolunteerManagement />
</ProtectedRoute>
),
},
{
path: '/admin-request-management',
path: ROUTES.TEST_ADMIN_DASHBOARD,
element: (
<ProtectedRoute>
<AdminRequestManagement />
<TestAdminDashboard />
</ProtectedRoute>
),
},
{
path: '/volunteer-management',
path: ROUTES.ADMIN_REQUEST_MANAGEMENT,
element: (
<ProtectedRoute>
<VolunteerManagement />
<AdminRequestManagement />
</ProtectedRoute>
),
},
{
path: '/admin-order-management',
path: ROUTES.ADMIN_ORDER_MANAGEMENT,
element: (
<ProtectedRoute>
<AdminOrderManagement />
</ProtectedRoute>
),
},
{
path: '/pantry-order-management',
path: ROUTES.PANTRY_ORDER_MANAGEMENT,
element: (
<ProtectedRoute>
<PantryOrderManagement />
</ProtectedRoute>
),
},
{
path: '/profile',
path: ROUTES.PROFILE,
element: (
<ProtectedRoute>
<ProfilePage />
</ProtectedRoute>
),
},
{
path: '/volunteer-assigned-pantries',
path: ROUTES.VOLUNTEER_ASSIGNED_PANTRIES,
element: (
<ProtectedRoute>
<AssignedPantries />
</ProtectedRoute>
),
},
{
path: '/volunteer-request-management',
path: ROUTES.VOLUNTEER_REQUEST_MANAGEMENT,
element: (
<ProtectedRoute>
<VolunteerRequestManagement />
</ProtectedRoute>
),
},
{
path: '/volunteer-order-management',
path: ROUTES.VOLUNTEER_ORDER_MANAGEMENT,
element: (
<ProtectedRoute>
<VolunteerOrderManagement />
Expand Down
23 changes: 23 additions & 0 deletions apps/frontend/src/components/AuthHeader.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { Box } from '@chakra-ui/react';

const AuthHeader: React.FC = () => (
<Box
h="74px"
w="full"
bg="white.core"
display="flex"
alignItems="center"
pl="26px"
flexShrink={0}
>
<Box w="40px" h="40px">
<img
src="/favicon.ico"
alt="SSF"
style={{ width: '100%', height: '100%', objectFit: 'contain' }}
/>
</Box>
</Box>
);

export default AuthHeader;
Loading
Loading