aboutsummaryrefslogtreecommitdiff
path: root/FrontEnd/src/App.tsx
diff options
context:
space:
mode:
Diffstat (limited to 'FrontEnd/src/App.tsx')
-rw-r--r--FrontEnd/src/App.tsx20
1 files changed, 4 insertions, 16 deletions
diff --git a/FrontEnd/src/App.tsx b/FrontEnd/src/App.tsx
index cfdab229..07a8780f 100644
--- a/FrontEnd/src/App.tsx
+++ b/FrontEnd/src/App.tsx
@@ -2,35 +2,25 @@ import * as React from "react";
import { BrowserRouter, Route, Routes } from "react-router-dom";
import AppBar from "./views/common/AppBar";
+import NotFoundPage from "./pages/404";
import LoadingPage from "./views/common/LoadingPage";
+import About from "./pages/about";
import Center from "./views/center";
-import Home from "./views/home";
import Login from "./views/login";
import Register from "./views/register";
import Settings from "./views/settings";
-import About from "./views/about";
import TimelinePage from "./views/timeline";
import Search from "./views/search";
import Admin from "./views/admin";
import AlertHost from "./views/common/alert/AlertHost";
-import { useUser } from "./services/user";
-
-const NoMatch: React.FC = () => {
- return <div>Ah-oh, 404!</div>;
-};
-
-function App(): JSX.Element {
- const user = useUser();
-
+export default function App() {
return (
<React.Suspense fallback={<LoadingPage />}>
<BrowserRouter>
<AppBar />
<div style={{ height: 56 }} />
<Routes>
- <Route index element={user == null ? <Home /> : <Center />} />
- <Route path="home" element={<Home />} />
<Route path="center" element={<Center />} />
<Route path="login" element={<Login />} />
<Route path="register" element={<Register />} />
@@ -40,12 +30,10 @@ function App(): JSX.Element {
<Route path="admin/*" element={<Admin />} />
<Route path=":owner" element={<TimelinePage />} />
<Route path=":owner/:timeline" element={<TimelinePage />} />
- <Route element={<NoMatch />} />
+ <Route path="*" element={<NotFoundPage />} />
</Routes>
<AlertHost />
</BrowserRouter>
</React.Suspense>
);
}
-
-export default App;