| Ред. бр. | -User ID | -Име | -Презиме | -Username | -Дисконектирај | -
|---|---|---|---|---|---|
| {i + 1} | -{f.userID} | -{f.name} | -{f.surname} | -{f.username} | -
| # | -Од - До | -Време тргање | -Време пристигање | -Број патници | -Цена | -
|---|---|---|---|---|---|
| - {i + 1} - | -- {route.from} - {route.to} - | -- {dateFormatter(route.departure)} - | -- {dateFormatter(route.arrival)} - | -- {route.freeSpace} - | -
За избраниот ресурс се уште не се достапни оценки!
-- Не се достапни слики! -
} -- {props.data.hotelRoomName} -
-- Климатизирано -
- -Кујна
- -Тераса
- -- {props.data.hotelRoomDescription} -
-+ {props.data.hotelRoomName} +
++ Климатизирано +
+ +Кујна
+ +Тераса
+ ++ {props.data.hotelRoomDescription} +
+Резервација за:
- {props.type === 'hotel' &&{props.data.hotelRoom.hotelRoomName}
} - {props.type === 'restaurant' &&{'Маса за ' + props.data.restaurantsTable.noSeats}
} - {props.type === 'transport' &&{props.data.transportRoute.from + ' ' + props.data.transportRoute.to}
} - {props.type === 'transport' &&{props.data.noSeats + ' ' + 'патници'}
} -{props.data.user.name + ' ' + props.data.user.surname}
- {props.type !== 'transport' &&{dateFormatter(props.data.dateFrom) + ' - ' + dateFormatter(props.data.dateTo)}
} - -Вкупна цена:
{props.data.hotelRoom.price}$
}
-
- Цена по ноќ: {props.data.price}
-{props.data.marketed && randomInt === 3 && {getMarketingMessage(randomInt)}
}
- {props.data.totalPrice}$
+ {props.data.totalPrice}$
{props.data.restaurantName}
-{props.data.hotelCaption}
*/} -Тип на кујна
- -{props.data.cousineType}
- -Многу добро
- -Мени
- +
{data.name}
-{data.ingredients}
- -Цена: {data.price}$
- -Име
+Свинско, Телешко, прасечко, ребра, чорба, тикви, компирМанЏа
+ +Цена: 99.99$
+ +Маса
-Број на луѓе {props.data.noSeats}
- - -Резервација на маса во ресторан
-На ден:{' ' + props.params.date}
-Време од:{' ' + props.params.hourFrom}
-Време до:{' ' + props.params.hourTo}
-Маса за {table.noSeats} луѓе
-| Тип на маса | -Колку единици? | -- |
|---|
{props.data.from} - {props.data.to}
+ {/*{props.data.routeCities}
*/}{props.data.routes.map(x => x).join(", ")}
@@ -37,5 +40,6 @@Цена:
-{props.data.maxPrice}$
+ {/*{props.data.routePrice}
*/} +99$
Index: ontend/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 (Нема податоци за одбраните критериуми!
} - - ) -} - -export default ActiveHotelReservations; Index: ontend/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 (Нема податоци за одбраните критериуми!
} - - ) -} - -export default ActiveRestaurantReservations; Index: ontend/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 (Нема податоци за одбраните критериуми!
} - - ) -} - -export default ActiveTransportReservations; Index: ontend/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 (<> -{props.data.hotelName}
-{props.data.hotelLocation}
-{dateFormatter(props.data.dateFrom) + ' - ' + dateFormatter(props.data.dateTo)}
- )} - {props.type === "restaurant" && (<> -{props.data.restaurantName}
-{props.data.restaurantLocation}
-{dateFormatter(props.data.dateFrom) + ' - ' + dateFormatter(props.data.dateTo)}
- )} - {props.type === "transport" && (<> -{props.data.carBrand + ' ' + props.data.carType}
-{props.data.transportRoute.from + ' - ' + props.data.transportRoute.to}
-{dateFormatter(props.data.transportRoute.departure) + ' - ' + dateFormatter(props.data.transportRoute.arrival)}
-{props.data.owner.name + ' ' + props.data.owner.surname}
- )} - - {props.type === 'transport' && -Вкупна цена:
{props.data.transportRoute.price}$
- }
- {(!props.past) && Откажи
резервација
-
-
-
- Додади
оценка
-
-
-
- Веќе имате
оставено оценка
за оваа резервација
- {props.data.hotelName}
- -Пријавување
-{dateFormatter(props.data.dateFrom)}
-Одјавување
-{dateFormatter(props.data.dateTo)}
-Адреса
-ул. Македонска бр. 10
-Детали за собата
-{props.data.hotelRoom.hotelRoomName}
- Климатизирано -
- -Кујна
- -Тераса
- -4 Ноќевања
- -32$
- -Вкупно
- -128$
- -Нема податоци за одбраните критериуми!
} - - ) -} - -export default PastHotelReservations; Index: ontend/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 (Нема податоци за одбраните критериуми!
} - - ) -} - -export default PastRestaurantReservations; Index: ontend/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 (Нема податоци за одбраните критериуми!
} - - ) -} - -export default PastTransportReservations; Index: ontend/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 ( - <> -Поврзани профили
-Поврзи нов локален профил
-Мои ресурси
-{data.hotelName}
-{data.hotelLocation}
-Мои ресурси
+{data.hotelName}
+{data.hotelLocation}
+Мојот профил
Index: ontend/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 ( - <> -Менаџмент со профили
-Мои ресурси
-{user.name + " " + user.surname}
-{user.username}
-Мои ресурси
+{data.name + " " + data.surname}
+{data.email}
+{data.restaurantName}
- -Име на ресторант
+ +Критериуми од пребарувањето
-
- Критериуми од пребарувањето
+
+ 
+ 
+ Вашето пребарување
-Резултантна рута
-{data.from} - {data.to}
-({data.routes.join(", ")})
- - -{data.from} - {data.to}
({data.routes.join(", ")})
+ +-
Одбрана рута
- -{params.from + ' - ' + params.to}
- --
Очекувано време на поаѓање
- -{dateFormatter(route.departure)}
- --
Цена
- -{data.price}$
- --
Возач
- -{data.transport.owner.name} {data.transport.owner.surname.substring(0, 1)}.
--
Возило
- -{data.transport.carBrand + " " + data.transport.carType}
- --
Број на патници
- -Резервација на рута
-{route.from + ' ' + route.to}
-Време на поаѓање:{' ' + dateFormatter(route.departure)}
-Време на престигнување:{' ' + dateFormatter(route.arrival)}
-Број на патници:{' ' + getData}
-+
Цена
+ +{data.price}$
+ ++
Возач
+ +{data.transport.owner.name} {data.transport.owner.surname.substring(0, 1)}.
++
Возило
+ +{data.transport.carBrand + " " + data.transport.carType}
+ ++