From de1f78931ac436660b72f8694495ba2d5e046a3d Mon Sep 17 00:00:00 2001 From: Whoknow77 Date: Wed, 3 Apr 2024 15:54:23 +0900 Subject: [PATCH 01/37] =?UTF-8?q?[Change=20=F0=9F=9A=9C=20]=20RootLayout?= =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 16 ++++++++-- src/routes/index.tsx | 48 +++++++++++----------------- src/routes/layouts/DefaultLayout.tsx | 3 ++ src/routes/layouts/RootLayout.tsx | 23 ------------- 4 files changed, 36 insertions(+), 54 deletions(-) delete mode 100644 src/routes/layouts/RootLayout.tsx diff --git a/src/App.tsx b/src/App.tsx index 59d7ef17..4514ee80 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,9 +1,14 @@ -import { RouterProvider } from "react-router-dom" +import { Suspense } from "react" +import { Outlet, RouterProvider } from "react-router-dom" import { ChakraProvider, ColorModeScript } from "@chakra-ui/react" import { QueryClient, QueryClientProvider } from "@tanstack/react-query" +import ErrorBoundaries from "@components/ErrorBoundary/ErrorBoundaries" +import FullScreenSpinner from "@components/LoadingComponents/FullScreenSpinner" +import Prefetcher from "@components/PreFetcher/Prefetcher" + import { isAuthError } from "@utils/isAuthError" import { router } from "./routes" @@ -28,7 +33,14 @@ const App = () => { - + + }> + + + + + + ) diff --git a/src/routes/index.tsx b/src/routes/index.tsx index 8913e634..8245a4ed 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -13,41 +13,31 @@ import ProjectEditPage from "@pages/ProjectEditPage/ProjectEditPage" import ProjectListPage from "@pages/ProjectListPage/ProjectListPage" import SignUpPage from "@pages/SignUpPage/SignUpPage" -import RootLayout from "./layouts/RootLayout" import { determineRedirectLoader } from "./loaders/determineRedirectLoader" export const router = createBrowserRouter([ { - element: , + path: "/", + element: , children: [ { - path: "/", - element: , + index: true, + element: , + }, + + { + path: "/project", children: [ - { - index: true, - element: , - }, - { - path: "/project", - element: , - }, - { - path: "/project/:projectId", - element: , - }, - { - path: "/project/edit", - element: , - }, - { - path: "/profile/:userId", - element: , - }, - { - path: "/profile/edit", - element: , - }, + { index: true, element: }, + { path: ":projectId", element: }, + { path: ":edit", element: }, + ], + }, + { + path: "/profile", + children: [ + { path: ":userId", element: }, + { path: "edit", element: }, ], }, { @@ -59,7 +49,7 @@ export const router = createBrowserRouter([ element: , }, { - path: "/login/validation", + path: ":validation", element: , }, ], diff --git a/src/routes/layouts/DefaultLayout.tsx b/src/routes/layouts/DefaultLayout.tsx index e67839c7..672c1680 100644 --- a/src/routes/layouts/DefaultLayout.tsx +++ b/src/routes/layouts/DefaultLayout.tsx @@ -5,11 +5,14 @@ import { Box, Flex, Spacer } from "@chakra-ui/react" import Footer from "@components/Footer/Footer" import Header from "@components/Header/Header" +import ScrollToTop from "../ScrollToTop/ScrollToTop" + const DefaultLayout = () => { return ( +
diff --git a/src/routes/layouts/RootLayout.tsx b/src/routes/layouts/RootLayout.tsx deleted file mode 100644 index 72679d63..00000000 --- a/src/routes/layouts/RootLayout.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { Suspense } from "react" -import { Outlet } from "react-router-dom" - -import ErrorBoundaries from "@components/ErrorBoundary/ErrorBoundaries" -import FullScreenSpinner from "@components/LoadingComponents/FullScreenSpinner" -import Prefetcher from "@components/PreFetcher/Prefetcher" - -import ScrollToTop from "../ScrollToTop/ScrollToTop" - -const RootLayout = () => { - return ( - - }> - - - - - - - ) -} - -export default RootLayout From 6d1ba3732494859b47626d069a30a440cc2ed272 Mon Sep 17 00:00:00 2001 From: Whoknow77 Date: Wed, 3 Apr 2024 15:59:07 +0900 Subject: [PATCH 02/37] =?UTF-8?q?[Refactoring=20=E2=9A=99=EF=B8=8F]=20?= =?UTF-8?q?=EB=9D=BC=EC=9A=B0=ED=84=B0=20=EA=B5=AC=EC=A1=B0=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/index.tsx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/routes/index.tsx b/src/routes/index.tsx index 8245a4ed..8e08e457 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -30,7 +30,7 @@ export const router = createBrowserRouter([ children: [ { index: true, element: }, { path: ":projectId", element: }, - { path: ":edit", element: }, + { path: "edit", element: }, ], }, { @@ -44,14 +44,8 @@ export const router = createBrowserRouter([ path: "/login", loader: determineRedirectLoader(false), children: [ - { - index: true, - element: , - }, - { - path: ":validation", - element: , - }, + { index: true, element: }, + { path: ":validation", element: }, ], }, { From 4c99633c0964031a46ccd8655f8017b380629c04 Mon Sep 17 00:00:00 2001 From: Whoknow77 Date: Wed, 3 Apr 2024 16:06:10 +0900 Subject: [PATCH 03/37] =?UTF-8?q?[Refactoring=20=E2=9A=99=EF=B8=8F]=20Pref?= =?UTF-8?q?etcher=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 6 +----- src/routes/layouts/DefaultLayout.tsx | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 4514ee80..b3726021 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,5 +1,5 @@ import { Suspense } from "react" -import { Outlet, RouterProvider } from "react-router-dom" +import { RouterProvider } from "react-router-dom" import { ChakraProvider, ColorModeScript } from "@chakra-ui/react" @@ -7,7 +7,6 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query" import ErrorBoundaries from "@components/ErrorBoundary/ErrorBoundaries" import FullScreenSpinner from "@components/LoadingComponents/FullScreenSpinner" -import Prefetcher from "@components/PreFetcher/Prefetcher" import { isAuthError } from "@utils/isAuthError" @@ -36,9 +35,6 @@ const App = () => { }> - - - diff --git a/src/routes/layouts/DefaultLayout.tsx b/src/routes/layouts/DefaultLayout.tsx index 672c1680..5827bf55 100644 --- a/src/routes/layouts/DefaultLayout.tsx +++ b/src/routes/layouts/DefaultLayout.tsx @@ -4,22 +4,25 @@ import { Box, Flex, Spacer } from "@chakra-ui/react" import Footer from "@components/Footer/Footer" import Header from "@components/Header/Header" +import Prefetcher from "@components/PreFetcher/Prefetcher" import ScrollToTop from "../ScrollToTop/ScrollToTop" const DefaultLayout = () => { return ( - - -
- - - - -