diff --git a/src/components/home/homeRecentTales/HomeRecentTales.tsx b/src/components/home/homeRecentTales/HomeRecentTales.tsx index c4ecdaa..378bb2c 100644 --- 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 index 682e394..3af6234 100644 --- 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: , }, + { + path: "/kakao", + element: , + }, { path: "/onboarding", - element: , + element: } />, }, { path: "/home", - element: , + element: } />, }, { path: "/more", - element: , - }, - { - path: "/createTale", - element: , - }, - { - path: "/kakao", - element: , - }, - { - path: "/learning", - element: , - }, - { - path: "/learning/moreWord", - element: , + element: } />, }, { - path: "/learning/moreUnLearned", - element: , + path: "/learnTale", + element: } />, }, { - path: "/learning/moreLearned", - element: , + path: "/createTale", + element: } />, }, { - path: "/selectKeyword", - element: , + path: "/createTale/keyword", + element: } />, }, { - path: "/taleDetail", - element: , + path: "/createTale/details", + element: } />, }, { - path: "/create", - element: , + path: "/createTale/generate", + element: } />, }, { path: "/readTale", - element: , + element: } />, }, { - path: "/learnTale", - element: , + path: "/learnTale/pre", + element: } />, }, { - path: "/learnTale/:id", - element: , + path: "/learnTale/quiz", + element: } />, }, ]); 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: , +// }, +// { +// path: "/login", +// element: , +// }, +// { +// path: "/onboarding", +// element: , +// }, +// { +// path: "/home", +// element: , +// }, +// { +// path: "/createTale", +// element: , +// }, +// { +// path: "/kakao", +// element: , +// }, +// // { +// // path: "/learnTale", +// // element: , +// // }, +// // { +// // path: "/home/moreRecentTales", +// // element: , +// // }, +// // { +// // path: "/learnTale/moreWord", +// // element: , +// // }, +// // { +// // path: "/learnTale/moreUnLearned", +// // element: , +// // }, +// // { +// // path: "/learnTale/moreLearned", +// // element: , +// // }, +// { +// path: "/selectKeyword", +// element: , +// }, +// { +// path: "/taleDetail", +// element: , +// }, +// { +// path: "/create", +// element: , +// }, +// { +// path: "/readTale", +// element: , +// }, +// { +// path: "/learnTale", +// element: , +// }, +// { +// path: "/learnTale/:id", +// element: , +// }, +// ]); + +// export default router;