Update app.py

app.py

@@ -64,46 +64,39 @@ def login(email, password):
 # Function to load menu items from Salesforce
 def load_menu_from_salesforce():
     try:
-        query = "SELECT Name, Price__c, Description__c, Image1__c, Ingredients__c FROM Menu_Item__c"
+        query = "SELECT Name, Price__c, Description__c, Image1__c, Veg_NonVeg__c FROM Menu_Item__c"
         result = sf.query(query)
         return result['records']
     except Exception as e:
         raise ValueError(f"Error loading menu data from Salesforce: {e}")
 
 # Function to filter menu items based on preference
-def filter_menu_from_salesforce(preference):
+def filter_menu(preferences):
     menu_data = load_menu_from_salesforce()
     filtered_data = []
 
     for item in menu_data:
-        if preference == "Halal/Non-Veg":
-            if any(x in item.get("Ingredients__c", "").lower() for x in ["chicken", "mutton", "fish", "prawns", "goat"]):
-                filtered_data.append(item)
-        elif preference == "Vegetarian":
-            if not any(x in item.get("Ingredients__c", "").lower() for x in ["chicken", "mutton", "fish", "prawns", "goat"]):
-                filtered_data.append(item)
-        elif preference == "Guilt-Free":
-            if "fat:" in item.get("Description__c", "").lower():
-                filtered_data.append(item)
-        else:
-            filtered_data = menu_data
+        if "Veg" in preferences and item["Veg_NonVeg__c"] in ["Veg", "Both"]:
+            filtered_data.append(item)
+        elif "Non-Veg" in preferences and item["Veg_NonVeg__c"] in ["Non-Veg", "Both"]:
+            filtered_data.append(item)
 
-    html_content = ""
+    # Generate HTML content
+    html_content = '<div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: center;">'
     for item in filtered_data:
         html_content += f"""
-        <div style="display: flex; align-items: center; border: 1px solid #ddd; border-radius: 8px; padding: 15px; margin-bottom: 10px; box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1);">
-            <div style="flex: 1; margin-right: 15px;">
-                <h3 style="margin: 0; font-size: 18px;">{item['Name']}</h3>
+        <div style="width: 300px; border: 1px solid #ddd; border-radius: 10px; overflow: hidden; box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1);">
+            <img src="{item['Image1__c']}" alt="{item['Name']}" style="width: 100%; height: 200px; object-fit: cover;">
+            <div style="padding: 15px;">
+                <h3 style="margin: 0; font-size: 20px; color: #333;">{item['Name']}</h3>
                 <p style="margin: 5px 0; font-size: 16px; color: #888;">${item['Price__c']}</p>
-                <p style="margin: 5px 0; font-size: 14px; color: #555;">{item['Description__c']}</p>
-            </div>
-            <div style="flex-shrink: 0; text-align: center;">
-                <img src="{item['Image1__c']}" alt="{item['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;">Add</button>
+                <p style="margin: 10px 0; font-size: 14px; color: #555;">{item['Description__c']}</p>
+                <button style="width: 100%; padding: 10px; background-color: #28a745; color: white; border: none; border-radius: 5px; cursor: pointer;">Add to Cart</button>
             </div>
         </div>
         """
-    return html_content
+    html_content += '</div>'
+    return html_content or "<p style='text-align: center;'>No items match your filter.</p>"
 
 # Gradio App
 with gr.Blocks() as app:
@@ -131,8 +124,9 @@ with gr.Blocks() as app:
 
     # Menu Page
     with gr.Row(visible=False) as menu_page:
-        preference = gr.Radio(["All", "Halal/Non-Veg", "Vegetarian", "Guilt-Free"], label="Filter Preference")
-        show_menu = gr.Button("Show Menu")
+        preferences = gr.CheckboxGroup(
+            choices=["Veg", "Non-Veg"], label="Filter Preference", value=["Veg", "Non-Veg"]
+        )
         menu_output = gr.HTML()
 
     # Functions for page transitions and operations
@@ -146,14 +140,14 @@ with gr.Blocks() as app:
     def handle_signup(name, email, phone, password):
         return signup(name, email, phone, password)
 
-    def handle_menu(preference):
-        return filter_menu_from_salesforce(preference)
+    def handle_menu(preferences):
+        return filter_menu(preferences)
 
     # Button Actions
     login_button.click(handle_login, [login_email, login_password], [login_page, menu_page, login_output])
     signup_button.click(lambda: (gr.update(visible=False), gr.update(visible=True)), None, [login_page, signup_page])
     submit_signup.click(handle_signup, [signup_name, signup_email, signup_phone, signup_password], signup_output)
     login_redirect.click(lambda: (gr.update(visible=False), gr.update(visible=True)), None, [signup_page, login_page])
-    show_menu.click(handle_menu, [preference], menu_output)
+    preferences.change(handle_menu, [preferences], menu_output)
 
 app.launch()