Index: frontend/package-lock.json =================================================================== --- frontend/package-lock.json (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/package-lock.json (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -13,5 +13,4 @@ "@testing-library/user-event": "^13.5.0", "axios": "^1.5.0", - "axios-extensions": "^3.1.6", "bootstrap": "^5.3.0", "file-loader": "^6.2.0", @@ -5350,25 +5349,4 @@ } }, - "node_modules/axios-extensions": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/axios-extensions/-/axios-extensions-3.1.6.tgz", - "integrity": "sha512-CmwMYxxAw4DcQDJ7/2Iv4GJj1Ao48lJEPieycgZQH6m1KcYZqf9zm2HM/CsULqheCpYxZbiGrCfZf5tVjXqoLg==", - "dependencies": { - "lru-cache": "^7.14.0", - "tslib": "^2.1.0", - "util": "^0.12.3" - }, - "peerDependencies": { - "axios": "*" - } - }, - "node_modules/axios-extensions/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "engines": { - "node": ">=12" - } - }, "node_modules/axios/node_modules/form-data": { "version": "4.0.0", @@ -9447,4 +9425,5 @@ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "peer": true, "dependencies": { "call-bind": "^1.0.2", @@ -9585,18 +9564,4 @@ "engines": { "node": ">=6" - } - }, - "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, @@ -16835,16 +16800,4 @@ } }, - "node_modules/util": { - "version": "0.12.5", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", - "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", - "dependencies": { - "inherits": "^2.0.3", - "is-arguments": "^1.0.4", - "is-generator-function": "^1.0.7", - "is-typed-array": "^1.1.3", - "which-typed-array": "^1.1.2" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", Index: frontend/package.json =================================================================== --- frontend/package.json (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/package.json (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -8,5 +8,4 @@ "@testing-library/user-event": "^13.5.0", "axios": "^1.5.0", - "axios-extensions": "^3.1.6", "bootstrap": "^5.3.0", "file-loader": "^6.2.0", Index: frontend/src/App.js =================================================================== --- frontend/src/App.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/App.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -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,14 +27,11 @@ import TransportEditPage from './Pages/TransportEditPage'; import RestaurantDetailsPage from './Pages/RestaurantDetailsPage'; -import {BrowserRouter, Route, Routes} from 'react-router-dom'; +import { BrowserRouter, Route, Routes } from 'react-router-dom'; import LoginErrorPage from "./Pages/LoginErrorPage"; -import {AuthProvider} from "./Components/Context/AuthContext"; -import PrivateRoute from "./Components/Misc/PrivateRoute"; -import ProfilesManagementPage from "./Pages/ProfilesManagementPage"; -import UserReservationsManagement from "./Pages/UserReservationsManagement"; function App() { +<<<<<<< HEAD return (
@@ -76,4 +73,31 @@
); +======= + return ( +
+ + + }/> + }/> + }/> + } /> + }/> + }/> + }/> + }/> + }/> + }/> + }/> + }/> + }/> + }/> + }/> + }/> + }/> + + +
+ ); +>>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) } Index: frontend/src/Components/Forms/AddHotelForm.js =================================================================== --- frontend/src/Components/Forms/AddHotelForm.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Forms/AddHotelForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -119,6 +119,4 @@ return prevState + 1; }) - if(!edit) - props.closeModal() }} > Index: frontend/src/Components/Forms/AddRestaurantForm.js =================================================================== --- frontend/src/Components/Forms/AddRestaurantForm.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Forms/AddRestaurantForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -85,5 +85,4 @@ return prevState + 1; }) - props.closeModal() }} > Index: frontend/src/Components/Forms/AddRoomForm.js =================================================================== --- frontend/src/Components/Forms/AddRoomForm.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Forms/AddRoomForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -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/AddTransportForm.js =================================================================== --- frontend/src/Components/Forms/AddTransportForm.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Forms/AddTransportForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -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/EditRoomForm.js =================================================================== --- frontend/src/Components/Forms/EditRoomForm.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Forms/EditRoomForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -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,13 @@ # +<<<<<<< HEAD Oд До Цена +======= + Достапно од + Достапно до + Број на соби +>>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) Index: frontend/src/Components/Hooks/Hotel/useCreateHotel.js =================================================================== --- frontend/src/Components/Hooks/Hotel/useCreateHotel.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Hooks/Hotel/useCreateHotel.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -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/useCreateRestaurant.js =================================================================== --- frontend/src/Components/Hooks/Restaurant/useCreateRestaurant.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Hooks/Restaurant/useCreateRestaurant.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -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/Transport/useCreateTransport.js =================================================================== --- frontend/src/Components/Hooks/Transport/useCreateTransport.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Hooks/Transport/useCreateTransport.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -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/useLogin.js =================================================================== --- frontend/src/Components/Hooks/User/useLogin.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Hooks/User/useLogin.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -4,10 +4,8 @@ import { Navigate, useAsyncValue, useNavigate } from "react-router-dom"; import LoginForm from "../../Login/LoginForm.js"; -import {useAuth} from "../../Context/AuthContext"; const useLogin = () => { const navigator = useNavigate() - const Auth = useAuth(); //const history = useNavigate(); const login = async (loginData) => { @@ -24,22 +22,7 @@ }) .then((res) => { - console.log("RES LOGIN") - console.log(res) - if(res.status === 200) - { - const user = { - sessionId: res.data.auth.details.sessionId, - userId: res.data.auth.principal.userID, - username: res.data.auth.principal.username, - role: res.data.auth.principal.role, - name: res.data.auth.principal.name, - surname: res.data.auth.principal.surname, - } - Auth.userLogin(user); - console.log(user) - } const sessionId = res.data.auth.details.sessionId; const userId = res.data.auth.principal.userID; - + localStorage.setItem("sessionId", sessionId); localStorage.setItem("userId", userId); Index: frontend/src/Components/Hooks/useGet.js =================================================================== --- frontend/src/Components/Hooks/useGet.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Hooks/useGet.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -11,4 +11,5 @@ console.log(localStorage.getItem("sessionId")) console.log("url od get " + uurl) +<<<<<<< HEAD await axios.get(uurl, {maxRedirects: 0}).then((res) => { console.log(res); @@ -22,4 +23,12 @@ // window.location.href = '/error' }) +======= + await axios. + get(uurl).then((res) => { + setData(res.data); + }).catch((err) => { + console.log(err) + }) +>>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) .finally(() => { setIsLoading(false); @@ -31,5 +40,5 @@ getData(url); }, [dep, url, changed]); - + return { data, Index: frontend/src/Components/HotelEdit/HotelEditTab.js =================================================================== --- frontend/src/Components/HotelEdit/HotelEditTab.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/HotelEdit/HotelEditTab.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -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 ( - - - - - - {props.displayRoom.hotelRooms.map((room) => { - return - })} - - - - - {!isLoading && data.map((res) => { - return ( - - ) - })} - {/**/} - - - - - - - - ); + + + {props.displayRoom.hotelRooms.map((room) => { + return + })} + + + + + + + + + + + + + ); } Index: frontend/src/Components/Layout/Navbar/Navigation.js =================================================================== --- frontend/src/Components/Layout/Navbar/Navigation.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Layout/Navbar/Navigation.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -7,6 +7,9 @@ import useGet from "../../Hooks/useGet"; import axios from "../../../axios.js"; +<<<<<<< HEAD import {useAuth} from "../../Context/AuthContext"; import ImageUpload from "../../ImageUpload/ImageUpload"; +======= +>>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) //import logo from 'assets/images/logo.png'; //src="https://upload.wikimedia.org/wikipedia/commons/0/08/Vergina_Sun_-_Golden_Larnax.png" @@ -14,4 +17,5 @@ function Navigation(props) { const navigator = useNavigate(); +<<<<<<< HEAD const Auth = useAuth(); const isLoggedIn = Auth.userIsAuthenticated(); @@ -22,4 +26,9 @@ const handleShow = () => setShow(true); +======= + + const { data, setData, isLoading, getData } = useGet("/username"); + +>>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) return ( <> @@ -31,5 +40,5 @@ > - + - {!isLoggedIn && ( + {!isLoading && !data && ( + + + + + + + ); +}; +>>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) -export default SearchCriteriasBar; +export default SearchCriterias; Index: frontend/src/Components/Tab/TabFormTransport.js =================================================================== --- frontend/src/Components/Tab/TabFormTransport.js (revision e6c2521bc7455763be50cf2e37427887b6efb4b9) +++ frontend/src/Components/Tab/TabFormTransport.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) @@ -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 (
@@ -23,7 +14,4 @@ placeholder="Од:" id="floatingFrom" - value={formData.from} - name={'from'} - onChange={onFormChange} > @@ -37,7 +25,4 @@ placeholder="До:" id="floatingTo" - name={'to'} - value={formData.to} - onChange={onFormChange} > @@ -51,7 +36,4 @@ placeholder="Датум:" id="floatingDate" - name={'date'} - value={formData.date} - onChange={onFormChange} > @@ -64,16 +46,10 @@ type="number" placeholder="Број на патници:" - name={'numPassengers'} id="floatingPassengers" - value={formData.numPassengers} - onChange={onFormChange} > -