Merge pull request #121 from ruiqi7/bugfix/general

Define location state type
CS3219-AY2425S1 · Nov 10, 2024 · 0d744bf · 0d744bf
2 parents eabdce9 + db722a0
commit 0d744bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/frontend/src/components/NoDirectAccessRoutes/index.tsx b/frontend/src/components/NoDirectAccessRoutes/index.tsx
@@ -1,9 +1,10 @@
 import { Navigate, Outlet, useLocation } from "react-router-dom";
+import { LocationState } from "../../hooks/useAppNavigate";
 
 const NoDirectAccessRoutes: React.FC = () => {
   const location = useLocation();
 
-  if (location.state?.from !== "app-navigation") {
+  if ((location.state as LocationState)?.from !== "app-navigation") {
     return <Navigate to="/home" replace />;
   }
 

diff --git a/frontend/src/hooks/useAppNavigate.tsx b/frontend/src/hooks/useAppNavigate.tsx
@@ -1,12 +1,16 @@
 import { useNavigate } from "react-router-dom";
 
+export interface LocationState {
+  from: string;
+}
+
 export const useAppNavigate = () => {
   const navigate = useNavigate();
 
   const appNavigate = (path: string) => {
     navigate(path, {
       replace: location.pathname !== "/home",
-      state: { from: "app-navigation" },
+      state: { from: "app-navigation" } as LocationState,
     });
   };