fix: router separate

boostcampwm2023 · Dec 13, 2023 · fc476e2 · fc476e2
1 parent 82e0222
commit fc476e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/front/src/App.tsx b/front/src/App.tsx
@@ -70,7 +70,7 @@ const App = () => {
                     </SnowBallProvider>
                   }
                 >
-                  <Route path="" element={<Pages.Nickname />} />
+                  <Route path="nickname" element={<Pages.Nickname />} />
                   <Route path="snowball" element={<Pages.Snowball />} />
                 </Route>
 

diff --git a/front/src/pages/Main/Main.tsx b/front/src/pages/Main/Main.tsx
@@ -98,7 +98,7 @@ const Main = () => {
           setUserData(resUserData);
 
           if (res.data.main_snowball === null) {
-            navigate('/make');
+            navigate('/make/snowball');
             return;
           }
 
@@ -114,7 +114,7 @@ const Main = () => {
             userData.snowball_count === 0 ||
             userData.nickname === 'null'
           ) {
-            navigate('/make');
+            navigate('/make/nickname');
           }
         }
       })

diff --git a/front/src/router/HasSnowballData.tsx b/front/src/router/HasSnowballData.tsx
@@ -8,7 +8,7 @@ const HasSnowballData: React.FC<{ children: ReactNode }> = ({ children }) => {
   const maxSnowball = 5;
 
   useEffect(() => {
-    if (url === '' || url === '/make' || url === 'main') {
+    if (url === '' || url === '/make/nickname' || url === 'main') {
       axios
         .get('/api/user', {
           withCredentials: true // axios 쿠키 값 전달
@@ -17,7 +17,7 @@ const HasSnowballData: React.FC<{ children: ReactNode }> = ({ children }) => {
           if (res.status === 200) {
             const data = res.data;
             if (data.user.nickname === null) {
-              setUrl('/make');
+              setUrl('/make/nickname');
             } else if (
               data.user.nickname !== null &&
               data.main_snowball === null