dd

Author: Jaysalgado

src/App.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Routes, Route, Navigate } from 'react-router-dom';
+import { Routes, Route, Navigate, useLocation } from 'react-router-dom';
 import { useAppSelector } from './reducers/hooks';
 import Login from './components/Login/Login';
 import SignUp from './components/SignUp/SignUp';
@@ -23,7 +23,7 @@ const App = () => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const { updateSession } = useSurvey();
   const { checkCookie } = useHelper();
-  
+  const location = useLocation();
   const [loading, setLoading] = useState(true);
   const [session, setSession] = useState<boolean | undefined>(undefined);
 
@@ -46,7 +46,7 @@ const App = () => {
       }
     };
     checkLogin();
-  }, [checkCookie, updateSession]);
+  }, [location.pathname, checkCookie, updateSession]);
 
   if (loading) {
     return <div>Loading...</div>;

src/components/Login/Login.tsx

@@ -72,6 +72,7 @@ const Login = (): JSX.Element => {
         )
       );
       // Navigate to root route
+      console.log(data);
       navigate('/');
     } catch (err) {
       // Alert user upon wrong username or password entry using an alert.

src/components/SharedLayout/SharedLayout.tsx

@@ -129,7 +129,7 @@ function SharedLayout(): JSX.Element {
     writeToDb();
     networkContainers();
     getAllDockerVolumes();
-    setAdminToken();
+    // setAdminToken();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -155,25 +155,25 @@ function SharedLayout(): JSX.Element {
   }, []);
 
   // Pertains to sysAdmin only
-  const setAdminToken = async (): Promise<void> => {
-    try {
-      const response = await fetch('/api/admin', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          token: userData.token,
-          username: userData.username,
-        }),
-      });
-      const parsedData = await response.json();
+  // const setAdminToken = async (): Promise<void> => {
+  //   try {
+  //     const response = await fetch('/api/admin', {
+  //       method: 'POST',
+  //       headers: {
+  //         'Content-Type': 'application/json',
+  //       },
+  //       body: JSON.stringify({
+  //         token: userData.token,
+  //         username: userData.username,
+  //       }),
+  //     });
+  //     const parsedData = await response.json();
 
-      updateUser(parsedData);
-    } catch (e) {
-      console.log(e);
-    }
-  };
+  //     updateUser(parsedData);
+  //   } catch (e) {
+  //     console.log(e);
+  //   }
+  // };
 
   return (
     <div className={styles.wrapper}>