From dbb70d8af6659cae464df8b26492ed3948422083 Mon Sep 17 00:00:00 2001 From: sosokker Date: Sat, 11 Nov 2023 22:59:27 +0700 Subject: [PATCH] Separate Login and Signup --- frontend/src/App.jsx | 75 +++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 071fced..cbd3257 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -1,40 +1,45 @@ -import './App.css'; -import { BrowserRouter, Route, Routes } from 'react-router-dom'; +import "./App.css"; +import { BrowserRouter, Route, Routes } from "react-router-dom"; -import TestAuth from './components/testAuth'; -import LoginPage from './components/authentication/LoginPage'; -import SignUpPage from './components/authentication/SignUpPage'; -import NavBar from './components/nav/Navbar'; -import Home from './components/Home'; -import ProfileUpdate from './components/ProfileUpdatePage'; -import Calendar from './components/calendar/calendar'; -import KanbanBoard from './components/kanbanBoard/kanbanBoard'; -import IconSideNav from './components/IconSideNav'; -import Eisenhower from './components/EisenhowerMatrix/Eisenhower'; +import TestAuth from "./components/testAuth"; +import LoginPage from "./components/authentication/LoginPage"; +import SignUpPage from "./components/authentication/SignUpPage"; +import NavBar from "./components/nav/Navbar"; +import Home from "./components/Home"; +import ProfileUpdate from "./components/ProfileUpdatePage"; +import Calendar from "./components/calendar/calendar"; +import KanbanBoard from "./components/kanbanBoard/kanbanBoard"; +import IconSideNav from "./components/IconSideNav"; +import Eisenhower from "./components/eisenhowerMatrix/Eisenhower"; const App = () => { - return ( - -
- -
- -
- - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - -
-
-
-
- ); -} + const currentPath = window.location.pathname; + const prevention = ["/login", "/signup"]; + + return ( + +
+ {!prevention.some(_ => currentPath.includes(_)) && } +
+ +
+ + } /> + } /> + } /> + } /> + } /> + } /> + +
+
+
+ + } /> + } /> + +
+ ); +}; export default App;