Index: frontend/src/App.js
===================================================================
--- frontend/src/App.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/App.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -5,5 +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,57 +27,35 @@
 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";
-import LoginCallback from "./Components/LoginCallback";
-import ConnectedAccountsPage from "./Pages/ConnectedAccountsPage";
 
 
 function App() {
 
-    return (
-        <div className="App" style={{overflow: 'hidden'}}>
-            <AuthProvider>
-                <BrowserRouter>
-                    <Routes>
-                        <Route path='/login' element={<LoginPage/>}/>
-                        <Route path='/register' element={<RegistrationPage/>}/>
-                        <Route path='/profile' element={<PrivateRoute><ProfilePage/></PrivateRoute>}/>
-                        <Route path='/profiles' element={<PrivateRoute><ProfilesManagementPage/></PrivateRoute>}/>
-                        <Route path='/reservations' element={<PrivateRoute><UserReservationsManagement/></PrivateRoute>}/>
-                        <Route path="/resources" exact element={<PrivateRoute><NoBusinessRegisteredError
-                            hasRegistration="false"/></PrivateRoute>}/>
-                        <Route path="/resources/hotel"
-                               element={<PrivateRoute><ResourcesPage tab="/hotel"/></PrivateRoute>}/>
-                        <Route path="/resources/hotel/:hotelId" element={<PrivateRoute><HotelEditPage/></PrivateRoute>}/>
-                        <Route path="/resources/restaurant"
-                               element={<PrivateRoute><ResourcesPage tab="/restaurant"/></PrivateRoute>}/>
-                        <Route path='/resources/restaurant/:restaurantId'
-                               element={<PrivateRoute><RestaurantEditPage/></PrivateRoute>}/>
-                        <Route path="/resources/transport"
-                               element={<PrivateRoute><ResourcesPage tab="/transport"/></PrivateRoute>}/>
-                        <Route path="/resources/transport/:transportId"
-                               element={<PrivateRoute><TransportEditPage/></PrivateRoute>}/>
-                        <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/:flexible"
-                               element={<SearchPage type="hotel"/>}/>
-                        <Route path="/search/transport/:from/:to/:date/:numPassengers"
-                               element={<SearchPage type="transport"/>}/>
-                        <Route path="/search/restaurant/:restaurantLocation/:date/:hourFrom/:hourTo/:numPeople"
-                               element={<SearchPage type="restaurant"/>}/>
-                        <Route path="/login-callback" element={<LoginCallback/>}></Route>
-                        <Route path="/connected" element={<PrivateRoute><ConnectedAccountsPage/></PrivateRoute>}></Route>
-                    </Routes>
-                </BrowserRouter>
-            </AuthProvider>
-        </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>
+  );
 }
 
Index: frontend/src/Components/AdminPanel/AllProfilesTable.js
===================================================================
--- frontend/src/Components/AdminPanel/AllProfilesTable.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,77 +1,0 @@
-import useGet from "../Hooks/useGet";
-import {Container} from "react-bootstrap";
-import { FaLock, FaLockOpen } from "react-icons/fa";
-import React from "react";
-import useApprove from "../Hooks/useApprove";
-
-const AllProfilesTable = () => {
-
-    const { data, isLoading, setData, getData, setChanged } = useGet('/user')
-    const { getData: approveProfile} = useApprove()
-
-    !isLoading && console.log(data)
-
-    const dateFormatter = (str) => {
-        const inputDate = new Date(str);
-
-        const options = {
-            year: '2-digit',
-            month: '2-digit',
-            day: '2-digit',
-            hour12: false,
-        };
-
-        return inputDate.toLocaleString('mk-MK', options);
-
-    }
-
-    return (
-        <>
-            <Container fluid >
-                <table className="table table-hover">
-                    <thead>
-                    <tr>
-                        <th scope="col"></th>
-                        <th scope="col">Име и презиме</th>
-                        <th scope="col">Адреса</th>
-                        <th scope="col">Email</th>
-                        <th scope="col">Датум на раѓање</th>
-                        <th scope="col">Контакт телефон</th>
-                        <th>Акции</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {!isLoading && data.map((f, i) => { return <tr key={f.userID}>
-                        <th style={{verticalAlign: "middle"}} scope="row">{i + 1}</th>
-                        <td style={{verticalAlign: "middle"}}>{f.name + ' ' + f.surname}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.address}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.email}</td>
-                        <td style={{verticalAlign: "middle"}}>{dateFormatter(f.birthDate)}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.contact}</td>
-                        <td style={{verticalAlign: "middle"}}>
-                            {f.accountNonLocked &&
-                                <FaLock size={'2.2em'} color={'#159895'} onClick={() => {
-                                    approveProfile('/users/unlock/' + f.userID).then(() => {
-                                        setChanged((prev) => {
-                                            return Math.random();
-                                        })
-                                    })
-                                }}/>}
-                            {!f.accountNonLocked &&
-                                <FaLockOpen size={'2.2em'} color={'#159895'} onClick={() => {
-                                    approveProfile('/users/unlock/' + f.userID).then(() => {
-                                        setChanged((prev) => {
-                                            return Math.random();
-                                        })
-                                    })
-                                }}/>}
-                        </td>
-                    </tr>})}
-                    </tbody>
-                </table>
-            </Container>
-        </>
-    )
-}
-
-export default AllProfilesTable;
Index: frontend/src/Components/AdminPanel/UnapprovedBusinessesTable.js
===================================================================
--- frontend/src/Components/AdminPanel/UnapprovedBusinessesTable.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,48 +1,0 @@
-import useGet from "../Hooks/useGet";
-import {Container} from "react-bootstrap";
-import {FaCheckCircle} from "react-icons/fa";
-import React from "react";
-import useApprove from "../Hooks/useApprove";
-
-const UnapprovedBusinessesTable = () => {
-
-    const { data, isLoading, setData, getData, setChanged } = useGet('/business/unapproved');
-    const { getData: approveBusiness} = useApprove();
-
-    return (
-        <>
-            <Container fluid >
-                <table className="table table-hover">
-                    <thead>
-                    <tr>
-                        <th scope="col">Ред. бр.</th>
-                        <th scope="col">Име на фирма</th>
-                        <th scope="col">Адреса</th>
-                        <th scope="col">Даночен број</th>
-                        <th scope="col">Одговорно лице</th>
-                        <th>Одобри</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {!isLoading && data.map((f, i) => { return <tr key={f.businessId}>
-                        <th style={{verticalAlign: "middle"}} scope="row">{i + 1}</th>
-                        <td style={{verticalAlign: "middle"}}>{f.name}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.address}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.edbs}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.user.name + " " + f.user.surname}</td>
-                        <td style={{verticalAlign: "middle"}}><FaCheckCircle size={'2.2em'} color={'#159895'} onClick={() => {
-                            approveBusiness('/business/approve/' + f.businessId).then(() => {
-                                setChanged((prev) => {
-                                    return Math.random();
-                                })
-                            })
-                        }}/></td>
-                    </tr>})}
-                    </tbody>
-                </table>
-            </Container>
-        </>
-    )
-}
-
-export default UnapprovedBusinessesTable;
Index: frontend/src/Components/AdminPanel/UnapprovedProfilesTable.js
===================================================================
--- frontend/src/Components/AdminPanel/UnapprovedProfilesTable.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,66 +1,0 @@
-import useGet from "../Hooks/useGet";
-import {Container} from "react-bootstrap";
-import {FaCheckCircle} from "react-icons/fa";
-import React from "react";
-import useApprove from "../Hooks/useApprove";
-
-const UnapprovedProfilesTable = () => {
-
-    const { data, isLoading, setData, getData, setChanged } = useGet('/users/unapproved')
-    const { getData: approveProfile} = useApprove()
-
-    !isLoading && console.log(data)
-
-    const dateFormatter = (str) => {
-        const inputDate = new Date(str);
-
-        const options = {
-            year: '2-digit',
-            month: '2-digit',
-            day: '2-digit',
-            hour12: false,
-        };
-
-        return inputDate.toLocaleString('mk-MK', options);
-
-    }
-
-    return (
-        <>
-            <Container fluid >
-                <table className="table table-hover">
-                    <thead>
-                    <tr>
-                        <th scope="col"></th>
-                        <th scope="col">Име и презиме</th>
-                        <th scope="col">Адреса</th>
-                        <th scope="col">Email</th>
-                        <th scope="col">Датум на раѓање</th>
-                        <th scope="col">Контакт телефон</th>
-                        <th>Одобри</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {!isLoading && data.map((f, i) => { return <tr key={f.userID}>
-                        <th style={{verticalAlign: "middle"}} scope="row">{i + 1}</th>
-                        <td style={{verticalAlign: "middle"}}>{f.name + ' ' + f.surname}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.address}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.email}</td>
-                        <td style={{verticalAlign: "middle"}}>{dateFormatter(f.birthDate)}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.contact}</td>
-                        <td style={{verticalAlign: "middle"}}><FaCheckCircle size={'2.2em'} color={'#159895'} onClick={() => {
-                            approveProfile('/users/approve/' + f.userID).then(() => {
-                                setChanged((prev) => {
-                                    return Math.random();
-                                })
-                            })
-                        }}/></td>
-                    </tr>})}
-                    </tbody>
-                </table>
-            </Container>
-        </>
-    )
-}
-
-export default UnapprovedProfilesTable;
Index: frontend/src/Components/BecomeAHost/Review.js
===================================================================
--- frontend/src/Components/BecomeAHost/Review.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/BecomeAHost/Review.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -7,5 +7,5 @@
     const generateStars = () => {
         const stars = [];
-        for (let i = 0; i < props.review.numStar; i++) {
+        for (let i = 0; i < 3; i++) {
           stars.push(
             <Col key={i} style={{display: "inline-block"}} className="w-20 px-0">
@@ -14,5 +14,5 @@
           );
         }
-        for (let i = 0; i < 5 - props.review.numStar; i++) {
+        for (let i = 0; i < 5 - 3; i++) {
           stars.push(
             <Col key={i + 3} style={{display: "inline-block"}} className="w-20 px-0">
@@ -25,5 +25,5 @@
     
     return (
-        <Container style={{padding: '2em', width: '18em', height: '15em', backgroundColor: 'lightgray', borderRadius: '1rem', position: "aboslute", top: "-410px", left: "-600px"}}>
+        <Container style={{padding: '2em', width: '18em', height: 'auto', backgroundColor: 'lightgray', borderRadius: '1rem', position: "aboslute", top: "-410px", left: "-600px"}}>
             <Row>
                 <Col>
@@ -31,9 +31,9 @@
                 </Col>
                 <Col className="my-auto">
-                    <span>{props.review.title}</span>
+                    <span>Ime Prezime</span>
                 </Col>
             </Row>
             <Row>
-                <span className="my-3 border">{props.review.description}</span>
+                <span className="my-3 border">Lorem Ipsum is simply dummy text of the printing and typesetting industry. </span>
             </Row>
             <Row className="w-100 mx-auto" style={{maxWidth: "100%"}}>
Index: frontend/src/Components/ConnectedAccounts/ConnectedAccountsTable.js
===================================================================
--- frontend/src/Components/ConnectedAccounts/ConnectedAccountsTable.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,47 +1,0 @@
-import useGet from "../Hooks/useGet";
-import useApprove from "../Hooks/useApprove";
-import {Container} from "react-bootstrap";
-import {FaCheckCircle} from "react-icons/fa";
-import React from "react";
-import {useAuth} from "../Context/AuthContext";
-import profilePage from "../../Pages/ProfilePage";
-
-const ConnectedAccountsTable = (props) => {
-
-    const data = props.data;
-    const isLoading = props.isLoading;
-
-    const { getData: approveBusiness} = useApprove();
-
-    return (
-        <>
-            <Container fluid >
-                <table className="table table-hover">
-                    <thead>
-                    <tr>
-                        <th scope="col">Ред. бр.</th>
-                        <th scope="col">User ID</th>
-                        <th scope="col">Име</th>
-                        <th scope="col">Презиме</th>
-                        <th scope="col">Username</th>
-                        <th>Дисконектирај</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {data.map((f, i) => { return <tr key={f.userID}>
-                        <th style={{verticalAlign: "middle"}} scope="row">{i + 1}</th>
-                        <td style={{verticalAlign: "middle"}}>{f.userID}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.name}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.surname}</td>
-                        <td style={{verticalAlign: "middle"}}>{f.username}</td>
-                        <td style={{verticalAlign: "middle"}}><FaCheckCircle size={'2.2em'} color={'#159895'} onClick={() => {
-                        }}/></td>
-                    </tr>})}
-                    </tbody>
-                </table>
-            </Container>
-        </>
-    )
-}
-
-export default ConnectedAccountsTable;
Index: frontend/src/Components/Context/AuthContext.js
===================================================================
--- frontend/src/Components/Context/AuthContext.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,52 +1,0 @@
-import React, { createContext, useContext, useState, useEffect } from 'react'
-
-const AuthContext = createContext()
-
-const AuthProvider = ({ children }) => {
-    const [user, setUser] = useState(null)
-
-    useEffect(() => {
-        const storedUser = JSON.parse(localStorage.getItem('user'))
-        setUser(storedUser)
-    }, [])
-
-    const getUser = () => {
-        return JSON.parse(localStorage.getItem('user'))
-    }
-
-    const userIsAuthenticated = () => {
-        return localStorage.getItem('user') !== null
-    }
-
-    const userLogin = user => {
-        localStorage.setItem('user', JSON.stringify(user))
-        setUser(user)
-    }
-
-    const userLogout = () => {
-        localStorage.removeItem('user')
-        setUser(null)
-    }
-
-    const contextValue = {
-        user,
-        getUser,
-        userIsAuthenticated,
-        userLogin,
-        userLogout,
-    }
-
-    return (
-        <AuthContext.Provider value={contextValue}>
-            {children}
-        </AuthContext.Provider>
-    )
-}
-
-export default AuthContext
-
-export function useAuth() {
-    return useContext(AuthContext)
-}
-
-export { AuthProvider }
Index: frontend/src/Components/Forms/AddHotelForm.js
===================================================================
--- frontend/src/Components/Forms/AddHotelForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Forms/AddHotelForm.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -119,6 +119,4 @@
                   return prevState + 1;
                 })
-                if(!edit)
-                  props.closeModal()
               }}
             >
Index: frontend/src/Components/Forms/AddItemMenuForm.js
===================================================================
--- frontend/src/Components/Forms/AddItemMenuForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Forms/AddItemMenuForm.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -4,5 +4,4 @@
 import useFormData from "../Hooks/useFormData";
 import useCreateMenu from "../Hooks/Restaurant/useCreateMenu"
-import useCreate from "../Hooks/useCreate";
 
 const AddItemMenuForm = (props) => {
@@ -10,5 +9,4 @@
 
   const edit = props.menu
-  console.log(props.menu)
   const dummy =     {
     name: "",
@@ -25,5 +23,4 @@
     edit ? props.menu : dummy
   );
-  const { createEntity } = useCreate();
 
   return (
@@ -75,11 +72,8 @@
               onClick={(e) => {
                 e.preventDefault();
-                if(!edit) {
-                  createMenu(props.Id, formData, props.refresh)
-                }
-                else {
-                  createEntity(`/menu/${props.menu.menuId}/edit`, formData, props.refresh)
-                }
-
+                createMenu(props.Id, formData)
+                props.refresh((prevState) => {
+                  return prevState + 1;
+                })
               }}
             >
Index: frontend/src/Components/Forms/AddRestaurantForm.js
===================================================================
--- frontend/src/Components/Forms/AddRestaurantForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Forms/AddRestaurantForm.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -82,6 +82,7 @@
                 e.preventDefault()
                 createRestaurant(formData, edit);
-                props.refresh(Math.random())
-                if(!edit) props.closeModal()
+                props.refresh((prevState) => {
+                  return prevState + 1;
+                })
               }}
             >
Index: frontend/src/Components/Forms/AddRoomForm.js
===================================================================
--- frontend/src/Components/Forms/AddRoomForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Forms/AddRoomForm.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -13,5 +13,5 @@
     hotelRoomDescription: "",
     hotelRoomName: "",
-    numOfBeds: "",
+    numBeds: "",
     price: "",
     kitchenAvailable: false,
@@ -58,6 +58,6 @@
             type="number" 
             placeholder="Внесете го бројот на кревети" 
-            value={formData.numOfBeds}
-            name="numOfBeds"
+            value={formData.numBeds}
+            name="numBeds"
             onChange={onFormChange}
             />
@@ -117,11 +117,7 @@
               style={{ backgroundColor: "#159895" }}
               size="md"
-              onClick={(e) => {
-                e.preventDefault();
-                props.refresh((prev) => {
-                  return ++prev;
-                })
+              onClick={() => {
+                console.log(formData);
                 createHotelRoom(formData);
-                props.closeModal();
               }}
             >
Index: frontend/src/Components/Forms/AddTableAvailabilityForm.js
===================================================================
--- frontend/src/Components/Forms/AddTableAvailabilityForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Forms/AddTableAvailabilityForm.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -62,6 +62,4 @@
               onClick={() => {
                 createTableAvailability(formData, props.table.tableId)
-                props.refresh(Math.random())
-                props.close()
               }}
             >
Index: frontend/src/Components/Forms/AddTransportForm.js
===================================================================
--- frontend/src/Components/Forms/AddTransportForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Forms/AddTransportForm.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -11,5 +11,5 @@
       transportName: "",
       carBrand: "",
-      carType: "",
+      carType: false,
       carManufacturedYear: 1900,
       noPassengers: 0,
@@ -107,8 +107,6 @@
                 createTransport(formData, edit);
                 props.refresh((prev) => {
-                  return ++prev;
+                  return prev + 1;
                 })
-                if(!edit)
-                    props.closeModal()
               }}
             >
Index: frontend/src/Components/Forms/AddTripForm.js
===================================================================
--- frontend/src/Components/Forms/AddTripForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Forms/AddTripForm.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -232,5 +232,4 @@
                                     console.log(wayPointNames);
                                     for (let i = 0; i < routeCount - 1; i++) {
-                                        console.log(wayPoints[i])
                                         wayPointNames.push(wayPoints[i].value);
                                     }
@@ -272,6 +271,9 @@
 
                                     for (let i = 0; i < Object.values(routesForm).length; i++) {
+                                        console.log(findDependantRoutes(wayPointNames, routesForm, i))
                                         setDependencies(prevState => [...prevState, findDependantRoutes(wayPointNames, routesForm, i)])
                                     }
+                                    console.log('VO STATEOOOO')
+                                    console.log(dependencies)
                                     routesSetFormData(routesForm)
                                     setRoutes(routesVar)
Index: frontend/src/Components/Forms/EditMainRouteForm.js
===================================================================
--- frontend/src/Components/Forms/EditMainRouteForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,85 +1,0 @@
-import React from "react";
-import useGet from "../Hooks/useGet";
-import {Col, Container, Row, Table} from "react-bootstrap";
-import AddRoomForm from "./AddRoomForm";
-import AddTripForm from "./AddTripForm";
-
-
-const EditMainRouteForm = (props) => {
-
-    console.log(props.route)
-
-    const dateFormatter = (str) => {
-        const inputDate = new Date(str);
-
-        const options = {
-            year: '2-digit',
-            month: '2-digit',
-            day: '2-digit',
-            hours: '2-digit',
-            minutes: '2-digit'
-        };
-
-        return inputDate.toLocaleString('en-GB', options);
-    }
-
-    const {
-        data,
-        isLoading,
-        setData,
-        getData
-    } = useGet(`/transport/${props.route.id}/available`)
-
-    !isLoading && console.log(data)
-
-    return (
-        <>
-            <Row>
-                <Col>
-                    <AddTripForm transportId={props.route.id} refresh={props.refresh}/>
-                </Col>
-                <Col>
-                    <Container>
-                        <Table>
-                            <thead>
-                            <tr>
-                                <th>#</th>
-                                <th>Од - До</th>
-                                <th>Време тргање</th>
-                                <th>Време пристигање</th>
-                                <th>Број патници</th>
-                                <th>Цена</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            {!isLoading && data != null && data.map((avail) => {
-                                return (
-                                    avail.routes.map((route, i) => {
-                                        return (<tr>
-                                            <td>
-                                                {i + 1}
-                                            </td>
-                                            <td>
-                                                {route.from} - {route.to}
-                                            </td>
-                                            <td>
-                                                {dateFormatter(route.departure)}
-                                            </td>
-                                            <td>
-                                                {dateFormatter(route.arrival)}
-                                            </td>
-                                            <td>
-                                                {route.freeSpace}
-                                            </td>
-                                        </tr>)
-                            }))})}
-                            </tbody>
-                        </Table>
-                    </Container>
-                </Col>
-            </Row>
-        </>
-    )
-}
-
-export default EditMainRouteForm
Index: frontend/src/Components/Forms/EditRoomForm.js
===================================================================
--- frontend/src/Components/Forms/EditRoomForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Forms/EditRoomForm.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -28,6 +28,4 @@
     } = useGet(`/hotel/rooms/${props.room.hotelRoomId}/available`)
 
-    console.log(`/hotel/rooms/${props.room.hotelRoomId}/available`)
-
     !isLoading && console.log(data)
 
@@ -44,7 +42,7 @@
                             <tr>
                                 <th>#</th>
-                                <th>Oд</th>
-                                <th>До</th>
-                                <th>Цена</th>
+                                <th>Достапно од</th>
+                                <th>Достапно до</th>
+                                <th>Број на соби</th>
                             </tr>
                             </thead>
Index: frontend/src/Components/Hooks/FilesUpload/useFileChange.js
===================================================================
--- frontend/src/Components/Hooks/FilesUpload/useFileChange.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,43 +1,0 @@
-import axios from "../../../axios";
-import { useState } from "react";
-
-const useFileChange = () => {
-    const [selectedFiles, setSelectedFiles] = useState([]);
-
-    const onFileChangeHandler = (files, type, id, refresh) => {
-        setSelectedFiles(files);
-
-        const formData = new FormData();
-
-        files.forEach((x) => formData.append('files', x))
-        //
-        // for (let i = 0; i < files.length; i++) {
-        //
-        // }
-
-
-        axios.post(`/upload/${type}/${id}`, formData, {
-            headers: {
-                'Content-Type': 'multipart/form-data'
-            }
-        })
-            .then(res => {
-                if (res.status === 200) {
-                    console.log(res.data);
-                    refresh((prev) => ++prev)
-                    alert("File(s) uploaded successfully.");
-                } else {
-                    console.error("File upload failed:", res.data);
-                    alert("File upload failed.");
-                }
-            })
-            .catch(error => {
-                console.error("Error uploading file(s):", error);
-                alert("An error occurred while uploading files.");
-            });
-    };
-
-    return { onFileChangeHandler, selectedFiles };
-};
-
-export default useFileChange;
Index: frontend/src/Components/Hooks/Hotel/useCreateHotel.js
===================================================================
--- frontend/src/Components/Hooks/Hotel/useCreateHotel.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Hooks/Hotel/useCreateHotel.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -6,8 +6,8 @@
 const useCreateHotel = () => {
 
+    //const history = useNavigate();
     const createHotel = async (hotel, edit) => {
 		console.log({hotel})
 		console.log(hotel)
-		console.log("vo createhotel")
 
 		if(!edit)
@@ -16,5 +16,5 @@
 			.post(`/hotel/add`, hotel, {
 				params: {
-					userId: JSON.parse(localStorage.getItem("user")).userId
+					userId: localStorage.getItem("userId")
 				}
 			}) 
Index: frontend/src/Components/Hooks/Restaurant/useCreateMenu.js
===================================================================
--- frontend/src/Components/Hooks/Restaurant/useCreateMenu.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Hooks/Restaurant/useCreateMenu.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -7,5 +7,5 @@
 	const navigator = useNavigate();
 
-    const createMenu = async (id, menu, dep) => {
+    const createMenu = async (id, menu) => {
 		console.log(menu)
         console.log(id)
@@ -18,5 +18,4 @@
 					//navigator("/resources/restaurant/" + id)
 	                //history.push('/restaurant');
-					dep(prev => ++prev)
 	            })
 	            .catch((err) => {
Index: frontend/src/Components/Hooks/Restaurant/useCreateRestaurant.js
===================================================================
--- frontend/src/Components/Hooks/Restaurant/useCreateRestaurant.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Hooks/Restaurant/useCreateRestaurant.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -15,5 +15,5 @@
 			.post(`/restaurant/add`, restaurant, {
 				params: {
-					userId: JSON.parse(localStorage.getItem('user')).userId,
+					userId: localStorage.getItem('userId')
 				}
 			}) 
Index: frontend/src/Components/Hooks/Restaurant/useCreateTable.js
===================================================================
--- frontend/src/Components/Hooks/Restaurant/useCreateTable.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Hooks/Restaurant/useCreateTable.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -13,5 +13,5 @@
 	            .then((res) => {
 					console.log(res)
-					refresh(Math.random())
+					refresh(prev => ++prev)
 	                //history.push('/restaurant');
 	            })
Index: frontend/src/Components/Hooks/Transport/useCreateTransport.js
===================================================================
--- frontend/src/Components/Hooks/Transport/useCreateTransport.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Hooks/Transport/useCreateTransport.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -4,10 +4,10 @@
 
 const useCreateTransport = () => {
-	const userId = JSON.parse(localStorage.getItem('user')).userId
+
     const createTransport = async (transport, edit) => {
 			if(!edit)
 			{
 				await axios
-	            .post(`/transport/add/` + userId, transport)
+	            .post(`/transport/add`, transport) 
 	            .then((res) => {
 	                //history.push('/transport');
Index: frontend/src/Components/Hooks/User/useCreateUser.js
===================================================================
--- frontend/src/Components/Hooks/User/useCreateUser.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Hooks/User/useCreateUser.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -10,5 +10,5 @@
 	            .post(`/register`, user) 
 	            .then((res) => {
-	                window.location.href = "http://localhost:8080/login"
+	                navigator("/login")
 	            })
 	            .catch((err) => {
Index: frontend/src/Components/Hooks/User/useLogin.js
===================================================================
--- frontend/src/Components/Hooks/User/useLogin.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Hooks/User/useLogin.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,35 +1,47 @@
-import { useState } from "react";
+import React from "react";
+
 import axios from "../../../axios.js";
-import {useAuth} from "../../Context/AuthContext"; // Assuming you have axios configured
+import { Navigate, useAsyncValue, useNavigate } from "react-router-dom";
+import LoginForm from "../../Login/LoginForm.js";
 
 const useLogin = () => {
-	const [loading, setLoading] = useState(false);
-	const [error, setError] = useState(null);
-	const Auth = useAuth();
 
-	const handleLoginCallback = async () => {
-		setLoading(true);
+    const navigator = useNavigate()
+    //const history = useNavigate();
+    const login = async (loginData) => {
+		console.log({loginData})
+		console.log(loginData)
+        await axios
+	            .post(`/api/login`, {
+                    username: loginData.email,
+                    password: loginData.password
+                }, {
+                    headers: { 
+                        "Content-Type": "application/x-www-form-urlencoded"
+                    }
+                }) 
+	            .then((res) => {
+					const sessionId = res.data.auth.details.sessionId;
+					const userId = res.data.auth.principal.userID;
+					
+					localStorage.setItem("sessionId", sessionId);
+					localStorage.setItem("userId", userId);
+					if(sessionId === null)
+					{
+					}
+                    navigator("/home")
+	            })
+	            .catch((err) => {
+	                console.log(err);
+	            })
+	            .finally(() => {
+	            });
+    }
 
-		try {
-			const response = await axios.get("http://localhost:8080/principal");
-
-			// Extract the needed attributes from the response
-			const { id, role, username } = response.data;
-
-			Auth.userLogin({userId: id, username: username, role: role})
-
-		} catch (err) {
-			setError(err.message);
-		} finally {
-			setLoading(false);
-		}
+	return {
+		login
 	};
 
-	return {
-		loading,
-		error,
-		handleLoginCallback,
-	};
-};
+}
 
 export default useLogin;
Index: frontend/src/Components/Hooks/useApprove.js
===================================================================
--- frontend/src/Components/Hooks/useApprove.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,31 +1,0 @@
-import axios from "../../axios";
-import { useState, useEffect, useContext } from 'react';
-
-const useApprove = (url, dep) => {
-
-    const [data, setData] = useState(null);
-    const [isLoading, setIsLoading] = useState(true);
-    const [changed, setChanged] = useState(0)
-    const getData = async (uurl) => {
-        await axios.
-        get(uurl).then((res) => {
-            setData(res.data);
-        }).catch((error) => {
-            console.log(error)
-        })
-            .finally(() => {
-                setIsLoading(false);
-            });
-    };
-
-    return {
-        data,
-        setData,
-        isLoading,
-        getData,
-        setChanged
-    };
-};
-
-
-export default useApprove;
Index: frontend/src/Components/Hooks/useCreate.js
===================================================================
--- frontend/src/Components/Hooks/useCreate.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Hooks/useCreate.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -15,4 +15,5 @@
             .then((res) => {
                 //history.push('/hotel');
+                console.log(res)
                 getData(prev => ++prev)
                 getData2(prev => ++prev)
Index: frontend/src/Components/Hooks/useGet.js
===================================================================
--- frontend/src/Components/Hooks/useGet.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Hooks/useGet.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,4 +1,4 @@
 import axios from "../../axios";
-import {useState, useEffect, useContext} from 'react';
+import { useState, useEffect, useContext } from 'react';
 
 const useGet = (url, dep) => {
@@ -11,15 +11,10 @@
         console.log(localStorage.getItem("sessionId"))
         console.log("url od get " + uurl)
-        await axios.get(uurl, {maxRedirects: 0}).then((res) => {
-            console.log(res);
-            // if(res.request.responseURL.includes('8080'))
-            // {
-            //     window.location.href = "/login"
-            // }
-            setData(res.data);
-        }).catch((error) => {
-            console.log(error)
-            // window.location.href = '/error'
-        })
+        await axios.
+            get(uurl).then((res) => {
+                setData(res.data);
+            }).catch((err) => {
+                console.log(err)
+            })
             .finally(() => {
                 setIsLoading(false);
@@ -31,5 +26,5 @@
         getData(url);
     }, [dep, url, changed]);
-
+    
     return {
         data,
Index: frontend/src/Components/HotelDetails/ReviewsCarousel.js
===================================================================
--- frontend/src/Components/HotelDetails/ReviewsCarousel.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/HotelDetails/ReviewsCarousel.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -2,33 +2,29 @@
 import Carousel from "react-bootstrap/Carousel";
 import Review from "../BecomeAHost/Review";
-import {useState} from "react";
-import {Container} from "react-bootstrap";
-import review from "../BecomeAHost/Review";
+import { useState } from "react";
+import { Container } from "react-bootstrap";
 
-const ReviewsCarousel = (props) => {
+const ReviewsCarousel = () => {
     document.body.style.backgroundColor = "white";
 
     const [index, setIndex] = useState(0);
-
+  
     const handleSelect = (selectedIndex) => {
-        setIndex(selectedIndex);
+      setIndex(selectedIndex);
     };
     return (<>
-        <Container
-            className="py-3 px-1 my-4">
-            <Carousel className="w-100" activeIndex={index} onSelect={handleSelect} indicators={false}>
-                {props.reviews.length === 0 && <Carousel.Item>
-                    <Container>
-                        <h4>За избраниот ресурс се уште не се достапни оценки!</h4>
-                    </Container>
-                </Carousel.Item>}
-                {props.reviews.map((rev) => {
-                    return (
-                        <Carousel.Item>
-                            <Review key={review.reviewId} review={rev}></Review>
-                        </Carousel.Item>
-                    )
-                })}
-            </Carousel>
+                    <Container
+        className="py-3 px-1 my-4">
+                <Carousel className="w-100" activeIndex={index} onSelect={handleSelect}>
+                  <Carousel.Item>
+                  <Review></Review>
+                  </Carousel.Item>
+                  <Carousel.Item>
+                  <Review></Review>
+                  </Carousel.Item>
+                  <Carousel.Item>
+                    <Review></Review>
+                  </Carousel.Item>
+                </Carousel>
         </Container>
     </>)
Index: frontend/src/Components/HotelDetails/Room.js
===================================================================
--- frontend/src/Components/HotelDetails/Room.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/HotelDetails/Room.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,104 +1,92 @@
-import React, {useState} from "react";
-import {Container, Row, Col, Image} from "react-bootstrap";
-import {LuFan} from "react-icons/lu";
-import {TbToolsKitchen2} from "react-icons/tb"
-import {MdBalcony} from "react-icons/md"
-import Carousel from "react-bootstrap/Carousel";
+import React from "react";
+import { Container, Row, Col, Image } from "react-bootstrap";
+import { LuFan } from "react-icons/lu";
+import { TbToolsKitchen2 } from "react-icons/tb"
+import { MdBalcony } from "react-icons/md"
 
 const Room = (props) => {
-    console.log("OD SOBATA")
-    const [index, setIndex] = useState(0);
-    const handleSelect = (selectedIndex) => {
-        setIndex(selectedIndex);
-    };
-    console.log(props)
-    return (
-        <>
-            <Container style={{width: "100%"}}>
-                <Row className="g-0">
-                    <Col
-                        className="d-flex justify-content-center"
-                        style={{maxWidth: "40%"}}
-                    >
-                        <Carousel activeIndex={index} onSelect={handleSelect}>
-                            {props.data.images.map(img => {
-                                let link = img.url;
-                                if (img.url.includes('Desktop')) {
-                                    link = 'http://localhost:8080/download?fileName=' + encodeURIComponent(img.url);
-                                }
-                                return (<Carousel.Item>
-                                    <Image src={link}/>
-                                </Carousel.Item>)
-                            })}
-                            {props.data.images.length === 0 && <h4>
-                                Не се достапни слики!
-                            </h4>}
-                        </Carousel>
-                    </Col>
-                    <Col>
-                        <Container className="m-auto">
-                            <Row>
-                                <h5 style={{textAlign: "left"}}>
-                                    {props.data.hotelRoomName}
-                                </h5>
-                            </Row>
-                            <Row>
-                                {props.data.airCondition && <Col className="col-auto">
-                                    <Container className="py-1 px-1">
-                                        <Row className="d-flex flex-row">
-                                            <Col className="m-0 w-25 py-1">
-                                                <LuFan
-                                                    className="my-0 "
-                                                    color="#159895"
-                                                    size={25}
-                                                ></LuFan>
-                                            </Col>
-                                            <Col className="w-75 d-flex p-0">
-                                                <h6 style={{fontSize: "10px"}} className="m-auto">
-                                                    Климатизирано
-                                                </h6>
-                                            </Col>
-                                        </Row>
-                                    </Container>
-                                </Col>}
-                                {props.data.kitchenAvailable && <Col className="col-auto">
-                                    <Container
-                                        className="py-1 px-1">
-                                        <Row className="d-flex flex-row">
-                                            <Col className="m-0 w-25 py-1">
-                                                <TbToolsKitchen2 className="my-0 " color="#159895"
-                                                                 size={25}></TbToolsKitchen2>
-                                            </Col>
-                                            <Col className="w-75 d-flex p-0">
-                                                <h6 style={{fontSize: "10px"}} className="m-auto">Кујна</h6>
-                                            </Col>
-                                        </Row>
-                                    </Container>
-                                </Col>}
-                                {props.data.balcony && <Col className="col-auto">
-                                    <Container
-                                        className="py-1 px-1">
-                                        <Row className="d-flex flex-row">
-                                            <Col className="m-0 w-25 py-1">
-                                                <MdBalcony className="my-0 " color="#159895" size={25}></MdBalcony>
-                                            </Col>
-                                            <Col className="w-75 d-flex p-0">
-                                                <h6 style={{fontSize: "10px"}} className="m-auto">Тераса</h6>
-                                            </Col>
-                                        </Row>
-                                    </Container>
-                                </Col>}
-                            </Row>
-                            <Row>
-                                <p style={{textAlign: "left", textDecoration: "none"}}>
-                                    {props.data.hotelRoomDescription}
-                                </p>
-                            </Row>
-                        </Container>
-                    </Col>
-                </Row>
+  return (
+    <>
+      <Container style={{ width: "100%" }}>
+        <Row className="g-0">
+          <Col
+            className="d-flex justify-content-center"
+            style={{ maxWidth: "40%" }}
+          >
+            <Image
+              src="https://img.freepik.com/free-photo/luxury-classic-modern-bedroom-suite-hotel_105762-1787.jpg?w=2000"
+              style={{
+                height: "10em",
+                borderRadius: "1em",
+                boxShadow: "0 4px 20px lightblue",
+                maxWidth: "100%",
+              }}
+              className="m-auto"
+            ></Image>
+          </Col>
+          <Col>
+            <Container className="m-auto">
+              <Row>
+                <h5 style={{ textAlign: "left" }}>
+                  {props.data.hotelRoomName}
+                </h5>
+              </Row>
+              <Row>
+                {props.data.airCondition && <Col className="col-auto">
+                  <Container className="py-1 px-1">
+                    <Row className="d-flex flex-row">
+                      <Col className="m-0 w-25 py-1">
+                        <LuFan
+                          className="my-0 "
+                          color="#159895"
+                          size={25}
+                        ></LuFan>
+                      </Col>
+                      <Col className="w-75 d-flex p-0">
+                        <h6 style={{ fontSize: "10px" }} className="m-auto">
+                          Климатизирано
+                        </h6>
+                      </Col>
+                    </Row>
+                  </Container>
+                </Col>}
+                {props.data.kitchenAvailable && <Col className="col-auto">
+                  <Container
+                    className="py-1 px-1">
+                                          <Row className="d-flex flex-row">
+                        <Col className="m-0 w-25 py-1">
+                        <TbToolsKitchen2 className="my-0 " color="#159895" size={25}></TbToolsKitchen2>
+                        </Col>
+                        <Col className="w-75 d-flex p-0" >
+                        <h6 style={{fontSize: "10px"}} className="m-auto">Кујна</h6>
+                        </Col>
+                      </Row>
+                  </Container>
+                </Col>}
+                {props.data.balcony && <Col className="col-auto">
+                <Container
+                    className="py-1 px-1">
+                                          <Row className="d-flex flex-row">
+                        <Col className="m-0 w-25 py-1">
+                        <MdBalcony className= "my-0 " color="#159895" size={25}></MdBalcony>
+                        </Col>
+                        <Col className="w-75 d-flex p-0" >
+                        <h6 style={{fontSize: "10px"}} className="m-auto">Тераса</h6>
+                        </Col>
+                      </Row>
+                  </Container>
+                </Col>}
+              </Row>
+              <Row>
+                <p style={{ textAlign: "left", textDecoration: "none" }}>
+                  {props.data.hotelRoomDescription}
+                </p>
+              </Row>
             </Container>
-        </>
-);
+          </Col>
+        </Row>
+      </Container>
+    </>
+  );
 };
 
Index: frontend/src/Components/HotelDetails/RoomRow.js
===================================================================
--- frontend/src/Components/HotelDetails/RoomRow.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/HotelDetails/RoomRow.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -8,7 +8,5 @@
     const [getData, setData] = useState(0);
     const room = props.room
-    console.log("dasdaskjdhaskdjashdkajk")
     console.log(props.data)
-    console.log(Array(props.data.find(x => x.hotelRoom.hotelRoomId === room.hotelRoomId)))
     return (
         <>
@@ -24,5 +22,5 @@
                     }}>
                         <option></option>
-                        {[...Array(props.data.filter(x => x.hotelRoom.hotelRoomId === room.hotelRoomId).reduce((sum, x) => x.numberOfBeds)).keys()].map(x => {
+                        {[...Array(props.data.find(x => x.hotelRoom.hotelRoomId === room.hotelRoomId).numberOfBeds).keys()].map(x => {
                             return (
                                 <option value={x+1}  >{x + 1}</option>
Index: frontend/src/Components/HotelDetails/RoomsTable.js
===================================================================
--- frontend/src/Components/HotelDetails/RoomsTable.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/HotelDetails/RoomsTable.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,3 +1,4 @@
 import React from "react";
+import Room from "./Room";
 import Form from "react-bootstrap/Form";
 import FaHotel from "react-icons/fa";
@@ -8,4 +9,7 @@
 const RoomsTable = (props) => {
 
+
+    console.log(props.data[0].hotelRoomAvailableId)
+    console.log([...Array(props.data[0].numberOfBeds).keys()])
     return (
         <>
@@ -20,7 +24,5 @@
                 </thead>
                 <tbody>
-                {Array.from(
-                    new Set(props.data.map((x) => JSON.stringify(x.hotelRoom)))
-                ).map((roomString) => JSON.parse(roomString)).map((room) => {
+                {Array.from(new Set(props.data.map(x => x.hotelRoom))).map((room) => {
                     return (
                         <>
Index: frontend/src/Components/HotelEdit/HotelEditTab.js
===================================================================
--- frontend/src/Components/HotelEdit/HotelEditTab.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/HotelEdit/HotelEditTab.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,119 +1,99 @@
 import React from "react";
-import {Container, Col, Row, Image, Nav, Tab} from "react-bootstrap";
-import {useState} from "react";
-import {FaTaxi, FaHotel} from "react-icons/fa";
-import {MdOutlineStickyNote2} from "react-icons/md";
+import { Container, Col, Row, Image, Nav, Tab } from "react-bootstrap";
+import { useState } from "react";
+import { FaTaxi, FaHotel } from "react-icons/fa";
+import { MdOutlineStickyNote2 } from "react-icons/md";
 import AddNew from "../Resources/AddNew";
-import {BiData} from "react-icons/bi"
+import { BiData } from "react-icons/bi"
 import RoomListing from "./RoomListing";
 import HotelEditForm from "./HotelEditForm";
 import AddHotelForm from "../Forms/AddHotelForm";
 import EditModal from "../Resources/EditModal";
-import AddAvailability from "../Resources/AddAvailability";
-import useGet from "../Hooks/useGet";
-import ReservationListing from "./ReservationListing";
 
 function HotelEditTab(props) {
-    const [activeTab, setActiveTab] = useState("/hotel");
-    const [modalData, setModalData] = useState("");
-    const [show, setShow] = useState(false);
+  const [activeTab, setActiveTab] = useState("/hotel");
+  const [modalData, setModalData] = useState("");
+  const [show, setShow] = useState(false);
 
-    console.log(props)
+  const handleClose = () => setShow(false);
+  const handleShow = () => {
+    //e.preventDefault();
+    setShow(true);
 
-    const {
-        data,
-        isLoading,
-        setData,
-        getData,
-        setChanged
-    } = useGet(`/hotel/${props.displayRoom.hotelId}/reservations/active`)
+  };
 
-    !isLoading && console.log(data)
+  const showModal = (modalData) => {
+    setModalData(modalData);
+    handleShow();
+  }
+  console.log(props.displayRoom)
 
-    const handleClose = () => setShow(false);
-    const handleShow = () => {
-        //e.preventDefault();
-        setShow(true);
+  const handleSelect = (eventKey) => {
+    setActiveTab(eventKey);
+  };
 
-    };
-
-    const showModal = (modalData) => {
-        setModalData(modalData);
-        handleShow();
-    }
-    console.log(props.displayRoom)
-
-    const handleSelect = (eventKey) => {
-        setActiveTab(eventKey);
-    };
-
-    return (
-        <Container className="rounded-5">
-            <Tab.Container
-                activeKey={activeTab}
-                onSelect={handleSelect}
-                className="bg-dark rounded-5"
-            >
-                <Nav
-                    fill
-                    variant="tabs"
-                    className="bg-body rounded-top-5"
-                    activeKey="/hotel"
-                    id="tab_item"
-                >
-                    <Nav.Item className="tab_item rounded-5">
-                        <Nav.Link eventKey="/hotel" className="text-left rounded-5">
+  return (
+    <Container className="rounded-5">
+      <Tab.Container
+        activeKey={activeTab}
+        onSelect={handleSelect}
+        className="bg-dark rounded-5"
+      >
+        <Nav
+          fill
+          variant="tabs"
+          className="bg-body rounded-top-5"
+          activeKey="/hotel"
+          id="tab_item"
+        >
+          <Nav.Item className="tab_item rounded-5">
+            <Nav.Link eventKey="/hotel" className="text-left rounded-5">
               <span className="ikona">
                 <FaHotel
-                    color="#159895"
-                    style={{lineHeight: "100em"}}
-                    size={"1.5em"}
-                    className="mx-3"
+                  color="#159895"
+                  style={{ lineHeight: "100em" }}
+                  size={"1.5em"}
+                  className="mx-3"
                 />
               </span>
-                            <span className="ikona">Соби</span>
-                        </Nav.Link>
-                    </Nav.Item>
-                    <Nav.Item className="tab_item">
-                        <Nav.Link eventKey="/restaurant">
+              <span className="ikona">Соби</span>
+            </Nav.Link>
+          </Nav.Item>
+          <Nav.Item className="tab_item">
+            <Nav.Link eventKey="/restaurant">
               <span className="ikona">
-                <MdOutlineStickyNote2 color="#159895" size={"1.5em"} className="mx-3"/>
+                <MdOutlineStickyNote2 color="#159895" size={"1.5em"} className="mx-3" />
               </span>
-                            <span className="ikona">Резервации</span>
-                        </Nav.Link>
-                    </Nav.Item>
-                    <Nav.Item className="tab_item rounded-5">
-                        <Nav.Link eventKey="/transport" className="text-left rounded-5">
+              <span className="ikona">Резервации</span>
+            </Nav.Link>
+          </Nav.Item>
+          <Nav.Item className="tab_item rounded-5">
+            <Nav.Link eventKey="/transport" className="text-left rounded-5">
               <span className="ikona">
-                <BiData color="#159895" size={"1.5em"} className="mx-3"/>
+                <BiData color="#159895" size={"1.5em"} className="mx-3" />
               </span>
-                            <span className="ikona">Општи податоци</span>
-                        </Nav.Link>
-                    </Nav.Item>
-                </Nav>
+              <span className="ikona">Општи податоци</span>
+            </Nav.Link>
+          </Nav.Item>
+        </Nav>
 
-                <Tab.Content className="py-5 px-3 border rounded-bottom-5 bg-light">
-                    <Tab.Pane eventKey="/hotel">
-                        {props.displayRoom.hotelRooms.map((room) => {
-                            return <RoomListing key={room.hotelRoomId} data={room} showModal={showModal}/>
-                        })}
-                        <EditModal show={show} handleClose={handleClose} type="room" room={modalData}></EditModal>
-                        <AddNew Id={props.displayRoom.hotelId} refresh={props.refresh} type="room"/>
-                    </Tab.Pane>
-                    <Tab.Pane eventKey="/restaurant">
-                        {!isLoading && data.map((res) => {
-                            return (
-                                <ReservationListing type={'hotel'} data={res}/>
-                            )
-                        })}
-                        {/*<AddNew type="restaurant"/>*/}
-                    </Tab.Pane>
-                    <Tab.Pane eventKey="/transport">
-                        <AddHotelForm refresh={props.refresh} hotel={props.displayRoom}/>
-                    </Tab.Pane>
-                </Tab.Content>
-            </Tab.Container>
-        </Container>
-    );
+        <Tab.Content className="py-5 px-3 border rounded-bottom-5 bg-light">
+          <Tab.Pane eventKey="/hotel">
+          {props.displayRoom.hotelRooms.map((room) => {
+              return <RoomListing key={room.hotelRoomId} data={room} showModal={showModal}/>
+            })}
+            <EditModal show={show} handleClose={handleClose} type="room" room={modalData}></EditModal>
+            <AddNew Id={props.displayRoom.hotelId} refresh={props.refresh} type="room"/>
+          </Tab.Pane>
+          <Tab.Pane eventKey="/restaurant">
+            <AddNew type="restaurant"/>
+          </Tab.Pane>
+          <Tab.Pane eventKey="/transport">
+            <AddHotelForm refresh={props.refresh} hotel={props.displayRoom}/>
+          </Tab.Pane>
+        </Tab.Content>
+      </Tab.Container>
+    </Container>
+  );
 }
 
Index: frontend/src/Components/HotelEdit/ReservationListing.js
===================================================================
--- frontend/src/Components/HotelEdit/ReservationListing.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,47 +1,0 @@
-import {Col, Container, Row} from "react-bootstrap";
-import React from "react";
-
-const ReservationListing = (props) => {
-
-    const dateFormatter = (str) => {
-        const inputDate = new Date(str);
-
-        const options = {
-            year: '2-digit',
-            month: '2-digit',
-            day: '2-digit',
-        };
-
-        return inputDate.toLocaleString('de-DE', options);
-    }
-
-    return(
-        <>
-            <Container className="py-3 px-1 my-4"
-                       style={{
-                           border: "4px solid #159895",
-                           borderRadius: "1em",
-                           boxShadow: "0 3px 5px #159895",
-                           maxWidth: "90%",
-                       }}>
-                <Row>
-                    <Col md={8} className="d-flex flex-column justify-content-start ps-5">
-                        <h3 style={{fontWeight: "bold"}} className={'text-start'}>Резервација за:</h3>
-                        {props.type === 'hotel' && <h4 className={'text-start'}>{props.data.hotelRoom.hotelRoomName}</h4>}
-                        {props.type === 'restaurant' && <h4 className={'text-start'}>{'Маса за ' + props.data.restaurantsTable.noSeats}</h4>}
-                        {props.type === 'transport' && <h4 className={'text-start'}>{props.data.transportRoute.from + ' ' + props.data.transportRoute.to}</h4>}
-                        {props.type === 'transport' && <h4 className={'text-start'}>{props.data.noSeats + ' ' + 'патници'}</h4>}
-                        <h4 className={'text-start'}>{props.data.user.name + ' ' + props.data.user.surname}</h4>
-                        {props.type !== 'transport' && <h5
-                            className={'text-start'}>{dateFormatter(props.data.dateFrom) + ' - ' + dateFormatter(props.data.dateTo)}</h5>}
-                    </Col>
-                    <Col md={4} className="d-flex flex-column justify-content-center align-content-center">
-                        {props.type === 'hotel' && <h3>Вкупна цена: <br></br>{props.data.hotelRoom.price}$</h3>}
-                    </Col>
-                </Row>
-            </Container>
-        </>
-    )
-}
-
-export default ReservationListing;
Index: frontend/src/Components/HotelEdit/RoomListing.js
===================================================================
--- frontend/src/Components/HotelEdit/RoomListing.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/HotelEdit/RoomListing.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -6,5 +6,4 @@
 import {AiOutlinePlusCircle} from "react-icons/ai"
 import AddAvailability from "../Resources/AddAvailability";
-import AddImages from "../Resources/AddImages";
 
 
@@ -41,7 +40,4 @@
                         <h2>Цена по ноќ: {props.data.price}</h2>
                     </Col>
-                    <Col className="d-flex flex-column justify-content-center align-content-center">
-                        <AddImages type="room" Id={props.data.hotelRoomId} />
-                    </Col>
 
                     <Col className="d-flex flex-column justify-content-center align-content-center">
Index: frontend/src/Components/ImageUpload/ImageUpload.js
===================================================================
--- frontend/src/Components/ImageUpload/ImageUpload.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,37 +1,0 @@
-import React, { useState } from "react";
-import { Button, Container, FormControl, FormGroup, FormLabel, Image } from "react-bootstrap";
-import useFileChange from "../Hooks/FilesUpload/useFileChange";
-
-const ImageUpload = () => {
-    const { onFileChangeHandler } = useFileChange();
-    const [selectedFiles, setSelectedFiles] = useState([]);
-
-    return (
-        <Container>
-            <FormGroup className="mb-3">
-                <FormLabel>Upload Images:</FormLabel>
-                <FormControl
-                    type="file"
-                    multiple
-                    onChange={(e) => setSelectedFiles(Array.from(e.target.files))}
-                />
-            </FormGroup>
-            <Button onClick={() => onFileChangeHandler(selectedFiles)}>
-                Upload Files
-            </Button>
-            <Container>
-                {selectedFiles.map((file, index) => (
-                    <Image
-                        key={index}
-                        onClick={() => {}}
-                        fluid
-                        src={URL.createObjectURL(file)}
-                        alt={`Uploaded Image ${index + 1}`}
-                    />
-                ))}
-            </Container>
-        </Container>
-    );
-};
-
-export default ImageUpload;
Index: frontend/src/Components/Layout/Navbar/Navigation.js
===================================================================
--- frontend/src/Components/Layout/Navbar/Navigation.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Layout/Navbar/Navigation.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,4 +1,4 @@
-import {Button, Modal} from "react-bootstrap";
-import React, {useState} from "react";
+import { Button } from "react-bootstrap";
+import React from "react";
 import { Container, Image, Navbar } from "react-bootstrap";
 import { Nav } from "react-bootstrap";
@@ -7,6 +7,4 @@
 import useGet from "../../Hooks/useGet";
 import axios from "../../../axios.js";
-import {useAuth} from "../../Context/AuthContext";
-import ImageUpload from "../../ImageUpload/ImageUpload";
 //import logo from 'assets/images/logo.png';
 //src="https://upload.wikimedia.org/wikipedia/commons/0/08/Vergina_Sun_-_Golden_Larnax.png"
@@ -14,12 +12,7 @@
 function Navigation(props) {
   const navigator = useNavigate();
-  const Auth = useAuth();
-  const isLoggedIn = Auth.userIsAuthenticated();
 
-  const [show, setShow] = useState(false);
-
-  const handleClose = () => setShow(false);
-  const handleShow = () => setShow(true);
-
+  const { data, setData, isLoading, getData } = useGet("/username");
+  
   return (
     <>
@@ -31,5 +24,5 @@
       >
         <Container>
-          <Navbar.Brand href="/home">
+          <Navbar.Brand href="#home">
             <span className="ikona">
               <Image
@@ -55,7 +48,7 @@
               </Nav.Link>
               <Nav.Link className="m-2" href="#pricing">
-                <Button onClick={handleShow}></Button>
+                Pricing
               </Nav.Link>
-              {!isLoggedIn && (
+              {!isLoading && !data && (
                 <Button
                   className="m-2"
@@ -63,5 +56,5 @@
                   style={{ backgroundColor: "#159895" }}
                   onClick={() => {
-                    window.location.href = ("http://localhost:8080/login");
+                    navigator("/login");
                   }}
                 >
@@ -69,8 +62,8 @@
                 </Button>
               )}
-              {isLoggedIn && (
+              {!isLoading && data && (
                 <>
                   <Nav.Link className="m-2" href="/profile">
-                    {Auth.getUser().username}
+                    {data}
                   </Nav.Link>
                   <Button
@@ -81,6 +74,5 @@
                       await axios.get("/logout")
                       .then((res) => {
-                        console.log(res);
-                        Auth.userLogout();
+                        console.log(res)
                       })
                       .catch((err) => {
@@ -100,19 +92,4 @@
       </Navbar>
       <br />
-
-      <Modal show={show} onHide={handleClose}>
-        <Modal.Header closeButton>
-          <Modal.Title>Modal heading</Modal.Title>
-        </Modal.Header>
-        <Modal.Body><ImageUpload/></Modal.Body>
-        <Modal.Footer>
-          <Button variant="secondary" onClick={handleClose}>
-            Close
-          </Button>
-          <Button variant="primary" onClick={handleClose}>
-            Save Changes
-          </Button>
-        </Modal.Footer>
-      </Modal>
     </>
   );
Index: frontend/src/Components/Listings/HotelListing.js
===================================================================
--- frontend/src/Components/Listings/HotelListing.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Listings/HotelListing.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,3 +1,3 @@
-import {Col, Container, Image, Row, Button, Badge} from "react-bootstrap";
+import {Col, Container, Image, Row, Button} from "react-bootstrap";
 import {BsFillPersonFill} from "react-icons/bs";
 import {MdOutlineLocalOffer} from "react-icons/md";
@@ -5,18 +5,5 @@
 
 function HotelListing(props) {
-
-    const getMarketingMessage = (num) => {
-        switch (num){
-            case 1:
-                return "Достапно само денес"
-            case 2:
-                return "Последна соба"
-            case 3:
-                return "Специјална цена"
-        }
-    }
-
     console.log(props)
-    const randomInt = Math.floor(Math.random() * (3)) + 1;
     return (
         <>
@@ -28,5 +15,4 @@
                     boxShadow: "0 3px 5px lightblue",
                     maxWidth: "60%",
-                    backgroundColor: props.data.promoted ? "#e1f7fa" : ""
                 }}
             >
@@ -45,8 +31,5 @@
                     <Col>
                         <Row>
-                            <h3>{props.data.hotelName}
-                            {props.data.marketed && randomInt !== 3 && <h6><Badge bg="warning">{getMarketingMessage(randomInt)}</Badge></h6>}
-                            {props.data.promoted && <h6><Badge bg="primary">Најпопуларно</Badge></h6>}
-                            </h3>
+                            <h3>{props.data.hotelName}</h3>
                         </Row>
                         <Row>
@@ -97,5 +80,6 @@
                       }}
                   >
-                        {(props.data.hotelReviews.reduce((sum, r) => sum + r.numStar, 0) / props.data.hotelReviews.length).toFixed(1)}
+                    {/* {props.data.hotelRating} */}
+                      9.1
                   </span>
                                 </Col>
@@ -107,6 +91,5 @@
                                 >
                                     <Row>
-                                        <h4>{props.data.marketed && randomInt === 3 && <h6><Badge bg="warning">{getMarketingMessage(randomInt)}</Badge></h6>}
-                                            {props.data.totalPrice}$</h4>
+                                        <h4>{props.data.totalPrice}$</h4>
                                     </Row>
                                     <Row className="w-100">
Index: frontend/src/Components/Listings/RestaurantListing.js
===================================================================
--- frontend/src/Components/Listings/RestaurantListing.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,122 +1,0 @@
-import {Col, Container, Image, Row, Button} from "react-bootstrap";
-import {BsFillPersonFill} from "react-icons/bs";
-import {MdOutlineLocalOffer} from "react-icons/md";
-import {Link} from "react-router-dom";
-
-function RestaurantListing(props) {
-    console.log(props)
-    return (
-        <>
-            <Container
-                className="py-3 px-1 my-4"
-                style={{
-                    border: "4px solid lightblue",
-                    borderRadius: "1em",
-                    boxShadow: "0 3px 5px lightblue",
-                    maxWidth: "60%",
-                }}
-            >
-                <Row className="mx-1 my-1" style={{textAlign: "left"}}>
-                    <Col className="d-flex justify-content-center">
-                        <Image
-                            src="https://www.imgacademy.com/sites/default/files/legacyhotel.jpg"
-                            style={{
-                                height: "15em",
-                                borderRadius: "1em",
-                                boxShadow: "0 4px 20px lightblue",
-                                maxWidth: "100%",
-                            }}
-                        ></Image>
-                    </Col>
-                    <Col>
-                        <Row>
-                            <h3>{props.data.restaurantName}</h3>
-                        </Row>
-                        <Row>
-                            <h8>{props.data.restaurantLocation}, Македонија</h8>
-                        </Row>
-                        <Row className="mt-3 ml-2">
-                            <Col className="md-4">
-                                <h4 style={{fontWeight: "bold"}}></h4>
-                            </Col>
-                        </Row>
-                        <Row>
-                            <Col className="ml-5">
-                                {/* <h5>{props.data.hotelCaption}</h5> */}
-                                <h5>Тип на кујна</h5>
-                            </Col>
-                        </Row>
-                        <Row>
-                            <Col>
-                                <h6>{props.data.cousineType}</h6>
-                            </Col>
-                        </Row>
-                    </Col>
-                    <Col>
-                        <Container
-                            fluid
-                            className="px-0"
-                            style={{
-                                display: "flex",
-                                flexDirection: "column",
-                                alignItems: "flex-end",
-                                justifyContent: "space-between",
-                                height: "100%",
-                            }}
-                        >
-                            <Row className="justify-self-end" style={{textAlign: "right"}}>
-                                <Col style={{textAlign: "right"}}>
-                                    <h6>Многу добро</h6>
-                                </Col>
-                                <Col>
-                  <span
-                      style={{
-                          backgroundColor: "#159895",
-                          padding: "0.75em",
-                          fontWeight: "bold",
-                          fontSize: "1.25rem",
-                          borderRadius: "0.75em",
-                          color: "white",
-                      }}
-                  >
-                     {props.data.averageScore.toFixed(1)}
-                  </span>
-                                </Col>
-                            </Row>
-                            <Row className="w-75 justify-self-end">
-                                <Container
-                                    className="justify-self-end"
-                                    style={{textAlign: "right"}}
-                                >
-                                    <Row>
-
-                                    </Row>
-                                    <Row className="w-100">
-                                        <Link
-                                            to="/details/restaurant"
-                                            state={{data: props.data, params: props.params}}
-                                            className="w-100"
-                                        >
-                                            <Button
-                                                className="m-2"
-                                                size="md"
-                                                style={{backgroundColor: "#159895"}}
-                                                onClick={() => {
-                                                }}
-                                            >
-                                                <MdOutlineLocalOffer size={"1.5em"}></MdOutlineLocalOffer>{" "}
-                                                Кон понудата
-                                            </Button>
-                                        </Link>
-                                    </Row>
-                                </Container>
-                            </Row>
-                        </Container>
-                    </Col>
-                </Row>
-            </Container>
-        </>
-    );
-}
-
-export default RestaurantListing;
Index: frontend/src/Components/Listings/SortButton.js
===================================================================
--- frontend/src/Components/Listings/SortButton.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Listings/SortButton.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -3,10 +3,7 @@
 import { BsSortUp } from "react-icons/bs"
 
-const SortButton = (props) => {
+const SortButton = () => {
     return (
-        <Dropdown onSelect={(event, x) => {
-            console.log(event)
-            props.setSortingArg(event)
-        }}>
+        <Dropdown>
           <Dropdown.Toggle variant="success" id="dropdown-basic" size="lg">
           <span className="ikona my-1"><BsSortUp/></span>
@@ -14,9 +11,9 @@
           </Dropdown.Toggle>
     
-          <Dropdown.Menu >
-              {props.type !== 'restaurant' && <Dropdown.Item eventKey={'priceDesc'}>Цена растечки</Dropdown.Item>}
-              {props.type !== 'restaurant' && <Dropdown.Item eventKey={'priceAsc'}>Цена опаѓачки</Dropdown.Item>}
-              {props.type !== 'transport' && <Dropdown.Item eventKey={'nameAsc'}>Име растечки</Dropdown.Item>}
-              {props.type !== 'transport' && <Dropdown.Item eventKey={'nameDesc'}>Име опаѓачки</Dropdown.Item>}
+          <Dropdown.Menu>
+            <Dropdown.Item href="#/action-1">Цена растечки</Dropdown.Item>
+            <Dropdown.Item href="#/action-2">Цена опаѓачки</Dropdown.Item>
+            <Dropdown.Item href="#/action-3">Име растечки</Dropdown.Item>
+            <Dropdown.Item href="#/action-3">Име опаѓачки</Dropdown.Item>
           </Dropdown.Menu>
         </Dropdown>
Index: frontend/src/Components/Listings/TransportListing.js
===================================================================
--- frontend/src/Components/Listings/TransportListing.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Listings/TransportListing.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -9,5 +9,5 @@
 
 const TransportListing = (props) => {
-
+  
 
 
@@ -56,5 +56,5 @@
                     }}
                   >
-                      {(props.data.reviews.reduce((sum, r) => sum + r.numStar, 0) / props.data.reviews.length).toFixed(1)}
+                    9.1
                   </span>
                 </Col>
@@ -69,5 +69,5 @@
                   </Row>
                   <Row className="w-100">
-                    <Link to="/details/transport" state={ {data: props.data, params: props.params} }>
+                    <Link to="/details/transport" state={ {data: props.data} }>
                     <Button
                       className="m-2"
Index: frontend/src/Components/Login/LoginForm.js
===================================================================
--- frontend/src/Components/Login/LoginForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Login/LoginForm.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -5,17 +5,14 @@
 import useLogin from "../Hooks/User/useLogin";
 import { Link } from "react-router-dom";
-import useCreate from "../Hooks/useCreate";
-import {useAuth} from "../Context/AuthContext";
 
-const LoginForm = (props) => {
+const LoginForm = () => {
   const { formData, onFormChange, onCheckBoxChange, setFormData } = useFormData(
     {
-      username: "",
+      email: "",
       password: "",
     }
   );
 
-  const { createEntity } = useCreate();
-  const Auth = useAuth();
+  const { login } = useLogin();
 
   return (
@@ -30,8 +27,11 @@
             type="email"
             placeholder="Enter email"
-            name="username"
+            name="email"
             onChange={onFormChange}
             value={formData.email}
           />
+          <Form.Text className="text-muted">
+            Вашите податоци никогаш нема да бидат споделени.
+          </Form.Text>
         </Form.Group>
 
@@ -46,12 +46,12 @@
           />
         </Form.Group>
-        {/*<Form.Group className="mb-3" controlId="formBasicCheckbox">*/}
-        {/*  <Form.Check type="checkbox" label="Check me out" />*/}
-        {/*</Form.Group>*/}
-        {/*<Link to={"/register"} style={{textDecoration: "none"}}>*/}
-        {/*  <Form.Text className="text-muted" style={{color: "#159895!important"}} >*/}
-        {/*    Регистритрај се*/}
-        {/*  </Form.Text>*/}
-        {/*</Link>*/}
+        <Form.Group className="mb-3" controlId="formBasicCheckbox">
+          <Form.Check type="checkbox" label="Check me out" />
+        </Form.Group>
+        <Link to={"/register"} style={{textDecoration: "none"}}>
+          <Form.Text className="text-muted" style={{color: "#159895!important"}} >
+            Регистритрај се
+          </Form.Text>
+        </Link>
         <Form.Group className="my-1">
           <Button
@@ -62,5 +62,5 @@
               e.preventDefault();
               console.log(formData);
-              createEntity(`/users/${Auth.getUser().userId}/connect`, formData, props.refresh)
+              login(formData)
             }}
           >
@@ -68,5 +68,5 @@
               <AiFillLock />
             </span>
-            <span className="ikona mx-3">Поврзи</span>
+            <span className="ikona mx-3">Најави се</span>
           </Button>
         </Form.Group>
Index: frontend/src/Components/LoginCallback.js
===================================================================
--- frontend/src/Components/LoginCallback.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,23 +1,0 @@
-import React, { useEffect } from "react";
-import { useLocation, useNavigate } from "react-router-dom";
-import useLogin from "./Hooks/User/useLogin";
-
-const LoginCallbackComponent = () => {
-    const location = useLocation();
-    const navigator = useNavigate();
-    const { handleLoginCallback } = useLogin();
-
-    useEffect(() => {
-        // Call a function to handle the callback and extract data
-        handleLoginCallback();
-        navigator("/home");
-    }, []);
-
-    return (
-        <div>
-            Redirecting...
-        </div>
-    );
-};
-
-export default LoginCallbackComponent;
Index: frontend/src/Components/Misc/PrivateRoute.js
===================================================================
--- frontend/src/Components/Misc/PrivateRoute.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,18 +1,0 @@
-import React from 'react'
-import { Navigate } from 'react-router-dom'
-import {useAuth} from "../Context/AuthContext";
-
-function PrivateRoute({ children }) {
-  const { userIsAuthenticated } = useAuth()
-  if(userIsAuthenticated())
-  {
-    return children;
-  }
-  else
-  {
-    window.location.href = "http://localhost:8080/login";
-  }
-  return userIsAuthenticated() ? children : <Navigate to="http://localhost:8080/login" />
-}
-
-export default PrivateRoute
Index: frontend/src/Components/ProfilePage/DataForm.js
===================================================================
--- frontend/src/Components/ProfilePage/DataForm.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/ProfilePage/DataForm.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -11,5 +11,5 @@
 
   const handleClose = () =>  setShow(false);
-  const handleShow = (e) => {
+  const handleShow = (e) => { 
     e.preventDefault();
     setShow(true);
@@ -29,6 +29,5 @@
             <Form.Group as={Col} controlId="name">
               <Form.Label>Име</Form.Label>
-              <Form.Control type="text" value={props.data["name"]}
-              name={"name"}/>
+              <Form.Control type="text" value={props.data["name"]} />
             </Form.Group>
 
@@ -39,5 +38,4 @@
                 placeholder=""
                 value={props.data["surname"]}
-                name={"surname"}
               />
             </Form.Group>
@@ -47,6 +45,5 @@
             <Form.Group as={Col} controlId="name">
               <Form.Label>Датум на раѓање</Form.Label>
-              <Form.Control type="date" value={props.data["dateOfBirth"]}
-              name={"dateOfBirth"}/>
+              <Form.Control type="date" value={props.data["dateOfBirth"]} />
             </Form.Group>
 
@@ -57,5 +54,4 @@
                 placeholder=""
                 value={props.data["country"]}
-                name={"country"}
               />
             </Form.Group>
@@ -64,6 +60,5 @@
           <Form.Group className="mb-3" controlId="address">
             <Form.Label>Адреса</Form.Label>
-            <Form.Control type="text" value={props.data["address"]}
-            name={"address"}/>
+            <Form.Control type="text" value={props.data["address"]} />
           </Form.Group>
 
@@ -71,6 +66,5 @@
             <Form.Group as={Col} controlId="city">
               <Form.Label>Град</Form.Label>
-              <Form.Control type="text" value={props.data["city"]}
-              name={"city"}/>
+              <Form.Control type="text" value={props.data["city"]} />
             </Form.Group>
 
@@ -81,5 +75,4 @@
                 placeholder=""
                 value={props.data["zip"]}
-                name={"zip"}
               />
             </Form.Group>
@@ -89,6 +82,5 @@
             <Form.Group as={Col} controlId="email">
               <Form.Label>Email</Form.Label>
-              <Form.Control type="email" value={props.data["email"]}
-              name={"email"}/>
+              <Form.Control type="email" value={props.data["email"]} />
             </Form.Group>
 
@@ -99,5 +91,4 @@
                 placeholder=""
                 value={props.data["mobile"]}
-                name={"mobile"}
               />
             </Form.Group>
Index: frontend/src/Components/Resources/AddAvailability.js
===================================================================
--- frontend/src/Components/Resources/AddAvailability.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Resources/AddAvailability.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,4 +1,4 @@
- import React from "react";
-import { Container, Row, Modal, Im } from "react-bootstrap";
+import React from "react";
+import { Container, Row, Modal } from "react-bootstrap";
 import { useState } from "react";
 import { AiOutlinePlusCircle } from "react-icons/ai"
@@ -42,6 +42,6 @@
         <Modal.Body>
             {props.type === "hotel" && <AddHotelForm/>}
-            {props.type === "room" && <AddRoomAvailablityForm refresh={props.refresh} close={props.closeModal}  hotelRoomId={props.hotelRoomId}/>}
-            {props.type === "table" && <AddTableAvailablityForm refresh={props.refresh} close={props.closeModal} table={props.table}/>}
+            {props.type === "room" && <AddRoomAvailablityForm hotelRoomId={props.hotelRoomId}/>}
+            {props.type === "table" && <AddTableAvailablityForm table={props.table}/>}
             {props.type === "restaurant" && <AddRestaurantForm/>}
             {props.type === "transport" && <AddTransportForm/>}
Index: frontend/src/Components/Resources/AddImages.js
===================================================================
--- frontend/src/Components/Resources/AddImages.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,98 +1,0 @@
-import React from "react";
-import {Container, Row, Modal, Image, FormGroup, FormLabel, FormControl, Button} from "react-bootstrap";
-import {useState} from "react";
-import {AiOutlinePlusCircle} from "react-icons/ai"
-import AddHotelForm from "../Forms/AddHotelForm";
-import AddRoomForm from "../Forms/AddRoomForm";
-import AddRestaurantForm from "../Forms/AddRestaurantForm";
-import AddTransportForm from "../Forms/AddTransportForm";
-import AddItemMenuForm from "../Forms/AddItemMenuForm";
-import AddRoomAvailablityForm from "../Forms/AddRoomAvailablityForm";
-import AddTableAvailablityForm from "../Forms/AddTableAvailabilityForm";
-import {FaImage} from "react-icons/fa";
-import useGet from "../Hooks/useGet";
-import useFileChange from "../Hooks/FilesUpload/useFileChange";
-
-
-const AddImages = (props) => {
-
-    const [show, setShow] = useState(false);
-    const {data, isLoading, getData, setData, setChanged} = useGet(`/${props.type}/${props.Id}/images`)
-    const { onFileChangeHandler } = useFileChange();
-    const [selectedFiles, setSelectedFiles] = useState([]);
-
-    console.log(props.Id)
-
-    const handleClose = () => setShow(false);
-    const handleShow = (e) => {
-        e.preventDefault();
-        setShow(true);
-
-    };
-
-    !isLoading && console.log(data)
-
-
-    return (<>
-        <Container onClick={handleShow}>
-            <h5>Слики</h5>
-            <div className="d-flex justify-content-center align-content-center"><FaImage size={50}
-                                                                                         color="#159895"></FaImage>
-            </div>
-
-        </Container>
-
-        {handleShow && <Modal size={'xl'} show={show} onHide={handleClose}>
-            <Modal.Header closeButton>
-                <Modal.Title style={{color: "#159895"}}>
-                    Слики за ресурс
-                </Modal.Title>
-            </Modal.Header>
-            <Modal.Body>
-                <Container>
-                    {!isLoading && data.map((image) => {
-                        let link = image.url;
-                        if (image.url.includes('Desktop')) {
-                            link = 'http://localhost:8080/download?fileName=' + encodeURIComponent(image.url);
-                        }
-                        console.log(link)
-                        return (
-                            <Image src={link} thumbnail width={171} height={180}/>
-                        )
-                    })}
-                </Container>
-                <Container>
-                    <FormGroup className="mb-3">
-                        <FormLabel>Upload Images:</FormLabel>
-                        <FormControl
-                            type="file"
-                            multiple
-                            onChange={(e) => setSelectedFiles(Array.from(e.target.files))}
-                        />
-                    </FormGroup>
-                    <Button onClick={() => {
-                        // setChanged((prev) => ++prev)
-                        onFileChangeHandler(selectedFiles, props.type, props.Id, setChanged)
-                        // setChanged((prev) => ++prev)
-                    }}>
-                        Upload Files
-                    </Button>
-                    <Container>
-                        {selectedFiles.map((file, index) => (
-                            <Image
-                                key={index}
-                                onClick={() => {
-                                }}
-                                fluid
-                                src={URL.createObjectURL(file)}
-                                alt={`Uploaded Image ${index + 1}`}
-                            />
-                        ))}
-                    </Container>
-                </Container>
-            </Modal.Body>
-        </Modal>}
-    </>)
-}
-
-export default AddImages;
Index: frontend/src/Components/Resources/AddNew.js
===================================================================
--- frontend/src/Components/Resources/AddNew.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Resources/AddNew.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -56,8 +56,8 @@
         </Modal.Header>
         <Modal.Body>
-            {props.type === "hotel" && <AddHotelForm closeModal={handleClose} refresh={props.refresh}/>}
-            {props.type === "room" && <AddRoomForm closeModal={handleClose} refresh={props.refresh} hotelId={props.Id}/>}
-            {props.type === "restaurant" && <AddRestaurantForm edit="false" closeModal={handleClose} refresh={props.refresh}/>}
-            {props.type === "transport" && <AddTransportForm closeModal={handleClose} refresh={props.refresh}/>}
+            {props.type === "hotel" && <AddHotelForm refresh={props.refresh}/>}
+            {props.type === "room" && <AddRoomForm refresh={props.refresh} hotelId={props.Id}/>}
+            {props.type === "restaurant" && <AddRestaurantForm edit="false" refresh={props.refresh}/>}
+            {props.type === "transport" && <AddTransportForm refresh={props.refresh}/>}
             {props.type === "menu" && <AddItemMenuForm Id={props.Id} refresh={props.refresh}/>}
             {props.type === "route" && <AddTripForm transportId={props.transport.transportID} setSize={setSizeXl} refresh={props.refresh}/>}
Index: frontend/src/Components/Resources/EditModal.js
===================================================================
--- frontend/src/Components/Resources/EditModal.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Resources/EditModal.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -11,5 +11,4 @@
 import EditTableForm from "../Forms/EditTableForm";
 import EditRoomForm from "../Forms/EditRoomForm";
-import EditMainRouteForm from "../Forms/EditMainRouteForm";
 
 const EditModal = (props) => {
@@ -32,10 +31,10 @@
         </Modal.Header>
         <Modal.Body>
-            {props.type === "hotel" && <AddHotelForm refresh={props.refresh}/>}
+            {props.type === "hotel" && <AddHotelForm/>}
             {props.type === "room" && <EditRoomForm refresh={props.refresh} room={props.room}/>}
             {props.type === "restaurant" && <AddRestaurantForm edit="false" refresh={props.refresh}/>}
             {props.type === "transport" && <AddTransportForm/>}
             {props.type === "menu" && <AddItemMenuForm Id={props.Id} refresh={props.refresh} menu={props.menu}/>}
-            {props.type === "route" && <EditMainRouteForm route={props.route} refresh={props.refresh}/>}
+            {props.type === "route" && <AddTripForm/>}
             {props.type === "table" && <EditTableForm table={props.table}/>}
         </Modal.Body>
Index: frontend/src/Components/Resources/ResourceListing.js
===================================================================
--- frontend/src/Components/Resources/ResourceListing.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Resources/ResourceListing.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,73 +1,69 @@
 import React from "react";
-import {useState} from "react";
-import {Col, Container, Row, Image, Modal, Button} from "react-bootstrap";
+import { useState } from "react";
+import { Col, Container, Row, Image, Modal, Button } from "react-bootstrap";
 import LoginForm from "../Login/LoginForm";
 import ChangePasswordForm from "../Forms/ChangePasswordForm";
-import AddAvailability from "./AddAvailability";
-import AddImages from "./AddImages";
 
 const ResourceListing = (props) => {
+  
+    console.log("props " + props.id)
+  
 
     const type = props.type == "hotel" ? "сместувањето" : props.type == "restaurant" ? "ресторанот" : "превозот";
     const name = props.type == "hotel" ? props.data.hotelName : props.type == "restaurant" ? props.data.restaurantName : props.data.transportName
-    const id = props.type == "hotel" ? props.data.hotelId : props.type == "restaurant" ? props.data.restaurantID : props.data.transportID
-    console.log(props.data)
-    return (<>
-        <a  style={{textDecoration: "none", color: "black"}} href={`${props.type}/${id}`}>
-            <Container className="py-3 px-1 my-4"
-                       style={{
-                           border: "4px solid #159895",
-                           borderRadius: "1em",
-                           boxShadow: "0 3px 5px #159895",
-                           maxWidth: "90%",
-                       }}>
-                <Row>
-                    <Col className="d-flex justify-content-center">
-                        <Image
-                            src="https://www.imgacademy.com/sites/default/files/legacyhotel.jpg"
-                            style={{
-                                height: "8em",
-                                borderRadius: "1em",
-                                boxShadow: "0 4px 20px lightblue",
-                                maxWidth: "100%",
-                            }}
-                        ></Image>
-                    </Col>
-                    <Col>
-                        <h2 style={{textAlign: "left"}}>{name}</h2>
-                        {props.type === "hotel" && (<>
-                            <h5 style={{textAlign: "left"}}>{props.data.hotelLocation}</h5>
-                            <h5 style={{textAlign: "left"}}>{props.data.hotelEmail}</h5>
-                        </>)}
-                        {props.type === "restaurant" && (<>
-                            <h5 style={{textAlign: "left"}}>{props.data.restaurantLocation}</h5>
-                            <h5 style={{textAlign: "left"}}>{props.data.cousineType} кујна</h5>
-                        </>)}
-                        {props.type === "transport" && (<>
-                            <h5 style={{textAlign: "left"}}>{props.data.carBrand}</h5>
-                            <h5 style={{textAlign: "left"}}>{props.data.carPlate}</h5>
-                        </>)}
-                    </Col>
-
-                    {props.type !== 'transport' && <Col className="d-flex flex-column justify-content-center align-content-center">
-                        <AddImages type={props.type} Id={id}/>
-                    </Col>}
-                    <Col className="d-flex justify-content-center align-content-center">
+    const id = props.type == "hotel" ? props.data.hotelId : props.type == "restaurant" ? props.data.resturantId : props.data.transportID
+    return(<> 
+    <a href={`${props.type}/${id}`} style={{textDecoration: "none", color:"black"}}>
+        <Container className="py-3 px-1 my-4"
+        style={{
+          border: "4px solid #159895",
+          borderRadius: "1em",
+          boxShadow: "0 3px 5px #159895",
+          maxWidth: "90%",
+        }}>
+            <Row>
+                <Col className="d-flex justify-content-center">
+                    <Image
+                    src="https://www.imgacademy.com/sites/default/files/legacyhotel.jpg"
+                    style={{
+                        height: "8em",
+                        borderRadius: "1em",
+                        boxShadow: "0 4px 20px lightblue",
+                        maxWidth: "100%",
+                    }}
+                    ></Image>
+                </Col>
+                <Col >
+                    <h2 style={{textAlign: "left"}}>{name}</h2>
+                    {props.type === "hotel" && (<>
+                      <h5 style={{textAlign: "left"}}>{props.data.hotelLocation}</h5>
+                      <h5 style={{textAlign: "left"}}>{props.data.hotelEmail}</h5>
+                    </>)}
+                    {props.type === "restaurant" && (<>
+                      <h5 style={{textAlign: "left"}}>{props.data.restaurantLocation}</h5>
+                      <h5 style={{textAlign: "left"}}>{props.data.cousineType} кујна</h5>
+                    </>)}
+                    {props.type === "transport" && (<>
+                      <h5 style={{textAlign: "left"}}>{props.data.carBrand}</h5>
+                      <h5 style={{textAlign: "left"}}>{props.data.carPlate}</h5>
+                    </>)}
+                </Col>
+                <Col className="d-flex justify-content-center align-content-center" >
                   <span
-                      style={{
-                          backgroundColor: "#159895",
-                          padding: "0.75em",
-                          fontWeight: "bold",
-                          fontSize: "1.8rem",
-                          borderRadius: "0.75em",
-                          color: "white",
-                          margin: "auto"
-                      }}
+                    style={{
+                      backgroundColor: "#159895",
+                      padding: "0.75em",
+                      fontWeight: "bold",
+                      fontSize: "1.8rem",
+                      borderRadius: "0.75em",
+                      color: "white",
+                      margin: "auto"
+                    }}
                   >
                     9.1
                   </span>
-                    </Col>
-                </Row>
-            </Container>
+                </Col>
+            </Row>
+        </Container>
         </a>
     </>)
Index: frontend/src/Components/Resources/ResourcesTab.js
===================================================================
--- frontend/src/Components/Resources/ResourcesTab.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Resources/ResourcesTab.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,118 +1,127 @@
-import React, {useTransition} from "react";
-import {Container, Col, Row, Image, Nav, Tab} from "react-bootstrap";
-import {useState} from "react";
-import {FaTaxi, FaHotel} from "react-icons/fa";
-import {MdRestaurant} from "react-icons/md";
+import React, { useTransition } from "react";
+import { Container, Col, Row, Image, Nav, Tab } from "react-bootstrap";
+import { useState } from "react";
+import { FaTaxi, FaHotel } from "react-icons/fa";
+import { MdRestaurant } from "react-icons/md";
 import AddNew from "./AddNew";
 import ResourceListing from "./ResourceListing";
-import {Link} from "react-router-dom";
+import { Link } from "react-router-dom";
 import useGet from "../Hooks/useGet";
 
 function ResourcesTab(props) {
-    const [activeTab, setActiveTab] = useState(props.tab);
-    const userId = JSON.parse(localStorage.getItem("user")).userId;
-    const {data, setData, isLoading, getData, setChanged} = useGet(`${props.tab}/user/${userId}`);
+  const [activeTab, setActiveTab] = useState(props.tab);
+  // const [changed, setChanged] = useState(0);
+  const userId = localStorage.getItem("userId");
+  const { data, setData, isLoading, getData, setChanged } = useGet(`${props.tab}/user/${userId}`);
 
-    const handleSelect = (eventKey) => {
-        setActiveTab(eventKey);
-        props.refresh(eventKey);
-    };
+  const handleSelect = (eventKey) => {
+    setActiveTab(eventKey);
+    console.log(props.refresh);
+    props.refresh(eventKey);
+    console.log("refresh" + eventKey);
+  };
 
-    return (
-        <Container className="rounded-5">
-            <Tab.Container
-                activeKey={activeTab}
-                onSelect={handleSelect}
-                className="bg-dark rounded-5"
-            >
-                <Nav
-                    fill
-                    variant="tabs"
-                    className="bg-body rounded-top-5"
-                    activeKey="/hotel"
-                    id="tab_item"
-                >
-                    <Nav.Item className="tab_item rounded-5">
-                        <Nav.Link href="/resources/hotel" className="text-left rounded-5">
+  !isLoading && console.log(data);
+  console.log(props.tab);
+
+  return (
+    <Container className="rounded-5">
+      <Tab.Container
+        activeKey={activeTab}
+        onSelect={handleSelect}
+        className="bg-dark rounded-5"
+      >
+        <Nav
+          fill
+          variant="tabs"
+          className="bg-body rounded-top-5"
+          activeKey="/hotel"
+          id="tab_item"
+        >
+          <Nav.Item className="tab_item rounded-5">
+            <Nav.Link href="/resources/hotel" className="text-left rounded-5">
               <span className="ikona">
                 <FaHotel
-                    color="#159895"
-                    style={{lineHeight: "100em"}}
-                    size={"1.5em"}
-                    className="mx-3"
+                  color="#159895"
+                  style={{ lineHeight: "100em" }}
+                  size={"1.5em"}
+                  className="mx-3"
                 />
               </span>
-                            <span className="ikona">Сместувања</span>
-                        </Nav.Link>
-                    </Nav.Item>
-                    <Nav.Item className="tab_item">
-                        <Nav.Link href="/resources/restaurant">
+              <span className="ikona">Сместувања</span>
+            </Nav.Link>
+          </Nav.Item>
+          <Nav.Item className="tab_item">
+            <Nav.Link href="/resources/restaurant">
               <span className="ikona">
-                <MdRestaurant color="#159895" size={"1.5em"} className="mx-3"/>
+                <MdRestaurant color="#159895" size={"1.5em"} className="mx-3" />
               </span>
-                            <span className="ikona">Ресторани</span>
-                        </Nav.Link>
-                    </Nav.Item>
-                    <Nav.Item className="tab_item rounded-5">
-                        <Nav.Link
-                            href="/resources/transport"
-                            className="text-left rounded-5"
-                        >
+              <span className="ikona">Ресторани</span>
+            </Nav.Link>
+          </Nav.Item>
+          <Nav.Item className="tab_item rounded-5">
+            <Nav.Link
+              href="/resources/transport"
+              className="text-left rounded-5"
+            >
               <span className="ikona">
-                <FaTaxi color="#159895" size={"1.5em"} className="mx-3"/>
+                <FaTaxi color="#159895" size={"1.5em"} className="mx-3" />
               </span>
-                            <span className="ikona">Превоз</span>
-                        </Nav.Link>
-                    </Nav.Item>
-                </Nav>
+              <span className="ikona">Превоз</span>
+            </Nav.Link>
+          </Nav.Item>
+        </Nav>
 
-                <Tab.Content className="py-5 px-3 border rounded-bottom-5 bg-light">
-                    <Tab.Pane eventKey="/hotel" key="hotelPane">
-                        {props.tab == "/hotel" && !isLoading && data != null &&
-                            data.map((hotel) => {
-                                return (
-                                    //<Link style={{textDecoration: "none"}} key={hotel.hotelId} to={"/resources/hotel/" + hotel.hotelId}>
-                                    <ResourceListing
-                                        on
-                                        key={hotel.hotelId}
-                                        id={hotel.hotelId}
-                                        type="hotel"
-                                        data={hotel}
-                                    />
-                                    //</Link>
-                                );
-                            })}
-                        <AddNew type="hotel" refresh={setChanged}/>
-                    </Tab.Pane>
-                    <Tab.Pane eventKey="/restaurant" key="restaurantPane">
-                        {props.tab == "/restaurant" && !isLoading && data != null &&
-                            data.map((restaurant) => {
-                                return (
-                                    <ResourceListing
-                                        key={restaurant.restaurantID}
-                                        type="restaurant"
-                                        data={restaurant}
-                                    />);
-                            })}
-                        <AddNew type="restaurant" refresh={setChanged}/>
-                    </Tab.Pane>
-                    <Tab.Pane eventKey="/transport" key="transportPane">
-                        {props.tab == "/transport" && !isLoading && data.length > 0 &&
-                            data.map((transport) => {
-                                return (
-                                    <ResourceListing
-                                        key={transport.transportId}
-                                        id={transport.transportId}
-                                        type="transport"
-                                        data={transport}
-                                    />
-                                );
-                            })}
-                        <AddNew type="transport" refresh={setChanged}/>
-                    </Tab.Pane>
-                </Tab.Content>
-            </Tab.Container>
-        </Container>
-    );
+        <Tab.Content className="py-5 px-3 border rounded-bottom-5 bg-light">
+          <Tab.Pane eventKey="/hotel" key="hotelPane">
+            {props.tab == "/hotel" && !isLoading && data != null &&
+              data.map((hotel) => {
+                return (
+                  <Link key={hotel.hotelId} to={"/resources/hotel/" + hotel.hotelId}>
+                    <ResourceListing
+                      key={hotel.hotelId}
+                      id={hotel.hotelId}
+                      type="hotel"
+                      data={hotel}
+                    />
+                  </Link>
+                );
+              })}
+            <AddNew type="hotel" refresh={setChanged} />
+          </Tab.Pane>
+          <Tab.Pane eventKey="/restaurant" key="restaurantPane">
+            {props.tab == "/restaurant" && !isLoading && data != null &&
+              data.map((restaurant) => {
+                console.log("mapiranje " + restaurant)
+                return (
+                  <Link key={restaurant.restaurantId} to={"/resources/restaurant/" + restaurant.restaurantID}>
+                    <ResourceListing
+                      key={restaurant.restaurantId}
+                      type="restaurant"
+                      data={restaurant}
+                    />
+                  </Link>
+                );
+              })}
+            <AddNew type="restaurant" refresh={setChanged}/>
+          </Tab.Pane>
+          <Tab.Pane eventKey="/transport" key="transportPane">
+            {props.tab == "/transport" && !isLoading && data.length > 0 &&
+              data.map((transport) => {
+                return (
+                  <ResourceListing
+                    key={transport.transportId}
+                    id={transport.transportId}
+                    type="transport"
+                    data={transport}
+                  />
+                );
+              })}
+            <AddNew type="transport" refresh={setChanged}/>
+          </Tab.Pane>
+        </Tab.Content>
+      </Tab.Container>
+    </Container>
+  );
 }
 
Index: frontend/src/Components/RestaurantDetails/Carousel.js
===================================================================
--- frontend/src/Components/RestaurantDetails/Carousel.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/RestaurantDetails/Carousel.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -5,5 +5,10 @@
 import { Row } from 'react-bootstrap';
 
-function MenuCarousel(props) {
+function MenuCarousel() {
+    const [index, setIndex] = useState(0);
+
+    const handleSelect = (selectedIndex) => {
+        setIndex(selectedIndex);
+    };
 
     return (
@@ -12,5 +17,15 @@
             <Row className='d-flex justify-content-center align-items-center'><h2>Мени</h2></Row>
             <hr className='m-2'></hr>
-            <Menu images={props.images} menu={props.menu}></Menu>
+            <Carousel activeIndex={index} onSelect={handleSelect}>
+                <Carousel.Item>
+                    <Menu></Menu>
+                </Carousel.Item>
+                <Carousel.Item>
+                    <Menu></Menu>
+                </Carousel.Item>
+                <Carousel.Item>
+                    <Menu></Menu>
+                </Carousel.Item>
+            </Carousel>
         </>
     );
Index: frontend/src/Components/RestaurantDetails/Menu.js
===================================================================
--- frontend/src/Components/RestaurantDetails/Menu.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/RestaurantDetails/Menu.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,52 +1,67 @@
-import React, {useState} from "react";
-import {Col, Container, Row, Carousel} from "react-bootstrap";
+import React from "react";
+import { Col, Container, Row } from "react-bootstrap";
 import MenuItem from "./MenuItem";
 
-const Menu = (props) => {
-    const menu = props.menu
-
-    console.log(menu)
-    const partitionBy3 = (arr) => {
-        const rowPartitions = Array.from({length: Math.ceil(arr.length / 5)}, (v, i) =>
-            arr.slice(i * 5, i * 5 + 5)
-        );
-        return Array.from({length: Math.ceil(rowPartitions.length / 2)}, (v, i) =>
-            rowPartitions.slice(i * 2, i * 2 + 2)
-        );
-    }
-
-    const [ind, setIndex] = useState(0);
-
-    const handleSelect = (selectedIndex) => {
-        setIndex(selectedIndex);
-    };
-
-
-
+const Menu = () =>{
 
     return (<>
-        <Carousel activeIndex={ind} onSelect={handleSelect} indicators={false}>
-            {partitionBy3(menu).map((slides, index) => {
-                return (
-                    <Carousel.Item key={index}>
-                        {slides.map((row) => {
-                            return (
-                                <Row>
-                                    {row.map((menuItem) => {
-                                        return (
-                                            <Col>
-                                                <MenuItem images={    props.images.filter(x => {
-                                                    console.log(x)
-                                                    return x.menu.menuId === menuItem.menuId
-                                                })} data={menuItem}/>
-                                            </Col>
-                                        )
-                                    })}
-                                </Row>
-                            )
-                        })}
-                    </Carousel.Item>)
-            })}
-        </Carousel>
+
+        <Container>
+            <Row>
+                <Col>
+                    <MenuItem>
+                    
+                    </MenuItem>
+                </Col>
+                <Col>
+                    <MenuItem>
+                    
+                    </MenuItem>
+                </Col>
+                <Col>
+                    <MenuItem>
+                    
+                    </MenuItem>
+                </Col>
+                <Col>
+                    <MenuItem>
+                    
+                    </MenuItem>
+                </Col>
+                <Col>
+                    <MenuItem>
+                    
+                    </MenuItem>
+                </Col>
+            </Row>
+            <Row>
+                <Col>
+                    <MenuItem>
+                    
+                    </MenuItem>
+                </Col>
+                <Col>
+                    <MenuItem>
+                    
+                    </MenuItem>
+                </Col>
+                <Col>
+                    <MenuItem>
+                    
+                    </MenuItem>
+                </Col>
+                <Col>
+                    <MenuItem>
+                    
+                    </MenuItem>
+                </Col>
+                <Col>
+                    <MenuItem>
+                    
+                    </MenuItem>
+                </Col>
+            </Row>
+        </Container>
+    
     </>)
 }
Index: frontend/src/Components/RestaurantDetails/MenuItem.js
===================================================================
--- frontend/src/Components/RestaurantDetails/MenuItem.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/RestaurantDetails/MenuItem.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,71 +1,42 @@
 import React from "react";
-import {Col, Row, Image, Container} from "react-bootstrap";
-import Carousel from "react-bootstrap/Carousel";
+import { Col, Row, Image, Container } from "react-bootstrap";
 
-const MenuItem = (props) => {
-
-    const data = props.data;
-    console.log(props)
+const MenuItem = () => {
     return (<>
-
-        <a href="#" style={{textDecoration: "none", color: "black"}}>
-            <Container className="py-3 px-1 my-4"
-                       style={{
-                           border: "4px solid #159895",
-                           borderRadius: "1em",
-                           boxShadow: "0 3px 5px #159895",
-                           maxWidth: "90%"
-                       }}>
-                <Row>
-                    <Col className="d-flex justify-content-center mb-3">
-                        <Carousel>
-                            {props.images.map((image) => {
-                                let link = image.url;
-                                if (image.url.includes('Desktop')) {
-                                    link = 'http://localhost:8080/download?fileName=' + encodeURIComponent(image.url);
-                                }
-                                return (
-                                    <Carousel.Item>
-                                        <img
-                                            className="d-block w-100 h-400 rounded-5"
-                                            src={link}
-                                            alt="First slide"
-                                            style={{
-                                                height: "7em",
-                                                borderRadius: "1em",
-                                                boxShadow: "0 4px 20px lightblue",
-                                                maxWidth: "100%",
-                                            }}
-                                        />
-                                    </Carousel.Item>
-                                )
-                            })}
-                            {props.images.length == 0 && <Carousel.Item>
-                                <Image
-                                    src="https://www.tasteofhome.com/wp-content/uploads/2019/01/medium-rare-steak-shutterstock_706040446.jpg"
-                                    style={{
-                                        height: "7em",
-                                        borderRadius: "1em",
-                                        boxShadow: "0 4px 20px lightblue",
-                                        maxWidth: "100%",
-                                    }}
-                                ></Image>
-                            </Carousel.Item>}
-                        </Carousel>
-                    </Col>
-                </Row>
-                <Row>
-                    <Col className="d-flex flex-column justify-content-center " style={{textAlign: "center"}}>
-                        <h4>{data.name}</h4>
-                        <h6>{data.ingredients}</h6>
-                    </Col>
-                </Row>
-                <Row>
-                    <Col className="d-flex flex-column justify-content-center align-content-center">
-
-                        <h5>Цена: {data.price}$</h5>
-                    </Col>
-                </Row>
-            </Container>
+    
+    <a href="#" style={{textDecoration: "none", color:"black"}}>
+        <Container className="py-3 px-1 my-4"
+        style={{
+          border: "4px solid #159895",
+          borderRadius: "1em",
+          boxShadow: "0 3px 5px #159895",
+          maxWidth: "90%"
+        }}>
+            <Row>
+                <Col className="d-flex justify-content-center mb-3">
+                    <Image
+                    src="https://www.tasteofhome.com/wp-content/uploads/2019/01/medium-rare-steak-shutterstock_706040446.jpg"
+                    style={{
+                        height: "7em",
+                        borderRadius: "1em",
+                        boxShadow: "0 4px 20px lightblue",
+                        maxWidth: "100%",
+                    }}
+                    ></Image>
+                </Col>
+            </Row>
+            <Row>
+                <Col className="d-flex flex-column justify-content-center " style={{textAlign: "center"}}>
+                    <h4>Име</h4>
+                    <h6>Свинско, Телешко, прасечко, ребра, чорба, тикви, компирМанЏа</h6>
+                </Col>
+            </Row>
+            <Row>
+                <Col className="d-flex flex-column justify-content-center align-content-center" >
+                  
+                  <h5>Цена: 99.99$</h5>
+                </Col>
+            </Row>
+        </Container>
         </a>
 
Index: frontend/src/Components/RestaurantDetails/Table.js
===================================================================
--- frontend/src/Components/RestaurantDetails/Table.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,38 +1,0 @@
-import {Col, Container, Image, Row} from "react-bootstrap";
-import React from "react";
-import { LuFan } from "react-icons/lu";
-import { TbToolsKitchen2 } from "react-icons/tb"
-import { MdBalcony } from "react-icons/md"
-
-const Table = (props) => {
-    return (
-        <>
-            <Container className="px-1 w-100">
-                <Row>
-                    <Col className="d-flex justify-content-center">
-                        <Image onClick={(e) => {
-                            e.preventDefault();
-                            console.log(props.data)
-                            props.showModal(props.data)
-                        }}
-                               src="https://cdnimg.webstaurantstore.com/uploads/seo_category/2019/5/table-dining-sets.jpg"
-                               style={{
-                                   height: "8em",
-                                   borderRadius: "1em",
-                                   boxShadow: "0 4px 20px lightblue",
-                                   maxWidth: "100%",
-                               }}
-                        ></Image>
-                    </Col>
-                    <Col className="d-flex flex-column justify-content-center" style={{textAlign: "left"}}>
-                        <h3>Маса</h3>
-                        <h3>Број на луѓе {props.data.noSeats}</h3>
-                    </Col>
-
-                </Row>
-            </Container>
-        </>
-    );
-};
-
-export default Table;
Index: frontend/src/Components/RestaurantDetails/TableRow.js
===================================================================
--- frontend/src/Components/RestaurantDetails/TableRow.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,83 +1,0 @@
-import React from "react";
-import { useState } from "react";
-import { Col, Container, Row, Image, Modal, Button } from "react-bootstrap";
-import Form from "react-bootstrap/Form";
-import useCreate from "../Hooks/useCreate";
-import Table from "./Table";
-import tab from "../Tab/Tab";
-const TableRow = (props) => {
-    const {createEntity} = useCreate()
-    const [getData, setData] = useState(0);
-    const [show, setShow] = useState(false);
-
-    const handleClose = () => setShow(false);
-    const handleShow = () => setShow(true);
-    const table = props.table
-    console.log(props)
-    console.log(table)
-    return (
-        <>
-            <tr>
-                <td>
-                    <Table data={table}></Table>
-                </td>
-                <td>
-                    <Form.Select aria-label="Default select example" name={'numberOfBeds'}
-                                 onChange={(e) => {
-                                     setData(e.target.value);
-                                 }}>
-                        <option></option>
-                        {[...Array(props.data.find(x => x.restaurantTable.tableId === table.tableId).numTables).keys()].map(x => {
-                            return (
-                                <option value={x+1}  >{x + 1}</option>
-                            )
-                        })}
-                    </Form.Select>
-                </td>
-                <td>
-                    <Button
-                        onClick={handleShow}
-                        className="m-2"
-                        size="md"
-                        style={{backgroundColor: "#159895"}}
-                    >
-                        Резервирај
-                    </Button>
-                </td>
-            </tr>
-
-            <Modal show={show} onHide={handleClose}>
-                <Modal.Header closeButton>
-                    <Modal.Title>Потврда на резервација</Modal.Title>
-                </Modal.Header>
-                <Modal.Body>
-                    <h3>Резервација на маса во ресторан</h3>
-                    <h3>На ден:<b>{' ' + props.params.date}</b></h3>
-                    <h3>Време од:<b>{' ' + props.params.hourFrom}</b></h3>
-                    <h3>Време до:<b>{' ' + props.params.hourTo}</b></h3>
-                    <h3>Маса за {table.noSeats} луѓе</h3>
-                </Modal.Body>
-                <Modal.Footer>
-                    <Button variant="secondary" onClick={handleClose}>
-                        Close
-                    </Button>
-                    <Button variant="primary" onClick={() => {
-                        createEntity('restaurant/reserve', {
-                            restaurantTableId: table.tableId,
-                            userId: 1,
-                            restaurantAvailibleId: props.availableId,
-                            hourFrom: props.params.hourFrom,
-                            hourTo: props.params.hourTo,
-                            date: props.params.date
-                        })
-                        handleClose();
-                    }}>
-                        Резервирај
-                    </Button>
-                </Modal.Footer>
-            </Modal>
-        </>
-    )
-}
-
-export default TableRow
Index: frontend/src/Components/RestaurantDetails/TablesTable.js
===================================================================
--- frontend/src/Components/RestaurantDetails/TablesTable.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,43 +1,0 @@
-import React from "react";
-import Form from "react-bootstrap/Form";
-import FaHotel from "react-icons/fa";
-import {Button} from "react-bootstrap";
-import useCreate from "../Hooks/useCreate";
-import TableRow from "./TableRow";
-
-const TablesTable = (props) => {
-
-    console.log(props)
-
-
-    return (
-        <>
-            <table className="m-auto table table-hover table-responsive">
-                <thead>
-                <tr>
-                    <th scope="col">Тип на маса</th>
-                    <th scope="col">Колку единици?</th>
-                    <th scope="col"></th>
-                </tr>
-                </thead>
-                <tbody>
-                {Array.from(
-                    new Set(props.data.map((x) => JSON.stringify(x.restaurantTable)))
-                ).map((roomString) => JSON.parse(roomString)).map((table) => {
-                    return (
-                        <>
-                            <TableRow
-                                params={props.params}
-                                availableId={props.data.filter(x => x.restaurantTable.tableId === table.tableId).
-                                map(x => x.restaurantAvailibleId)[0]}
-                                data={props.data} table={table} from={props.from} to={props.to}/>
-                        </>
-                    );
-                })}
-                </tbody>
-            </table>
-        </>
-    );
-};
-
-export default TablesTable;
Index: frontend/src/Components/RestaurantEdit/MenuListing.js
===================================================================
--- frontend/src/Components/RestaurantEdit/MenuListing.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/RestaurantEdit/MenuListing.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -6,5 +6,4 @@
 import { AiOutlinePlusCircle } from "react-icons/ai"
 import EditModal from "../Resources/EditModal";
-import AddImages from "../Resources/AddImages";
 
 const MenuListing = (props) => {
@@ -13,5 +12,6 @@
     console.log(props.data)
     return(<>
-    <a href="#" style={{textDecoration: "none", color:"black"}}>
+    <a href="#" onClick={(e) => {e.preventDefault(); props.showModal(props.data);
+    console.log("kliknav")} } style={{textDecoration: "none", color:"black"}}>
         <Container className="py-3 px-1 my-4"
         style={{
@@ -23,9 +23,5 @@
             <Row>
                 <Col className="d-flex justify-content-center">
-                    <Image onClick={(e) => {
-                        e.preventDefault();
-                        props.showModal(props.data);
-                        console.log("kliknav")
-                    }}
+                    <Image
                     src="https://www.tasteofhome.com/wp-content/uploads/2019/01/medium-rare-steak-shutterstock_706040446.jpg"
                     style={{
@@ -41,7 +37,4 @@
                     <h6>{props.data.ingredients}</h6>
                 </Col>
-                <Col className="d-flex flex-column justify-content-center align-content-center">
-                    <AddImages type="menu" Id={props.data.menuId} />
-                </Col>
                 
                 <Col className="d-flex flex-column justify-content-center align-content-center">
Index: frontend/src/Components/RestaurantEdit/RestaurantEditTab.js
===================================================================
--- frontend/src/Components/RestaurantEdit/RestaurantEditTab.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/RestaurantEdit/RestaurantEditTab.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -10,6 +10,4 @@
 import TableListing from "./TableListing";
 import EditModal from "../Resources/EditModal";
-import ReservationListing from "../HotelEdit/ReservationListing";
-import useGet from "../Hooks/useGet";
 
 function RestaurantEditTab(props) {
@@ -37,12 +35,4 @@
     setActiveTab(eventKey);
   };
-
-  const {
-    data,
-    isLoading,
-    setData,
-    getData,
-    setChanged: dhanged
-  } = useGet(`/restaurant/${props.displayMenu.restaurantID}/reservations/active`)
 
   console.log(props.displayMenu.restaurantID)
@@ -110,10 +100,10 @@
               return <MenuListing key={menu.menuId} data={menu} showModal={showModal}/>
             })}
-            {activeTab === '/hotel' && <EditModal show={show} refresh={props.refresh} handleClose={handleClose} type="menu" menu={modalData}></EditModal>}
+            {activeTab === '/hotel' && <EditModal show={show} handleClose={handleClose} type="menu" menu={modalData}></EditModal>}
             <AddNew Id={props.displayMenu.restaurantID} refresh={props.refresh} type="menu"/>
           </Tab.Pane>
           <Tab.Pane eventKey="/masi">
            {props.displayMenu.tables.map((table) => {
-              return <TableListing key={table.tableId} refresh={props.refresh} showModal={showModal} handleClose={handleClose} data={table}/>
+              return <TableListing key={table.tableId} showModal={showModal} data={table}/>
             })}
             {activeTab === '/masi' && <EditModal show={show} handleClose={handleClose} refresh={props.refresh} type="table"
@@ -122,9 +112,5 @@
           </Tab.Pane>
           <Tab.Pane eventKey="/restaurant">
-            {!isLoading && data.map((res) => {
-              return (
-                  <ReservationListing type={'restaurant'} data={res}/>
-              )
-            })}
+            <AddNew type="restaurant"/>
           </Tab.Pane>
           <Tab.Pane eventKey="/transport">
Index: frontend/src/Components/RestaurantEdit/TableListing.js
===================================================================
--- frontend/src/Components/RestaurantEdit/TableListing.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/RestaurantEdit/TableListing.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -41,5 +41,5 @@
                 
                 <Col className="d-flex flex-column justify-content-center align-content-center">
-                  <AddAvailability type="table" refresh={props.refresh} closeModal={props.handleClose} table={props.data}/>
+                  <AddAvailability type="table" table={props.data}/>
                 </Col>
 
Index: frontend/src/Components/SearchCriterias/SearchCriteriasBar.js
===================================================================
--- frontend/src/Components/SearchCriterias/SearchCriteriasBar.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/SearchCriterias/SearchCriteriasBar.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -2,20 +2,97 @@
 import { Container, Form, Button, Row, Col } from "react-bootstrap";
 import useFormData from "../Hooks/useFormData";
-import SearchCriteriasHotel from "./SearchCriteriasHotel";
-import SearchCriteriasTransport from "./SearchCriteriasTransport";
-import SearchCriteriasRestaurant from "./SearchCriteriasRestaurant";
 
-const SearchCriteriasBar = (props) => {
+const SearchCriterias = (props) => {
 
-    const { criterias, type } = props
+  const { formData, onFormChange, onCheckBoxChange, setFormData} = useFormData(props.criterias)
+  console.log("KRITERIUMI")
+  console.log(formData)
 
-    return (
-        <>
-            {type === 'hotel' && <SearchCriteriasHotel criterias={criterias}/>}
-            {type === 'transport' && <SearchCriteriasTransport showButton={props.showButton} criterias={criterias}/>}
-            {type === 'restaurant' && <SearchCriteriasRestaurant criterias={criterias}/>}
-        </>
-    )
-}
+  return (
+    <>
+      <Container
+        className="p-1 pb-0 mb-5 mt-3 rounded-2"
+        style={{ backgroundColor: "#002B5B", width: "65%"}}
+      >
+        <Form className="rounded-5">
+          <Row className="gx-1">
+            <Col>
+              <Form.Floating className="mb-3">
+                <Form.Control
+                  size="md"
+                  type="text"
+                  placeholder="Каде ќе патувате?:"
+                  id="location"
+                  name="hotelLocation"
+                  onChange={onFormChange}
+                  value={formData.hotelLocation}
+                ></Form.Control>
+                <label htmlFor="location">Локација:</label>
+              </Form.Floating>
+            </Col>
+            <Col>
+              <Form.Floating className="mb-3">
+                <Form.Control
+                  size="md"
+                  type="date"
+                  placeholder="Датум на пристигнување:"
+                  id="dateFrom"
+                  name="dateFrom"
+                  onChange={onFormChange}
+                  value={formData.dateFrom}
+                ></Form.Control>
+                <label htmlFor="dateFrom">Датум на пристигнување:</label>
+              </Form.Floating>
+            </Col>
+            <Col>
+              <Form.Floating className="mb-3">
+                <Form.Control
+                  size="md"
+                  type="date"
+                  placeholder="Датум на заминување:"
+                  id="dateTo"
+                  name="dateTo"
+                  onChange={onFormChange}
+                  value={formData.dateTo}
+                ></Form.Control>
+                <label htmlFor="dateTo">Датум на заминување:</label>
+              </Form.Floating>
+            </Col>
+            <Col>
+              <Form.Floating className="mb-3">
+                <Form.Control
+                  size="md"
+                  type="number"
+                  placeholder="Број на гости:"
+                  id="floatingPassengers"
+                  name="numBeds"
+                  onChange={onFormChange}
+                  value={formData.numBeds}
+                ></Form.Control>
+                <label htmlFor="floatingPassengers">Број на гости:</label>
+              </Form.Floating>
+            </Col>
+            <Col>
+              <Form.Group className="my-1">
+                <Button
+                  type="submit"
+                  style={{ backgroundColor: "#159895" }}
+                  size="lg"
+                  className="w-100"
+                  onClick={(e) => {
+                    e.preventDefault();
+                    window.location.href = `/search/hotel/${formData.hotelLocation}/${formData.dateFrom}/${formData.dateTo}/${formData.numBeds}`
+                  }}
+                >
+                  <span className="ikona mx-3">Пребарај</span>
+                </Button>
+              </Form.Group>
+            </Col>
+          </Row>
+        </Form>
+      </Container>
+    </>
+  );
+};
 
-export default SearchCriteriasBar;
+export default SearchCriterias;
Index: frontend/src/Components/SearchCriterias/SearchCriteriasHotel.js
===================================================================
--- frontend/src/Components/SearchCriterias/SearchCriteriasHotel.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,98 +1,0 @@
-import React from "react";
-import { Container, Form, Button, Row, Col } from "react-bootstrap";
-import useFormData from "../Hooks/useFormData";
-
-const SearchCriteriasHotel = (props) => {
-
-  const { formData, onFormChange, onCheckBoxChange, setFormData} = useFormData(props.criterias)
-
-
-
-  return (
-    <>
-      <Container
-        className="p-1 pb-0 mb-5 mt-3 rounded-2"
-        style={{ backgroundColor: "#002B5B", width: "65%"}}
-      >
-        <Form className="rounded-5">
-          <Row className="gx-1">
-            <Col>
-              <Form.Floating className="mb-3">
-                <Form.Control
-                  size="md"
-                  type="text"
-                  placeholder="Каде ќе патувате?:"
-                  id="location"
-                  name="hotelLocation"
-                  onChange={onFormChange}
-                  value={formData.hotelLocation}
-                ></Form.Control>
-                <label htmlFor="location">Локација:</label>
-              </Form.Floating>
-            </Col>
-            <Col>
-              <Form.Floating className="mb-3">
-                <Form.Control
-                  size="md"
-                  type="date"
-                  placeholder="Датум на пристигнување:"
-                  id="dateFrom"
-                  name="dateFrom"
-                  onChange={onFormChange}
-                  value={formData.dateFrom}
-                ></Form.Control>
-                <label htmlFor="dateFrom">Датум на пристигнување:</label>
-              </Form.Floating>
-            </Col>
-            <Col>
-              <Form.Floating className="mb-3">
-                <Form.Control
-                  size="md"
-                  type="date"
-                  placeholder="Датум на заминување:"
-                  id="dateTo"
-                  name="dateTo"
-                  onChange={onFormChange}
-                  value={formData.dateTo}
-                ></Form.Control>
-                <label htmlFor="dateTo">Датум на заминување:</label>
-              </Form.Floating>
-            </Col>
-            <Col>
-              <Form.Floating className="mb-3">
-                <Form.Control
-                  size="md"
-                  type="number"
-                  placeholder="Број на гости:"
-                  id="floatingPassengers"
-                  name="numBeds"
-                  onChange={onFormChange}
-                  value={formData.numBeds}
-                ></Form.Control>
-                <label htmlFor="floatingPassengers">Број на гости:</label>
-              </Form.Floating>
-            </Col>
-            <Col>
-              <Form.Group className="my-1">
-                <Button
-                  type="submit"
-                  style={{ backgroundColor: "#159895" }}
-                  size="lg"
-                  className="w-100"
-                  onClick={(e) => {
-                    e.preventDefault();
-                    window.location.href = `/search/hotel/${formData.hotelLocation}/${formData.dateFrom}/${formData.dateTo}/${formData.numBeds}`
-                  }}
-                >
-                  <span className="ikona mx-3">Пребарај</span>
-                </Button>
-              </Form.Group>
-            </Col>
-          </Row>
-        </Form>
-      </Container>
-    </>
-  );
-};
-
-export default SearchCriteriasHotel;
Index: frontend/src/Components/SearchCriterias/SearchCriteriasRestaurant.js
===================================================================
--- frontend/src/Components/SearchCriterias/SearchCriteriasRestaurant.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,124 +1,0 @@
-import React from "react";
-import {Container, Form, Button, Row, Col} from "react-bootstrap";
-import useFormData from "../Hooks/useFormData";
-import {HiMagnifyingGlass} from "react-icons/hi2";
-
-
-const timeOfArrival = () => {
-    let times = [];
-
-    for (let i = 0; i <= 23; i++) {
-        for (let j = 0; j <= 30; j += 30) {
-            let hour = i.toString().padStart(2, "0");
-            let minutes = j.toString().padStart(2, "0");
-            times.push(`${hour}:${minutes}`);
-        }
-    }
-
-    return times;
-};
-
-const SearchCriteriasRestaurant = (props) => {
-
-    const {formData, onFormChange, onCheckBoxChange, setFormData} = useFormData(props.criterias)
-    const a = timeOfArrival();
-
-    return (
-        <>
-            <Container
-                className="p-1 pb-0 mb-5 mt-3 rounded-2"
-                style={{backgroundColor: "#002B5B", width: "65%"}}
-            >
-                <Form>
-                    <Row>
-                        <Col>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="lg"
-                                    type="text"
-                                    placeholder="Место:"
-                                    id="location"
-                                    name={'restaurantLocation'}
-                                    value={formData.restaurantLocation}
-                                    onChange={onFormChange}
-                                ></Form.Control>
-                                <label htmlFor="location">Место:</label>
-                            </Form.Floating>
-                        </Col>
-                        <Col>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="date"
-                                    step={3600000}
-                                    placeholder="Час од:"
-                                    id="dateFrom"
-                                    name={'date'}
-                                    value={formData.date}
-                                    onChange={onFormChange}
-                                ></Form.Control>
-                                <label htmlFor="dateFrom">Датум:</label>
-                            </Form.Floating>
-                        </Col>
-                        <Col>
-                            <Form.Floating className="mb-3">
-                                <Form.Select size="md"
-                                             name={'hourFrom'}
-                                             value={formData.hourFrom}
-                                             onChange={onFormChange}>
-                                    <option>Изберете време:</option>
-                                    {a.map((x) => {
-                                        return <option key={x}>{x}</option>;
-                                    })}
-                                </Form.Select>
-                                <label htmlFor="hour">Час од:</label>
-                            </Form.Floating>
-                        </Col>
-                        <Col>
-                            <Form.Floating className="mb-3">
-                                <Form.Select size="md"
-                                             name={'hourTo'}
-                                             value={formData.hourTo}
-                                             onChange={onFormChange}>
-                                    <option>Изберете време:</option>
-                                    {a.filter((x) => x > formData.hourFrom).map((x) => {
-                                        return <option key={x}>{x}</option>;
-                                    })}
-                                </Form.Select>
-                                <label htmlFor="hour">Час до:</label>
-                            </Form.Floating>
-                        </Col>
-                        <Col>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="number"
-                                    placeholder="Број на гости:"
-                                    id="floatingPassengers"
-                                    name={'numPeople'}
-                                    value={formData.numPeople}
-                                    onChange={onFormChange}
-                                ></Form.Control>
-                                <label htmlFor="floatingPassengers">Број на гости:</label>
-                            </Form.Floating>
-                        </Col>
-                        <Col>
-                            <Form.Group className="my-1">
-                                <Button type="submit" style={{backgroundColor: "#159895"}} size="lg" onClick={(e) => {
-                                    e.preventDefault();
-                                    window.location.href = `/search/restaurant/${formData.restaurantLocation}/${formData.date}/${formData.hourFrom}/${formData.hourTo}/${formData.numPeople}`
-
-                                }}>
-                                    <span className="ikona my-1"><HiMagnifyingGlass/></span>
-                                    <span className="ikona mx-3">Пребарај</span>
-                                </Button>
-                            </Form.Group>
-                        </Col>
-                    </Row>
-                </Form>
-            </Container>
-        </>
-    );
-};
-
-export default SearchCriteriasRestaurant;
Index: frontend/src/Components/SearchCriterias/SearchCriteriasTransport.js
===================================================================
--- frontend/src/Components/SearchCriterias/SearchCriteriasTransport.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,96 +1,0 @@
-import React from "react";
-import { Container, Form, Button, Row, Col } from "react-bootstrap";
-import useFormData from "../Hooks/useFormData";
-
-const SearchCriteriasTransport = (props) => {
-
-    const { formData, onFormChange, onCheckBoxChange, setFormData} = useFormData(props.criterias)
-
-    return (
-        <>
-            <Container
-                className="p-1 pb-0 mb-5 mt-3 rounded-2"
-                style={{ backgroundColor: "#002B5B", width: "65%"}}
-            >
-                <Form className="rounded-5">
-                    <Row className="gx-1">
-                        <Col>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="text"
-                                    placeholder="Од?:"
-                                    id="location"
-                                    name="from"
-                                    onChange={onFormChange}
-                                    value={formData.from}
-                                ></Form.Control>
-                                <label htmlFor="location">Од:</label>
-                            </Form.Floating>
-                        </Col>
-                        <Col>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="text"
-                                    placeholder="Од?:"
-                                    id="location"
-                                    name="to"
-                                    onChange={onFormChange}
-                                    value={formData.to}
-                                ></Form.Control>
-                                <label htmlFor="location">До:</label>
-                            </Form.Floating>
-                        </Col>
-                        <Col>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="date"
-                                    placeholder="Датум на заминување:"
-                                    id="dateTo"
-                                    name="date"
-                                    onChange={onFormChange}
-                                    value={formData.date}
-                                ></Form.Control>
-                                <label htmlFor="dateTo">Датум:</label>
-                            </Form.Floating>
-                        </Col>
-                        <Col>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="number"
-                                    placeholder="Број на патници:"
-                                    id="floatingPassengers"
-                                    name="numBeds"
-                                    onChange={onFormChange}
-                                    value={formData.numPassengers}
-                                ></Form.Control>
-                                <label htmlFor="floatingPassengers">Број на патници:</label>
-                            </Form.Floating>
-                        </Col>
-                        {props.showButton !== false && <Col>
-                            <Form.Group className="my-1">
-                                <Button
-                                    type="submit"
-                                    style={{backgroundColor: "#159895"}}
-                                    size="lg"
-                                    className="w-100"
-                                    onClick={(e) => {
-                                        e.preventDefault();
-                                        window.location.href = `/search/transport/${formData.from}/${formData.to}/${formData.date}/${formData.numPassengers}`
-                                    }}
-                                >
-                                    <span className="ikona mx-3">Пребарај</span>
-                                </Button>
-                            </Form.Group>
-                        </Col>}
-                    </Row>
-                </Form>
-            </Container>
-        </>
-    );
-};
-
-export default SearchCriteriasTransport;
Index: frontend/src/Components/Tab/TabFormHotel.js
===================================================================
--- frontend/src/Components/Tab/TabFormHotel.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Tab/TabFormHotel.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,102 +1,91 @@
 import React from "react";
-import {Button, Col, Container, Form, InputGroup, Row} from "react-bootstrap";
-import {FaMagnet} from "react-icons/fa"
-import {HiMagnifyingGlass} from "react-icons/hi2"
+import { Button, Col, Container, Form, Row } from "react-bootstrap";
+import { FaMagnet } from "react-icons/fa"
+import { HiMagnifyingGlass } from "react-icons/hi2"
 import useFormData from "../Hooks/useFormData";
 
 function TabFormHotel() {
 
-    const {formData, onFormChange, setFormData, onCheckBoxChange} = useFormData({
-        hotelLocation: undefined,
-        dateFrom: undefined,
-        dateTo: undefined,
-        numBeds: undefined,
-        flexible: false,
-    })
+  const { formData, onFormChange, setFormData } = useFormData({
+    hotelLocation: undefined,
+    dateFrom: undefined,
+    dateTo: undefined,
+    numBeds: undefined
+  })
 
-    return (
-        <Form className='rounded-5'>
-            <Row>
-                <Col>
-                    <Form.Floating className="mb-3">
-                        <Form.Control
-                            size="md"
-                            type="text"
-                            placeholder="Каде ќе патувате?:"
-                            id="location"
-                            name="hotelLocation"
-                            value={formData.hotelLocation}
-                            onChange={onFormChange}
-                        ></Form.Control>
-                        <label htmlFor="location">Локација:</label>
-                    </Form.Floating>
-                    <div className="mb-3">
-                        <Form.Check
-                            type={"checkbox"}
-                            id={`default-checkbox}`}
-                            label={`флексибилност +- 3 дена`}
-                            onChange={onCheckBoxChange}
-                            name={'flexible'}
-                            value={formData.flexible}
-                        />
-                    </div>
-                </Col>
-                <Col>
-                    <Form.Floating className="mb-3">
-                        <Form.Control
-                            size="md"
-                            type="date"
-                            placeholder="Датум на пристигнување:"
-                            id="dateFrom"
-                            name="dateFrom"
-                            value={formData.dateFrom}
-                            onChange={onFormChange}
-                        ></Form.Control>
-                        <label htmlFor="dateFrom">Датум на пристигнување:</label>
-                    </Form.Floating>
-                </Col>
-                <Col>
-                    <Form.Floating className="mb-3">
-                        <Form.Control
-                            size="md"
-                            type="date"
-                            placeholder="Датум на заминување:"
-                            id="dateTo"
-                            name="dateTo"
-                            value={formData.dateTo}
-                            onChange={onFormChange}
-                        ></Form.Control>
-                        <label htmlFor="dateTo">Датум на заминување:</label>
-                    </Form.Floating>
-                </Col>
-                <Col>
-                    <Form.Floating className="mb-3">
-                        <Form.Control
-                            size="md"
-                            type="number"
-                            placeholder="Број на гости:"
-                            id="floatingPassengers"
-                            name="numBeds"
-                            value={formData.numBeds}
-                            onChange={onFormChange}
-                        ></Form.Control>
-                        <label htmlFor="floatingPassengers">Број на гости:</label>
-                    </Form.Floating>
+  return (
+    <Form className='rounded-5' >
+      <Row>
+        <Col>
+          <Form.Floating className="mb-3">
+            <Form.Control
+              size="md"
+              type="text"
+              placeholder="Каде ќе патувате?:"
+              id="location"
+              name="hotelLocation"
+              value={formData.hotelLocation}
+              onChange={onFormChange}
+            ></Form.Control>
+            <label htmlFor="location">Локација:</label>
+          </Form.Floating>
+        </Col>
+        <Col>
+          <Form.Floating className="mb-3">
+            <Form.Control
+              size="md"
+              type="date"
+              placeholder="Датум на пристигнување:"
+              id="dateFrom"
+              name="dateFrom"
+              value={formData.dateFrom}
+              onChange={onFormChange}
+            ></Form.Control>
+            <label htmlFor="dateFrom">Датум на пристигнување:</label>
+          </Form.Floating>
+        </Col>
+        <Col>
+          <Form.Floating className="mb-3">
+            <Form.Control
+              size="md"
+              type="date"
+              placeholder="Датум на заминување:"
+              id="dateTo"
+              name="dateTo"
+              value={formData.dateTo}
+              onChange={onFormChange}
+            ></Form.Control>
+            <label htmlFor="dateTo">Датум на заминување:</label>
+          </Form.Floating>
+        </Col>
+        <Col>
+          <Form.Floating className="mb-3">
+            <Form.Control
+              size="md"
+              type="number"
+              placeholder="Број на гости:"
+              id="floatingPassengers"
+              name="numBeds"
+              value={formData.numBeds}
+              onChange={onFormChange}
+            ></Form.Control>
+            <label htmlFor="floatingPassengers">Број на гости:</label>
+          </Form.Floating>
 
-                    <Form.Group className="my-1">
-                        <Button type="submit" style={{backgroundColor: "#159895"}} size="lg"
-                                onClick={(e) => {
-                                    e.preventDefault();
-                                    window.location.href = `/search/hotel/${formData.hotelLocation}/${formData.dateFrom}/${formData.dateTo}/${formData.numBeds}/${formData.flexible}`
-                                }}>
-                            <span className="ikona my-1"><HiMagnifyingGlass/></span>
-                            <span className="ikona mx-3">Пребарај</span>
-                        </Button>
-                    </Form.Group>
-                </Col>
+          <Form.Group className="my-1">
+            <Button type="submit" style={{backgroundColor: "#159895"}} size="lg" 
+            onClick={(e) => {
+              e.preventDefault();
+              window.location.href = `/search/hotel/${formData.hotelLocation}/${formData.dateFrom}/${formData.dateTo}/${formData.numBeds}`
+            }}>
+              <span className="ikona my-1"><HiMagnifyingGlass/></span>
+              <span className="ikona mx-3">Пребарај</span>
+            </Button>
+          </Form.Group>
+        </Col>
 
-            </Row>
-        </Form>
-    );
+      </Row>
+    </Form>
+  );
 }
 
Index: frontend/src/Components/Tab/TabFormRestaurant.js
===================================================================
--- frontend/src/Components/Tab/TabFormRestaurant.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Tab/TabFormRestaurant.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,119 +1,79 @@
 import React from "react";
-import {Button, Col, Container, Form, Row} from "react-bootstrap";
-import {HiMagnifyingGlass} from "react-icons/hi2"
-import useFormData from "../Hooks/useFormData";
+import { Button, Col, Container, Form, Row } from "react-bootstrap";
+import { HiMagnifyingGlass } from "react-icons/hi2"
 
 const timeOfArrival = () => {
-    let times = [];
+  let times = [];
 
-    for (let i = 0; i <= 23; i++) {
-        for (let j = 0; j <= 30; j += 30) {
-            let hour = i.toString().padStart(2, "0");
-            let minutes = j.toString().padStart(2, "0");
-            times.push(`${hour}:${minutes}`);
-        }
+  for (let i = 0; i <= 23; i++) {
+    for (let j = 0; j <= 45; j += 15) {
+      let hour = i.toString().padStart(2, "0");
+      let minutes = j.toString().padStart(2, "0");
+      times.push(`${hour}:${minutes}`);
     }
+  }
 
-    return times;
+  return times;
 };
+
 function TabFormRestaurant() {
-    const {formData, onFormChange, setFormData} = useFormData({
-        restaurantLocation: '',
-        date: '',
-        hourFrom: '',
-        hourTo: '',
-        numPeople: ''
-    })
+  const a = timeOfArrival();
 
-
-    const a = timeOfArrival();
-
-    return (
-        <Form>
-            <Row>
-                <Col>
-                    <Form.Floating className="mb-3">
-                        <Form.Control
-                            size="lg"
-                            type="text"
-                            placeholder="Место:"
-                            id="location"
-                            name={'restaurantLocation'}
-                            value={formData.restaurantLocation}
-                            onChange={onFormChange}
-                        ></Form.Control>
-                        <label htmlFor="location">Место:</label>
-                    </Form.Floating>
-                </Col>
-                <Col>
-                    <Form.Floating className="mb-3">
-                        <Form.Control
-                            size="md"
-                            type="date"
-                            step={3600000}
-                            placeholder="Час од:"
-                            id="dateFrom"
-                            name={'date'}
-                            value={formData.date}
-                            onChange={onFormChange}
-                        ></Form.Control>
-                        <label htmlFor="dateFrom">Датум:</label>
-                    </Form.Floating>
-                </Col>
-                <Col>
-                    <Form.Floating className="mb-3">
-                        <Form.Select size="md"
-                         name={'hourFrom'}
-                         value={formData.hourFrom}
-                         onChange={onFormChange}>
-                            <option>Изберете време:</option>
-                            {a.map((x) => {
-                                return <option key={x}>{x}</option>;
-                            })}
-                        </Form.Select>
-                        <label htmlFor="hour">Час од:</label>
-                    </Form.Floating>
-                </Col>
-                <Col>
-                    <Form.Floating className="mb-3">
-                        <Form.Select size="md"
-                         name={'hourTo'}
-                         value={formData.hourTo}
-                         onChange={onFormChange}>
-                            <option>Изберете време:</option>
-                            {a.filter((x) => x > formData.hourFrom).map((x) => {
-                                return <option key={x}>{x}</option>;
-                            })}
-                        </Form.Select>
-                        <label htmlFor="hour">Час до:</label>
-                    </Form.Floating>
-                </Col>
-                <Col>
-                    <Form.Floating className="mb-3">
-                        <Form.Control
-                            size="md"
-                            type="number"
-                            placeholder="Број на гости:"
-                            id="floatingPassengers"
-                            name={'numPeople'}
-                            value={formData.numPeople}
-                            onChange={onFormChange}
-                        ></Form.Control>
-                        <label htmlFor="floatingPassengers">Број на гости:</label>
-                    </Form.Floating>
-                    <Form.Group className="my-1">
-                        <Button type="submit" style={{backgroundColor: "#159895"}} size="lg" onClick={(e) => {
-                            e.preventDefault();
-                            window.location.href = `/search/restaurant/${formData.restaurantLocation}/${formData.date}/${formData.hourFrom}/${formData.hourTo}/${formData.numPeople}`
-
-                        }}>
-                            <span className="ikona my-1"><HiMagnifyingGlass/></span>
-                            <span className="ikona mx-3">Пребарај</span>
-                        </Button>
-                    </Form.Group>
-                </Col>
-            </Row>
-        </Form>
-    );
+  return (
+    <Form>
+      <Row>
+        <Col>
+          <Form.Floating className="mb-3">
+            <Form.Control
+              size="lg"
+              type="text"
+              placeholder="Место:"
+              id="location"
+            ></Form.Control>
+            <label htmlFor="location">Место:</label>
+          </Form.Floating>
+        </Col>
+        <Col>
+          <Form.Floating className="mb-3">
+            <Form.Control
+              size="md"
+              type="date"
+              placeholder="Датум:"
+              id="dateFrom"
+            ></Form.Control>
+            <label htmlFor="dateFrom">Датум:</label>
+          </Form.Floating>
+        </Col>
+        <Col>
+          <Form.Floating className="mb-3">
+            <Form.Select size="md">
+              <option>Изберете време:</option>
+              {a.map((x) => {
+                return <option key={x}>{x}</option>;
+              })}
+            </Form.Select>
+            <label htmlFor="hour">Час:</label>
+          </Form.Floating>
+        </Col>
+        <Col>
+          <Form.Floating className="mb-3">
+            <Form.Control
+              size="md"
+              type="number"
+              placeholder="Број на гости:"
+              id="floatingPassengers"
+            ></Form.Control>
+            <label htmlFor="floatingPassengers">Број на гости:</label>
+          </Form.Floating>
+          <Form.Group className="my-1">
+            <Button type="submit" style={{backgroundColor: "#159895"}} size="lg">
+              <span className="ikona my-1"><HiMagnifyingGlass/></span>
+              <span className="ikona mx-3">Пребарај</span>
+            </Button>
+          </Form.Group>
+        </Col>
+      </Row>
+    </Form>
+  );
 }
 
Index: frontend/src/Components/Tab/TabFormTransport.js
===================================================================
--- frontend/src/Components/Tab/TabFormTransport.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/Tab/TabFormTransport.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -2,15 +2,6 @@
 import { Button, Col, Container, Form, Row } from "react-bootstrap";
 import { HiMagnifyingGlass } from "react-icons/hi2"
-import useFormData from "../Hooks/useFormData";
 
 function TabFormTransport() {
-
-  const { formData, onFormChange, setFormData } = useFormData({
-    from: undefined,
-    to: undefined,
-    date: undefined,
-    numPassengers: 0
-  })
-
   return (
     <Form>
@@ -23,7 +14,4 @@
               placeholder="Од:"
               id="floatingFrom"
-              value={formData.from}
-              name={'from'}
-              onChange={onFormChange}
             ></Form.Control>
             <label htmlFor="floatingFrom">Од:</label>
@@ -37,7 +25,4 @@
               placeholder="До:"
               id="floatingTo"
-              name={'to'}
-              value={formData.to}
-              onChange={onFormChange}
             ></Form.Control>
             <label htmlFor="floatingTo">До:</label>
@@ -51,7 +36,4 @@
               placeholder="Датум:"
               id="floatingDate"
-              name={'date'}
-              value={formData.date}
-              onChange={onFormChange}
             ></Form.Control>
             <label htmlFor="floatingDate">Датум:</label>
@@ -64,16 +46,10 @@
               type="number"
               placeholder="Број на патници:"
-              name={'numPassengers'}
               id="floatingPassengers"
-              value={formData.numPassengers}
-              onChange={onFormChange}
             ></Form.Control>
             <label htmlFor="floatingPassengers">Број на патници:</label>
           </Form.Floating>
           <Form.Group className="my-1">
-            <Button type="submit" style={{backgroundColor: "#159895"}} size="lg" onClick={(e) => {
-              e.preventDefault();
-              window.location.href = `/search/transport/${formData.from}/${formData.to}/${formData.date}/${formData.numPassengers}`
-            }}>
+            <Button type="submit" style={{backgroundColor: "#159895"}} size="lg">
               <span className="ikona my-1"><HiMagnifyingGlass/></span>
               <span className="ikona mx-3">Пребарај</span>
Index: frontend/src/Components/TransportDetails/FinalPoint.js
===================================================================
--- frontend/src/Components/TransportDetails/FinalPoint.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/TransportDetails/FinalPoint.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -17,5 +17,5 @@
     <>
       <Row>
-        {props.left === "true" && <Col className="d-flex flex-column justify-content-center col-md-4" style={{paddingLeft: "2.6rem"}}>
+        {props.left === "true" && <Col className="d-flex flex-column justify-content-center col-auto" style={{paddingLeft: "2.6rem"}}>
             <h5 className="m-auto">{getTimeAsString(props.time)}</h5>
         </Col>  }
Index: frontend/src/Components/TransportDetails/Line.js
===================================================================
--- frontend/src/Components/TransportDetails/Line.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/TransportDetails/Line.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -2,5 +2,7 @@
 
 const Line = (props) => {
-    const left = props.left === "true" ? "1.8rem" : "1.85rem";
+    console.log(props.left)
+    const left = props.left === "true" ? "9.08rem" : "2.6rem";
+    console.log({borderLeft: "5px solid #159895", height: "3em", marginLeft: left, marginTop: "-1.4rem", marginBottom: "-1.4rem"})
     return (<>
         <div style={{borderLeft: "5px solid #159895", height: "3em", marginLeft: left, marginTop: "-1.4rem", marginBottom: "-1.4rem"}}></div>
Index: frontend/src/Components/TransportDetails/RouteContainer.js
===================================================================
--- frontend/src/Components/TransportDetails/RouteContainer.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/TransportDetails/RouteContainer.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -20,5 +20,5 @@
         }}
       >
-        <Waypoint city={props.data.from} time={''}></Waypoint>
+        <Waypoint city={props.data.from} time={props.data.date}></Waypoint>
         {props.data.routes && props.data.routes.map((route, i) => {
           return <Waypoint city={route} time={props.data.times[i]}></Waypoint>
Index: frontend/src/Components/TransportDetails/Waypoint.js
===================================================================
--- frontend/src/Components/TransportDetails/Waypoint.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/TransportDetails/Waypoint.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,60 +1,38 @@
 import React from "react";
-import {Container, Row, Col} from "react-bootstrap";
-import {RxDot} from "react-icons/rx"
+import { Container, Row, Col } from "react-bootstrap";
+import { RxDot } from "react-icons/rx"
 import Line from "./Line";
 
 const Waypoint = (props) => {
-    console.log(props.left)
-    const style = props.left === "true" ? {textAlign: "left"} : {}
-    console.log(style)
+  console.log(props.left)
+  const style = props.left === "true" ? {textAlign: "left"} : {}
+  console.log(style)
 
-    const getTimeAsString = (dateString) => {
-        if(dateString === '')
-            return ''
-        const date = new Date(dateString)
-        return `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
-    }
+  const getTimeAsString = (dateString) => {
+    const date = new Date(dateString)
+    return `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
+  }
 
-    return (
-        <>
-            <Row className="d-flex flex-row gap-0">
-                {props.left === "true" &&
-                    <Col className="d-flex flex-column justify-content-center col-md-4" style={{paddingLeft: "2.6rem"}}>
-                        <h5 style={{color: props.routes === "true" ? "white" : ""}}
-                            className="m-auto">{getTimeAsString(props.time)}</h5>
-                    </Col>}
-                <Col md="auto">
-                    <RxDot size={"4rem"} color="#159895"></RxDot>
-                </Col>
-                <Col className="d-flex flex-column justify-content-center">
-                    <h3 className="my-auto" style={{
-                        ...style,
-                        fontSize: props.routes === "true" ? "1.3rem" : "",
-                        color: props.routes === "true" ? "#708090	" : ""
-                    }}>{props.city}</h3>
-                </Col>
-                {props.left !== "true" && <Col className="d-flex flex-column justify-content-center">
-                    <h5>{getTimeAsString(props.time)}</h5>
-                </Col>}
-            </Row>
-            <Row className="d-flex flex-row gap-0">
-                {props.left === "true" &&
-                    <Col className="d-flex flex-column justify-content-center col-md-4" style={{paddingLeft: "2.6rem"}}>
-
-                    </Col>}
-                <Col md="auto">
-                    <Line left={props.left}> </Line>
-                </Col>
-                <Col className="d-flex flex-column justify-content-center">
-                </Col>
-                {props.left !== "true" && <Col className="d-flex flex-column justify-content-center">
-
-                </Col>}
-            </Row>
-            {/*<Row>*/}
-            {/*<Line left={props.left}> </Line>*/}
-            {/*</Row>*/}
-        </>
-    );
+  return (
+    <>
+      <Row className="d-flex flex-row gap-0">
+      {props.left === "true" && <Col className="d-flex flex-column justify-content-center col-auto" style={{paddingLeft: "2.6rem"}}>
+            <h5 style={{color: props.routes === "true" ? "white" : "" }} className="m-auto">{getTimeAsString(props.time)}</h5>
+        </Col>}
+        <Col md="auto">
+          <RxDot size={"4rem"} color="#159895"></RxDot>
+        </Col>
+        <Col className="d-flex flex-column justify-content-center">
+          <h3 className="my-auto" style={{...style, fontSize: props.routes === "true" ? "1.3rem" : "", color: props.routes === "true" ? "#708090	" : ""}}>{props.city}</h3>
+        </Col>
+      {props.left !== "true" && <Col className="d-flex flex-column justify-content-center">
+            <h5>{getTimeAsString(props.time)}</h5>
+        </Col>}
+      </Row>
+      <Row>
+      <Line left={props.left}> </Line>
+      </Row>
+    </>
+  );
 };
 
Index: frontend/src/Components/TransportEdit/TransportEditTab.js
===================================================================
--- frontend/src/Components/TransportEdit/TransportEditTab.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/TransportEdit/TransportEditTab.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -9,19 +9,11 @@
 import TransportListing from "./TransportListing";
 import useGet from "../Hooks/useGet";
-import ReservationListing from "../HotelEdit/ReservationListing";
 
 function TransportEditTab(props) {
   const [activeTab, setActiveTab] = useState("/hotel");
-  console.log(props)
-
-
-  const {
-    data,
-    isLoading,
-    setData,
-    getData,
-    setChanged: dhanged
-  } = useGet(`/transport/${props.displayRoute.transportID}/reservations/active`)
-
+  const link = "/transport/" + props.displayRoute.transportID + "/available";
+  console.log(props.displayRoute)
+  const [changed, setChanged] = useState(0)
+  const { data, setData, isLoading, getData } = useGet(link, changed);
 
 
@@ -83,9 +75,5 @@
           </Tab.Pane>
           <Tab.Pane eventKey="/restaurant">
-            {!isLoading && data.map((res) => {
-              return (
-                  <ReservationListing type={'transport'} data={res}/>
-              )
-            })}
+            <AddNew type="restaurant"/>
           </Tab.Pane>
           <Tab.Pane eventKey="/transport">
Index: frontend/src/Components/TransportEdit/TransportListing.js
===================================================================
--- frontend/src/Components/TransportEdit/TransportListing.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/TransportEdit/TransportListing.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -9,4 +9,6 @@
 
     //const type = props.type == "hotel" ? "сместувањето" : props.type == "restaurant" ? "ресторанот" : "превозот";
+    console.log(props.data)
+    console.log(props.data.from)
     return (<>
         <a href="#" style={{textDecoration: "none", color: "black"}}>
@@ -32,4 +34,5 @@
                     <Col className="d-flex flex-column justify-content-center" style={{textAlign: "left"}}>
                         <h2>{props.data.from} - {props.data.to}</h2>
+                        {/* <h6>{props.data.routeCities}</h6> */}
                         <h6>{props.data.routes.map(x => x).join(", ")}</h6>
                     </Col>
@@ -37,5 +40,6 @@
                     <Col className="d-flex flex-column justify-content-center align-content-center">
                         <h5>Цена:</h5>
-                         <h4>{props.data.maxPrice}$</h4>
+                        {/* <h4>{props.data.routePrice}</h4> */}
+                        <h4>99$</h4>
                     </Col>
                 </Row>
Index: frontend/src/Components/UserPanel/ActiveHotelReservations.js
===================================================================
--- frontend/src/Components/UserPanel/ActiveHotelReservations.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,20 +1,0 @@
-import HotelReservationListing from "./HotelReservationListing";
-import React from "react";
-import useGet from "../Hooks/useGet";
-
-const ActiveHotelReservations = () => {
-
-    const {data, isLoading, setData, getData, setChanged} = useGet('/hotel/reservations/user/1')
-
-    return (
-        <>
-            {!isLoading && data.map((res) => {
-                return (<HotelReservationListing data={res} type={'hotel'}></HotelReservationListing>)
-            })}
-
-            {(!isLoading && data.length === 0) && <h3 className={'my-5'}>Нема податоци за одбраните критериуми!</h3>}
-        </>
-    )
-}
-
-export default ActiveHotelReservations;
Index: frontend/src/Components/UserPanel/ActiveRestaurantReservations.js
===================================================================
--- frontend/src/Components/UserPanel/ActiveRestaurantReservations.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,20 +1,0 @@
-import HotelReservationListing from "./HotelReservationListing";
-import React from "react";
-import useGet from "../Hooks/useGet";
-
-const ActiveRestaurantReservations = () => {
-
-    const {data, isLoading, setData, getData, setChanged} = useGet('/restaurant/reservations/user/1')
-
-    return (
-        <>
-            {!isLoading && data.map((res) => {
-                return (<HotelReservationListing data={res} type={'restaurant'}></HotelReservationListing>)
-            })}
-
-            {(!isLoading && data.length === 0) && <h3 className={'my-5'}>Нема податоци за одбраните критериуми!</h3>}
-        </>
-    )
-}
-
-export default ActiveRestaurantReservations;
Index: frontend/src/Components/UserPanel/ActiveTransportReservations.js
===================================================================
--- frontend/src/Components/UserPanel/ActiveTransportReservations.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,20 +1,0 @@
-import HotelReservationListing from "./HotelReservationListing";
-import React from "react";
-import useGet from "../Hooks/useGet";
-
-const ActiveTransportReservations = () => {
-
-    const {data, isLoading, setData, getData, setChanged} = useGet('/transport/reservations/user/1')
-
-    return (
-        <>
-            {!isLoading && data.map((res) => {
-                return (<HotelReservationListing data={res} type={'transport'}></HotelReservationListing>)
-            })}
-
-            {(!isLoading && data.length === 0) && <h3 className={'my-5'}>Нема податоци за одбраните критериуми!</h3>}
-        </>
-    )
-}
-
-export default ActiveTransportReservations;
Index: frontend/src/Components/UserPanel/HotelReservationListing.js
===================================================================
--- frontend/src/Components/UserPanel/HotelReservationListing.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,155 +1,0 @@
-import React from "react";
-import {useState} from "react";
-import {Col, Container, Row, Image, Modal, Button, Form} from "react-bootstrap";
-import LoginForm from "../Login/LoginForm";
-import ChangePasswordForm from "../Forms/ChangePasswordForm";
-import {FaCalendarAlt} from "react-icons/fa";
-import {MdBalcony, MdLocationOn} from "react-icons/md";
-import AddAvailability from "../Resources/AddAvailability";
-import {LuFan} from "react-icons/lu";
-import {TbToolsKitchen2} from "react-icons/tb";
-import useGet from "../Hooks/useGet";
-import data from "bootstrap/js/src/dom/data";
-import {AiOutlinePlusCircle} from "react-icons/ai";
-import { MdCancel } from "react-icons/md";
-import { MdOutlineRateReview } from "react-icons/md"
-import useFormData from "../Hooks/useFormData";
-import useCreate from "../Hooks/useCreate";
-import HotelReservationModal from "./HotelReservationModal";
-import ReviewModal from "./ReviewModal";
-
-
-const HotelReservationListing = (props) => {
-
-    const type = props.type == "hotel" ? "сместувањето" : props.type == "restaurant" ? "ресторанот" : "превозот";
-    // const name = props.type == "hotel" ? props.data.hotelName : props.type == "restaurant" ? props.data.restaurantName : props.data.transportName
-    // const id = props.type == "hotel" ? props.data.hotelId : props.type == "restaurant" ? props.data.restaurantID : props.data.transportID
-
-    console.log(props.data)
-    const { createEntity } = useCreate();
-    const dateFormatter = (str) => {
-        const inputDate = new Date(str);
-
-        const options = props.type === 'hotel' ? {
-            year: 'numeric',
-            month: '2-digit',
-            day: '2-digit',
-            hour12: false,
-        } : {
-            year: 'numeric',
-            month: '2-digit',
-            day: '2-digit',
-            hour: '2-digit',
-            minute: '2-digit',
-            hour12: false,
-        };
-
-        return inputDate.toLocaleString('de-DE', options);
-
-    }
-
-    console.log(props)
-
-    const [showReview, setShowReview] = useState(false);
-
-    const handleCloseReview = () => setShowReview(false);
-    const handleShowReview = () => setShowReview(true);
-
-    const [show, setShow] = useState(false);
-
-    const handleClose = () => setShow(false);
-    const handleShow = () => setShow(true);
-
-    return (<>
-        <Container onClick={(e) => {
-            if (e.target.id !== 'icon') {
-                handleShow();
-            }
-        }} className="py-3 px-1 my-4"
-                   style={{
-                       border: "4px solid #159895",
-                       borderRadius: "1em",
-                       boxShadow: "0 3px 5px #159895",
-                       maxWidth: "90%",
-                   }}>
-            <Row>
-                <Col className="d-flex justify-content-center">
-                    {props.type !== 'transport' && <Image
-                        src="https://www.imgacademy.com/sites/default/files/legacyhotel.jpg"
-                        style={{
-                            height: "8em",
-                            borderRadius: "1em",
-                            boxShadow: "0 4px 20px lightblue",
-                            maxWidth: "100%",
-                        }}
-                    ></Image>}
-                    {props.type === 'transport' && <Image
-                        src="https://samsung.teveotecno.com.ar/wp-content/uploads/2022/07/how-to-create-and-draw-custom-routes-with-google-maps_62d4ad146140d.jpeg"
-                        style={{
-                            height: "8em",
-                            borderRadius: "1em",
-                            boxShadow: "0 4px 20px lightblue",
-                            maxWidth: "80%",
-                        }}
-                    ></Image>}
-                </Col>
-                <Col className={'d-flex flex-column justify-content-center'}>
-                    {props.type === "hotel" && (<>
-                        <h2 style={{textAlign: "left"}}>{props.data.hotelName}</h2>
-                        <h5 style={{textAlign: "left"}}>{props.data.hotelLocation}</h5>
-                        <h5 style={{textAlign: "left"}}>{dateFormatter(props.data.dateFrom) + ' - ' + dateFormatter(props.data.dateTo)}</h5>
-                    </>)}
-                    {props.type === "restaurant" && (<>
-                        <h2 style={{textAlign: "left"}}>{props.data.restaurantName}</h2>
-                        <h5 style={{textAlign: "left"}}>{props.data.restaurantLocation}</h5>
-                        <h5 style={{textAlign: "left"}}>{dateFormatter(props.data.dateFrom) + ' - ' + dateFormatter(props.data.dateTo)}</h5>
-                    </>)}
-                    {props.type === "transport" && (<>
-                        <h5 style={{textAlign: "left"}}>{props.data.carBrand + ' ' + props.data.carType}</h5>
-                        <h5 style={{textAlign: "left"}}>{props.data.transportRoute.from + ' - ' + props.data.transportRoute.to}</h5>
-                        <h5 style={{textAlign: "left"}}>{dateFormatter(props.data.transportRoute.departure) + ' - ' + dateFormatter(props.data.transportRoute.arrival)}</h5>
-                        <h5 style={{textAlign: "left"}}>{props.data.owner.name + ' ' + props.data.owner.surname}</h5>
-                    </>)}
-                </Col>
-                {props.type === 'transport' &&
-                    <Col className="d-flex flex-column justify-content-center align-content-center">
-                        <h3>Вкупна цена: <br></br>{props.data.transportRoute.price}$</h3>
-                    </Col>}
-                {(!props.past) && <Col className="d-flex flex-column justify-content-center align-content-center">
-                    {<Container id={'ocn'} onClick={(e) => {
-                        console.log(e.target)
-                        if (e.target.id === 'icon') {
-                            createEntity(`/restaurant/${props.data.reservationId}/cancel`, props.setChanged, props.setChanged)
-                            window.location.href="/reservations"
-                        }
-                    }}>
-                        <h5 id={'icon'}>Откажи<br/>резервација</h5>
-                        <div className="d-flex justify-content-center align-content-center">
-                            <MdCancel size={50} color="#159895"/></div>
-
-                    </Container>}
-                </Col>}
-                {(props.past) && <Col className="d-flex flex-column justify-content-center align-content-center">
-                    {!props.data.reviewed && <Container id={'ocn'} onClick={(e) => {
-                        console.log(e.target)
-                        if (e.target.id === 'icon') {
-                            handleShowReview();
-                        }
-                    }}>
-                        <h5 id={'icon'}>Додади<br/>оценка</h5>
-                        <div className="d-flex justify-content-center align-content-center">
-                            <MdOutlineRateReview size={50} color="#159895"/></div>
-
-                    </Container>}
-                    {props.data.reviewed && <Container>
-                        <h5>Веќе имате <br/>оставено оценка<br/>за оваа резервација</h5>
-                    </Container>}
-                </Col>}
-            </Row>
-        </Container>
-        {props.type === 'hotel' && <HotelReservationModal setChanged={props.setChanged} show={show} handleClose={handleClose} data={props.data}/>}
-        <ReviewModal setChanged={props.setChanged} type={props.type} showReview={showReview} handleCloseReview={handleCloseReview} data={props.data}/>
-    </>)
-}
-
-export default HotelReservationListing;
Index: frontend/src/Components/UserPanel/HotelReservationModal.js
===================================================================
--- frontend/src/Components/UserPanel/HotelReservationModal.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,210 +1,0 @@
-import {Button, Col, Container, Image, Modal, Row} from "react-bootstrap";
-import {FaCalendarAlt} from "react-icons/fa";
-import {MdBalcony, MdLocationOn} from "react-icons/md";
-import {LuFan} from "react-icons/lu";
-import {TbToolsKitchen2} from "react-icons/tb";
-import React from "react";
-import useCreate from "../Hooks/useCreate";
-
-const HotelReservationModal = (props) => {
-
-    const {createEntity} = useCreate();
-
-    const dateFormatter = (str) => {
-        const inputDate = new Date(str);
-
-        const options = {
-            year: 'numeric',
-            month: '2-digit',
-            day: '2-digit',
-            hour12: false,
-        };
-
-        console.log(props)
-
-        return inputDate.toLocaleString('de-DE', options);
-
-    }
-
-    return (
-        <>
-            <Modal size={"xl"} show={props.show} onHide={props.handleClose}>
-                <Modal.Header closeButton>
-                    <Modal.Title>Детали за резервација</Modal.Title>
-                </Modal.Header>
-                <Modal.Body>
-                    <Container className="py-3 px-1 my-4" style={{maxWidth: "90%"}}>
-                        <Row className={'mb-3'}>
-                            <Col className={'px-4'}>
-                                <h3>{props.data.hotelName}</h3>
-                            </Col>
-                            <Col>
-
-                            </Col>
-                        </Row>
-                        <Row className={'mb-3'}>
-                            <Col className={'d-flex flex-column justify-content-between'}>
-                                <Row>
-                                    <Col md={'auto'}
-                                         className={'d-flex flex-column justify-content-center align-items-center ms-3'}>
-                                        <FaCalendarAlt size={'2em'}/>
-                                    </Col>
-                                    <Col md={'auto'} style={{borderRight: '1px solid black'}}>
-                                        <Row className={'w-75'}>
-                                            <h6>Пријавување</h6>
-                                        </Row>
-                                        <Row>
-                                            <h5>{dateFormatter(props.data.dateFrom)}</h5>
-                                        </Row>
-
-                                    </Col>
-                                    <Col>
-                                        <Row>
-                                            <h6>Одјавување</h6>
-                                        </Row>
-                                        <Row>
-                                            <h5>{dateFormatter(props.data.dateTo)}</h5>
-                                        </Row>
-                                    </Col>
-                                    <Col md={7}>
-
-                                    </Col>
-                                </Row>
-                                <Row>
-                                    <Col md={'auto'}
-                                         className={'d-flex flex-column justify-content-center align-items-center ms-3'}>
-                                        <MdLocationOn size={'2em'}/>
-                                    </Col>
-                                    <Col md={'auto'}>
-                                        <Row className={'w-75'}>
-                                            <h6>Адреса</h6>
-                                        </Row>
-                                        <Row>
-                                            <h5>ул. Македонска бр. 10</h5>
-                                        </Row>
-                                    </Col>
-                                    <Col>
-                                    </Col>
-
-                                </Row>
-                            </Col>
-                            <Col className={'d-flex flex-column align-items-center'}>
-                                <Image
-                                    src="https://www.imgacademy.com/sites/default/files/legacyhotel.jpg"
-                                    style={{
-                                        height: "10em",
-                                        borderRadius: "1em",
-                                        boxShadow: "0 4px 20px lightblue",
-                                        maxWidth: "100%",
-                                    }}
-                                ></Image>
-                            </Col>
-
-                        </Row>
-                    </Container>
-                    <Container>
-                        <Row className={'mb-3'}>
-                            <h4>Детали за собата</h4>
-                        </Row>
-                        <Row>
-                            <Col className="d-flex justify-content-center">
-                                <Image
-                                    src="https://img.freepik.com/free-photo/luxury-classic-modern-bedroom-suite-hotel_105762-1787.jpg?w=200"
-                                    style={{
-                                        height: "10em",
-                                        borderRadius: "1em",
-                                        boxShadow: "0 4px 20px lightblue",
-                                        maxWidth: "100%",
-                                    }}
-                                ></Image>
-                            </Col>
-                            <Col className="d-flex flex-column justify-content-center" style={{textAlign: "left"}}>
-                                <Row><h4>{props.data.hotelRoom.hotelRoomName}</h4></Row>
-                                <Row>
-                                    {props.data.hotelRoom.airConditioning && <Col className="col-auto">
-                                        <Container className="py-1 px-1">
-                                            <Row className="d-flex flex-row">
-                                                <Col className="m-0 w-25 py-1">
-                                                    <LuFan
-                                                        className="my-0 "
-                                                        color="#159895"
-                                                        size={40}
-                                                    ></LuFan>
-                                                </Col>
-                                                <Col className="w-75 d-flex p-0">
-                                                    <h6 style={{fontSize: "14px"}} className="m-auto">
-                                                        Климатизирано
-                                                    </h6>
-                                                </Col>
-                                            </Row>
-                                        </Container>
-                                    </Col>}
-                                    {props.data.hotelRoom.kitchenAvailable && <Col className="col-auto">
-                                        <Container
-                                            className="py-1 px-1">
-                                            <Row className="d-flex flex-row">
-                                                <Col className="m-0 w-25 py-1">
-                                                    <TbToolsKitchen2 className="my-0 " color="#159895"
-                                                                     size={40}></TbToolsKitchen2>
-                                                </Col>
-                                                <Col className="w-75 d-flex p-0">
-                                                    <h6 style={{fontSize: "14px"}} className="m-auto">Кујна</h6>
-                                                </Col>
-                                            </Row>
-                                        </Container>
-                                    </Col>}
-                                    {props.data.hotelRoom.balcony && <Col className="col-auto">
-                                        <Container
-                                            className="py-1 px-1">
-                                            <Row className="d-flex flex-row">
-                                                <Col className="m-0 w-25 py-1">
-                                                    <MdBalcony className="my-0 " color="#159895" size={40}></MdBalcony>
-                                                </Col>
-                                                <Col className="w-75 d-flex p-0">
-                                                    <h6 style={{fontSize: "14px"}} className="m-auto">Тераса</h6>
-                                                </Col>
-                                            </Row>
-                                        </Container>
-                                    </Col>}
-                                </Row>
-                            </Col>
-                        </Row>
-                    </Container>
-                    <Container className={'border mt-3 w-75 py-3 rounded-3'}>
-                        <Row className={'mb-3'}>
-                            <Col>
-                                <h5>4 Ноќевања</h5>
-                            </Col>
-                            <Col>
-                                <h5 className={'text-end'}>32$</h5>
-                            </Col>
-                        </Row>
-                        <Row>
-                            <Col>
-                                <h5>Вкупно</h5>
-                            </Col>
-                            <Col>
-                                <h4 className={'text-end'}>128$</h4>
-                            </Col>
-                        </Row>
-                    </Container>
-                </Modal.Body>
-                <Modal.Footer>
-                    <Button variant="secondary" onClick={props.handleClose}>
-                        Затвори
-                    </Button>
-                    <Button variant="danger" onClick={() => {
-                        createEntity(`/hotel/${props.data.reservationId}/cancel`, props.setChanged)
-                        props.handleClose()
-                    }
-                    }>
-                        Откажи резервација
-                    </Button>
-                </Modal.Footer>
-            </Modal>
-
-        </>
-    )
-}
-
-export default HotelReservationModal;
Index: frontend/src/Components/UserPanel/PastHotelReservations.js
===================================================================
--- frontend/src/Components/UserPanel/PastHotelReservations.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,19 +1,0 @@
-import HotelReservationListing from "./HotelReservationListing";
-import React from "react";
-import useGet from "../Hooks/useGet";
-
-const PastHotelReservations = () => {
-
-    const {data, isLoading, setData, getData, setChanged} = useGet('/hotel/reservations/user/1/past')
-
-    return (
-        <>
-            {!isLoading && data.map((res) => {
-                return (<HotelReservationListing setChanged={setChanged} past={true} data={res} type={'hotel'}></HotelReservationListing>)
-            })}
-            {(!isLoading && data.length === 0) && <h3 className={'my-5'}>Нема податоци за одбраните критериуми!</h3>}
-        </>
-    )
-}
-
-export default PastHotelReservations;
Index: frontend/src/Components/UserPanel/PastRestaurantReservations.js
===================================================================
--- frontend/src/Components/UserPanel/PastRestaurantReservations.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,21 +1,0 @@
-import HotelReservationListing from "./HotelReservationListing";
-import React from "react";
-import useGet from "../Hooks/useGet";
-
-const PastRestaurantReservations = () => {
-
-    const {data, isLoading, setData, getData, setChanged} = useGet('/restaurant/reservations/user/1/past')
-    !isLoading && console.log(data)
-
-    return (
-        <>
-            {!isLoading && data.map((res) => {
-                console.log(res)
-                return (<HotelReservationListing setChanged={setChanged} past={true} data={res} type={'restaurant'}></HotelReservationListing>)
-            })}
-            {(!isLoading && data.length === 0) && <h3 className={'my-5'}>Нема податоци за одбраните критериуми!</h3>}
-        </>
-    )
-}
-
-export default PastRestaurantReservations;
Index: frontend/src/Components/UserPanel/PastTransportReservations.js
===================================================================
--- frontend/src/Components/UserPanel/PastTransportReservations.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,20 +1,0 @@
-import HotelReservationListing from "./HotelReservationListing";
-import React from "react";
-import useGet from "../Hooks/useGet";
-
-const PastTransportReservations = () => {
-
-    const {data, isLoading, setData, getData, setChanged} = useGet('/transport/reservations/user/1/past')
-
-    return (
-        <>
-            {!isLoading && data.map((res) => {
-                return (<HotelReservationListing setChanged={setChanged} past={true} data={res} type={'transport'}></HotelReservationListing>)
-            })}
-
-            {(!isLoading && data.length === 0) && <h3 className={'my-5'}>Нема податоци за одбраните критериуми!</h3>}
-        </>
-    )
-}
-
-export default PastTransportReservations;
Index: frontend/src/Components/UserPanel/ReviewModal.js
===================================================================
--- frontend/src/Components/UserPanel/ReviewModal.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,110 +1,0 @@
-import {Button, Form, Modal, Row} from "react-bootstrap";
-import React from "react";
-import useFormData from "../Hooks/useFormData";
-import useCreate from "../Hooks/useCreate";
-
-const ReviewModal = (props) => {
-    const dummy = {
-        tite: "",
-        numStars: "",
-        description: "",
-    }
-    console.log(props)
-
-    const {createEntity} = useCreate();
-
-    const {formData, setFormData, onFormChange} = useFormData(dummy)
-
-    return (
-        <>
-            <Modal show={props.showReview} onHide={props.handleCloseReview}>
-                <Modal.Header closeButton>
-                    <Modal.Title>Внесување оценка по резервација</Modal.Title>
-                </Modal.Header>
-                <Modal.Body>
-                    <Form>
-                        <Row>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="text"
-                                    placeholder="Каде ќе патувате?:"
-                                    id="title"
-                                    name="title"
-                                    onChange={onFormChange}
-                                    value={formData.title}
-                                ></Form.Control>
-                                <label style={{left: '10px'}} htmlFor="location">Наслов:</label>
-                            </Form.Floating>
-                        </Row>
-                        <Row>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="number"
-                                    max={5}
-                                    min={1}
-                                    placeholder="Каде ќе патувате?:"
-                                    id="numStars"
-                                    name="numStars"
-                                    onChange={onFormChange}
-                                    value={formData.numStars}
-                                ></Form.Control>
-                                <label style={{left: '10px'}} htmlFor="location">Број на ѕвезди:</label>
-                            </Form.Floating>
-                        </Row>
-
-                        <Row>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    as="textarea"
-                                    placeholder="Каде ќе патувате?:"
-                                    id="description"
-                                    name="description"
-                                    onChange={onFormChange}
-                                    value={formData.description}
-                                ></Form.Control>
-                                <label style={{left: '10px'}} htmlFor="location">Опис:</label>
-                            </Form.Floating>
-                        </Row>
-
-                    </Form>
-                </Modal.Body>
-                <Modal.Footer>
-                    <Button variant="secondary" onClick={props.handleClose}>
-                        Затвори
-                    </Button>
-                    <Button variant="primary" onClick={() => {
-                        // console.log(props.data.hotelId)
-                        const dataToPost = props.type === 'hotel' ? {
-                                ...formData,
-                                hotelId: props.data.hotelId,
-                                userId: 1,
-                                reservationId: props.data.reservationId
-                            } :
-                            props.type === 'restaurant' ? {
-                                ...formData,
-                                restaurantId: props.data.restaurantId,
-                                userId: 1,
-                                reservationId: props.data.reservationId
-                            } : {
-                                ...formData,
-                                transportId: props.data.transportId,
-                                userId: 1,
-                                reservationId: props.data.reservationId
-                            }
-                        createEntity('/review/add', dataToPost, props.setChanged)
-                        setFormData(dummy)
-                        props.handleCloseReview()
-                    }
-                    }>
-                        Зачувај
-                    </Button>
-                </Modal.Footer>
-            </Modal>
-        </>
-    )
-}
-
-export default ReviewModal;
Index: frontend/src/Components/UserPanel/TypeSelectionTab.js
===================================================================
--- frontend/src/Components/UserPanel/TypeSelectionTab.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,115 +1,0 @@
-import React, {useState} from "react";
-import {Container, Nav, Tabs} from "react-bootstrap";
-import {Tab} from "react-bootstrap";
-import {FaHotel, FaTaxi} from 'react-icons/fa'
-import {MdRestaurant} from "react-icons/md"
-import HotelReservationListing from "./HotelReservationListing";
-import UnapprovedBusinessesTable from "../AdminPanel/UnapprovedBusinessesTable";
-import UnapprovedProfilesTable from "../AdminPanel/UnapprovedProfilesTable";
-import AllProfilesTable from "../AdminPanel/AllProfilesTable";
-import useGet from "../Hooks/useGet";
-import ActiveHotelReservations from "./ActiveHotelReservations";
-import PastHotelReservations from "./PastHotelReservations";
-import ActiveRestaurantReservations from "./ActiveRestaurantReservations";
-import PastRestaurantReservations from "./PastRestaurantReservations";
-import ActiveTransportReservations from "./ActiveTransportReservations";
-import PastTransportReservations from "./PastTransportReservations";
-
-function TypeSelectionTab() {
-    const [activeTab, setActiveTab] = useState("/hotel");
-    const handleSelect = (eventKey) => {
-        setActiveTab(eventKey);
-    };
-
-
-    return (
-        <Container className='rounded-5'>
-            <Tab.Container
-                activeKey={activeTab}
-                onSelect={handleSelect}
-                className="bg-dark rounded-5"
-            >
-                <Nav
-                    fill
-                    variant="tabs"
-                    className="bg-body rounded-top-5"
-                    activeKey="/hotel"
-                    id="tab_item"
-                >
-                    <Nav.Item className="tab_item rounded-5">
-                        <Nav.Link eventKey="/hotel" className="text-left rounded-5">
-                            <span className="ikona"><FaHotel color="#159895" style={{lineHeight: "100em"}}
-                                                             size={"1.5em"} className="mx-3"/></span>
-                            <span className="ikona">Сместување</span>
-                        </Nav.Link>
-                    </Nav.Item>
-                    <Nav.Item className="tab_item">
-                        <Nav.Link eventKey="/restaurant">
-                            <span className="ikona"><MdRestaurant color="#159895" size={"1.5em"}
-                                                                  className="mx-3"/></span><
-                            span className="ikona">Ресторан</span>
-                        </Nav.Link>
-                    </Nav.Item>
-                    <Nav.Item className="tab_item rounded-5">
-                        <Nav.Link eventKey="/transport" className="text-left rounded-5"><span className="ikona"><FaTaxi
-                            color="#159895" size={"1.5em"} className="mx-3"/></span>
-                            <span className="ikona">Превоз</span>
-                        </Nav.Link>
-                    </Nav.Item>
-                </Nav>
-
-                <Tab.Content className="py-5 px-3 border rounded-bottom-5 bg-light">
-                    <Tab.Pane eventKey="/hotel">
-                        <Container>
-                            <Tabs
-                                fill
-                                defaultActiveKey="home"
-                                id="uncontrolled-tab-example"
-                                className="mb-3"
-                            >
-                                <Tab eventKey="home" title="Активни резервации">
-                                    <ActiveHotelReservations></ActiveHotelReservations>
-                                </Tab>
-                                <Tab eventKey="profile" title="Претходни резервации">
-                                    <PastHotelReservations></PastHotelReservations>
-                                </Tab>
-                            </Tabs>
-                        </Container>
-                    </Tab.Pane>
-                    <Tab.Pane eventKey="/restaurant">
-                        <Tabs
-                            fill
-                            defaultActiveKey="home"
-                            id="uncontrolled-tab-example"
-                            className="mb-3"
-                        >
-                            <Tab eventKey="home" title="Активни резервации">
-                                <ActiveRestaurantReservations></ActiveRestaurantReservations>
-                            </Tab>
-                            <Tab eventKey="profile" title="Претходни резервации">
-                                <PastRestaurantReservations></PastRestaurantReservations>
-                            </Tab>
-                        </Tabs>
-                    </Tab.Pane>
-                    <Tab.Pane eventKey="/transport">
-                        <Tabs
-                            fill
-                            defaultActiveKey="home"
-                            id="uncontrolled-tab-example"
-                            className="mb-3"
-                        >
-                            <Tab eventKey="home" title="Активни резервации">
-                                <ActiveTransportReservations></ActiveTransportReservations>
-                            </Tab>
-                            <Tab eventKey="profile" title="Претходни резервации">
-                                <PastTransportReservations></PastTransportReservations>
-                            </Tab>
-                        </Tabs>
-                    </Tab.Pane>
-                </Tab.Content>
-            </Tab.Container>
-        </Container>
-    );
-}
-
-export default TypeSelectionTab;
Index: frontend/src/Components/useFormNested.js
===================================================================
--- frontend/src/Components/useFormNested.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Components/useFormNested.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -7,5 +7,5 @@
         console.log(e)
 
-        const dependantRoutes = e.target.name === 'freeSpace' ? e.target.parentElement.getAttribute('dependantRoutes').split(',') : undefined;
+        const dependantRoutes = e.target.parentElement.getAttribute('dependantRoutes').split(',')
         console.log(dependantRoutes)
 
Index: frontend/src/Pages/ConnectedAccountsPage.js
===================================================================
--- frontend/src/Pages/ConnectedAccountsPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,38 +1,0 @@
-import React from "react";
-import Navigation from "../Components/Layout/Navbar/Navigation";
-import {Container, Row} from "react-bootstrap";
-import ConnectedAccountsTable from "../Components/ConnectedAccounts/ConnectedAccountsTable";
-import LoginForm from "../Components/Login/LoginForm";
-import {useAuth} from "../Components/Context/AuthContext";
-import useGet from "../Components/Hooks/useGet";
-
-const ConnectedAccountsPage = () => {
-    const Auth = useAuth();
-    console.log(Auth.getUser())
-    const { data, isLoading, setData, getData, setChanged } = useGet(`/users/${Auth.getUser().userId}/connected`);
-
-
-    return (
-        <>
-            <Navigation/>
-            <Container>
-                <Row className="mb-5">
-                    <h2 style={{color: "#159895", textAlign: "left"}}>Поврзани профили</h2>
-                </Row>
-            </Container>
-            <Container>
-                {!isLoading && <ConnectedAccountsTable data={data}></ConnectedAccountsTable>}
-            </Container>
-            <Container className={'mt-5'}>
-                <Row className="mb-5">
-                    <h2 style={{color: "#159895", textAlign: "left"}}>Поврзи нов локален профил</h2>
-                </Row>
-            </Container>
-            <Container className={'w-50'}>
-                <LoginForm refresh={setChanged}></LoginForm>
-            </Container>
-        </>
-    )
-}
-
-export default ConnectedAccountsPage;
Index: frontend/src/Pages/HomePage.js
===================================================================
--- frontend/src/Pages/HomePage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/HomePage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -43,5 +43,5 @@
       </Container>
       <Container className="my-5">
-        {/*<BecomeAHost></BecomeAHost>*/}
+        <BecomeAHost></BecomeAHost>
       </Container>
     </>
Index: frontend/src/Pages/HotelDetailsPage.js
===================================================================
--- frontend/src/Pages/HotelDetailsPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/HotelDetailsPage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,5 +1,5 @@
 import React from "react";
 import LoginForm from "../Components/Login/LoginForm";
-import {Container, Row, Col, Form, FloatingLabel, Modal, Button} from "react-bootstrap";
+import { Container, Row, Col, Form } from "react-bootstrap";
 import Navigation from "../Components/Layout/Navbar/Navigation";
 import Carousel from "react-bootstrap/Carousel";
@@ -48,5 +48,5 @@
                     }}
                   >
-                    {data.averageScore.toFixed(1)}
+                    9.1
                   </span>
                 </Col>
@@ -69,7 +69,6 @@
                   placeholder="Каде ќе патувате?:"
                   id="location"
-                  value={data.hotelLocation}
                 ></Form.Control>
-                <label style={{left: "10px"}} htmlFor="location">Локација:</label>
+                <label htmlFor="location">Локација:</label>
               </Form.Floating>
             </Row>
@@ -81,7 +80,6 @@
                   placeholder="Датум на пристигнување:"
                   id="dateFrom"
-                  value={from}
                 ></Form.Control>
-                <label style={{left: "10px"}} htmlFor="dateFrom">Датум на пристигнување:</label>
+                <label htmlFor="dateFrom">Датум на пристигнување:</label>
               </Form.Floating>
             </Row>
@@ -93,7 +91,6 @@
                   placeholder="Датум на заминување:"
                   id="dateTo"
-                  value={to}
                 ></Form.Control>
-                <label style={{left: "10px"}} htmlFor="dateTo">Датум на заминување:</label>
+                <label htmlFor="dateTo">Датум на заминување:</label>
               </Form.Floating>
             </Row>
@@ -106,5 +103,5 @@
                   id="floatingPassengers"
                 ></Form.Control>
-                <label style={{left: "10px"}} htmlFor="floatingPassengers">Број на гости:</label>
+                <label htmlFor="floatingPassengers">Број на гости:</label>
               </Form.Floating>
             </Row>
@@ -114,20 +111,4 @@
               <Row>
                 <Carousel activeIndex={index} onSelect={handleSelect}>
-                  {data.images.map((image) => {
-                    let link = image.url;
-                    if (image.url.includes('Desktop')) {
-                      link = 'http://localhost:8080/download?fileName=' + encodeURIComponent(image.url);
-                    }
-                    return (
-                        <Carousel.Item>
-                          <img
-                              className="d-block w-100 h-400 rounded-5"
-                              src={link}
-                              alt="First slide"
-                              style={{ height: "50vh" }}
-                          />
-                        </Carousel.Item>
-                    )
-                  })}
                   <Carousel.Item>
                     <img
@@ -164,5 +145,5 @@
         <Row className="mb-5">
           <Col className="col-md-8"><DescriptionContainer data={data.hotelDescripiton} type="hotel"></DescriptionContainer></Col>
-          <Col className="col-md-4"><ReviewsCarousel reviews={data.hotelReviews}></ReviewsCarousel></Col>
+          <Col className="col-md-4"><ReviewsCarousel></ReviewsCarousel></Col>
         </Row>
         <Row className="mb-3"><RoomsTable from={from} to={to} data={data.hotelRooms}></RoomsTable></Row>
Index: frontend/src/Pages/HotelEditPage.js
===================================================================
--- frontend/src/Pages/HotelEditPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/HotelEditPage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,60 +1,59 @@
-import React, {useState} from "react";
-import {Container, Col, Row, Image} from "react-bootstrap";
+import React, { useState } from "react";
+import { Container, Col, Row, Image } from "react-bootstrap";
 import Navigation from "../Components/Layout/Navbar/Navigation";
 import ResourcesTab from "../Components/Resources/ResourcesTab";
 import HotelEditTab from "../Components/HotelEdit/HotelEditTab";
 import useGet from "../Components/Hooks/useGet";
-import {Navigate, useParams} from "react-router-dom";
-import {useAuth} from "../Components/Context/AuthContext";
+import { useParams } from "react-router-dom";
 
 
 const HotelEditPage = () => {
 
-    const params = useParams();
-    const link = `/hotel/${params.hotelId}/list`;
-    const [changed, setChanged] = useState(0)
-    const {data, setData, isLoading, getData} = useGet(link, changed);
+  const params = useParams();
+  const link = "/hotel/list/" + params.hotelId;
+  const [changed, setChanged] = useState(0)
+  const { data, setData, isLoading, getData } = useGet(link, changed);
 
 
-    console.log(data)
-    return (
-        <>
-            <Navigation/>
-            {!isLoading && <Container>
-                <Row className="mb-5">
-                    <h2 style={{color: "#159895", textAlign: "left"}}>Мои ресурси</h2>
-                </Row>
-                <Row className="mb-5">
-                    <Col>
-                        <Row className="d-flex mb-3">
-                            <Col
-                                className="d-flex justify-content-center"
-                                style={{maxWidth: "30%"}}
-                            >
-                                <Image
-                                    src="https://t3.ftcdn.net/jpg/05/16/27/58/360_F_516275801_f3Fsp17x6HQK0xQgDQEELoTuERO4SsWV.jpg"
-                                    style={{
-                                        height: "5em",
-                                        borderRadius: "50%",
-                                        maxWidth: "100%",
-                                    }}
-                                    className="m-auto"
-                                ></Image>
-                            </Col>
-                            <Col className="d-flex justify-content-center">
-                                <Container className="pt-2" style={{textAlign: "left"}}>
-                                    <h4>{data.hotelName}</h4>
-                                    <h5>{data.hotelLocation}</h5>
-                                </Container>
-                            </Col>
-                        </Row>
-                    </Col>
-                </Row>
-                <Row>
-                    <HotelEditTab refresh={setChanged} displayRoom={data}/>
-                </Row>
-            </Container>}
-        </>
-    );
+  console.log(data)
+  return (
+    <>
+      <Navigation />
+      {!isLoading && <Container>
+        <Row className="mb-5">
+          <h2 style={{ color: "#159895", textAlign: "left" }}>Мои ресурси</h2>
+        </Row>
+        <Row className="mb-5">
+          <Col>
+            <Row className="d-flex mb-3">
+              <Col
+                className="d-flex justify-content-center"
+                style={{ maxWidth: "30%" }}
+              >
+                <Image
+                  src="https://t3.ftcdn.net/jpg/05/16/27/58/360_F_516275801_f3Fsp17x6HQK0xQgDQEELoTuERO4SsWV.jpg"
+                  style={{
+                    height: "5em",
+                    borderRadius: "50%",
+                    maxWidth: "100%",
+                  }}
+                  className="m-auto"
+                ></Image>
+              </Col>
+              <Col className="d-flex justify-content-center">
+                <Container className="pt-2" style={{ textAlign: "left" }}>
+                  <h4>{data.hotelName}</h4>
+                  <h5>{data.hotelLocation}</h5>
+                </Container>
+              </Col>
+            </Row>
+          </Col>
+        </Row>
+        <Row>
+            <HotelEditTab refresh={setChanged} displayRoom={data}/>
+        </Row>
+      </Container>}
+    </>
+  );
 };
 
Index: frontend/src/Pages/LoginErrorPage.js
===================================================================
--- frontend/src/Pages/LoginErrorPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/LoginErrorPage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -11,4 +11,5 @@
     const [show, setShow] = useState(false);
     const [changed, setChanged] = useState(0);
+    const {data, isLoading} = useGet("/username")
     const userId = localStorage.getItem("userId")
     const [registered, setRegistered] = useState(false);
Index: frontend/src/Pages/LoginPage.js
===================================================================
--- frontend/src/Pages/LoginPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/LoginPage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -3,7 +3,4 @@
 import { Container } from "react-bootstrap";
 import Navigation from "../Components/Layout/Navbar/Navigation";
-import {useAuth} from "../Components/Context/AuthContext";
-import {Navigate} from "react-router-dom";
-
 
 const LoginPage = () => {
@@ -11,12 +8,4 @@
   document.body.style.marginTop = "auto";
   document.body.style.marginBottom = "auto";
-
-  const Auth = useAuth();
-  const isLoggedIn = Auth.userIsAuthenticated();
-
-    if (isLoggedIn) {
-        return <Navigate to={'/home'}/>
-    }
-
   return (
     <>
Index: frontend/src/Pages/NoBusinessRegisteredError.js
===================================================================
--- frontend/src/Pages/NoBusinessRegisteredError.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/NoBusinessRegisteredError.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -6,13 +6,11 @@
 import RegisterBusinessForm from "../Components/Forms/RegisterBusinessForm";
 import useGet from "../Components/Hooks/useGet";
-import {Navigate, useNavigate} from "react-router-dom";
-import {useAuth} from "../Components/Context/AuthContext";
+import { useNavigate } from "react-router-dom";
 
 const NoBusinessRegisteredError = (props) => {
   const [show, setShow] = useState(false);
   const [changed, setChanged] = useState(0);
-  const Auth = useAuth();
-  const isLoggedIn = Auth.userIsAuthenticated();
-  const userId = Auth.getUser().userId
+  const {data, isLoading} = useGet("/username")
+  const userId = localStorage.getItem("userId")
   const [registered, setRegistered] = useState(false);
   let checked = false;
@@ -26,6 +24,5 @@
   
   const { data: firma, isLoading: firmaIsLoading, getData: getFirmi} = useGet("/business/" + userId + "/unapproved", changed)
-  const { data, isLoading, getData} = useGet("/" + userId + "/hasBusiness")
-
+  
 
   useEffect(() => {
@@ -48,10 +45,8 @@
 
 
-  if(!isLoggedIn)
-  {
-    return <Navigate to={'/login'}/>
-  }
+  console.log(data)
 
-  !isLoading && data && navigator("/resources/hotel")
+  !isLoading && !data && navigator("/login")
+  !firmaIsLoading && firma && firma.length > 0 && firma[0].approved && navigator("/resources/hotel")
   
 
Index: frontend/src/Pages/ProfilePage.js
===================================================================
--- frontend/src/Pages/ProfilePage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/ProfilePage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -8,13 +8,10 @@
 import ChangePasswordForm from "../Components/Forms/ChangePasswordForm";
 import useGet from "../Components/Hooks/useGet";
-import {useAuth} from "../Components/Context/AuthContext";
-import {Navigate} from "react-router-dom";
 
 const ProfilePage = () => {
 
-    const { data, setData, isLoading, getData } = useGet("/principal");
+  const { data, setData, isLoading, getData } = useGet("/principal");
 
-
-
+  
     const profileData = {
         "name": "Марко",
@@ -22,5 +19,5 @@
         "address": "ул. Раскрсница бр. 10",
         "dateOfBirth": "2002-01-01",
-        "country": "Македонија",
+        "country": "Никогаш Северна само МАКЕДОНИЈА",
         "zip": "1000",
         "city": "Скопје",
@@ -30,9 +27,8 @@
 
 
-
   return (
     <>
       <Navigation />
-    {!isLoading && <Container>
+{      !isLoading && <Container>
         <Row className="mb-5">
           <h2 style={{ color: "#159895", textAlign: "left" }}>Мојот профил</h2>
Index: frontend/src/Pages/ProfilesManagementPage.js
===================================================================
--- frontend/src/Pages/ProfilesManagementPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,47 +1,0 @@
-import React from "react";
-import {Container, Col, Row, Image, Tabs, Tab} from "react-bootstrap";
-import Navigation from "../Components/Layout/Navbar/Navigation";
-import ResourcesTab from "../Components/Resources/ResourcesTab";
-import {useState} from "react";
-import useGet from "../Components/Hooks/useGet";
-import {useAuth} from "../Components/Context/AuthContext";
-import {Navigate} from "react-router-dom";
-import {FaCheckCircle} from "react-icons/fa";
-import UnapprovedBusinessesTable from "../Components/AdminPanel/UnapprovedBusinessesTable";
-import UnapprovedProfilesTable from "../Components/AdminPanel/UnapprovedProfilesTable";
-import AllProfilesTable from "../Components/AdminPanel/AllProfilesTable";
-
-const ProfilesManagementPage = (props) => {
-
-    console.log(props.tab)
-
-
-    return (
-        <>
-            <Navigation/>
-            <Container>
-                <Row className="mb-5">
-                    <h2 style={{color: "#159895", textAlign: "left"}}>Менаџмент со профили</h2>
-                </Row>
-            </Container>
-            <Container>
-                <Tabs
-                    defaultActiveKey="home"
-                    id="uncontrolled-tab-example"
-                    className="mb-3"
-                >
-                    <Tab eventKey="home" title="Неодобрени регистрации за фирма">
-                        <UnapprovedBusinessesTable/>
-                    </Tab>
-                    <Tab eventKey="profile" title="Неверифицирани профили">
-                        <UnapprovedProfilesTable/>
-                    </Tab>
-                    <Tab eventKey="contact" title="Сите профили">
-                        <AllProfilesTable/>
-                    </Tab>
-                </Tabs>
-            </Container>
-        </>)
-}
-
-export default ProfilesManagementPage;
Index: frontend/src/Pages/ResourcesPage.js
===================================================================
--- frontend/src/Pages/ResourcesPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/ResourcesPage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,55 +1,54 @@
 import React from "react";
-import {Container, Col, Row, Image} from "react-bootstrap";
+import { Container, Col, Row, Image } from "react-bootstrap";
 import Navigation from "../Components/Layout/Navbar/Navigation";
 import ResourcesTab from "../Components/Resources/ResourcesTab";
-import {useState} from "react";
+import { useState } from "react";
 import useGet from "../Components/Hooks/useGet";
-import {useAuth} from "../Components/Context/AuthContext";
-import {Navigate} from "react-router-dom";
 
 const ResourcesPage = (props) => {
 
-    const Auth = useAuth();
-    const user = Auth.getUser();
+  console.log(props.tab)
+  const { data, setData, isLoading, getData } = useGet("/principal");
 
-    return (
-        <>
-            <Navigation/>
-            {<Container>
-                <Row className="mb-5">
-                    <h2 style={{color: "#159895", textAlign: "left"}}>Мои ресурси</h2>
-                </Row>
-                <Row className="mb-5">
-                    <Col>
-                        <Row className="d-flex mb-3">
-                            <Col
-                                className="d-flex justify-content-center"
-                                style={{maxWidth: "30%"}}
-                            >
-                                <Image
-                                    src="https://t3.ftcdn.net/jpg/05/16/27/58/360_F_516275801_f3Fsp17x6HQK0xQgDQEELoTuERO4SsWV.jpg"
-                                    style={{
-                                        height: "5em",
-                                        borderRadius: "50%",
-                                        maxWidth: "100%",
-                                    }}
-                                    className="m-auto"
-                                ></Image>
-                            </Col>
-                            <Col className="d-flex justify-content-center">
-                                <Container className="pt-2" style={{textAlign: "left"}}>
-                                    <h4>{user.name + " " + user.surname}</h4>
-                                    <h5>{user.username}</h5>
-                                </Container>
-                            </Col>
-                        </Row>
-                    </Col>
-                </Row>
-                <Row>
-                    <ResourcesTab tab={props.tab}></ResourcesTab>
-                </Row>
-            </Container>}
-        </>
-    );
+
+  return (
+    <>
+      <Navigation />
+{!isLoading && <Container>
+        <Row className="mb-5">
+          <h2 style={{ color: "#159895", textAlign: "left" }}>Мои ресурси</h2>
+        </Row>
+        <Row className="mb-5">
+          <Col>
+            <Row className="d-flex mb-3">
+              <Col
+                className="d-flex justify-content-center"
+                style={{ maxWidth: "30%" }}
+              >
+                <Image
+                  src="https://t3.ftcdn.net/jpg/05/16/27/58/360_F_516275801_f3Fsp17x6HQK0xQgDQEELoTuERO4SsWV.jpg"
+                  style={{
+                    height: "5em",
+                    borderRadius: "50%",
+                    maxWidth: "100%",
+                  }}
+                  className="m-auto"
+                ></Image>
+              </Col>
+              <Col className="d-flex justify-content-center">
+                <Container className="pt-2" style={{ textAlign: "left" }}>
+                  <h4>{data.name + " " + data.surname}</h4>
+                  <h5>{data.email}</h5>
+                </Container>
+              </Col>
+            </Row>
+          </Col>
+        </Row>
+        <Row>
+            <ResourcesTab tab={props.tab}></ResourcesTab>
+        </Row>
+      </Container>}
+    </>
+  );
 };
 
Index: frontend/src/Pages/RestaurantDetailsPage.js
===================================================================
--- frontend/src/Pages/RestaurantDetailsPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/RestaurantDetailsPage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,8 +1,8 @@
 import React from "react";
 import LoginForm from "../Components/Login/LoginForm";
-import {Container, Row, Col, Form} from "react-bootstrap";
+import { Container, Row, Col, Form } from "react-bootstrap";
 import Navigation from "../Components/Layout/Navbar/Navigation";
 import Carousel from "react-bootstrap/Carousel";
-import {useState} from "react";
+import { useState } from "react";
 import DescriptionContainer from "../Components/HotelDetails/DescriptionContainer";
 import ReviewsCarousel from "../Components/HotelDetails/ReviewsCarousel";
@@ -11,168 +11,140 @@
 import Menu from "../Components/RestaurantDetails/Menu";
 import MenuCarousel from "../Components/RestaurantDetails/Carousel";
-import {useLocation} from "react-router-dom";
-import TablesTable from "../Components/RestaurantDetails/TablesTable";
 
 const RestaurantDetailsPage = (props) => {
-    document.body.style.backgroundColor = "white";
+  document.body.style.backgroundColor = "white";
 
-    const [index, setIndex] = useState(0);
-    const location = useLocation();
-    const {data, params: formData} = location.state;
+  const [index, setIndex] = useState(0);
 
-    const handleSelect = (selectedIndex) => {
-        setIndex(selectedIndex);
-    };
+  const handleSelect = (selectedIndex) => {
+    setIndex(selectedIndex);
+  };
 
-    return (
-        <>
-            <Navigation/>
-            <Container className="my-3">
-                <Row className="d-flex justify-content-between">
-                    <Col style={{textAlign: "left"}}>
-                        <h2 style={{color: "#159895"}}>{data.restaurantName}</h2>
-                    </Col>
-                    <Col>
-                        <Container>
-                            <Row className="mb-4">
-                                <Col style={{textAlign: "right"}}>
+  return (
+    <>
+      <Navigation />
+      <Container className="my-3">
+        <Row className="d-flex justify-content-between">
+          <Col style={{textAlign: "left"}}>
+            <h2 style={{color: "#159895"}}>Име на ресторант</h2>
+          </Col>
+          <Col>
+            <Container>
+              <Row className="mb-4">
+                <Col style={{textAlign: "right"}}>
                   <span
-                      style={{
-                          backgroundColor: "#159895",
-                          padding: "0.75em",
-                          fontWeight: "bold",
-                          fontSize: "1.25rem",
-                          borderRadius: "0.75em",
-                          color: "white",
-                      }}
+                    style={{
+                      backgroundColor: "#159895",
+                      padding: "0.75em",
+                      fontWeight: "bold",
+                      fontSize: "1.25rem",
+                      borderRadius: "0.75em",
+                      color: "white",
+                    }}
                   >
-                    {data.averageScore.toFixed(1)}
+                    9.1
                   </span>
-                                </Col>
-                            </Row>
-                        </Container>
-                    </Col>
-                </Row>
-                <Row>
-                    <Col
-                        className="p-3 rounded-4"
-                        sm={3}
-                        style={{backgroundColor: "#002B5B"}}
-                    >
-                        <Row>
-                            <h3 className="mb-5 mt-3" style={{color: "white"}}>Критериуми од пребарувањето</h3>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="text"
-                                    placeholder="Каде ќе патувате?:"
-                                    id="location"
-                                    name={'restaurantLocation'}
-                                    value={formData.restaurantLocation}
-                                ></Form.Control>
-                                <label style={{left: "10px"}} htmlFor="location">Локација:</label>
-                            </Form.Floating>
-                        </Row>
-                        <Row>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="date"
-                                    placeholder="Датум на резервација:"
-                                    id="date"
-                                    name={'date'}
-                                    value={formData.date}
-                                ></Form.Control>
-                                <label style={{left: "10px"}} htmlFor="dateFrom">Датум на резерација:</label>
-                            </Form.Floating>
-                        </Row>
-                        <Row>
-                            <Col>
-                                <Form.Floating className="mb-3">
-                                    <Form.Control
-                                        size="lg"
-                                        type="text"
-                                        placeholder="Место:"
-                                        id="location"
-                                        name={'hourFrom'}
-                                        value={formData.hourFrom}
-                                    ></Form.Control>
-                                    <label style={{left: "10px"}} htmlFor="location">Време од:</label>
-                                </Form.Floating>
-                            </Col>
-                            <Col>
-                                <Form.Floating className="mb-3">
-                                    <Form.Control
-                                        size="lg"
-                                        type="text"
-                                        placeholder="Место:"
-                                        id="location"
-                                        name={'hourTo'}
-                                        value={formData.hourTo}
-                                    ></Form.Control>
-                                    <label style={{left: "10px"}} htmlFor="location">Време до:</label>
-                                </Form.Floating>
-                            </Col>
-                        </Row>
-                        <Row>
-                            <Form.Floating className="mb-3">
-                                <Form.Control
-                                    size="md"
-                                    type="number"
-                                    placeholder="Број на гости:"
-                                    id="floatingPassengers"
-                                    name={'numPeople'}
-                                    value={formData.numPeople}
-                                ></Form.Control>
-                                <label style={{left: "10px"}} htmlFor="floatingPassengers">Број на гости:</label>
-                            </Form.Floating>
-                        </Row>
-                    </Col>
-                    <Col>
-                        <Container>
-                            <Row>
-                                <Carousel activeIndex={index} onSelect={handleSelect}>
-                                    {data.images.map((image) => {
-                                        let link = image.url;
-                                        if (image.url.includes('Desktop')) {
-                                            link = 'http://localhost:8080/download?fileName=' + encodeURIComponent(image.url);
-                                        }
-                                        return (
-                                            <Carousel.Item>
-                                                <img
-                                                    className="d-block w-100 h-400 rounded-5"
-                                                    src={link}
-                                                    alt="First slide"
-                                                    style={{ height: "50vh" }}
-                                                />
-                                            </Carousel.Item>
-                                        )
-                                    })}
-                                    {data.images.length == 0 && <Carousel.Item>
-                                        <img
-                                            className="d-block w-100 h-400 rounded-5"
-                                            src="https://emagazin.mk/wp-content/uploads/2022/03/Karos_Photography-7795.jpg"
-                                            alt="First slide"
-                                            style={{height: "50vh"}}
-                                        />
-                                    </Carousel.Item>}
-                                </Carousel>
-                            </Row>
-                            <Row>
-                                <Container></Container>
-                            </Row>
-                        </Container>
-                    </Col>
-                </Row>
-                <Row className="mb-5">
-                    <Col className="col-md-8"><DescriptionContainer data={data.restaurantDescription} type="restaurant"></DescriptionContainer></Col>
-                    <Col className="col-md-4"><ReviewsCarousel reviews={data.reviews}></ReviewsCarousel></Col>
-                </Row>
-                <Row className="mb-3"><MenuCarousel images={data.menuImages} menu={data.menus}></MenuCarousel></Row>
-                <Row><TablesTable params={formData} data={data.tables}></TablesTable></Row>
-                <Row><ContactBar></ContactBar></Row>
+                </Col>
+              </Row>
             </Container>
-        </>
-    );
+          </Col>
+        </Row>
+        <Row>
+          <Col
+            className="p-3 rounded-4"
+            sm={3}
+            style={{ backgroundColor: "#002B5B" }}
+          >
+            <Row>
+              <h3 className="mb-5 mt-3" style={{color: "white"}}>Критериуми од пребарувањето</h3>
+              <Form.Floating className="mb-3">
+                <Form.Control
+                  size="md"
+                  type="text"
+                  placeholder="Каде ќе патувате?:"
+                  id="location"
+                ></Form.Control>
+                <label htmlFor="location">Локација:</label>
+              </Form.Floating>
+            </Row>
+            <Row>
+              <Form.Floating className="mb-3">
+                <Form.Control
+                  size="md"
+                  type="date"
+                  placeholder="Датум на резервација:"
+                  id="date"
+                ></Form.Control>
+                <label htmlFor="dateFrom">Датум на резерација:</label>
+              </Form.Floating>
+            </Row>
+            <Row>
+              <Form.Floating className="mb-3">
+                <Form.Control
+                  size="md"
+                  type="time"
+                  placeholder="Време на пристигање:"
+                  id="time"
+                ></Form.Control>
+                <label htmlFor="time">Време на пристигање:</label>
+              </Form.Floating>
+            </Row>
+            <Row>
+              <Form.Floating className="mb-3">
+                <Form.Control
+                  size="md"
+                  type="number"
+                  placeholder="Број на гости:"
+                  id="floatingPassengers"
+                ></Form.Control>
+                <label htmlFor="floatingPassengers">Број на гости:</label>
+              </Form.Floating>
+            </Row>
+          </Col>
+          <Col>
+            <Container>
+              <Row>
+                <Carousel activeIndex={index} onSelect={handleSelect}>
+                  <Carousel.Item>
+                    <img
+                      className="d-block w-100 h-400 rounded-5"
+                      src="https://emagazin.mk/wp-content/uploads/2022/03/Karos_Photography-7795.jpg"
+                      alt="First slide"
+                      style={{ height: "50vh" }}
+                    />
+                  </Carousel.Item>
+                  <Carousel.Item>
+                    <img
+                      className="d-block w-100 rounded-5"
+                      src="https://emagazin.mk/wp-content/uploads/2022/03/Karos_Photography-7871.jpg"
+                      alt="Second slide"
+                      style={{ height: "50vh" }}
+                    />
+                  </Carousel.Item>
+                  <Carousel.Item>
+                    <img
+                      className="d-block w-100 rounded-5"
+                      src="https://lh5.googleusercontent.com/p/AF1QipMQAwahuuJCJ2rDUYNrhnwiX1070adTsM6LmzV5=w480-h300-k-n"
+                      alt="Third slide"
+                      style={{ height: "50vh" }}
+                    />
+                  </Carousel.Item>
+                </Carousel>
+              </Row>
+              <Row>
+                <Container></Container>
+              </Row>
+            </Container>
+          </Col>
+        </Row>
+        <Row className="mb-5">
+          <Col className="col-md-8"><DescriptionContainer type="restaurant"></DescriptionContainer></Col>
+          <Col className="col-md-4"><ReviewsCarousel></ReviewsCarousel></Col>
+        </Row>
+        <Row className="mb-3"><MenuCarousel></MenuCarousel></Row>
+        <Row><ContactBar></ContactBar></Row>
+      </Container>
+    </>
+  );
 };
 
Index: frontend/src/Pages/RestaurantEditPage.js
===================================================================
--- frontend/src/Pages/RestaurantEditPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/RestaurantEditPage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -6,6 +6,5 @@
 import RestaurantEditTab from "../Components/RestaurantEdit/RestaurantEditTab";
 import useGet from "../Components/Hooks/useGet";
-import {Navigate, useParams, useSearchParams} from "react-router-dom";
-import {useAuth} from "../Components/Context/AuthContext";
+import { useParams, useSearchParams } from "react-router-dom";
 
 const RestaurantEditPage = () => {
Index: frontend/src/Pages/SearchPage.js
===================================================================
--- frontend/src/Pages/SearchPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/SearchPage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,8 +1,8 @@
-import React, {useState} from "react";
+import React from "react";
 import Navigation from '../Components/Layout/Navbar/Navigation';
 import 'bootstrap/dist/css/bootstrap.css';
 import 'bootstrap/dist/js/bootstrap.js';
 import HomeCarousel from '../Components/Layout/CarouselHome/Carousel';
-import {Card, Container, Nav, Row, Col} from 'react-bootstrap';
+import { Card, Container, Nav, Row, Col } from 'react-bootstrap';
 import TabComponent from '../Components/Tab/Tab';
 import Offers from '../Components/Layout/Offers/Offers';
@@ -11,13 +11,10 @@
 import BecomeAHost from "../Components/BecomeAHost/BecomeAHost"
 import HotelLisitng from "../Components/Listings/HotelListing"
-import SearchCriteriasHotel from "../Components/SearchCriterias/SearchCriteriasHotel";
+import SearchCriterias from "../Components/SearchCriterias/SearchCriteriasBar";
 import SortButton from "../Components/Listings/SortButton";
 import FilterButton from "../Components/Listings/FilterButton";
 import TransportListing from "../Components/Listings/TransportListing";
 import useGet from "../Components/Hooks/useGet";
-import {useParams} from "react-router-dom";
-import SearchCriteriasBar from "../Components/SearchCriterias/SearchCriteriasBar";
-import RestaurantDetailsPage from "./RestaurantDetailsPage";
-import RestaurantListing from "../Components/Listings/RestaurantListing";
+import { useParams } from "react-router-dom";
 
 
@@ -26,5 +23,5 @@
     const params = useParams();
     console.log(params)
-    const [sortingArg, setSortingArg] = useState("")
+
 
     document.body.style.backgroundColor = "white"
@@ -38,73 +35,13 @@
 
     }
-
-    const getSortingFn = (type, arg) => {
-        if (type === 'hotel') {
-            if (arg === "priceAsc")
-            {
-                return (a, b) => {
-                    return a.totalPrice - b.totalPrice;
-                }
-            }
-            else if (arg === "priceDesc")
-            {
-                return (a, b) => {
-                    return -(a.totalPrice - b.totalPrice);
-                }
-            }
-            else if (arg === 'nameAsc')
-            {
-                return (a, b) => {
-                    return a.hotelName.localeCompare(b.hotelName);
-                }
-            }
-            else if(arg === 'nameDesc')
-            {
-                return (a, b) => {
-                    return -a.hotelName.localeCompare(b.hotelName);
-                }
-            }
-        }
-        else if (type === 'transport')
-        {
-            if (arg === "priceAsc")
-            {
-                return (a, b) => {
-                    return a.price - b.price;
-                }
-            }
-            else if (arg === "priceDesc")
-            {
-                return (a, b) => {
-                    return -(a.price - b.price);
-                }
-            }
-        }
-        else if (type === 'restaurant')
-        {
-            if (arg === 'nameAsc')
-            {
-                return (a, b) => {
-                    return a.restaurantName.localeCompare(b.restaurantName);
-                }
-            }
-            else if(arg === 'nameDesc')
-            {
-                return (a, b) => {
-                    return -a.restaurantName.localeCompare(b.restaurantName);
-                }
-            }
-        }
-    }
-
-    let link = props.type === "transport" ? `/transport/search?from=${params.from}&to=${params.to}&date=${params.date}&numPassengers=${params.numPassengers}` : props.type === "hotel" ? `/hotel/search?hotelLocation=${params.hotelLocation}&dateFrom=${params.dateFrom}&dateTo=${params.dateTo}&numBeds=${params.numBeds}&flexible=${params.flexible}` : `/restaurant/search?restaurantLocation=${params.restaurantLocation}&date=${params.date}&hourFrom=${params.hourFrom}&hourTo=${params.hourTo}&numPeople=${params.numPeople}`
+    
+    let link = props.type === "transport" ? `/transport/search?from=${params.from}&to=${params.to}&date=${params.date}` : props.type === "hotel" ? `/hotel/search?hotelLocation=${params.hotelLocation}&dateFrom=${params.dateFrom}&dateTo=${params.dateTo}&numBeds=${params.numBeds}` : ""
     console.log(link)
-    console.log(params.date)
-    const {data, isLoading, getData, setData} = useGet(link);
+    const { data, isLoading, getData, setData } = useGet(link);
     !isLoading && console.log(data)
     return (
         <>
             <Navigation></Navigation>
-            <SearchCriteriasBar type={props.type} criterias={useParams()}></SearchCriteriasBar>
+            <SearchCriterias criterias={useParams()}></SearchCriterias>
             <Container className="d-flex justify-content-end gx-5" style={{maxWidth: "60%"}}>
                 <Row>
@@ -113,21 +50,16 @@
                     </Col>
                     <Col>
-                        <SortButton setSortingArg={setSortingArg} type={props.type}></SortButton>
+                        <SortButton></SortButton>
                     </Col>
                 </Row>
             </Container>
             {props.type === "hotel" && !isLoading && data && <Container fluid>
-                {data.sort(getSortingFn(props.type, sortingArg)).map(hotel => {
+                {data.map(hotel => {
                     return <HotelLisitng from={params.dateFrom} to={params.dateTo} data={hotel}/>
                 })}
-            </Container>}
+                </Container>}
             {props.type === "transport" && !isLoading && data && <Container fluid>
-                {data.sort(getSortingFn(props.type, sortingArg)).map(transport => {
-                    return <TransportListing params={params} data={transport}/>
-                })}
-            </Container>}
-            {props.type === "restaurant" && !isLoading && data && <Container fluid>
-                {data.sort(getSortingFn(props.type, sortingArg)).map(restaurant => {
-                    return <RestaurantListing params={params} data={restaurant}/>
+                {data.map(transport => {
+                    return <TransportListing data={transport}/>
                 })}
             </Container>}
Index: frontend/src/Pages/TransportDetailsPage.js
===================================================================
--- frontend/src/Pages/TransportDetailsPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/TransportDetailsPage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,8 +1,8 @@
 import React from "react";
 import LoginForm from "../Components/Login/LoginForm";
-import {Container, Row, Col, Form, Image, Button, Modal} from "react-bootstrap";
+import { Container, Row, Col, Form, Image, Button } from "react-bootstrap";
 import Navigation from "../Components/Layout/Navbar/Navigation";
 import Carousel from "react-bootstrap/Carousel";
-import {useState} from "react";
+import { useState } from "react";
 import DescriptionContainer from "../Components/HotelDetails/DescriptionContainer";
 import ReviewsCarousel from "../Components/HotelDetails/ReviewsCarousel";
@@ -10,197 +10,115 @@
 import ContactBar from "../Components/HotelDetails/ContactBar";
 import RouteContainer from "../Components/TransportDetails/RouteContainer";
-import {useLocation, useParams} from "react-router-dom";
-import SearchCriteriasTransport from "../Components/SearchCriterias/SearchCriteriasTransport";
-import SearchCriteriasBar from "../Components/SearchCriterias/SearchCriteriasBar";
-import useCreate from "../Components/Hooks/useCreate";
+import { useLocation } from "react-router-dom";
 
 const TransportDetailsPage = (props) => {
-    document.body.style.backgroundColor = "white";
-    const {createEntity} = useCreate()
+  document.body.style.backgroundColor = "white";
 
-    const [index, setIndex] = useState(0);
-    const [getData, setData] = useState(0);
+  const [index, setIndex] = useState(0);
 
-    const location = useLocation();
-    const {data, params} = location.state;
-    const [show, setShow] = useState(false);
-    const handleClose = () => setShow(false);
-    const handleShow = () => setShow(true);
-    const route = data.transportRoutes.filter(x => x.from === params.from && x.to === params.to)[0];
-    const dateFormatter = (str) => {
-        const inputDate = new Date(str);
+  const location = useLocation();
+  const { data } = location.state;
 
-        const options = {
-            year: 'numeric',
-            month: '2-digit',
-            day: '2-digit',
-            hour12: false,
-            hour: '2-digit',
-            minute: '2-digit'
-        };
+  const handleSelect = (selectedIndex) => {
+    setIndex(selectedIndex);
+  };
 
-        return inputDate.toLocaleString('de-DE', options);
-
-    }
-
-    const handleSelect = (selectedIndex) => {
-        setIndex(selectedIndex);
-    };
-
-    return (
-        <>
-            <Navigation/>
-            <Container className="my-3">
-                <Row>
-                    <span><h2 style={{color: "#159895", textAlign: 'left'}}>Вашето пребарување</h2></span>
-                </Row>
-                <SearchCriteriasBar type={'transport'} showButton={false} criterias={params}></SearchCriteriasBar>
-                <Row className="d-flex justify-content-between">
-                    <Col style={{textAlign: "left"}}>
-                        <span>
-                            <h3 style={{color: "#159895"}}><b>Резултантна рута</b></h3>
-                            <h2 style={{color: "#159895"}}>{data.from} - {data.to}</h2>
-                            <h5 style={{color: "#159895"}}>({data.routes.join(", ")})</h5>
-                        </span>
-                    </Col>
-                    <Col>
-                        <Container>
-                            <Row className="mb-4">
-                                <Col style={{textAlign: "right"}}>
+  return (
+    <>
+      <Navigation />
+      <Container className="my-3">
+        <Row className="d-flex justify-content-between">
+          <Col style={{textAlign: "left"}}>
+            <span><h2 style={{color: "#159895"}}>{data.from} - {data.to}</h2><h5 style={{color: "#159895"}}>({data.routes.join(", ")})</h5></span>
+          </Col>
+          <Col>
+            <Container>
+              <Row className="mb-4">
+                <Col style={{textAlign: "right"}}>
                   <span
-                      style={{
-                          backgroundColor: "#159895",
-                          padding: "0.75em",
-                          fontWeight: "bold",
-                          fontSize: "1.25rem",
-                          borderRadius: "0.75em",
-                          color: "white",
-                      }}
+                    style={{
+                      backgroundColor: "#159895",
+                      padding: "0.75em",
+                      fontWeight: "bold",
+                      fontSize: "1.25rem",
+                      borderRadius: "0.75em",
+                      color: "white",
+                    }}
                   >
                     9.1
                   </span>
-                                </Col>
-                            </Row>
-                        </Container>
-                    </Col>
-                </Row>
-                <Row>
-                    <RouteContainer data={data}></RouteContainer>
-                </Row>
-                <hr></hr>
-                <Row>
-                    <Col>
-                        <h3>Одбрана рута</h3>
-                    </Col>
-                    <Col>
-                        <h3>{params.from + ' - ' + params.to}</h3>
-                    </Col>
-                </Row>
-                <hr></hr>
-                <Row>
-                    <Col>
-                        <h3>Очекувано време на поаѓање</h3>
-                    </Col>
-                    <Col>
-                        <h3>{dateFormatter(route.departure)}</h3>
-                    </Col>
-                </Row>
-                <hr></hr>
-                <Row>
-                    <Col>
-                        <h3>Цена</h3>
-                    </Col>
-                    <Col>
-                        <h3>{data.price}$</h3>
-                    </Col>
-                </Row>
-                <hr></hr>
-                <Row>
-                    <Col className="d-flex flex-column justify-content-center">
-                        <h3>Возач</h3>
-                    </Col>
-                    <Col className="d-flex flex-column justify-content-center">
-                        <Container className="d-flex flex-row justify-content-center mb-3" style={{paddingLeft: "28%"}}>
-                            <Col className="d-flex flex-column justify-content-center" style={{maxWidth: "30%"}}>
-                                <Image
-                                    src="https://t3.ftcdn.net/jpg/05/16/27/58/360_F_516275801_f3Fsp17x6HQK0xQgDQEELoTuERO4SsWV.jpg"
-                                    style={{
-                                        height: "4em",
-                                        borderRadius: "50%",
-                                        maxWidth: "100%",
-                                    }}
-                                    className="m-auto"
-                                ></Image>
-                            </Col>
-                            <Col className="d-flex flex-column justify-content-center">
-                                <Container className="pt-2" style={{textAlign: "left"}}>
-                                    <h4>{data.transport.owner.name} {data.transport.owner.surname.substring(0, 1)}.</h4>
-                                </Container>
-                            </Col>
-                        </Container>
-                    </Col>
-                </Row>
-                <hr></hr>
-                <Row>
-                    <Col>
-                        <h3>Возило</h3>
-                    </Col>
-                    <Col>
-                        <h3>{data.transport.carBrand + " " + data.transport.carType}</h3>
-                    </Col>
-                </Row>
-                <hr></hr>
-                <Row>
-                    <Col className="d-flex flex-column justify-content-center">
-                        <h3>Број на патници</h3>
-                    </Col>
-                    <Col md="auto" className="d-flex flex-column justify-content-center">
-                        <Form.Select onChange={(e) => {
-                            setData(e.target.value)
-                        }} aria-label="Default select example">
-                            <option></option>
-                            {[...Array(route.freeSpace).keys()].map(x => {
-                                return (
-                                    <option value={x+1}  >{x + 1}</option>
-                                )
-                            })}
-                        </Form.Select>
-                    </Col>
-                    <Col>
-                        <Button className="m-2" size="lg" style={{backgroundColor: "#159895"}} onClick={handleShow}>Резервирај</Button>
-                    </Col>
-                </Row>
-                <Row><ContactBar></ContactBar></Row>
+                </Col>
+              </Row>
             </Container>
-
-            <Modal show={show} size={'lg'} onHide={handleClose}>
-                <Modal.Header closeButton>
-                    <Modal.Title>Потврда на резервација</Modal.Title>
-                </Modal.Header>
-                <Modal.Body>
-                    <h4>Резервација на рута</h4>
-                    <h3>{route.from + ' ' + route.to}</h3>
-                    <h4>Време на поаѓање:<b>{' ' + dateFormatter(route.departure)}</b></h4>
-                    <h4>Време на престигнување:<b>{' ' + dateFormatter(route.arrival)}</b></h4>
-                    <h4>Број на патници:<b>{' ' + getData}</b></h4>
-                </Modal.Body>
-                <Modal.Footer>
-                    <Button variant="secondary" onClick={handleClose}>
-                        Close
-                    </Button>
-                    <Button variant="primary" onClick={() => {
-                        createEntity('transport/reserve', {
-                            transportRouteId: route.routeId,
-                            userId: 1,
-                            numSeats: getData
-                        })
-                        handleClose();
-                    }}>
-                        Резервирај
-                    </Button>
-                </Modal.Footer>
-            </Modal>
-        </>
-    );
+          </Col>
+        </Row>
+        <Row>
+            <RouteContainer data={data}></RouteContainer>
+        </Row>
+        <hr></hr>
+        <Row>
+            <Col>
+               <h3>Цена</h3>     
+            </Col>
+            <Col>
+                <h3>{data.price}$</h3>
+            </Col>
+        </Row>
+        <hr></hr>
+        <Row>
+            <Col className="d-flex flex-column justify-content-center">
+               <h3>Возач</h3>     
+            </Col>
+            <Col className="d-flex flex-column justify-content-center">
+            <Container className="d-flex flex-row justify-content-center mb-3" style={{paddingLeft: "28%"}}>
+              <Col className="d-flex flex-column justify-content-center" style={{maxWidth: "30%"}}>
+                <Image
+                  src="https://t3.ftcdn.net/jpg/05/16/27/58/360_F_516275801_f3Fsp17x6HQK0xQgDQEELoTuERO4SsWV.jpg"
+                  style={{
+                    height: "4em",
+                    borderRadius: "50%",
+                    maxWidth: "100%",
+                  }}
+                  className="m-auto"
+                ></Image>
+              </Col>
+              <Col className="d-flex flex-column justify-content-center">
+                <Container className="pt-2" style={{ textAlign: "left" }}>
+                  <h4>{data.transport.owner.name} {data.transport.owner.surname.substring(0, 1)}.</h4>
+                </Container>
+              </Col>
+            </Container>
+            </Col>
+        </Row>
+        <hr></hr>
+        <Row>
+            <Col>
+               <h3>Возило</h3>     
+            </Col>
+            <Col>
+                <h3>{data.transport.carBrand + " " + data.transport.carType}</h3>
+            </Col>
+        </Row>
+        <hr></hr>
+        <Row>
+            <Col className="d-flex flex-column justify-content-center">
+                <h3>Број на патници</h3>
+            </Col>
+            <Col md="auto" className="d-flex flex-column justify-content-center"> 
+            <Form.Select aria-label="Default select example">
+                <option></option>
+                <option value="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+              </Form.Select>
+            </Col>
+            <Col >   
+            <Button className="m-2" size="lg" style={{backgroundColor: "#159895"}}>Резервирај</Button>
+            </Col>
+        </Row>
+        <Row><ContactBar></ContactBar></Row>
+      </Container>
+    </>
+  );
 };
 
Index: frontend/src/Pages/TransportEditPage.js
===================================================================
--- frontend/src/Pages/TransportEditPage.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/Pages/TransportEditPage.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,4 +1,4 @@
-import React, {useState} from "react";
-import {Container, Col, Row, Image} from "react-bootstrap";
+import React, { useState } from "react";
+import { Container, Col, Row, Image } from "react-bootstrap";
 import Navigation from "../Components/Layout/Navbar/Navigation";
 import ResourcesTab from "../Components/Resources/ResourcesTab";
@@ -7,58 +7,56 @@
 import TransportEditTab from "../Components/TransportEdit/TransportEditTab";
 import useGet from "../Components/Hooks/useGet";
-import {Navigate, useParams} from "react-router-dom";
-import {useAuth} from "../Components/Context/AuthContext";
+import { useParams } from "react-router-dom";
 
 const TransportEditPage = () => {
+  const params = useParams();
+  console.log("transportot ima id " + params.transportId);
+  const link = "/transport/" + params.transportId;
+  const [changed, setChanged] = useState(0);
+  const { data, setData, isLoading, getData } = useGet(link, changed);
 
-    const params = useParams();
+  !isLoading && console.log(data)
 
-    const link = "/transport/" + params.transportId;
-
-    const {data, setData, isLoading, getData, setChanged} = useGet(link);
-
-    !isLoading && console.log(data)
-
-    return (
-        <>
-            <Navigation/>
-            {!isLoading && (
-                <Container>
-                    <Row className="mb-5">
-                        <h2 style={{color: "#159895", textAlign: "left"}}>Мои ресурси</h2>
-                    </Row>
-                    <Row className="mb-5">
-                        <Col>
-                            <Row className="d-flex mb-3">
-                                <Col
-                                    className="d-flex justify-content-center"
-                                    style={{maxWidth: "30%"}}
-                                >
-                                    <Image
-                                        src="https://t3.ftcdn.net/jpg/05/16/27/58/360_F_516275801_f3Fsp17x6HQK0xQgDQEELoTuERO4SsWV.jpg"
-                                        style={{
-                                            height: "5em",
-                                            borderRadius: "50%",
-                                            maxWidth: "100%",
-                                        }}
-                                        className="m-auto"
-                                    ></Image>
-                                </Col>
-                                <Col className="d-flex justify-content-center">
-                                    <Container className="pt-2" style={{textAlign: "left"}}>
-                                        <h4>{data.transportName}</h4>
-                                        <h5>{data.carBrand + " " + data.carType}</h5>
-                                    </Container>
-                                </Col>
-                            </Row>
-                        </Col>
-                    </Row>
-                    <Row>
-                        {data && <TransportEditTab displayRoute={data} refresh={setChanged}/>}
-                    </Row>
-                </Container>
-            )}
-        </>
-    );
+  return (
+    <>
+      <Navigation />
+      {!isLoading && (
+        <Container>
+          <Row className="mb-5">
+            <h2 style={{ color: "#159895", textAlign: "left" }}>Мои ресурси</h2>
+          </Row>
+          <Row className="mb-5">
+            <Col>
+              <Row className="d-flex mb-3">
+                <Col
+                  className="d-flex justify-content-center"
+                  style={{ maxWidth: "30%" }}
+                >
+                  <Image
+                    src="https://t3.ftcdn.net/jpg/05/16/27/58/360_F_516275801_f3Fsp17x6HQK0xQgDQEELoTuERO4SsWV.jpg"
+                    style={{
+                      height: "5em",
+                      borderRadius: "50%",
+                      maxWidth: "100%",
+                    }}
+                    className="m-auto"
+                  ></Image>
+                </Col>
+                <Col className="d-flex justify-content-center">
+                  <Container className="pt-2" style={{ textAlign: "left" }}>
+                    <h4>{data.transportName}</h4>
+                    <h5>{data.carBrand + " " + data.carType}</h5>
+                  </Container>
+                </Col>
+              </Row>
+            </Col>
+          </Row>
+          <Row>
+            {data && <TransportEditTab displayRoute={data} refresh={setChanged}/>}
+          </Row>
+        </Container>
+      )}
+    </>
+  );
 };
 
Index: frontend/src/Pages/UserReservationsManagement.js
===================================================================
--- frontend/src/Pages/UserReservationsManagement.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ 	(revision )
@@ -1,34 +1,0 @@
-import React from "react";
-import {Container, Col, Row, Image, Tabs, Tab} from "react-bootstrap";
-import Navigation from "../Components/Layout/Navbar/Navigation";
-import ResourcesTab from "../Components/Resources/ResourcesTab";
-import {useState} from "react";
-import useGet from "../Components/Hooks/useGet";
-import {useAuth} from "../Components/Context/AuthContext";
-import {Navigate} from "react-router-dom";
-import {FaCheckCircle} from "react-icons/fa";
-import UnapprovedBusinessesTable from "../Components/AdminPanel/UnapprovedBusinessesTable";
-import UnapprovedProfilesTable from "../Components/AdminPanel/UnapprovedProfilesTable";
-import AllProfilesTable from "../Components/AdminPanel/AllProfilesTable";
-import TypeSelectionTab from "../Components/UserPanel/TypeSelectionTab";
-
-const UserReservationsManagement = (props) => {
-
-    console.log(props.tab)
-
-
-    return (
-        <>
-            <Navigation/>
-            <Container>
-                <Row className="mb-5">
-                    <h2 style={{color: "#159895", textAlign: "left"}}>Менаџмент со резервации</h2>
-                </Row>
-            </Container>
-            <Container>
-                <TypeSelectionTab/>
-            </Container>
-        </>)
-}
-
-export default UserReservationsManagement;
Index: frontend/src/axios.js
===================================================================
--- frontend/src/axios.js	(revision efaa05348a3e0dac884385ba4dd765baaeb47ec6)
+++ frontend/src/axios.js	(revision e9b4ba920295b1b329df3313a9e80743d23804ee)
@@ -1,16 +1,21 @@
 import axios from "axios";
-
 
 const instance = axios.create({
     baseURL: "http://localhost:8080/",
     withCredentials: true,
-    maxRedirects: 1,
-    beforeRedirect: (options, { headers }) => {
-        console.log(options)
-        if (options.hostname === "example.com") {
-            options.auth = "user:password";
-        }}
-
+    maxRedirects: 1
 })
 
+instance.interceptors.response.use(function (response) {
+    // Any status code that lie within the range of 2xx cause this function to trigger
+    // Do something with response data
+    return response;
+  }, function (error) {
+    console.log(error)
+    //  window.location.href="/login"
+    // Any status codes that falls outside the range of 2xx cause this function to trigger
+    // Do something with response error
+    return Promise.reject(error);
+  });
+
 export default instance
