Merge branch 'dev' of https://github.com/side-peek/sidepeek_frontend …

…into feature/#5/ProjectCard

package.json

@@ -30,6 +30,7 @@
     "react-dom": "^18.2.0",
     "react-icons": "^5.0.1",
     "react-router-dom": "^6.22.0",
+    "rollup": "^4.10.0",
     "styled-components": "^6.1.8",
     "zustand": "^4.5.0"
   },

src/routes/index.tsx

@@ -1,6 +1,4 @@
-import { Outlet, createBrowserRouter } from "react-router-dom"
-
-import TestPage from "@/pages/TestPage/TestPage"
+import { createBrowserRouter } from "react-router-dom"
 
 import ErrorPage from "@pages/ErrorPage/ErrorPage"
 import HomePage from "@pages/HomePage/HomePage"
@@ -10,15 +8,13 @@ import ProjectDetailPage from "@pages/ProjectDetailPage/ProjectDetailPage"
 import ProjectEditPage from "@pages/ProjectEditPage/ProjectEditPage"
 import ProjectListPage from "@pages/ProjectListPage/ProjectListPage"
 import SignUpPage from "@pages/SignUpPage/SignUpPage"
+import TestPage from "@pages/TestPage/TestPage"
+
+import DefaultLayout from "@styles/layouts/DefaultLayout"
 
 export const router = createBrowserRouter([
   {
-    element: (
-      <>
-        {/* <Header /> */}
-        <Outlet />
-      </>
-    ),
+    element: <DefaultLayout />,
     errorElement: <ErrorPage />,
     children: [
       {
@@ -40,25 +36,16 @@ export const router = createBrowserRouter([
           },
         ],
       },
-      {
-        path: "/login",
-        element: <LoginPage />,
-      },
-      {
-        path: "/signup",
-        element: <SignUpPage />,
-      },
       {
         path: "/test",
         element: <TestPage />,
       },
+      {
+        path: "/profile/:userId",
+        element: <ProfilePage />,
+      },
     ],
   },
-
-  {
-    path: "/profile/:userId",
-    element: <ProfilePage />,
-  },
   {
     path: "/login",
     element: <LoginPage />,

src/styles/layouts/DefaultLayout.tsx

@@ -0,0 +1,14 @@
+import { Outlet } from "react-router"
+
+import Header from "@components/Header/Header"
+
+const DefaultLayout = () => {
+  return (
+    <>
+      <Header />
+      <Outlet />
+    </>
+  )
+}
+
+export default DefaultLayout

tsconfig.json

@@ -23,7 +23,6 @@
     "forceConsistentCasingInFileNames": false,
     "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"],
       "@components/*": ["src/components/*"],
       "@apis/*": ["src/apis/*"],
       "@assets/*": ["src/assets/*"],
@@ -33,7 +32,8 @@
       "@constants/*": ["src/constants/*"],
       "@styles/*": ["src/styles/*"],
       "@types/*": ["src/types/*"],
-      "@utils/*": ["src/utils/*"]
+      "@utils/*": ["src/utils/*"],
+      "@/*": ["src/*"]
     }
   },