Merge pull request #1395 from crupest/dev

Refector 2023 v0.1

1 files changed, 20 insertions, 36 deletions

diff --git a/FrontEnd/src/App.tsx b/FrontEnd/src/App.tsx
index cfdab229..58463d08 100644
--- a/FrontEnd/src/App.tsx
+++ b/FrontEnd/src/App.tsx
@@ -1,51 +1,35 @@
-import * as React from "react";
+import { Suspense } from "react";
 import { BrowserRouter, Route, Routes } from "react-router-dom";
 
-import AppBar from "./views/common/AppBar";
-import LoadingPage from "./views/common/LoadingPage";
-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();
+import AppBar from "./components/AppBar";
+import NotFoundPage from "./pages/404";
+import HomePage from "./pages/home";
+import AboutPage from "./pages/about";
+import SettingPage from "./pages/setting";
+import LoginPage from "./pages/login";
+import RegisterPage from "./pages/register";
+import TimelinePage from "./pages/timeline";
+import LoadingPage from "./pages/loading";
+import { AlertHost } from "./components/alert";
 
+export default function App() {
   return (
-    <React.Suspense fallback={<LoadingPage />}>
+    <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 />} />
-          <Route path="settings" element={<Settings />} />
-          <Route path="about" element={<About />} />
-          <Route path="search" element={<Search />} />
-          <Route path="admin/*" element={<Admin />} />
+          <Route path="login" element={<LoginPage />} />
+          <Route path="register" element={<RegisterPage />} />
+          <Route path="settings" element={<SettingPage />} />
+          <Route path="about" element={<AboutPage />} />
           <Route path=":owner" element={<TimelinePage />} />
           <Route path=":owner/:timeline" element={<TimelinePage />} />
-          <Route element={<NoMatch />} />
+          <Route path="" element={<HomePage />} />
+          <Route path="*" element={<NotFoundPage />} />
         </Routes>
         <AlertHost />
       </BrowserRouter>
-    </React.Suspense>
+    </Suspense>
   );
 }
-
-export default App;