build fix

hack4impact-upenn · Oct 29, 2023 · 6ecfc9b · 6ecfc9b
1 parent a2e7887
commit 6ecfc9b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/client/src/Authentication/LoginPage.tsx b/client/src/Authentication/LoginPage.tsx
@@ -143,11 +143,21 @@ function LoginPage() {
     <ScreenGrid>
       <FormGrid>
         <FormCol>
-          <Grid item container justifyContent="center">
-            <Typography variant="h2" textAlign="center">
-              Small Things Log-in
-            </Typography>
-            <img src={Logo} alt="logo" style={{ width: '400px' }} />
+          <Grid
+            item
+            container
+            direction="column"
+            justifyContent="center"
+            alignItems="center"
+          >
+            <Grid item>
+              <Typography variant="h2" textAlign="center">
+                Small Things Log-in
+              </Typography>
+            </Grid>
+            <Grid item>
+              <img src={Logo} alt="logo" style={{ width: '400px' }} />
+            </Grid>
           </Grid>
           <Grid item width="1">
             <TextField

diff --git a/client/src/OrderPage/ModifyOrderForm.tsx b/client/src/OrderPage/ModifyOrderForm.tsx
@@ -30,15 +30,15 @@ interface ModifyOrderFormProps {
   settings: ISettings;
   dates: Date;
   order: IOrder;
-  handelSave: (order: IOrder | undefined) => void;
+  handleSave: (order: IOrder | undefined) => void;
   cancel: () => void;
 }
 
 function ModifyOrderForm({
   settings,
   order,
   dates,
-  handelSave,
+  handleSave,
   cancel,
 }: ModifyOrderFormProps) {
   const originalValues = {
@@ -123,7 +123,7 @@ function ModifyOrderForm({
     const modifiedOrder: IOrder = {
       // eslint-disable-next-line no-underscore-dangle
       _id: order._id,
-      advanced: settings.advanced,
+      advanced: order.advanced,
       organization: order.organization,
       status: order.status,
       produce: values.produce,
@@ -444,7 +444,7 @@ function ModifyOrderForm({
                 variant="contained"
                 color="primary"
                 fullWidth
-                onClick={() => handelSave(buildOrder())}
+                onClick={() => handleSave(buildOrder())}
                 disabled={!canSubmit}
               >
                 Save Changes

diff --git a/client/src/OrderPage/OrderPage.tsx b/client/src/OrderPage/OrderPage.tsx
@@ -191,7 +191,7 @@ function OrderPage() {
                   order={order}
                   settings={settings}
                   dates={dates}
-                  handelSave={handleModification}
+                  handleSave={handleModification}
                   cancel={() => setModifying(false)}
                 />
               ) : (

diff --git a/server/src/controllers/auth.controller.ts b/server/src/controllers/auth.controller.ts
@@ -47,8 +47,8 @@ const login = async (
       failureMessage: true,
     },
     // Callback function defined by passport strategy in configPassport.ts
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    (err, user, info) => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
+    (err: any, user: any, info: any) => {
       if (err) {
         next(ApiError.internal('Failed to authenticate user.'));
         return;
@@ -57,7 +57,7 @@ const login = async (
         next(ApiError.unauthorized('Incorrect credentials'));
         return;
       }
-      if (!user!.verified) {
+      if (!user?.verified) {
         next(ApiError.unauthorized('Need to verify account by email'));
         return;
       }

diff --git a/server/src/services/order.service.ts b/server/src/services/order.service.ts
@@ -67,7 +67,7 @@ const getAllApprovedOrders = async () => {
 
 const getAllApprovedOrdersInDateRange = async (start: Date, end: Date) => {
   const orders = await Order.find({
-    status: { $in: ['APPROVED', 'RELEASED'] },
+    status: { $in: ['APPROVED', 'RELEASED', 'COMPLETED'] },
     pickup: { $gte: start, $lte: end },
   }).exec();
   return orders;