Update app.py

app.py

@@ -47,68 +47,66 @@ def login(email, password):
         password = password.strip()
 
         # Query Salesforce for user details
-        query = f"SELECT Name, Email__c, Phone_Number__c, Password__c FROM Customer_Login__c WHERE Email__c = '{email}'"
+        query = f"SELECT Name, Password__c FROM Customer_Login__c WHERE Email__c = '{email}'"
         result = sf.query(query)
 
         if len(result['records']) == 0:
             return "Invalid email or password.", None
 
         user = result['records'][0]
-        stored_password = user['Password__c']
-
-        # Verify the entered password with the stored hash
-        if verify_password(password, stored_password):
+        if verify_password(password, user['Password__c']):
             return "Login successful!", user['Name']
         else:
             return "Invalid email or password.", None
     except Exception as e:
         return f"Error during login: {str(e)}", None
 
-# Fetch menu items from Salesforce
-def fetch_menu():
+# Function to load menu items from Salesforce
+def load_menu_from_salesforce():
     try:
-        query = "SELECT Name, Price__c, Description__c, Image1__c, Veg_NonVeg__c FROM Menu_Item__c"
+        query = "SELECT Name, Price__c, Description__c, Image1__c, Ingredients__c FROM Menu_Item__c"
         result = sf.query(query)
-        return [
-            {
-                "Name": item["Name"],
-                "Price": item["Price__c"],
-                "Description": item["Description__c"],
-                "Image": item["Image1__c"],
-                "Category": item["Veg_NonVeg__c"],
-            }
-            for item in result["records"]
-        ]
+        return result['records']
     except Exception as e:
-        return f"Error fetching menu: {e}"
-
-# Render the menu as HTML
-def render_menu(veg, non_veg):
-    menu_items = fetch_menu()
-    if not isinstance(menu_items, list):
-        return menu_items  # Return error if fetching menu fails
-
-    filtered_items = [
-        item
-        for item in menu_items
-        if (veg and item["Category"] in ["Veg", "Both"]) or
-           (non_veg and item["Category"] in ["Non-Veg", "Both"])
-    ]
+        raise ValueError(f"Error loading menu data from Salesforce: {e}")
+
+# Function to filter menu items based on preference
+def filter_menu_from_salesforce(preference):
+    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
 
     html_content = ""
-    for item in filtered_items:
+    for item in filtered_data:
         html_content += f"""
-        <div style="border: 1px solid #ddd; padding: 10px; margin: 10px; border-radius: 5px; box-shadow: 2px 2px 8px #aaa;">
-            <h3>{item['Name']} - ${item['Price']}</h3>
-            <p>{item['Description']}</p>
-            <img src="{item['Image']}" alt="{item['Name']}" style="width: 100px; height: 100px; object-fit: cover;">
+        <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>
+                <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>
+            </div>
         </div>
         """
-    return html_content or "No items match your filter."
+    return html_content
 
 # Gradio App
 with gr.Blocks() as app:
-    # States for visibility
     login_status = gr.State(value=False)
 
     # Login Page
@@ -117,8 +115,27 @@ with gr.Blocks() as app:
             login_email = gr.Textbox(label="Email")
             login_password = gr.Textbox(label="Password", type="password")
             login_button = gr.Button("Login")
+            signup_button = gr.Button("Go to Signup")
             login_output = gr.Textbox(label="Status")
 
+    # Signup Page
+    with gr.Row(visible=False) as signup_page:
+        with gr.Column():
+            signup_name = gr.Textbox(label="Name")
+            signup_email = gr.Textbox(label="Email")
+            signup_phone = gr.Textbox(label="Phone")
+            signup_password = gr.Textbox(label="Password", type="password")
+            submit_signup = gr.Button("Signup")
+            login_redirect = gr.Button("Go to Login")
+            signup_output = gr.Textbox(label="Status")
+
+    # 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")
+        menu_output = gr.HTML()
+
+    # Functions for page transitions and operations
     def handle_login(email, password):
         status, user = login(email, password)
         if status == "Login successful!":
@@ -126,18 +143,17 @@ with gr.Blocks() as app:
         else:
             return gr.update(), gr.update(), status
 
-    login_button.click(handle_login, [login_email, login_password], [login_page, gr.Row(visible=True), login_output])
-
-    # Menu Page
-    with gr.Row(visible=False) as menu_page:
-        veg_filter = gr.Checkbox(label="Veg", value=True)
-        non_veg_filter = gr.Checkbox(label="Non-Veg", value=True)
-        filter_button = gr.Button("Filter Menu")
-        menu_display = gr.HTML(label="Menu")
+    def handle_signup(name, email, phone, password):
+        return signup(name, email, phone, password)
 
-        def filter_menu(veg, non_veg):
-            return render_menu(veg, non_veg)
+    def handle_menu(preference):
+        return filter_menu_from_salesforce(preference)
 
-        filter_button.click(filter_menu, [veg_filter, non_veg_filter], menu_display)
+    # 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)
 
 app.launch()