DonutCard employee vs menu

CMU-17-356 · Mar 1, 2022 · 1e668ed · 1e668ed
1 parent 406dcd5
commit 1e668ed
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/frontend/src/components/DonutCard.tsx b/frontend/src/components/DonutCard.tsx
@@ -11,6 +11,7 @@ class Donut {
     description: string
     price: number
     quantity: number
+    menuView: boolean
 
     constructor(id: string, name: string, image: string, description: string, price: number, quantity: number) {
         this.id = id;
@@ -32,14 +33,18 @@ export const DonutCard: React.FC<Donut> = (donutIn: Donut) => {
     headers.append("Access-Control-Allow-Methods", "GET,HEAD,OPTIONS,POST,PUT");
     headers.append("Access-Control-Allow-Headers", "Access-Control-Allow-Headers, Origin,Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers");
 
-
-    useEffect(() => {
-        if (quantity != 0)
-            sentOrder(donut.id, quantity).then()
-    }, [quantity])
+    // Temporary fix for menu vs employee donut cards
+    if (donutIn.menuView) {
+        useEffect(() => {
+            if (quantity != 0)
+                sentOrder(donut.id, quantity).then()
+        }, [quantity])
+    } else {
+        if (quantity != donutIn.quantity)
+            setQuantity(donutIn.quantity);
+    }
 
     async function sentOrder(donut: string, amount: number) {
-        console.log("sendOrder")
         try {
             const res = await postRequest<OrderInterface>({
                 "donut": donut,

diff --git a/frontend/src/pages/Employee.tsx b/frontend/src/pages/Employee.tsx
@@ -120,6 +120,7 @@ export const Employee: React.FC = () => {
                                     description={donut.description}
                                     price={donut.price}
                                     quantity={orders[selectedOrder].amounts[index]}
+                                    menuView={false}
                                 />;
                             }
                         })}

diff --git a/frontend/src/pages/Menu.tsx b/frontend/src/pages/Menu.tsx
@@ -41,7 +41,7 @@ export const Menu: React.FC = () => {
                 <div className="options-Div">
                     {menu.map((donut: DonutInterface, index: number) => (
                         <DonutCard key={index} id={donut.id} name={donut.name} image={donut.picture} description={donut.description}
-                                   price={donut.price} quantity={0}/>
+                                   price={donut.price} quantity={0} menuView={true}/>
                     ))}
                 </div>
             </div>
@@ -51,7 +51,7 @@ export const Menu: React.FC = () => {
                 <div className="options-Div">
                     {menu.map((donut: DonutInterface, index: number) => (
                         <DonutCard key={index} id={donut.id} name={donut.name} image={donut.picture} description={donut.description}
-                                   price={donut.price} quantity={0}/>
+                                   price={donut.price} quantity={0} menuView={true}/>
                     ))}
                 </div>
             </div>
@@ -61,7 +61,7 @@ export const Menu: React.FC = () => {
                 <div className="options-Div">
                     {menu.map((donut: DonutInterface, index: number) => (
                         <DonutCard key={index} id={donut.id} name={donut.name} image={donut.picture} description={donut.description}
-                                   price={donut.price} quantity={0}/>
+                                   price={donut.price} quantity={0} menuView={true}/>
                     ))}
                 </div>
             </div>