Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { BrowserRouter as Router, Routes, Route, useLocation } from 'react-router-dom';
import { BrowserRouter as Router, Routes, Route, useLocation, Navigate } from 'react-router-dom';
import { useEffect } from 'react';

import LoginSwitcher from './components/switcher/LoginSwitcher';
import BuildingSelectPage from './pages/BuildingSelectPage';
import ZoneSelectPage from './pages/ZoneSelectPage';
import QRCodeScanner from './pages/QRCodeScanner';

import PrivateRoute from './contexts/PrivateRoute';

function GlobalPopStateHandler() {
useEffect(() => {
const handlePopState = () => {
Expand Down Expand Up @@ -63,11 +65,16 @@ function App() {
<GlobalPopStateHandler />
<LocationWatcher />
<Routes>
<Route path="/" element={<LoginSwitcher />} />
{/* 로그인 안한 상태에서 접근 시 로그인 페이지로 이동 */}
<Route path="/" element={<Navigate to="/login" replace />} />

<Route path="/login" element={<LoginSwitcher />} />
<Route path="/building/select" element={<BuildingSelectPage />} />
<Route path="/zone/select" element={<ZoneSelectPage />} />
<Route path="/qr" element={<QRCodeScanner />} />

<Route element={<PrivateRoute />}>
<Route path="/building/select" element={<BuildingSelectPage />} />
<Route path="/zone/select" element={<ZoneSelectPage />} />
<Route path="/qr" element={<QRCodeScanner />} />
</Route>
</Routes>
</Router>
);
Expand Down
2 changes: 1 addition & 1 deletion src/contexts/PrivateRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Navigate, Outlet } from 'react-router-dom';

const PrivateRoute = () => {
const isLoggedIn = !!localStorage.getItem('accessToken');
return isLoggedIn ? <Outlet /> : <Navigate to="/admin/login" replace />;
return isLoggedIn ? <Outlet /> : <Navigate to="/login" replace />;
};

export default PrivateRoute;