@@ -6,11 +6,11 @@ import LoginPage from "../page/LoginPage";
6
6
import SignupPage from "../page/SingupPage" ;
7
7
import KakaoLogin from "../components/login/KakaoLogin" ;
8
8
import KakaoLoginLoding from "../components/login/KakaoLoginLoding" ;
9
+ import NaverLoginPage from "../page/NaverLoginPage" ;
10
+ import NaverLoginLoding from "../components/login/NaverLoginLoding" ;
9
11
import FollowList from "../components/follow/FollowList" ;
10
12
import Profile from "../components/mypage/Profile" ;
11
13
import ScheduleRegisterPage from "../page/ScheduleRegisterPage" ;
12
- import NaverLoginPage from "../page/NaverLoginPage" ;
13
- import Callback from "../page/callback" ;
14
14
import ScheduleDetailPage from "../page/ScheduleDetailPage" ;
15
15
import MainPage from "../page/MainPage" ;
16
16
import SetProfileNamePage from "../page/SetProfileNamePage" ;
@@ -26,23 +26,19 @@ const Router = () => {
26
26
< Container >
27
27
< Layout >
28
28
< Routes >
29
+ { /* 메인과 디테일 페이지 */ }
29
30
{ /* <Route path="/main" element={<MainPage />} /> */ }
30
31
< Route path = "/main" element = { < InfiniteScroll /> } />
31
32
{ localStorage . getItem ( "nickname" ) ? (
32
33
< Route path = "/" element = { < MainPage /> } />
33
34
) : (
34
35
< Route path = "/" element = { < LoginPage /> } />
35
36
) }
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 /> } />
45
37
< Route path = "/detail/:id" element = { < ScheduleDetailPage /> } />
38
+ < Route path = "/schedule" element = { < ScheduleRegisterPage /> } />
39
+
40
+ { /* 회원가입 */ }
41
+ < Route path = "/signup" element = { < SignupPage /> } />
46
42
< Route
47
43
path = "/signup/setProfileName"
48
44
element = { < SetProfileNamePage /> }
@@ -51,11 +47,24 @@ const Router = () => {
51
47
path = "/signup/setProfileImg"
52
48
element = { < SetProfileImgPage /> }
53
49
/>
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 /> } />
55
60
< Route
56
61
path = "/scheduleinvitation"
57
62
element = { < ScheduleInvitation /> }
58
63
/>
64
+ < Route path = "/follow" element = { < FollowList /> } />
65
+
66
+ { /* 알람 */ }
67
+ < Route path = "/notification" element = { < NotificationsPage /> } />
59
68
</ Routes >
60
69
</ Layout >
61
70
</ Container >
0 commit comments