Changeset 5528b99 for frontend/src/Components/Resources

Timestamp:

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

Author:

darsov2 <62809499+darsov2@…>

Branches:

master

Children:

07f4e8b

Parents:

e6c2521

Message:

revert

Location:

frontend/src/Components/Resources

Files:

• AddNew.js (modified) (1 diff)
• EditModal.js (modified) (1 diff)
• ResourceListing.js (modified) (2 diffs)
• ResourcesTab.js (modified) (4 diffs)

frontend/src/Components/Resources/AddNew.js

@@ -56 +56 @@
         </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}/>}

frontend/src/Components/Resources/EditModal.js

@@ -32 +32 @@
         </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}/>}

frontend/src/Components/Resources/ResourceListing.js

@@ -8 +8 @@
 
 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
+<<<<<<< HEAD
     const id = props.type == "hotel" ? props.data.hotelId : props.type == "restaurant" ? props.data.restaurantID : props.data.transportID
     console.log(props.data)
@@ -54 +58 @@
                     </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" >
+>>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl)
                   <span
                       style={{

frontend/src/Components/Resources/ResourcesTab.js

@@ -10 +10 @@
 
 function ResourcesTab(props) {
+<<<<<<< HEAD
     const [activeTab, setActiveTab] = useState(props.tab);
     const userId = JSON.parse(localStorage.getItem("user")).userId;
@@ -35 +36 @@
                     <Nav.Item className="tab_item rounded-5">
                         <Nav.Link href="/resources/hotel" className="text-left rounded-5">
+=======
+  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);
+    console.log(props.refresh);
+    props.refresh(eventKey);
+    console.log("refresh" + eventKey);
+  };
+
+  !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">
+>>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl)
               <span className="ikona">
                 <FaHotel
@@ -67 +101 @@
                 </Nav>
 
+<<<<<<< HEAD
                 <Tab.Content className="py-5 px-3 border rounded-bottom-5 bg-light">
                     <Tab.Pane eventKey="/hotel" key="hotelPane">
@@ -115 +150 @@
         </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>
+  );
+>>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl)
 }