refactor: Router 구조 수정

woowacourse-teams · Aug 15, 2023 · d9afabc · d9afabc
1 parent 55939ce
commit d9afabc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -1,7 +1,7 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { ErrorBoundary } from 'components/ErrorBoundary/ErrorBoundary';
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
-import Layout from 'pages/Layout/Layout';
+import { Outlet } from 'react-router-dom';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -16,7 +16,7 @@ const App = () => {
   return (
     <QueryClientProvider client={queryClient}>
       <ErrorBoundary>
-        <Layout />
+        <Outlet />
       </ErrorBoundary>
       <ReactQueryDevtools initialIsOpen={false} />
     </QueryClientProvider>

diff --git a/frontend/src/routes/Router.tsx b/frontend/src/routes/Router.tsx
@@ -3,6 +3,8 @@ import WritingPage from 'pages/WritingPage/WritingPage';
 import WritingTablePage from 'pages/WritingTablePage/WritingTablePage';
 import App from '../App';
 import OauthPage from 'pages/OauthPage/OauthPage';
+import IntroducePage from 'pages/IntroducePage/IntroducePage';
+import Layout from 'pages/Layout/Layout';
 
 export const Router = () => {
   const browserRouter = createBrowserRouter([
@@ -11,12 +13,8 @@ export const Router = () => {
       element: <App />,
       children: [
         {
-          path: '/writings/:categoryId/:writingId',
-          element: <WritingPage />,
-        },
-        {
-          path: '/writings/:categoryId',
-          element: <WritingTablePage />,
+          path: '',
+          element: <IntroducePage />,
         },
         {
           path: '/oauth/login/*',
@@ -27,6 +25,20 @@ export const Router = () => {
             },
           ],
         },
+        {
+          path: '/space',
+          element: <Layout />,
+          children: [
+            {
+              path: 'writings/:categoryId/:writingId',
+              element: <WritingPage />,
+            },
+            {
+              path: 'writings/:categoryId',
+              element: <WritingTablePage />,
+            },
+          ],
+        },
       ],
     },
   ]);