Changeset 07f4e8b for frontend/src/Components/UserPanel

Timestamp:

01/24/24 17:42:28 (5 months ago)

Author:

darsov2 <62809499+darsov2@…>

Branches:

master

Children:

0f5aa27

Parents:

5528b99

Message:

prefinal fixes

Location:

frontend/src/Components/UserPanel

Files:

• HotelReservationListing.js (modified) (4 diffs)
• HotelReservationModal.js (modified) (3 diffs)
• PastHotelReservations.js (modified) (1 diff)
• PastRestaurantReservations.js (modified) (1 diff)
• PastTransportReservations.js (modified) (1 diff)
• ReviewModal.js (modified) (2 diffs)

frontend/src/Components/UserPanel/HotelReservationListing.js

@@ -12 +12 @@
 import data from "bootstrap/js/src/dom/data";
 import {AiOutlinePlusCircle} from "react-icons/ai";
-import {MdOutlineRateReview} from "react-icons/md";
+import { MdCancel } from "react-icons/md";
+import { MdOutlineRateReview } from "react-icons/md"
 import useFormData from "../Hooks/useFormData";
 import useCreate from "../Hooks/useCreate";
@@ -26 +27 @@
 
     console.log(props.data)
+    const { createEntity } = useCreate();
     const dateFormatter = (str) => {
         const inputDate = new Date(str);
@@ -114 +116 @@
                         <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) => {
@@ -132 +148 @@
             </Row>
         </Container>
-        {props.type === 'hotel' && <HotelReservationModal show={show} handleClose={handleClose} data={props.data}/>}
-        <ReviewModal type={props.type} showReview={showReview} handleCloseReview={handleCloseReview} data={props.data}/>
+        {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}/>
     </>)
 }

frontend/src/Components/UserPanel/HotelReservationModal.js

@@ -5 +5 @@
 import {TbToolsKitchen2} from "react-icons/tb";
 import React from "react";
+import useCreate from "../Hooks/useCreate";
 
 const HotelReservationModal = (props) => {
+
+    const {createEntity} = useCreate();
 
     const dateFormatter = (str) => {
@@ -17 +20 @@
             hour12: false,
         };
+
+        console.log(props)
 
         return inputDate.toLocaleString('de-DE', options);
@@ -189 +194 @@
                         Затвори
                     </Button>
+                    <Button variant="danger" onClick={() => {
+                        createEntity(`/hotel/${props.data.reservationId}/cancel`, props.setChanged)
+                        props.handleClose()
+                    }
+                    }>
+                        Откажи резервација
+                    </Button>
                 </Modal.Footer>
             </Modal>

frontend/src/Components/UserPanel/PastHotelReservations.js

@@ -10 +10 @@
         <>
             {!isLoading && data.map((res) => {
-                return (<HotelReservationListing past={true} data={res} type={'hotel'}></HotelReservationListing>)
+                return (<HotelReservationListing setChanged={setChanged} past={true} data={res} type={'hotel'}></HotelReservationListing>)
             })}
             {(!isLoading && data.length === 0) && <h3 className={'my-5'}>Нема податоци за одбраните критериуми!</h3>}

frontend/src/Components/UserPanel/PastRestaurantReservations.js

@@ -11 +11 @@
         <>
             {!isLoading && data.map((res) => {
-                return (<HotelReservationListing past={true} data={res} type={'restaurant'}></HotelReservationListing>)
+                console.log(res)
+                return (<HotelReservationListing setChanged={setChanged} past={true} data={res} type={'restaurant'}></HotelReservationListing>)
             })}
             {(!isLoading && data.length === 0) && <h3 className={'my-5'}>Нема податоци за одбраните критериуми!</h3>}

frontend/src/Components/UserPanel/PastTransportReservations.js

@@ -10 +10 @@
         <>
             {!isLoading && data.map((res) => {
-                return (<HotelReservationListing past={true} data={res} type={'transport'}></HotelReservationListing>)
+                return (<HotelReservationListing setChanged={setChanged} past={true} data={res} type={'transport'}></HotelReservationListing>)
             })}
 

frontend/src/Components/UserPanel/ReviewModal.js

@@ -10 +10 @@
         description: "",
     }
+    console.log(props)
 
     const {createEntity} = useCreate();
@@ -80 +81 @@
                                 ...formData,
                                 hotelId: props.data.hotelId,
-                                userId: 1
+                                userId: 1,
+                                reservationId: props.data.reservationId
                             } :
                             props.type === 'restaurant' ? {
-                                    ...formData,
-                                    restaurantId: props.data.restaurantId,
-                                    userId: 1
-                                } : {
+                                ...formData,
+                                restaurantId: props.data.restaurantId,
+                                userId: 1,
+                                reservationId: props.data.reservationId
+                            } : {
                                 ...formData,
                                 transportId: props.data.transportId,
-                                userId: 1
+                                userId: 1,
+                                reservationId: props.data.reservationId
                             }
-                                createEntity('/review/add', dataToPost)
+                        createEntity('/review/add', dataToPost, props.setChanged)
                         setFormData(dummy)
                         props.handleCloseReview()