Update app.py

app.py

@@ -13,19 +13,21 @@ def hash_password(password):
 def verify_password(plain_password, hashed_password):
     return bcrypt.checkpw(plain_password.encode('utf-8'), hashed_password.encode('utf-8'))
 
-# Signup Function
+# Signup function
 def signup(name, email, phone, password):
     try:
-        query = f"SELECT Id FROM Customer_Login__c WHERE Email__c = '{email.strip()}'"
+        email = email.strip()
+        query = f"SELECT Id FROM Customer_Login__c WHERE Email__c = '{email}'"
         result = sf.query(query)
 
-        if result['records']:
+        if len(result['records']) > 0:
             return "Email already exists! Please use a different email."
 
         hashed_password = hash_password(password)
+
         sf.Customer_Login__c.create({
             'Name': name.strip(),
-            'Email__c': email.strip(),
+            'Email__c': email,
             'Phone_Number__c': phone.strip(),
             'Password__c': hashed_password
         })
@@ -33,24 +35,84 @@ def signup(name, email, phone, password):
     except Exception as e:
         return f"Error during signup: {str(e)}"
 
-# Login Function
+# Login function
 def login(email, password):
     try:
-        query = f"SELECT Name, Password__c FROM Customer_Login__c WHERE Email__c = '{email.strip()}'"
+        email = email.strip()
+        query = f"SELECT Name, Password__c FROM Customer_Login__c WHERE Email__c = '{email}'"
         result = sf.query(query)
 
-        if not result['records']:
+        if len(result['records']) == 0:
             return "Invalid email or password.", None
 
         user = result['records'][0]
-        if verify_password(password.strip(), user['Password__c']):
+        stored_password = user['Password__c']
+
+        if verify_password(password.strip(), stored_password):
             return "Login successful!", user['Name']
         else:
             return "Invalid email or password.", None
     except Exception as e:
         return f"Error during login: {str(e)}", None
 
-# Function to Store Order in Salesforce
+# Function to load menu data
+def load_menu_from_salesforce():
+    try:
+        query = "SELECT Name, Price__c, Description__c, Image1__c, Image2__c, Veg_NonVeg__c, Section__c FROM Menu_Item__c"
+        result = sf.query(query)
+        return result['records']
+    except Exception as e:
+        return []
+
+# Function to load add-ons data
+def load_add_ons_from_salesforce():
+    try:
+        query = "SELECT Name, Price__c FROM Add_Ons__c"
+        result = sf.query(query)
+        return result['records']
+    except Exception as e:
+        return []
+
+# Function to filter menu items
+def filter_menu(preference):
+    menu_data = load_menu_from_salesforce()
+
+    filtered_data = {}
+    for item in menu_data:
+        if "Section__c" not in item or "Veg_NonVeg__c" not in item:
+            continue
+
+        if item["Section__c"] not in filtered_data:
+            filtered_data[item["Section__c"]] = []
+
+        if preference == "All" or (preference == "Veg" and item["Veg_NonVeg__c"] in ["Veg", "Both"]) or (preference == "Non-Veg" and item["Veg_NonVeg__c"] in ["Non veg", "Both"]):
+            filtered_data[item["Section__c"].strip()].append(item)
+
+    html_content = '<div style="padding: 0 10px; max-width: 1200px; margin: auto;">'
+    for section, items in filtered_data.items():
+        html_content += f"<h2 style='text-align: center; margin-top: 5px;'>{section}</h2>"
+        html_content += '<div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px; justify-content: center; margin-top: 10px;">'
+        for item in items:
+            html_content += f"""
+            <div style="border: 1px solid #ddd; border-radius: 10px; box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1); overflow: hidden; height: 350px;">
+                <img src="{item.get('Image1__c', '')}" style="width: 100%; height: 200px; object-fit: cover;" 
+                onclick="openModal('{item['Name']}', '{item.get('Image2__c', '')}', '{item['Description__c']}', '${item['Price__c']}')">
+                <div style="padding: 10px;">
+                    <h3 style='font-size: 1.2em; text-align: center;'>{item['Name']}</h3>
+                    <p style='font-size: 1.1em; color: green; text-align: center;'>${item['Price__c']}</p>
+                    <p style='font-size: 0.9em; text-align: justify; margin: 5px;'>{item['Description__c']}</p>
+                </div>
+            </div>
+            """
+        html_content += '</div>'
+    html_content += '</div>'
+
+    if not any(filtered_data.values()):
+        return "<p>No items match your filter.</p>"
+
+    return html_content
+
+# Function to submit order to Salesforce
 def submit_order_to_salesforce(cart):
     try:
         for item in cart:
@@ -72,37 +134,63 @@ def submit_order_to_salesforce(cart):
 
 # Gradio App
 with gr.Blocks() as app:
-    # UI Elements
     with gr.Row():
-        gr.HTML("<h1>Welcome to Biryani Hub</h1>")
+        gr.HTML("<h1 style='text-align: center;'>Welcome to Biryani Hub</h1>")
+
     with gr.Row(visible=True) as login_page:
-        login_email = gr.Textbox(label="Email")
-        login_password = gr.Textbox(label="Password", type="password")
-        login_button = gr.Button("Login")
-        login_output = gr.Textbox(label="Login Status")
+        with gr.Column():
+            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")
+
+    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")
+
     with gr.Row(visible=False) as menu_page:
-        preference = gr.Radio(["All", "Veg", "Non-Veg"], label="Filter Preference", value="All")
-        menu_output = gr.HTML()
-        submit_cart = gr.Button("Submit Order")
-        cart_status = gr.Textbox(label="Cart Submission Status")
+        with gr.Column():
+            preference = gr.Radio(choices=["All", "Veg", "Non-Veg"], label="Filter Preference", value="All")
+            menu_output = gr.HTML()
+            cart_input = gr.JSON(label="Cart Data")
+            submit_cart = gr.Button("Submit Order")
+            cart_status = gr.Textbox(label="Order Submission Status")
 
-    # Login Logic
     login_button.click(
-        lambda email, password: (
-            gr.update(visible=False),
-            gr.update(visible=True),
-            gr.update(value="Login successful!"),
-        )
-        if login(email, password)[0] == "Login successful!"
-        else (gr.update(), gr.update(), "Invalid email or password."),
-        [login_email, login_password],
-        [login_page, menu_page, login_output],
+        lambda email, password: (gr.update(visible=False), gr.update(visible=True), gr.update(value=filter_menu("All")), "Login successful!")
+        if login(email, password)[0] == "Login successful!" else (gr.update(), gr.update(), gr.update(), "Invalid email or password."),
+        [login_email, login_password], [login_page, menu_page, menu_output, login_output]
+    )
+    submit_signup.click(
+        lambda name, email, phone, password: signup(name, email, phone, password),
+        inputs=[signup_name, signup_email, signup_phone, signup_password],
+        outputs=signup_output
+    )
+
+    signup_button.click(
+        lambda: (gr.update(visible=False), gr.update(visible=True)),
+        inputs=[],
+        outputs=[login_page, signup_page]
+    )
+
+    login_redirect.click(
+        lambda: (gr.update(visible=True), gr.update(visible=False)),
+        inputs=[],
+        outputs=[login_page, signup_page]
     )
 
-    # Order Submission Logic
+    preference.change(lambda pref: filter_menu(pref), [preference], menu_output)
+
     submit_cart.click(
         lambda cart: submit_order_to_salesforce(cart),
-        inputs=menu_output,
+        inputs=cart_input,
         outputs=cart_status,
     )