diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index b95ec603..5a75814c 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,41 +1,27 @@ -import { BrowserRouter as Router, Route, Routes } from 'react-router-dom'; +import { Route, BrowserRouter as Router, Routes } from 'react-router-dom'; +import AdminRoute from './components/AdminRoute'; import Layout from './components/Layout'; -import HomePage from './pages/HomePage'; -import LoginPage from './pages/LoginPage'; -import SignupPage from './pages/SignupPage'; -import ReservationPage from './pages/ReservationPage'; -import MyReservationPage from './pages/MyReservationPage'; +import { AuthProvider } from './context/AuthContext'; import AdminLayout from './pages/admin/AdminLayout'; import AdminPage from './pages/admin/AdminPage'; -import AdminReservationPage from './pages/admin/ReservationPage'; -import AdminTimePage from './pages/admin/TimePage'; -import AdminThemePage from './pages/admin/ThemePage'; -import AdminWaitingPage from './pages/admin/WaitingPage'; -import { AuthProvider } from './context/AuthContext'; -import AdminRoute from './components/AdminRoute'; -import ReservationStep1Page from './pages/v2/ReservationStep1Page'; -import ReservationStep2Page from './pages/v2/ReservationStep2Page'; -import ReservationSuccessPage from './pages/v2/ReservationSuccessPage'; -import MyReservationPageV2 from './pages/v2/MyReservationPageV2'; -import ReservationStep1PageV21 from './pages/v2/ReservationStep1PageV21'; -import ReservationStep2PageV21 from './pages/v2/ReservationStep2PageV21'; -import ReservationSuccessPageV21 from './pages/v2/ReservationSuccessPageV21'; -import HomePageV2 from './pages/v2/HomePageV2'; -import LoginPageV2 from './pages/v2/LoginPageV2'; -import SignupPageV2 from './pages/v2/SignupPageV2'; -import ReservationFormPage from './pages/v2/ReservationFormPage'; -import AdminThemeEditPage from './pages/admin/AdminThemeEditPage'; import AdminSchedulePage from './pages/admin/AdminSchedulePage'; +import AdminThemeEditPage from './pages/admin/AdminThemeEditPage'; +import AdminThemePage from './pages/admin/AdminThemePage'; +import HomePage from '@_pages/HomePage'; +import LoginPage from '@_pages/LoginPage'; +import MyReservationPage from '@_pages/MyReservationPage'; +import ReservationFormPage from '@_pages/ReservationFormPage'; +import ReservationStep1Page from '@_pages/ReservationStep1Page'; +import ReservationStep2Page from '@_pages/ReservationStep2Page'; +import ReservationSuccessPage from '@_pages/ReservationSuccessPage'; +import SignupPage from '@_pages/SignupPage'; const AdminRoutes = () => ( } /> - } /> - } /> } /> } /> - } /> } /> @@ -54,28 +40,14 @@ function App() { - } /> + } /> } /> } /> - } /> + } /> + } /> + } /> + } /> } /> - } /> - - {/* V2 Pages */} - } /> - } /> - } /> - - {/* V2 Reservation Flow */} - } /> - } /> - } /> - - {/* V2.1 Reservation Flow */} - } /> - } /> - } /> - } /> } /> diff --git a/frontend/src/pages/admin/AdminNavbar.tsx b/frontend/src/pages/admin/AdminNavbar.tsx index 20444525..263f203c 100644 --- a/frontend/src/pages/admin/AdminNavbar.tsx +++ b/frontend/src/pages/admin/AdminNavbar.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Link, useNavigate } from 'react-router-dom'; -import { useAuth } from '../../context/AuthContext'; -import '../../css/navbar.css'; +import { useAuth } from '@_context/AuthContext'; +import '@_css/navbar.css'; const AdminNavbar: React.FC = () => { const { loggedIn, userName, logout } = useAuth(); @@ -21,10 +21,7 @@ const AdminNavbar: React.FC = () => {