Changeset 8ca35dc for my-react-app/src/App.js

Timestamp:

01/19/25 23:18:37 (4 months ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

f5b256e

Parents:

db39d9e

Message:

Done with stupid timeslots

File:

• my-react-app/src/App.js (modified) (5 diffs)

my-react-app/src/App.js

@@ -1 @@
-import {BrowserRouter as Router, Route, Routes, useNavigate} from 'react-router-dom';
+import {BrowserRouter as Router, Navigate, Route, Routes, useNavigate} from 'react-router-dom';
 import Customers from './components/Customers';
 import Layout from "./components/Layout";
@@ -14 +14 @@
 import { CuisineContext } from './components/CuisineContext';
 import RestaurantInfo from "./components/RestaurantInfo";
-import LoginForm from "./components/Login";
+import AuthForm from "./components/AuthForm";
 import AppContent from "./components/AppContent";
+import ReservationHistory from "./components/ReservationHistory";
+
+const ProtectedRoute = ({ element, isAuthenticated }) => {
+    return isAuthenticated ? element : <Navigate to="/login" />;
+};
 
 const App = () => {
+    const [isAuthenticated, setIsAuthenticated] = React.useState(false);
+
+    React.useEffect(() => {
+        const token = localStorage.getItem('token');
+        if (token) {
+            setIsAuthenticated(true);
+        }
+    }, []);
+
     return (
         <Router>
@@ -23 +37 @@
                 <Routes>
                     <Route path="/" element={<Home />} />
-                    <Route path="/customers" element={<Customers />} />
-                    <Route path="/customers/add" element={<CustomerFormContainer/>} />
-                    <Route path="/customers/:id" element={<CustomerDetails />} />
-                    <Route path="/customers/edit/:id" element={<CustomerFormContainer/>} />
-                    <Route path="/restaurants" element={<Restaurants />} />
-                    <Route path="/restaurants/:id" element={<RestaurantDetails />} />
-                    <Route path="/reservations" element={<Reservations />} />
-                    <Route path="/reservationConfirmation/:tableNumber/:timeSlot/:restaurantId" element={<ReservationConfirmation />} />
-                    <Route path="/reservations/reservationEdit/:reservationId" element={<ReservationEdit />} />
-                    <Route path="/login" element={<LoginForm/>}/>
-                    <Route path="/error" element={<ErrorPage/>}/>
+                    <Route path="/customers" element={<ProtectedRoute isAuthenticated={isAuthenticated} element={<Customers />} />} />
+                    <Route path="/customers/add" element={<ProtectedRoute isAuthenticated={isAuthenticated} element={<CustomerFormContainer />} />} />
+                    <Route path="/customers/:id" element={<ProtectedRoute isAuthenticated={isAuthenticated} element={<CustomerDetails />} />} />
+                    <Route path="/customers/edit/:id" element={<ProtectedRoute isAuthenticated={isAuthenticated} element={<CustomerFormContainer />} />} />
+                    <Route path="/restaurants" element={<ProtectedRoute isAuthenticated={isAuthenticated} element={<Restaurants />} />} />
+                    <Route path="/restaurants/:id" element={<ProtectedRoute isAuthenticated={isAuthenticated} element={<RestaurantDetails />} />} />
+                    <Route path="/reservations" element={<ProtectedRoute isAuthenticated={isAuthenticated} element={<Reservations />} />} />
+                    <Route path="/reservationConfirmation/:tableNumber/:timeSlot/:restaurantId" element={<ProtectedRoute isAuthenticated={isAuthenticated} element={<ReservationConfirmation />} />} />
+                    <Route path="/reservations/reservationEdit/:reservationId" element={<ProtectedRoute isAuthenticated={isAuthenticated} element={<ReservationEdit />} />} />
+                    <Route path="/reservations-past" element={<ProtectedRoute isAuthenticated={isAuthenticated} element={<ReservationHistory />} />} />
+                    <Route path="/login" element={<AuthForm setIsAuthenticated={setIsAuthenticated} />} />
+
+                    <Route path="/error" element={<ErrorPage />} />
                 </Routes>
-                <AppContent/>
             </Layout>
         </Router>
     );
-}
+};
 
 
@@ -149 +164 @@
 
         try {
-            const response = await axios.post('http://localhost:8080/api/search', data);
+            const response = await axios.post('http://localhost:8081/api/search', data);
             const filteredRestaurants = response.data;
             setFilteredRestaurants(filteredRestaurants);
@@ -163 +178 @@
         const cuisineName = cuisine.replace('Searching by cuisine: ', '');
         try {
-            const response = await axios.post(`http://localhost:8080/api/search/shortcut/${cuisineName}`, cuisineName);
+            const response = await axios.post(`http://localhost:8081/api/search/shortcut/${cuisineName}`, cuisineName);
             console.log(response.data);
             setFilteredRestaurants(response.data)