fix: router merge 오류 해결

GlowTales · Aug 26, 2024 · a41f975 · a41f975
1 parent 429b135
commit a41f975
Show file tree

Hide file tree

Showing 2 changed files with 115 additions and 38 deletions.
diff --git a/src/components/home/homeRecentTales/HomeRecentTales.tsx b/src/components/home/homeRecentTales/HomeRecentTales.tsx
@@ -39,7 +39,7 @@ const HomeRecentTales = () => {
   };
 
   const handleMoreClick = () => {
-    navigate("/more", { state: { allTales: tales } });
+    navigate("/home/moreRecentTales", { state: { allTales: tales } });
   };
 
   return (

diff --git a/src/router.tsx b/src/router.tsx
@@ -13,9 +13,7 @@ import CreateTalePage from "@pages/CreateTalePage";
 import TaleLearnPage from "@pages/TaleLearnPage";
 import PreLearningQuestionPage from "@pages/PreLearningQuestionPage";
 import MoreRecentTales from "@components/home/homeRecentTales/MoreRecentTales";
-import LearnedMore from "@components/learn/learnMain/learned/LearnedMore";
-import UnLearnedMore from "@components/learn/learnMain/unLearned/UnLearnedMore";
-import WordMore from "@components/learn/learnMain/word/WordMore";
+import PrivateRoute from "@utils/PrivateRoute";
 
 const router = createBrowserRouter([
   {
@@ -26,66 +24,145 @@ const router = createBrowserRouter([
     path: "/login",
     element: <LoginPage />,
   },
+  {
+    path: "/kakao",
+    element: <KakaoRedirect />,
+  },
   {
     path: "/onboarding",
-    element: <OnboardingPage />,
+    element: <PrivateRoute element={<OnboardingPage />} />,
   },
   {
     path: "/home",
-    element: <HomePage />,
+    element: <PrivateRoute element={<HomePage />} />,
   },
   {
     path: "/more",
-    element: <MoreRecentTales />,
-  },
-  {
-    path: "/createTale",
-    element: <CreateMainPage />,
-  },
-  {
-    path: "/kakao",
-    element: <KakaoRedirect />,
-  },
-  {
-    path: "/learning",
-    element: <LearningPage />,
-  },
-  {
-    path: "/learning/moreWord",
-    element: <WordMore />,
+    element: <PrivateRoute element={<MoreRecentTales />} />,
   },
   {
-    path: "/learning/moreUnLearned",
-    element: <UnLearnedMore />,
+    path: "/learnTale",
+    element: <PrivateRoute element={<LearningPage />} />,
   },
   {
-    path: "/learning/moreLearned",
-    element: <LearnedMore />,
+    path: "/createTale",
+    element: <PrivateRoute element={<CreateMainPage />} />,
   },
   {
-    path: "/selectKeyword",
-    element: <SelectKeywordPage />,
+    path: "/createTale/keyword",
+    element: <PrivateRoute element={<SelectKeywordPage />} />,
   },
   {
-    path: "/taleDetail",
-    element: <TaleDetailPage />,
+    path: "/createTale/details",
+    element: <PrivateRoute element={<TaleDetailPage />} />,
   },
   {
-    path: "/create",
-    element: <CreateTalePage />,
+    path: "/createTale/generate",
+    element: <PrivateRoute element={<CreateTalePage />} />,
   },
   {
     path: "/readTale",
-    element: <ReadTalePage />,
+    element: <PrivateRoute element={<ReadTalePage />} />,
   },
   {
-    path: "/learnTale",
-    element: <PreLearningQuestionPage />,
+    path: "/learnTale/pre",
+    element: <PrivateRoute element={<PreLearningQuestionPage />} />,
   },
   {
-    path: "/learnTale/:id",
-    element: <TaleLearnPage />,
+    path: "/learnTale/quiz",
+    element: <PrivateRoute element={<TaleLearnPage />} />,
   },
 ]);
 
 export default router;
+// import { createBrowserRouter } from "react-router-dom";
+// import LoginPage from "@pages/LoginPage";
+// import OnboardingPage from "@pages/OnboardingPage";
+// import HomePage from "@pages/HomePage";
+// import SplashScreen from "@pages/SplashScreen";
+// import KakaoRedirect from "@pages/KakaoRedirect";
+// import SelectKeywordPage from "@pages/SelectKeywordPage";
+// import TaleDetailPage from "@pages/TaleDetailPage";
+// import ReadTalePage from "@pages/ReadTalePage";
+// import CreateMainPage from "@pages/CreateMainPage";
+// import CreateTalePage from "@pages/CreateTalePage";
+// import TaleLearnPage from "@pages/TaleLearnPage";
+// import PreLearningQuestionPage from "@pages/PreLearningQuestionPage";
+// // import LearningPage from "@pages/LearningPage";
+// // import MoreRecentTales from "@components/home/homeRecentTales/MoreRecentTales";
+// // import LearnedMore from "@components/learn/learnMain/learned/LearnedMore";
+// // import UnLearnedMore from "@components/learn/learnMain/unLearned/UnLearnedMore";
+// // import WordMore from "@components/learn/learnMain/word/WordMore";
+
+// const router = createBrowserRouter([
+//   {
+//     path: "/",
+//     element: <SplashScreen />,
+//   },
+//   {
+//     path: "/login",
+//     element: <LoginPage />,
+//   },
+//   {
+//     path: "/onboarding",
+//     element: <OnboardingPage />,
+//   },
+//   {
+//     path: "/home",
+//     element: <HomePage />,
+//   },
+//   {
+//     path: "/createTale",
+//     element: <CreateMainPage />,
+//   },
+//   {
+//     path: "/kakao",
+//     element: <KakaoRedirect />,
+//   },
+//   // {
+//   //   path: "/learnTale",
+//   //   element: <LearningPage />,
+//   // },
+//   // {
+//   //   path: "/home/moreRecentTales",
+//   //   element: <MoreRecentTales />,
+//   // },
+//   // {
+//   //   path: "/learnTale/moreWord",
+//   //   element: <WordMore />,
+//   // },
+//   // {
+//   //   path: "/learnTale/moreUnLearned",
+//   //   element: <UnLearnedMore />,
+//   // },
+//   // {
+//   //   path: "/learnTale/moreLearned",
+//   //   element: <LearnedMore />,
+//   // },
+//   {
+//     path: "/selectKeyword",
+//     element: <SelectKeywordPage />,
+//   },
+//   {
+//     path: "/taleDetail",
+//     element: <TaleDetailPage />,
+//   },
+//   {
+//     path: "/create",
+//     element: <CreateTalePage />,
+//   },
+//   {
+//     path: "/readTale",
+//     element: <ReadTalePage />,
+//   },
+//   {
+//     path: "/learnTale",
+//     element: <PreLearningQuestionPage />,
+//   },
+//   {
+//     path: "/learnTale/:id",
+//     element: <TaleLearnPage />,
+//   },
+// ]);
+
+// export default router;