fix:QA and added 1st grading template for WMAA

ipetersenpai · ipetersenpai · commit e4ae4f7f6014 · 2024-05-11T00:16:59.000+08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "@mui/material": "^5.15.12",
     "@mui/styled-engine-sc": "^6.0.0-alpha.17",
     "@mui/x-data-grid": "^6.19.6",
-    "@react-pdf/renderer": "^3.4.0",
+    "@react-pdf/renderer": "3.4.2",
     "@reduxjs/toolkit": "^2.2.1",
     "aos": "^3.0.0-beta.6",
     "axios": "^1.6.8",
diff --git a/src/assets/font/OPTITimes-Roman.otf b/src/assets/font/OPTITimes-Roman.otf
diff --git a/src/components/Auth/LoginForm.jsx b/src/components/Auth/LoginForm.jsx
@@ -35,7 +35,7 @@ const LoginForm = () => {
     if (loginStatus === "loading") {
       setComplete("loading");
     } else if (loginStatus === "succeeded" && complete === "loading") {
-      window.location.href = "/";
+      window.location.href = "/welcome";
       setComplete("idle");
     } else if (loginStatus === "failed") {
       setComplete("failed");
diff --git a/src/components/FormatSession/SPITICFormat.jsx b/src/components/FormatSession/SPITICFormat.jsx
@@ -125,7 +125,7 @@ const SPITICFormat = ({ openModal, closeModal }) => {
       setComplete("loading");
     } else if (SessionStatus === "succeeded" && complete === "loading") {
       setComplete("idle");
-      window.location.href = "/";
+      window.location.href = "/welcome";
     }
   }, [SessionStatus, setComplete, closeModal, complete]);
 
@@ -997,7 +997,7 @@ const SPITICFormat = ({ openModal, closeModal }) => {
                               <TextField
                                 label="Signatory Position"
                                 variant="outlined"
-                                name="signatory_position3"
+                                name="signatory_position2"
                                 className="w-full"
                                 error={
                                   errors.signatory_position3 ? true : false
@@ -1007,13 +1007,13 @@ const SPITICFormat = ({ openModal, closeModal }) => {
                                     height: "14px",
                                   },
                                 }}
-                                {...register("signatory_position3", {
+                                {...register("signatory_position2", {
                                   required: "This is required.",
                                 })}
                               />
-                              {errors.signatory_position3 && (
+                              {errors.signatory_position2 && (
                                 <p className="ml-1 mt-1 text-[13px] text-red-500 mb-[-0.2rem]">
-                                  {errors.signatory_position3.message}
+                                  {errors.signatory_position2.message}
                                 </p>
                               )}
                             </div>
diff --git a/src/components/FormatSession/WMAAFormat.jsx b/src/components/FormatSession/WMAAFormat.jsx
@@ -92,7 +92,7 @@ const WMAAFormat = ({ openModal, closeModal }) => {
       setComplete("loading");
     } else if (SessionStatus === "succeeded" && complete === "loading") {
       setComplete("idle");
-      window.location.href = "/";
+      window.location.href = "/welcome";
     }
   }, [SessionStatus, setComplete, closeModal, complete]);
 
@@ -139,12 +139,14 @@ const WMAAFormat = ({ openModal, closeModal }) => {
   ];
 
   const quarterList = [
-    "1st Quarter",
-    "2nd Quarter",
-    "3rd Quarter",
-    "4th Quarter",
-    "1st Semester",
-    "2nd Semester",
+    // "1st Quarter",
+    // "2nd Quarter",
+    // "3rd Quarter",
+    // "4th Quarter",
+    // "1st Semester",
+    // "2nd Semester",
+    "1st Grading",
+    "2nd Grading",
   ];
 
   return (
diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
@@ -45,7 +45,7 @@ const Navbar = () => {
     // Remove the "bridgette" cookie
     document.cookie =
       "bridgette=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
-    window.location.href = "/";
+    window.location.href = "/welcome";
   };
 
   useEffect(() => {
@@ -71,7 +71,7 @@ const Navbar = () => {
         <section
           className="flex flex-row items-center  md:ml-6 cursor-pointer"
           onClick={() => {
-            navigate("/");
+            navigate("/welcome");
           }}
         >
           <img
diff --git a/src/components/Navigation/AuthenticateUser.jsx b/src/components/Navigation/AuthenticateUser.jsx
@@ -15,7 +15,7 @@ const AuthenticateUser = () => {
   return (
     <>
       <Routes>
-        <Route path="/" element={<Landing />} />
+        <Route path="/welcome" element={<Landing />} />
         <Route path="/academic-excellence" element={<Option1 />} />
         <Route path="*" element={<NotFound />} />
         <Route
diff --git a/src/components/Navigation/GuessUser.jsx b/src/components/Navigation/GuessUser.jsx
@@ -6,7 +6,7 @@ const GuessUser = () => {
   return (
     <>
       <Routes>
-        <Route path="/" element={<Landing />} />
+        <Route path="/welcome" element={<Landing />} />
         <Route path="*" element={<NotFound />} />
       </Routes>
     </>
diff --git a/src/redux/slice/auth/getUserInfo.jsx b/src/redux/slice/auth/getUserInfo.jsx
@@ -8,7 +8,7 @@ export const getUserInfo = createAsyncThunk(
       const response = await axios.get(`auth/user-information/${data}`);
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      S;
       throw error;
     }
   }
diff --git a/src/redux/slice/auth/loginSlice.jsx b/src/redux/slice/auth/loginSlice.jsx
@@ -2,7 +2,9 @@ import { createAsyncThunk, createSlice, createAction } from "@reduxjs/toolkit";
 import axios from "./../../../utils/baseURL";
 const { VITE_REACT_APP_COOKIE_DOMAIN } = import.meta.env;
 const setJwtCookie = (token) => {
-  document.cookie = `bridgette=${token}; max-age=${24 * 60 * 60}; path=/; domain=${VITE_REACT_APP_COOKIE_DOMAIN}; samesite=lax`;
+  document.cookie = `bridgette=${token}; max-age=${
+    24 * 60 * 60
+  }; path=/; domain=${VITE_REACT_APP_COOKIE_DOMAIN}; samesite=lax`;
 };
 
 export const userLogin = createAsyncThunk("user/login", async (data) => {
@@ -12,7 +14,7 @@ export const userLogin = createAsyncThunk("user/login", async (data) => {
     setJwtCookie(token);
     return response.data;
   } catch (error) {
-    console.error("Login failed:", error.message);
+    // console.error("Login failed:", error.message);
     throw error;
   }
 });
diff --git a/src/redux/slice/auth/registerSlice.jsx b/src/redux/slice/auth/registerSlice.jsx
@@ -6,7 +6,7 @@ export const userRegister = createAsyncThunk("user/register", async (data) => {
     const response = await axios.post("auth/register", data);
     return response.data;
   } catch (error) {
-    console.error(error.message);
+    // console.error(error.message);
     throw error;
   }
 });
diff --git a/src/redux/slice/auth/updateInfo.jsx b/src/redux/slice/auth/updateInfo.jsx
@@ -7,7 +7,7 @@ export const updateInfo = createAsyncThunk("user/udpateInfo", async (data) => {
     const response = await axios.put("auth/update-profile", data);
     return response.data;
   } catch (error) {
-    console.error(error.message);
+    // console.error(error.message);
     throw error;
   }
 });
@@ -45,6 +45,6 @@ export const UpdateUserInfoRefresh = (data, userId) => async (dispatch) => {
     await dispatch(updateInfo(data));
     await dispatch(getUserInfo(userId));
   } catch (error) {
-    console.error("Error no user info found", error.message);
+    // console.error("Error no user info found", error.message);
   }
 };
diff --git a/src/redux/slice/auth/updatePassword.jsx b/src/redux/slice/auth/updatePassword.jsx
@@ -8,7 +8,7 @@ export const changePassword = createAsyncThunk(
       const response = await axios.put("auth/change-password", data);
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
diff --git a/src/redux/slice/awardee/SPITICAwardee/addAwardee.jsx b/src/redux/slice/awardee/SPITICAwardee/addAwardee.jsx
@@ -9,7 +9,7 @@ export const addAwardeeSpitic = createAsyncThunk(
       const response = await axios.post(`awardee/spitic/add-awardee/`, data);
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
@@ -48,6 +48,6 @@ export const AwardeeRefreshSpitic = (data, userId) => async (dispatch) => {
     await dispatch(addAwardeeSpitic(data));
     await dispatch(getAwardee(userId));
   } catch (error) {
-    console.error("Error adding awardee", error.message);
+    // console.error("Error adding awardee", error.message);
   }
 };
diff --git a/src/redux/slice/awardee/SPITICAwardee/addMultipleAwardee.jsx b/src/redux/slice/awardee/SPITICAwardee/addMultipleAwardee.jsx
@@ -12,7 +12,7 @@ export const addMultipleAwardeeSpitic = createAsyncThunk(
       );
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
@@ -52,6 +52,6 @@ export const MultipleAwardeeRefreshSpitic =
       await dispatch(addMultipleAwardeeSpitic(excelData));
       await dispatch(getAwardee(userId));
     } catch (error) {
-      console.error("Error adding awardee", error.message);
+      // console.error("Error adding awardee", error.message);
     }
   };
diff --git a/src/redux/slice/awardee/SPITICAwardee/updateAwardee.jsx b/src/redux/slice/awardee/SPITICAwardee/updateAwardee.jsx
@@ -19,7 +19,7 @@ export const updateAwardeeSpitic = createAsyncThunk(
       );
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
@@ -59,6 +59,6 @@ export const UpdateAwardeeRefreshSpitic =
       await dispatch(updateAwardeeSpitic(data));
       await dispatch(getAwardee(userId));
     } catch (error) {
-      console.error("Error upading awardee", error.message);
+      // console.error("Error upading awardee", error.message);
     }
   };
diff --git a/src/redux/slice/awardee/WMAAAwardee/addAwardee.jsx b/src/redux/slice/awardee/WMAAAwardee/addAwardee.jsx
@@ -9,7 +9,7 @@ export const addAwardeeWmaa = createAsyncThunk(
       const response = await axios.post(`awardee/wmaa/add-awardee/`, data);
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
@@ -48,6 +48,6 @@ export const AwardeeRefreshWmaa = (data, userId) => async (dispatch) => {
     await dispatch(addAwardeeWmaa(data));
     await dispatch(getAwardee(userId));
   } catch (error) {
-    console.error("Error adding awardee", error.message);
+    // console.error("Error adding awardee", error.message);
   }
 };
diff --git a/src/redux/slice/awardee/WMAAAwardee/addMultipleAwardee.jsx b/src/redux/slice/awardee/WMAAAwardee/addMultipleAwardee.jsx
@@ -12,7 +12,7 @@ export const addMultipleAwardeeWmaa = createAsyncThunk(
       );
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
@@ -52,6 +52,6 @@ export const MultipleAwardeeRefreshWmaa =
       await dispatch(addMultipleAwardeeWmaa(excelData));
       await dispatch(getAwardee(userId));
     } catch (error) {
-      console.error("Error adding awardee", error.message);
+      // console.error("Error adding awardee", error.message);
     }
   };
diff --git a/src/redux/slice/awardee/WMAAAwardee/updateAwardee.jsx b/src/redux/slice/awardee/WMAAAwardee/updateAwardee.jsx
@@ -19,7 +19,7 @@ export const updateAwardeeWmaa = createAsyncThunk(
       );
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
@@ -58,6 +58,6 @@ export const UpdateAwardeeRefreshWmaa = (data, userId) => async (dispatch) => {
     await dispatch(updateAwardeeWmaa(data));
     await dispatch(getAwardee(userId));
   } catch (error) {
-    console.error("Error upading awardee", error.message);
+    // console.error("Error upading awardee", error.message);
   }
 };
diff --git a/src/redux/slice/awardee/deleteAllAwardee.jsx b/src/redux/slice/awardee/deleteAllAwardee.jsx
@@ -9,7 +9,7 @@ export const deleteAllAwardee = createAsyncThunk(
       const response = await axios.delete(`awardee/deleteAll-awardee/${data}`);
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
@@ -48,6 +48,6 @@ export const deleteAllAwardeeRefresh = (userId) => async (dispatch) => {
     await dispatch(deleteAllAwardee(userId));
     await dispatch(getAwardee(userId));
   } catch (error) {
-    console.error("Error deleting all awardee", error.message);
+    // console.error("Error deleting all awardee", error.message);
   }
 };
diff --git a/src/redux/slice/awardee/deleteAwardee.jsx b/src/redux/slice/awardee/deleteAwardee.jsx
@@ -9,7 +9,7 @@ export const deleteAwardee = createAsyncThunk(
       const response = await axios.delete(`awardee/delete-awardee/${data}`);
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
@@ -48,6 +48,6 @@ export const deleteAwardeeRefresh = (data, userId) => async (dispatch) => {
     await dispatch(deleteAwardee(data));
     await dispatch(getAwardee(userId));
   } catch (error) {
-    console.error("Error deleting awardee", error.message);
+    // console.error("Error deleting awardee", error.message);
   }
 };
diff --git a/src/redux/slice/awardee/getAwardee.jsx b/src/redux/slice/awardee/getAwardee.jsx
@@ -6,7 +6,7 @@ export const getAwardee = createAsyncThunk("get/Awardee", async (data) => {
     const response = await axios.get(`awardee/get-awardee/${data}`);
     return response.data;
   } catch (error) {
-    console.error(error.message);
+    // console.error(error.message);
     throw error;
   }
 });
diff --git a/src/redux/slice/session/createSession.jsx b/src/redux/slice/session/createSession.jsx
@@ -38,7 +38,7 @@ export const createSession = createAsyncThunk(
       });
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
diff --git a/src/redux/slice/session/getSession.jsx b/src/redux/slice/session/getSession.jsx
@@ -6,7 +6,7 @@ export const getSession = createAsyncThunk("get/Session", async (data) => {
     const response = await axios.get(`session/get-session/${data}`);
     return response.data;
   } catch (error) {
-    console.error(error.message);
+    // console.error(error.message);
     throw error;
   }
 });
diff --git a/src/redux/slice/session/resetSession.jsx b/src/redux/slice/session/resetSession.jsx
@@ -8,7 +8,7 @@ export const deleteSession = createAsyncThunk(
       const response = await axios.delete(`session/delete-session/${data}`);
       return response.data;
     } catch (error) {
-      console.error(error.message);
+      // console.error(error.message);
       throw error;
     }
   }
diff --git a/src/screens/AcademicExcellence/Option1.jsx b/src/screens/AcademicExcellence/Option1.jsx
diff --git a/src/screens/Landing.jsx b/src/screens/Landing.jsx
diff --git a/src/screens/NotFound.jsx b/src/screens/NotFound.jsx
diff --git a/src/templates/AcademicExcellence/SPITICTemplate.jsx b/src/templates/AcademicExcellence/SPITICTemplate.jsx
diff --git a/src/templates/AcademicExcellence/WMAATemplate.jsx b/src/templates/AcademicExcellence/WMAATemplate.jsx
diff --git a/src/utils/extractJWT.jsx b/src/utils/extractJWT.jsx
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export const getUserInfo = createAsyncThunk(`
`8`	`8`	const response = await axios.get(`auth/user-information/${data}`);
`9`	`9`	`return response.data;`
`10`	`10`	`} catch (error) {`
`11`		`- console.error(error.message);`
	`11`	`+ S;`
`12`	`12`	`throw error;`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ export const userRegister = createAsyncThunk("user/register", async (data) => {`
`6`	`6`	`const response = await axios.post("auth/register", data);`
`7`	`7`	`return response.data;`
`8`	`8`	`} catch (error) {`
`9`		`- console.error(error.message);`
	`9`	`+ // console.error(error.message);`
`10`	`10`	`throw error;`
`11`	`11`	`}`
`12`	`12`	`});`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export const changePassword = createAsyncThunk(`
`8`	`8`	`const response = await axios.put("auth/change-password", data);`
`9`	`9`	`return response.data;`
`10`	`10`	`} catch (error) {`
`11`		`- console.error(error.message);`
	`11`	`+ // console.error(error.message);`
`12`	`12`	`throw error;`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export const addAwardeeSpitic = createAsyncThunk(`
`9`	`9`	const response = await axios.post(`awardee/spitic/add-awardee/`, data);
`10`	`10`	`return response.data;`
`11`	`11`	`} catch (error) {`
`12`		`- console.error(error.message);`
	`12`	`+ // console.error(error.message);`
`13`	`13`	`throw error;`
`14`	`14`	`}`
`15`	`15`	`}`
`@@ -48,6 +48,6 @@ export const AwardeeRefreshSpitic = (data, userId) => async (dispatch) => {`
`48`	`48`	`await dispatch(addAwardeeSpitic(data));`
`49`	`49`	`await dispatch(getAwardee(userId));`
`50`	`50`	`} catch (error) {`
`51`		`- console.error("Error adding awardee", error.message);`
	`51`	`+ // console.error("Error adding awardee", error.message);`
`52`	`52`	`}`
`53`	`53`	`};`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export const addMultipleAwardeeSpitic = createAsyncThunk(`
`12`	`12`	`);`
`13`	`13`	`return response.data;`
`14`	`14`	`} catch (error) {`
`15`		`- console.error(error.message);`
	`15`	`+ // console.error(error.message);`
`16`	`16`	`throw error;`
`17`	`17`	`}`
`18`	`18`	`}`
`@@ -52,6 +52,6 @@ export const MultipleAwardeeRefreshSpitic =`
`52`	`52`	`await dispatch(addMultipleAwardeeSpitic(excelData));`
`53`	`53`	`await dispatch(getAwardee(userId));`
`54`	`54`	`} catch (error) {`
`55`		`- console.error("Error adding awardee", error.message);`
	`55`	`+ // console.error("Error adding awardee", error.message);`
`56`	`56`	`}`
`57`	`57`	`};`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export const updateAwardeeSpitic = createAsyncThunk(`
`19`	`19`	`);`
`20`	`20`	`return response.data;`
`21`	`21`	`} catch (error) {`
`22`		`- console.error(error.message);`
	`22`	`+ // console.error(error.message);`
`23`	`23`	`throw error;`
`24`	`24`	`}`
`25`	`25`	`}`
`@@ -59,6 +59,6 @@ export const UpdateAwardeeRefreshSpitic =`
`59`	`59`	`await dispatch(updateAwardeeSpitic(data));`
`60`	`60`	`await dispatch(getAwardee(userId));`
`61`	`61`	`} catch (error) {`
`62`		`- console.error("Error upading awardee", error.message);`
	`62`	`+ // console.error("Error upading awardee", error.message);`
`63`	`63`	`}`
`64`	`64`	`};`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export const deleteAllAwardee = createAsyncThunk(`
`9`	`9`	const response = await axios.delete(`awardee/deleteAll-awardee/${data}`);
`10`	`10`	`return response.data;`
`11`	`11`	`} catch (error) {`
`12`		`- console.error(error.message);`
	`12`	`+ // console.error(error.message);`
`13`	`13`	`throw error;`
`14`	`14`	`}`
`15`	`15`	`}`
`@@ -48,6 +48,6 @@ export const deleteAllAwardeeRefresh = (userId) => async (dispatch) => {`
`48`	`48`	`await dispatch(deleteAllAwardee(userId));`
`49`	`49`	`await dispatch(getAwardee(userId));`
`50`	`50`	`} catch (error) {`
`51`		`- console.error("Error deleting all awardee", error.message);`
	`51`	`+ // console.error("Error deleting all awardee", error.message);`
`52`	`52`	`}`
`53`	`53`	`};`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export const deleteAwardee = createAsyncThunk(`
`9`	`9`	const response = await axios.delete(`awardee/delete-awardee/${data}`);
`10`	`10`	`return response.data;`
`11`	`11`	`} catch (error) {`
`12`		`- console.error(error.message);`
	`12`	`+ // console.error(error.message);`
`13`	`13`	`throw error;`
`14`	`14`	`}`
`15`	`15`	`}`
`@@ -48,6 +48,6 @@ export const deleteAwardeeRefresh = (data, userId) => async (dispatch) => {`
`48`	`48`	`await dispatch(deleteAwardee(data));`
`49`	`49`	`await dispatch(getAwardee(userId));`
`50`	`50`	`} catch (error) {`
`51`		`- console.error("Error deleting awardee", error.message);`
	`51`	`+ // console.error("Error deleting awardee", error.message);`
`52`	`52`	`}`
`53`	`53`	`};`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ export const getAwardee = createAsyncThunk("get/Awardee", async (data) => {`
`6`	`6`	const response = await axios.get(`awardee/get-awardee/${data}`);
`7`	`7`	`return response.data;`
`8`	`8`	`} catch (error) {`
`9`		`- console.error(error.message);`
	`9`	`+ // console.error(error.message);`
`10`	`10`	`throw error;`
`11`	`11`	`}`
`12`	`12`	`});`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export const createSession = createAsyncThunk(`
`38`	`38`	`});`
`39`	`39`	`return response.data;`
`40`	`40`	`} catch (error) {`
`41`		`- console.error(error.message);`
	`41`	`+ // console.error(error.message);`
`42`	`42`	`throw error;`
`43`	`43`	`}`
`44`	`44`	`}`