Changeset 07f4e8b for frontend/src/Components/RestaurantEdit

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/RestaurantEdit

Files:

• MenuListing.js (modified) (4 diffs)
• RestaurantEditTab.js (modified) (4 diffs)
• TableListing.js (modified) (1 diff)

frontend/src/Components/RestaurantEdit/MenuListing.js

@@ -6 +6 @@
 import { AiOutlinePlusCircle } from "react-icons/ai"
 import EditModal from "../Resources/EditModal";
+import AddImages from "../Resources/AddImages";
 
 const MenuListing = (props) => {
@@ -12 +13 @@
     console.log(props.data)
     return(<>
-    <a href="#" onClick={(e) => {e.preventDefault(); props.showModal(props.data);
-    console.log("kliknav")} } style={{textDecoration: "none", color:"black"}}>
+    <a href="#" style={{textDecoration: "none", color:"black"}}>
         <Container className="py-3 px-1 my-4"
         style={{
@@ -23 +23 @@
             <Row>
                 <Col className="d-flex justify-content-center">
-                    <Image
+                    <Image onClick={(e) => {
+                        e.preventDefault();
+                        props.showModal(props.data);
+                        console.log("kliknav")
+                    }}
                     src="https://www.tasteofhome.com/wp-content/uploads/2019/01/medium-rare-steak-shutterstock_706040446.jpg"
                     style={{
@@ -37 +41 @@
                     <h6>{props.data.ingredients}</h6>
                 </Col>
+                <Col className="d-flex flex-column justify-content-center align-content-center">
+                    <AddImages type="menu" Id={props.data.menuId} />
+                </Col>
                 
                 <Col className="d-flex flex-column justify-content-center align-content-center">

frontend/src/Components/RestaurantEdit/RestaurantEditTab.js

@@ -10 +10 @@
 import TableListing from "./TableListing";
 import EditModal from "../Resources/EditModal";
+import ReservationListing from "../HotelEdit/ReservationListing";
+import useGet from "../Hooks/useGet";
 
 function RestaurantEditTab(props) {
@@ -35 +37 @@
     setActiveTab(eventKey);
   };
+
+  const {
+    data,
+    isLoading,
+    setData,
+    getData,
+    setChanged: dhanged
+  } = useGet(`/restaurant/${props.displayMenu.restaurantID}/reservations/active`)
 
   console.log(props.displayMenu.restaurantID)
@@ -100 +110 @@
               return <MenuListing key={menu.menuId} data={menu} showModal={showModal}/>
             })}
-            {activeTab === '/hotel' && <EditModal show={show} handleClose={handleClose} type="menu" menu={modalData}></EditModal>}
+            {activeTab === '/hotel' && <EditModal show={show} refresh={props.refresh} handleClose={handleClose} type="menu" menu={modalData}></EditModal>}
             <AddNew Id={props.displayMenu.restaurantID} refresh={props.refresh} type="menu"/>
           </Tab.Pane>
           <Tab.Pane eventKey="/masi">
            {props.displayMenu.tables.map((table) => {
-              return <TableListing key={table.tableId} showModal={showModal} data={table}/>
+              return <TableListing key={table.tableId} refresh={props.refresh} showModal={showModal} handleClose={handleClose} data={table}/>
             })}
             {activeTab === '/masi' && <EditModal show={show} handleClose={handleClose} refresh={props.refresh} type="table"
@@ -112 +122 @@
           </Tab.Pane>
           <Tab.Pane eventKey="/restaurant">
-            <AddNew type="restaurant"/>
+            {!isLoading && data.map((res) => {
+              return (
+                  <ReservationListing type={'restaurant'} data={res}/>
+              )
+            })}
           </Tab.Pane>
           <Tab.Pane eventKey="/transport">

frontend/src/Components/RestaurantEdit/TableListing.js

@@ -41 +41 @@
                 
                 <Col className="d-flex flex-column justify-content-center align-content-center">
-                  <AddAvailability type="table" table={props.data}/>
+                  <AddAvailability type="table" refresh={props.refresh} closeModal={props.handleClose} table={props.data}/>
                 </Col>