Skip to content

Commit a11a395

Browse files
author
Ju
committed
Feat. Router 정리
1 parent ab6df0d commit a11a395

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

src/components/layout/BottomNavi.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const BottomNavi = () => {
1212
<div className="flex gap-[77px] pt-[13px] justify-center">
1313
<div
1414
onClick={() => {
15-
navigate();
15+
navigate("/follow");
1616
}}
1717
className="w-[24px] h-[24px]"
1818
>

src/page/callback.jsx src/components/login/NaverLoginLoding.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import axios from "axios";
22
import React, { useEffect } from "react";
33

4-
function Callback() {
4+
function NaverLoginLoding() {
55
const userAccessToken = () => {
66
window.location.href.includes("access_token") && getToken();
77
};
@@ -61,4 +61,4 @@ function Callback() {
6161
);
6262
}
6363

64-
export default Callback;
64+
export default NaverLoginLoding;

src/shared/Router.jsx

+21-12
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import LoginPage from "../page/LoginPage";
66
import SignupPage from "../page/SingupPage";
77
import KakaoLogin from "../components/login/KakaoLogin";
88
import KakaoLoginLoding from "../components/login/KakaoLoginLoding";
9+
import NaverLoginPage from "../page/NaverLoginPage";
10+
import NaverLoginLoding from "../components/login/NaverLoginLoding";
911
import FollowList from "../components/follow/FollowList";
1012
import Profile from "../components/mypage/Profile";
1113
import ScheduleRegisterPage from "../page/ScheduleRegisterPage";
12-
import NaverLoginPage from "../page/NaverLoginPage";
13-
import Callback from "../page/callback";
1414
import ScheduleDetailPage from "../page/ScheduleDetailPage";
1515
import MainPage from "../page/MainPage";
1616
import SetProfileNamePage from "../page/SetProfileNamePage";
@@ -26,23 +26,19 @@ const Router = () => {
2626
<Container>
2727
<Layout>
2828
<Routes>
29+
{/* 메인과 디테일 페이지 */}
2930
{/* <Route path="/main" element={<MainPage />} /> */}
3031
<Route path="/main" element={<InfiniteScroll />} />
3132
{localStorage.getItem("nickname") ? (
3233
<Route path="/" element={<MainPage />} />
3334
) : (
3435
<Route path="/" element={<LoginPage />} />
3536
)}
36-
<Route path="/login" element={<LoginPage />} />
37-
<Route path="/signup" element={<SignupPage />} />
38-
<Route path="/kakaoLogin" element={<KakaoLogin />} />
39-
<Route path="auth/kakao/callback" element={<KakaoLoginLoding />} />
40-
<Route path="/follow" element={<FollowList />} />
41-
<Route path="/profile" element={<Profile />} />
42-
<Route path="/schedule" element={<ScheduleRegisterPage />} />
43-
<Route path="/naver/login" element={<NaverLoginPage />} />
44-
<Route path="/callback" element={<Callback />} />
4537
<Route path="/detail/:id" element={<ScheduleDetailPage />} />
38+
<Route path="/schedule" element={<ScheduleRegisterPage />} />
39+
40+
{/* 회원가입 */}
41+
<Route path="/signup" element={<SignupPage />} />
4642
<Route
4743
path="/signup/setProfileName"
4844
element={<SetProfileNamePage />}
@@ -51,11 +47,24 @@ const Router = () => {
5147
path="/signup/setProfileImg"
5248
element={<SetProfileImgPage />}
5349
/>
54-
<Route path="/notification" element={<NotificationsPage />} />
50+
51+
{/* 로그인 */}
52+
<Route path="/login" element={<LoginPage />} />
53+
<Route path="/kakaoLogin" element={<KakaoLogin />} />
54+
<Route path="auth/kakao/callback" element={<KakaoLoginLoding />} />
55+
<Route path="/naver/login" element={<NaverLoginPage />} />
56+
<Route path="/auth/naver/callback" element={<NaverLoginLoding />} />
57+
58+
{/* 마이페이지 */}
59+
<Route path="/profile" element={<Profile />} />
5560
<Route
5661
path="/scheduleinvitation"
5762
element={<ScheduleInvitation />}
5863
/>
64+
<Route path="/follow" element={<FollowList />} />
65+
66+
{/* 알람 */}
67+
<Route path="/notification" element={<NotificationsPage />} />
5968
</Routes>
6069
</Layout>
6170
</Container>

0 commit comments

Comments
 (0)