diff --git a/src/App.tsx b/src/App.tsx index 1915b38..f5bb174 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,156 +1,18 @@ import "./App.css"; -import PublicLayout from "./layout/PublicLayout"; -import { - createBrowserRouter, - Navigate, - RouterProvider, - type RouteObject, -} from "react-router-dom"; -import MainPage from "./pages/MainPage"; -import ErrorPage from "./pages/ErrorPage"; -import LoginPage from "./pages/LoginPage.tsx"; -import SearchPage from "./pages/SearchPage"; -import { AuthProvider } from "./context/AuthContext.tsx"; -import PostWrite from "./pages/Post/PostWritePage.tsx"; -import PostSuccess from "./pages/Post/PostSuccess.tsx"; -import RandomFeedPage from "./pages/RandomFeedPage.tsx"; -import LuckyDrawPage from "./pages/LuckyDrawPage.tsx"; -import MyPageLayout from "./pages/MyPage/MyPageLayout.tsx"; -import PostDetailPage from "./pages/Post/PostDetailPage.tsx"; -import FavoriteFeedPage from "./pages/FavoriteFeedPage.tsx"; -import CategoryFeedPage from "./pages/CategoryFeedPage.tsx"; -import BestFeedPage from "./pages/BestFeedPage.tsx"; -import ServiceTerm from "./components/Terms/ServiceTerm.tsx"; -import PrivacyTerms from "./components/Terms/PrivacyTerms.tsx"; -import MarketingTerm from "./components/Terms/Marketing.tsx"; -import ProfileEditPage from "./pages/MyPage/ProfileEditPage.tsx"; -import MyPostPage from "./pages/MyPage/MyPostPage.tsx"; -import MyLessonPage from "./pages/MyPage/MyLessonPage.tsx"; -import SignUpPage from "./pages/SignUp/SignUpPage.tsx"; -import FindPasswordPage from "./pages/FindPasswordPage.tsx"; -import SetNewPassWordPage from "./pages/SetNewPasswordPage.tsx"; -import PostEditPage from "./pages/Post/PostEditPage.tsx"; +import { createBrowserRouter, RouterProvider } from "react-router-dom"; +import { AuthProvider } from "./context/AuthContext"; -//로그인 구현 필요 없이 들어가는 페이지 라우터 -const publicRoutes: RouteObject[] = [ - { - path: "/", - element: , - children: [ - { - // path : "" 와 동일함 -> 하지만 react 에서 index: true를 적극 권장 - index: true, - element: , - }, - { - path: "login", - element: , - }, - //TODO: login 사항 없도록 라우터 분리 - { - path: "terms1", - element: , - }, - { - path: "terms2", - element: , - }, - { - path: "terms3", - element: , - }, - ///////////////////////// - { - path: "signup", - element: , - }, - { - path: "find-password", - element: - }, - { - path: "set-password", - element: - }, - { - path: "search", - element: , - }, - { - path: "random-feed", - element: , - }, - { - path: "lucky-draw", - element: , - }, - { - path: "favorite-feed", - element: , - }, - { - path: "category-feed/:categoryId", - element: , - }, - { - path: "best-failer", - element: , - }, - { - path: "my-profile", - element: , - children: [ - { index: true, element: }, - { path: "profile", element: }, - { path: "posts", element: }, - { path: "lessons", element: }, - ], - }, - // 설정한 path 이외에 모든 Path 에 대해 ErrorPage 랜더링 - { - path: "*", - element: , - }, - { - path: "post", - element: , - }, - { - path: "posts/edit/:postId", - element: - }, +import { publicRoutes } from "./routes/publicRoutes"; +import { protectedRoutes } from "./routes/protectedRoutes"; - { - path: "post/success", - element: , - }, - { - path: "posts/:postId", - element: , - }, - ], - }, -]; +const router = createBrowserRouter([...publicRoutes, ...protectedRoutes]); -//router 생성 : 이후 portected를 위해 배열로 넣음 -const router = createBrowserRouter([...publicRoutes]); - -/* - useQueryClient 사용을 위해 코드 생성 후 주석 처리 - export const queryClient = new QueryClient(); -*/ - -// 이후 쿼리, authprovider 사용을 위해 주석 처리 function App() { return ( - <> - - {/* - {/* */} - - + + + ); } -export default App; +export default App; \ No newline at end of file diff --git a/src/apis/SignUp/getTerms.ts b/src/apis/SignUp/getTerms.ts index 22c092f..79e0c08 100644 --- a/src/apis/SignUp/getTerms.ts +++ b/src/apis/SignUp/getTerms.ts @@ -12,5 +12,6 @@ export const getTerms = async ():Promise> => { const {data} = await axiosInstance.get>( `/terms` ); + console.log("약관 조회", data); return data; } \ No newline at end of file diff --git a/src/apis/SignUp/postSinUp.ts b/src/apis/SignUp/postSinUp.ts index 4f23a16..6bb3171 100644 --- a/src/apis/SignUp/postSinUp.ts +++ b/src/apis/SignUp/postSinUp.ts @@ -23,5 +23,6 @@ export const postSignUp = async ({ verificationToken, } ); + console.log("회원가입", data); return data; } \ No newline at end of file diff --git a/src/apis/mypage.ts b/src/apis/mypage.ts index 59de3eb..57e893c 100644 --- a/src/apis/mypage.ts +++ b/src/apis/mypage.ts @@ -41,7 +41,6 @@ export const editMyProfile = async ({ "Content-Type": "multipart/form-data", }, }); - return data; }; diff --git a/src/components/SignUpPage/TermsAgreement.tsx b/src/components/SignUpPage/TermsAgreement.tsx index 5ea7cc9..2acb098 100644 --- a/src/components/SignUpPage/TermsAgreement.tsx +++ b/src/components/SignUpPage/TermsAgreement.tsx @@ -47,7 +47,6 @@ export const TermsAgreement = () => { }, [location.key, terms.length, requiredTerms, optionalTerms]); const setOptionalTrue = () => { - // 요구사항 4: 전체약관 동의 누르면 OPTIONAL은 자동 체크 for (const t of optionalTerms) { localStorage.setItem(lsKey(t.id), "true"); } diff --git a/src/components/Terms/TermsContainer.tsx b/src/components/Terms/TermsContainer.tsx index c239741..e77bc5c 100644 --- a/src/components/Terms/TermsContainer.tsx +++ b/src/components/Terms/TermsContainer.tsx @@ -18,12 +18,13 @@ const TermsContainer = ({ id }: Props) => { localStorage.setItem(lsKey(id), "true"); navigate(-1); }; + return (
{term?.title}
-
{term?.content}
+
{term?.content}
{/* 누르면 체크 ok되고 넘어가는거로 */}