Update app.py

app.py

@@ -32,7 +32,8 @@ def filter_menu(preference):
             </div>
             <div style="flex-shrink: 0; text-align: center;">
                 <img src="{item['Image URL']}" alt="{item['Dish Name']}" style="width: 100px; height: 100px; border-radius: 8px; object-fit: cover; margin-bottom: 10px;">
-                <button style="background-color: #28a745; color: white; border: none; padding: 8px 15px; font-size: 14px; border-radius: 5px; cursor: pointer;" onclick="openModal('{item['Dish Name']}', '{item['Image URL']}', '{item['Description']}', '{item['Price ($)']}')">Add</button>
+                <button style="background-color: #28a745; color: white; border: none; padding: 8px 15px; font-size: 14px; border-radius: 5px; cursor: pointer;" 
+                        onclick="openModal('{item['Dish Name']}', '{item['Image URL']}', '{item['Description']}', '{item['Price ($)']}', event)">Add</button>
             </div>
         </div>
         """
@@ -40,43 +41,6 @@ def filter_menu(preference):
 
 # JavaScript for modal and cart behavior
 modal_and_cart_js = """
-<style>
-  .cart-container {
-    border: 1px solid #ddd;
-    border-radius: 8px;
-    padding: 15px;
-    margin-bottom: 15px;
-    background-color: #f9f9f9;
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-  }
-  .cart-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    border-bottom: 1px solid #ddd;
-    padding: 10px 0;
-  }
-  .cart-item:last-child {
-    border-bottom: none;
-  }
-  .cart-item span {
-    font-size: 16px;
-    margin-right: 10px;
-  }
-  .cart-item .quantity-container {
-    display: flex;
-    align-items: center;
-    gap: 5px;
-  }
-  .cart-total {
-    font-size: 18px;
-    font-weight: bold;
-    text-align: right;
-    margin-top: 10px;
-  }
-</style>
 <script>
     let cart = [];
     const extrasPrices = {
@@ -89,52 +53,45 @@ modal_and_cart_js = """
         "Veg Manchurian": 12
     };
     let finalized = false;
-    function openModal(name, image, description, price) {
+
+    function openModal(name, image, description, price, event) {
         if (finalized) {
             alert("You cannot add more items after finalizing your order.");
             return;
         }
         const modal = document.getElementById('modal');
         modal.style.display = 'block';
-        modal.style.position = 'fixed';
+        modal.style.position = 'absolute';
+
+        const buttonRect = event.target.getBoundingClientRect();
+        modal.style.top = `${window.scrollY + buttonRect.top}px`;
+        modal.style.left = `${window.scrollX + buttonRect.left}px`;
+
         if (window.innerWidth <= 768) {
             modal.style.width = '90%';
+            modal.style.left = '50%';
+            modal.style.transform = 'translateX(-50%)';
         } else {
             modal.style.width = '30%';
+            modal.style.transform = 'none';
         }
-        modal.style.top = '15%';
-        modal.style.left = '50%';
-        modal.style.transform = 'translate(-50%, -50%)';
+
         document.getElementById('modal-image').src = image;
         document.getElementById('modal-name').innerText = name;
         document.getElementById('modal-description').innerText = description;
         document.getElementById('modal-price').innerText = price;
+
         const extrasInputs = document.querySelectorAll('input[name="biryani-extra"]');
         extrasInputs.forEach(input => input.checked = false);
         document.getElementById('quantity').value = 1;
         document.getElementById('special-instructions').value = '';
     }
+
     function closeModal() {
         document.getElementById('modal').style.display = 'none';
     }
-    function addToCart() {
-        if (finalized) {
-            alert("You cannot add more items after finalizing your order.");
-            return;
-        }
-        const name = document.getElementById('modal-name').innerText;
-        const price = parseFloat(document.getElementById('modal-price').innerText.replace('$', ''));
-        const quantity = parseInt(document.getElementById('quantity').value) || 1;
-        const instructions = document.getElementById('special-instructions').value;
-        const extras = Array.from(document.querySelectorAll('input[name="biryani-extra"]:checked')).map(extra => extra.value);
-        const extrasCost = extras.reduce((sum, extra) => sum + (extrasPrices[extra] || 0), 0);
-        const itemTotal = (price + extrasCost) * quantity;
-        const cartItem = { name, price, quantity, instructions, extras, itemTotal, extrasQuantities: extras.map(() => 1) };
-        cart.push(cartItem);
-        alert(`${name} added to cart!`);
-        updateCartDisplay();
-        closeModal();
-    }
+
+    // Update the cart display dynamically
     function updateCartDisplay() {
         let totalBill = 0;
         let cartHTML = "<div class='cart-container'>";
@@ -149,7 +106,7 @@ modal_and_cart_js = """
                             <span>Price: $${extrasPrices[extra].toFixed(2)}</span>
                             <div class='quantity-container'>
                                 <label for='extra-quantity-${index}-${i}'>Quantity:</label>
-                                <input type='number' id='extra-quantity-${index}-${i}' value='${extraQuantity}' min='1' style='width: 50px;' onchange='updateExtraQuantity(${index}, ${i}, this.value)'>
+                                <input type='number' id='extra-quantity-${index}-${i}' value='${extraQuantity}' min='1' style='width: 50px;' onchange='updateExtraQuantity(${index}, ${i}, this.value)' />
                             </div>
                             <span>Total: $${extraTotal.toFixed(2)}</span>
                             <input type='checkbox' id='extra-remove-${index}-${i}' onclick='removeExtra(${index}, ${i})'> Remove
@@ -160,7 +117,7 @@ modal_and_cart_js = """
                             <span>Item Price: $${item.price.toFixed(2)}</span>
                             <div class='quantity-container'>
                                 <label for='item-quantity-${index}'>Quantity:</label>
-                                <input type='number' id='item-quantity-${index}' value='${item.quantity}' min='1' style='width: 50px;' onchange='updateItemQuantity(${index}, this.value)'>
+                                <input type='number' id='item-quantity-${index}' value='${item.quantity}' min='1' style='width: 50px;' onchange='updateItemQuantity(${index}, this.value)' />
                             </div>
                             <span>Total: $${(item.price * item.quantity).toFixed(2)}</span>
                             <input type='checkbox' id='item-remove-${index}' onclick='removeItem(${index})'> Remove
@@ -172,18 +129,22 @@ modal_and_cart_js = """
         cartHTML += `<button style='margin-top: 10px; background-color: #007bff; color: white; border: none; padding: 10px; border-radius: 5px; width: 100%; cursor: pointer;' onclick='submitCart()'>Submit</button>`;
         document.getElementById('floating-cart').innerHTML = cartHTML;
     }
+
+    // Additional functions for cart management (unchanged from your original code)
     function updateItemQuantity(index, newQuantity) {
         const quantity = parseInt(newQuantity) || 1;
         cart[index].quantity = quantity;
         cart[index].itemTotal = cart[index].price * quantity;
         updateCartDisplay();
     }
+
     function updateExtraQuantity(cartIndex, extraIndex, newQuantity) {
         const quantity = parseInt(newQuantity) || 1;
         cart[cartIndex].extrasQuantities = cart[cartIndex].extrasQuantities || [];
         cart[cartIndex].extrasQuantities[extraIndex] = quantity;
         updateCartDisplay();
     }
+
     function removeExtra(cartIndex, extraIndex) {
         cart[cartIndex].extras.splice(extraIndex, 1);
         if (cart[cartIndex].extrasQuantities) {
@@ -191,45 +152,33 @@ modal_and_cart_js = """
         }
         updateCartDisplay();
     }
+
     function removeItem(index) {
         cart.splice(index, 1);
         updateCartDisplay();
     }
-    function submitCart() {
-    console.log("Submit button clicked.");
-    console.log(cart); // Check the cart contents here
 
-    if (cart.length === 0) {
-        alert("Your cart is empty.");
-        return;
+    function submitCart() {
+        let finalOrderHTML = "<h3>Final Order:</h3><ul>";
+        let totalBill = 0;
+        cart.forEach(item => {
+            totalBill += item.itemTotal;
+            const extras = item.extras.map((extra, i) => {
+                const extraQuantity = item.extrasQuantities ? item.extrasQuantities[i] || 1 : 1;
+                const extraTotal = extrasPrices[extra] * extraQuantity;
+                totalBill += extraTotal;
+                return `${extra} (x${extraQuantity}) - $${extraTotal.toFixed(2)}`;
+            }).join(', ');
+            finalOrderHTML += `<li>
+                ${item.name} (x${item.quantity}) - $${item.itemTotal.toFixed(2)}
+                <br>Extras: ${extras}
+                <br>Instructions: ${item.instructions || "None"}
+            </li>`;
+        });
+        finalOrderHTML += `</ul><p><strong>Total Bill: $${totalBill.toFixed(2)}</strong></p>`;
+        document.getElementById('final-order').innerHTML = finalOrderHTML;
+        alert("Your final order has been submitted!");
     }
-
-    let finalOrderHTML = "<h3>Final Order:</h3><ul>";
-    let totalBill = 0;
-
-    cart.forEach(item => {
-        totalBill += item.itemTotal;
-        const extras = item.extras.map((extra, i) => {
-            const extraQuantity = item.extrasQuantities ? item.extrasQuantities[i] || 1 : 1;
-            const extraTotal = extrasPrices[extra] * extraQuantity;
-            totalBill += extraTotal;
-            return `${extra} (x${extraQuantity}) - $${extraTotal.toFixed(2)}`;
-        }).join(', ');
-
-        finalOrderHTML += `<li>
-            ${item.name} (x${item.quantity}) - $${item.itemTotal.toFixed(2)}
-            <br>Extras: ${extras}
-            <br>Instructions: ${item.instructions || "None"}
-        </li>`;
-    });
-
-    finalOrderHTML += `</ul><p><strong>Total Bill: $${totalBill.toFixed(2)}</strong></p>`;
-
-    sessionStorage.setItem('finalOrderSummary', finalOrderHTML);
-    window.location.href = "/final_order.html"; // Ensure this page exists
-}
-
-
 </script>
 """
 
@@ -238,23 +187,17 @@ def app():
     with gr.Blocks() as demo:
         gr.Markdown("## Dynamic Menu with Preferences")
 
-        # Radio button for selecting preference
         selected_preference = gr.Radio(
             choices=["All", "Vegetarian", "Halal/Non-Veg", "Guilt-Free"],
             value="All",
             label="Choose a Preference",
         )
 
-        # Output area for menu items
         menu_output = gr.HTML(value=filter_menu("All"))
-
-        # Floating cart display
         cart_output = gr.HTML(value="Your cart is empty.", elem_id="floating-cart")
-
-        # Final order display
         final_order_output = gr.HTML(value="", elem_id="final-order")
 
-        # Modal window
+        # Modal window preserved as requested
         modal_window = gr.HTML("""
         <div id="modal" style="display: none; position: fixed; background: white; border-radius: 8px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); padding: 20px; z-index: 1000;">
             <div style="text-align: right;">
@@ -286,10 +229,8 @@ def app():
         </div>
         """)
 
-        # Update menu dynamically based on preference
         selected_preference.change(filter_menu, inputs=[selected_preference], outputs=[menu_output])
 
-        # Layout
         gr.Row([selected_preference])
         gr.Row(menu_output)
         gr.Row(cart_output)
@@ -301,4 +242,4 @@ def app():
 
 if __name__ == "__main__":
     demo = app()
-    demo.launch()
+    demo.launch()