Merge pull request #108 from KDT-Web-IDE-Project/dev

배포를 위한 최신화
F3B4-KDT-Project · Feb 1, 2025 · dc5805a · dc5805a
2 parents 3cee7ec + bcf43e4
commit dc5805a
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 23 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react/react-in-jsx-scope */
 import './App.css';
-import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
+import { Route, Routes, useNavigate, useLocation } from 'react-router-dom';
 import SignUp from './pages/SignUp';
 import SignIn from './pages/SignIn';
 import Board from './pages/Board';
@@ -10,7 +10,25 @@ import Sidebar from './components/layout/sideBar';
 import { AppContainer, ContentWrapper } from './components/layout/style';
 import { useEffect, useState } from 'react';
 
+const RequireAuth = ({ children }: { children: JSX.Element }) => {
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    const token = localStorage.getItem('accessToken'); // 토큰 가져오기
+    if (!token) {
+      navigate('/sign-in', { replace: true }); // 토큰이 없으면 로그인 페이지로 이동
+    }
+  }, [navigate]);
+
+  return children;
+};
+
 function App() {
+  const location = useLocation(); // 현재 경로 가져오기
+  const hiddenPaths: string[] = ['/sign-in', '/sign-up']; // 사이드바 숨길 경로
+
+  const shouldShowSidebar = !hiddenPaths.includes(location.pathname); // 숨길 경로에 해당하지 않을 때만 true
+
   const [theme, setTheme] = useState(() => {
     return localStorage.getItem('theme') || 'dark'; // 기본값은 'dark'
   });
@@ -29,23 +47,41 @@ function App() {
   };
 
   return (
-    <Router>
-      <AppContainer>
-        <Sidebar />
-        <ContentWrapper>
-          <Routes>
-            <Route path="/sign-up" element={<SignUp />} />
-            <Route path="/sign-in" element={<SignIn />} />
-            <Route path="/" element={<Board />} />
-            <Route path="/post" element={<Post />} />
-            <Route
-              path="/my-page"
-              element={<MyPage theme={theme} setTheme={handleThemeChange} />}
-            />
-          </Routes>
-        </ContentWrapper>
-      </AppContainer>
-    </Router>
+    <AppContainer>
+      {/* shouldShowSidebar가 true일 때만 Sidebar 렌더링 */}
+      {shouldShowSidebar && <Sidebar />}
+      <ContentWrapper>
+        <Routes>
+          <Route path="/sign-up" element={<SignUp />} />
+          <Route path="/sign-in" element={<SignIn />} />
+
+          <Route
+            path="/"
+            element={
+              <RequireAuth>
+                <Board />
+              </RequireAuth>
+            }
+          />
+          <Route
+            path="/post"
+            element={
+              <RequireAuth>
+                <Post />
+              </RequireAuth>
+            }
+          />
+          <Route
+            path="/my-page"
+            element={
+              <RequireAuth>
+                <MyPage theme={theme} setTheme={handleThemeChange} />
+              </RequireAuth>
+            }
+          />
+        </Routes>
+      </ContentWrapper>
+    </AppContainer>
   );
 }
 

diff --git a/src/main.tsx b/src/main.tsx
@@ -1,12 +1,14 @@
 /* eslint-disable react/react-in-jsx-scope */
-import { createRoot } from 'react-dom/client';
-import './index.css';
-import App from './App.tsx';
+import ReactDOM from 'react-dom/client';
+import { BrowserRouter as Router } from 'react-router-dom';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { queryClient } from './apis/queryClient.ts';
+import App from './App.tsx';
+import './index.css';
 
 /* monaco-editor 세팅 */
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 (window as any).MonacoEnvironment = {
   getWorkerUrl(label: string) {
     switch (label) {
@@ -24,8 +26,10 @@ import { queryClient } from './apis/queryClient.ts';
   },
 };
 
-createRoot(document.getElementById('root')!).render(
+ReactDOM.createRoot(document.getElementById('root')!).render(
   <QueryClientProvider client={queryClient}>
-    <App />
+    <Router>
+      <App />
+    </Router>
   </QueryClientProvider>
 );