ChangePlusPlusVandy · JayLi1209 · Mar 4, 2024 · Mar 24, 2024 · Mar 24, 2024 · Mar 29, 2024
diff --git a/dist/assets/index-9cadcfb4.js b/dist/assets/index-9cadcfb4.js
diff --git a/dist/assets/index-b3075354.css b/dist/assets/index-b3075354.css
diff --git a/dist/assets/login-photo-fd0af800.png b/dist/assets/login-photo-fd0af800.png
diff --git a/dist/assets/logo-horizontal-ec52cb1c.png b/dist/assets/logo-horizontal-ec52cb1c.png
diff --git a/dist/index.html b/dist/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <link rel="stylesheet" href="https://use.typekit.net/guv4hmv.css">
+  <title>Nashville Diaper Connection</title>
+  <script type="module" crossorigin src="/assets/index-9cadcfb4.js"></script>
+  <link rel="stylesheet" href="/assets/index-b3075354.css">
+</head>
+
+<body>
+  <div id="root"></div>
+
+</body>
+
+</html>
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@hookform/resolvers": "^3.3.2",
     "@mantine/charts": "^7.5.0",
-    "@mantine/core": "^7.5.0",
+    "@mantine/core": "^7.6.1",
     "@mantine/dates": "^7.5.0",
     "@mantine/hooks": "^7.5.0",
     "@tabler/icons-react": "^2.46.0",

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,14 +1,14 @@
 import React, { useContext, ReactNode } from "react";
 import "@mantine/core/styles.css";
 import "@mantine/dates/styles.css";
-import '@mantine/charts/styles.css';
+import "@mantine/charts/styles.css";
 import {
   Route,
   Routes,
   BrowserRouter as RouterProvider,
 } from "react-router-dom";
 import { AuthProvider, useAuth } from "./AuthContext";
-import "./App.css"
+import "./App.css";
 // Routes
 import ForgotPassword from "./pages/Auth/ForgotPassword";
 import PartnerDashboard from "./pages/PartnerDashboard/PartnerDashboard";
@@ -25,45 +25,43 @@ import AuthWrapper from "./pages/Auth/AuthWrapper";
 const DashboardAccessControl: React.FC = () => {
   const { isStaff } = useAuth();
   return isStaff ? <StaffDashboard /> : <PartnerDashboard />;
-}
+};
 
 const OrderManageControl: React.FC = () => {
   const { isStaff } = useAuth();
   return isStaff && <OrderManagement />;
-}
-
-
+};
 
 const App: React.FC = () => {
   return (
     <AuthProvider>
       <RouterProvider>
         <Routes>
           <Route index path="/login" element={AuthWrapper(<Login />)} />
-          <Route path="/forgot-password" element={AuthWrapper(<ForgotPassword />)} />
-
-          <Route path="/" element={<PrivateRoute element={<DashboardLayout />} />}>
-
+          <Route
+            path="/forgot-password"
+            element={AuthWrapper(<ForgotPassword />)}
+          />
+
+          <Route
+            path="/"
+            element={<PrivateRoute element={<DashboardLayout />} />}
+          >
             <Route index element={<DashboardAccessControl />} />
-            <Route path="/profile" element={<PrivateRoute element={<Profile />} />} />
-
+            <Route
+              path="/profile"
+              element={<PrivateRoute element={<Profile />} />}
+            />
             <Route path="/register" element={<Register />} />
-
-
-            // TODO: make this dynamic. Staff should be able to click on a Partner and view all orders under order-info route
+            // TODO: make this dynamic. Staff should be able to click on a
+            Partner and view all orders under order-info route
             <Route path="/order-info" element={<OrderPartner />} />
             <Route path="/order-manage" element={<OrderManageControl />} />
-
-
           </Route>
         </Routes>
       </RouterProvider>
-    </AuthProvider >
+    </AuthProvider>
   );
-}
-
-
-
+};
 
 export default App;
-
diff --git a/src/AuthContext.tsx b/src/AuthContext.tsx
@@ -20,7 +20,7 @@ interface AuthContextData {
     lastName: string,
     email: string,
     password: string,
-    isStaff: boolean,
+    isStaff: boolean
   ) => Promise<void>;
   logout: () => Promise<void>;
   getUser: () => User | null;
@@ -39,7 +39,7 @@ export function useAuth(): AuthContextData {
 export function AuthProvider({ children }: { children: React.ReactNode }) {
   const [currentUser, setCurrentUser] = useState<User | null>(null);
   const [isLoading, setIsLoading] = useState(true);
-  const [isStaff, setIsStaff] = useState<boolean | null>(null);
+  const [isStaff, setIsStaff] = useState<boolean | null>(true);
   const [mongoId, setMongoId] = useState<string | null>(null);
 
   async function login(email: string, password: string) {
@@ -51,28 +51,40 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
             method: "GET",
             headers: {
               "Content-Type": "application/json",
-            }
-          }
-          let checkPartner = await fetch(`${import.meta.env.VITE_BACKEND_URL}/login?firebaseUid=${userCredential.user.uid}`, requestOptions);
+            },
+          };
+          let checkPartner = await fetch(
+            `${import.meta.env.VITE_BACKEND_URL}/login?firebaseUid=${
+              userCredential.user.uid
+            }`,
+            requestOptions
+          );
           let data = await checkPartner.json();
 
-          console.log("reached here")
-          console.log("LOGGED IN AUTH ", data)
+          console.log("reached here");
+          console.log("LOGGED IN AUTH ", data);
 
           if (!data.error) {
             setMongoId(data.data._id);
-            setIsStaff(data.isStaff);
+            // setIsStaff(data.isStaff);
+            setIsStaff(true);
 
             window.sessionStorage.setItem("mongoId", data.data._id);
           }
         } catch (err) {
-          console.error(err)
+          console.error(err);
         }
       }
     );
   }
 
-  async function registerUser(firstName: string, lastName: string, email: string, password: string, isStaff: boolean = false) {
+  async function registerUser(
+    firstName: string,
+    lastName: string,
+    email: string,
+    password: string,
+    isStaff: boolean = false
+  ) {
     return createUserWithEmailAndPassword(auth, email, password)
       .then((userCredential) => {
         // Update the user profile
@@ -83,14 +95,29 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       .then((userCredential) => {
         // Now userCredential is accessible here
         if (isStaff) {
-          return createMongoStaff(firstName, lastName, email, userCredential.user.uid);
+          return createMongoStaff(
+            firstName,
+            lastName,
+            email,
+            userCredential.user.uid
+          );
         } else {
-          return createMongoPartner(firstName, lastName, email, userCredential.user.uid);
+          return createMongoPartner(
+            firstName,
+            lastName,
+            email,
+            userCredential.user.uid
+          );
         }
       });
   }
 
-  const createMongoStaff = async (firstName: string, lastName: string, email: string, uid: string) => {
+  const createMongoStaff = async (
+    firstName: string,
+    lastName: string,
+    email: string,
+    uid: string
+  ) => {
     try {
       const requestOptions = {
         method: "POST",
@@ -104,18 +131,26 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
           email: email,
           phoneNumber: "123",
           firebaseUid: uid,
-        })
-      }
-      const res = await fetch(`${import.meta.env.VITE_BACKEND_URL}/staff/`, requestOptions);
+        }),
+      };
+      const res = await fetch(
+        `${import.meta.env.VITE_BACKEND_URL}/staff/`,
+        requestOptions
+      );
       const staffUser = await res.json();
       setIsStaff(true);
-      setMongoId(staffUser._id)
+      setMongoId(staffUser._id);
     } catch (err) {
       console.error(err);
     }
-  }
+  };
 
-  const createMongoPartner = async (firstName: string, lastName: string, email: string, uid: string) => {
+  const createMongoPartner = async (
+    firstName: string,
+    lastName: string,
+    email: string,
+    uid: string
+  ) => {
     try {
       const requestOptions = {
         method: "POST",
@@ -134,17 +169,20 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
           numOrdersYTD: 1,
           numOrdersMonth: 1,
           type: "DFD",
-          firebaseUid: uid
-        })
-      }
-      const res = await fetch(`${import.meta.env.VITE_BACKEND_URL}/login/create-partner/`, requestOptions);
-      const partnerUser = await res.json()
+          firebaseUid: uid,
+        }),
+      };
+      const res = await fetch(
+        `${import.meta.env.VITE_BACKEND_URL}/login/create-partner/`,
+        requestOptions
+      );
+      const partnerUser = await res.json();
       setIsStaff(false);
       setMongoId(partnerUser._id);
     } catch (err) {
       console.error(err);
     }
-  }
+  };
 
   async function logout(): Promise<void> {
     setIsStaff(null);
@@ -185,20 +223,24 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
               headers: {
                 "Content-Type": "application/json",
                 Authorization: `Bearer ${token}`,
-              }
-            }
-
-            let checkPartner = await fetch(`${import.meta.env.VITE_BACKEND_URL}/staff?id=${window.sessionStorage.getItem("mongoId")}`, requestOptions);
-            let data = await checkPartner.json();
-
-
-            if (data && !data.error) {
-              setIsStaff(true);
-            } else {
-              setIsStaff(false);
-            }
-
-
+              },
+            };
+
+            let checkPartner = await fetch(
+              `${
+                import.meta.env.VITE_BACKEND_URL
+              }/staff?id=${window.sessionStorage.getItem("mongoId")}`,
+              requestOptions
+            );
+            // let data = await checkPartner.json();
+
+            setIsStaff(true);
+
+            // if (data && !data.error) {
+            //   setIsStaff(true);
+            // } else {
+            //   setIsStaff(false);
+            // }
           })();
         } else {
           // Only fetch user details if mongoId is not in sessionStorage
@@ -218,20 +260,18 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     return () => unsubscribe();
   }, []);
 
-  useEffect(() => {
-    // This effect ensures that mongoId is immediately saved to sessionStorage when it's updated
-    if (mongoId) {
-      window.sessionStorage.setItem("mongoId", mongoId);
-    }
-  }, [mongoId]);
+  // useEffect(() => {
+  //   // This effect ensures that mongoId is immediately saved to sessionStorage when it's updated
+  //   if (mongoId) {
+  //     window.sessionStorage.setItem("mongoId", mongoId);
+  //   }
+  // }, [mongoId]);
 
   const setToken = async () => {
     const userToken = await currentUser?.getIdToken();
     if (userToken) {
       window.sessionStorage.setItem("auth", userToken);
     }
-
-
   };
 
   useEffect(() => {
@@ -240,15 +280,14 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     } else {
       window.sessionStorage.removeItem("auth");
     }
-  }, [currentUser])
+  }, [currentUser]);
 
   // useEffect(() => {
   //   if (mongoId) {
   //     window.sessionStorage.setItem("mongoId", mongoId);
   //   }
   // }, [mongoId])
 
-
   const value = {
     currentUser,
     login,