Changeset 5528b99 for frontend/src/App.js

Timestamp:

01/16/24 16:34:03 (9 months ago)

Author:

darsov2 <62809499+darsov2@…>

Branches:

master

Children:

07f4e8b

Parents:

e6c2521

Message:

revert

File:

• frontend/src/App.js (modified) (3 diffs)

frontend/src/App.js

@@ -5 +5 @@
 import 'bootstrap/dist/js/bootstrap.js';
 import HomeCarousel from './Components/Layout/CarouselHome/Carousel';
-import {Card, Container} from 'react-bootstrap';
+import { Card, Container } from 'react-bootstrap';
 import TabComponent from './Components/Tab/Tab';
 import Offers from './Components/Layout/Offers/Offers';
@@ -27 +27 @@
 import TransportEditPage from './Pages/TransportEditPage';
 import RestaurantDetailsPage from './Pages/RestaurantDetailsPage';
-import {BrowserRouter, Route, Routes} from 'react-router-dom';
+import { BrowserRouter, Route, Routes } from 'react-router-dom';
 import LoginErrorPage from "./Pages/LoginErrorPage";
-import {AuthProvider} from "./Components/Context/AuthContext";
-import PrivateRoute from "./Components/Misc/PrivateRoute";
-import ProfilesManagementPage from "./Pages/ProfilesManagementPage";
-import UserReservationsManagement from "./Pages/UserReservationsManagement";
 
 
 function App() {
 
+<<<<<<< HEAD
     return (
         <div className="App" style={{overflow: 'hidden'}}>
@@ -76 +73 @@
         </div>
     );
+=======
+  return (
+    <div className="App" style={{overflow: 'hidden'}}>
+      <BrowserRouter>
+        <Routes>
+          <Route path='/login' element={<LoginPage/>}/>
+          <Route path='/register' element={<RegistrationPage/>}/>
+          <Route path='/profile' element={<ProfilePage/>}/>
+          <Route path="/resources" exact element={<NoBusinessRegisteredError hasRegistration="false"/>} />
+          <Route path="/resources/hotel" element={<ResourcesPage tab="/hotel"/>}/>
+          <Route path="/resources/hotel/:hotelId" element={<HotelEditPage />}/>
+          <Route path="/resources/restaurant" element={<ResourcesPage tab="/restaurant"/>}/>
+          <Route path='/resources/restaurant/:restaurantId' element={<RestaurantEditPage />}/>
+          <Route path="/resources/transport" element={<ResourcesPage tab="/transport"/>}/>
+          <Route path="/resources/transport/:transportId" element={<TransportEditPage/>}/>
+          <Route path="/home" element={<HomePage/> }/>
+          <Route path="/error" element={<LoginErrorPage/> }/>
+          <Route path='/details/transport' element={<TransportDetailsPage></TransportDetailsPage>}/>
+          <Route path='/details/hotel' element={<HotelDetailsPage></HotelDetailsPage>}/>
+          <Route path='/details/restaurant' element={<RestaurantDetailsPage></RestaurantDetailsPage>}/>
+          <Route path="/search/hotel/:hotelLocation/:dateFrom/:dateTo/:numBeds" element={<SearchPage type="hotel"/> }/>
+          <Route path="/search/transport/:from/:to/:date" element={<SearchPage type="transport"/> }/>
+        </Routes>
+      </BrowserRouter>
+    </div>
+  );
+>>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl)
 }