refactory

tukcom2023CD · Sep 4, 2023 · a1bf1ed · a1bf1ed
1 parent 9bdd5bb
commit a1bf1ed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 35 deletions.
diff --git a/front/src/App.tsx b/front/src/App.tsx
@@ -19,42 +19,25 @@ import Question2 from "./pages/agora/Question2";
 axios.defaults.baseURL = process.env.REACT_APP_BASE_URL;
 axios.defaults.withCredentials = true;
 
-function AppRoutes() {
-  const [user] = useUser();
-
-  if (user) {
-    return (
-      <Routes>
-        <Route path='/TeamList' element={<TeamList />} />
-        <Route path='/DashBoard' element={<DashBoard />} />
-        <Route path='/Project' element={<Project />} />
-        <Route path='/Sprint' element={<Sprint />} />
-        <Route path='/Task' element={<Task />} />
-        <Route path='/Members' element={<Members />} />
-        <Route path='/Graph' element={<Graph />} />
-        <Route path='/Agora' element={<Agora />} />
-        <Route path='/Question' element={<Question />} />
-        <Route path='/Question1' element={<Question1 />} />
-        <Route path='/Question2' element={<Question2 />} />
-        <Route path='/*' element={<Navigate to='/TeamList' />} />
-      </Routes>
-    );
-  }
-
-  return (
-    <Routes>
-      <Route path='/' element={<WelcomePage />} />
-      <Route path='/Login' element={<Login />} />
-      <Route path='/*' element={<Navigate to='/' />} />
-    </Routes>
-  );
-}
-
 function App() {
   return (
     <UserProvider>
       <BrowserRouter>
-        <AppRoutes />
+        <Routes>
+          <Route path='/' element={<WelcomePage />} />
+          <Route path='/Login' element={<Login />} />
+          <Route path='/TeamList' element={<TeamList />} />
+          <Route path='/DashBoard' element={<DashBoard />} />
+          <Route path='/Project' element={<Project />} />
+          <Route path='/Sprint' element={<Sprint />} />
+          <Route path='/Task' element={<Task />} />
+          <Route path='/Members' element={<Members />} />
+          <Route path='/Graph' element={<Graph />} />
+          <Route path='/Agora' element={<Agora />} />
+          <Route path='/Question' element={<Question />} />
+          <Route path='/Question1' element={<Question1 />} />
+          <Route path='/Question2' element={<Question2 />} />
+        </Routes>
       </BrowserRouter>
     </UserProvider>
   );

diff --git a/front/src/components/frames/token/UserContext.tsx b/front/src/components/frames/token/UserContext.tsx
@@ -36,8 +36,10 @@ export const UserProvider: React.FC<{ children: React.ReactNode }> = ({
   const [isLoginSuccessful, setIsLoginSuccessful] = useState(false);
 
   useEffect(() => {
-    console.log("Login successful: ", isLoginSuccessful);
-    console.log("Current user: ", user);
+    const loginSuccess = () => {
+      console.log("Logging in...");
+      setIsLoginSuccessful(true);
+    };
     if (isLoginSuccessful) {
       const token = "some_token";
       const storedNickname = localStorage.getItem("nickname");
@@ -49,7 +51,7 @@ export const UserProvider: React.FC<{ children: React.ReactNode }> = ({
         setUser({ token, nickname: "Guest", isNewUser: true });
       }
     }
-  }, [isLoginSuccessful, user]);
+  }, [isLoginSuccessful]);
 
   const setNicknameAndHidePopup = (nickname: string) => {
     if (user) {