Changeset 07f4e8b for frontend/src/Components/Resources/ResourceListing.js

Timestamp:

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

Author:

darsov2 <62809499+darsov2@…>

Branches:

master

Children:

0f5aa27

Parents:

5528b99

Message:

prefinal fixes

File:

• frontend/src/Components/Resources/ResourceListing.js (modified) (2 diffs)

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 +50 @@
                     </Col>
 
-                    <Col className="d-flex flex-column justify-content-center align-content-center">
-                        <AddImages type={props.type} Id={id} />
-                    </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" >
->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl)
                   <span
                       style={{