Update app.py

app.py

@@ -1,13 +1,10 @@
-
-
-
 import bcrypt
 import gradio as gr
 from simple_salesforce import Salesforce
+
 # Salesforce Connection
 sf = Salesforce(username='diggavalli98@gmail.com', password='Sati@1020', security_token='sSSjyhInIsUohKpG8sHzty2q')
 
-
 # Function to Hash Password
 def hash_password(password):
     return bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()).decode('utf-8')
@@ -16,111 +13,102 @@ 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 with email validation
+# Signup Function
 def signup(name, email, phone, password):
-    try:
-        email = email.strip()
-
-        # Check if the email already exists in Salesforce
-        query = f"SELECT Id FROM Customer_Login__c WHERE Email__c = '{email}'"
-        result = sf.query(query)
-
-        if len(result['records']) > 0:
-            # Email already exists
-            return "Email already exists! Please use a different email."
-
-        # Hash the password
-        hashed_password = hash_password(password)
-
-        # Create the new user record
-        sf.Customer_Login__c.create({
-            'Name': name.strip(),
-            'Email__c': email,
-            'Phone_Number__c': phone.strip(),
-            'Password__c': hashed_password  # Use Password3__c field for hashed passwords
-        })
-        return "Signup successful! You can now login."
-    except Exception as e:
-        return f"Error during signup: {str(e)}"
-
-# Login function
+    email = email.strip()
+    query = f"SELECT Id FROM Customer_Login__c WHERE Email__c = '{email}'"
+    result = sf.query(query)
+
+    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,
+        'Phone_Number__c': phone.strip(),
+        'Password__c': hashed_password
+    })
+    return "Signup successful! You can now login."
+
+# Login Function
 def login(email, password):
-    try:
-        email = email.strip()
-        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}'"
-        result = sf.query(query)
-
-        if len(result['records']) == 0:
-            return "Invalid email or password.", None, None, None
-
-        user = result['records'][0]
-        stored_password = user['Password__c']
-
-        print(f"Entered Email: {email}")
-        print(f"Entered Password: {password}")
-        print(f"Stored Hashed Password: {stored_password}")
-
-        # Verify the entered password with the stored hash
-        if verify_password(password, stored_password):
-            print("Password matched!")
-            return "Login successful!", user['Name'], user['Email__c'], user['Phone_Number__c']
-        else:
-            print("Password did not match!")
-            return "Invalid email or password.", None, None, None
-    except Exception as e:
-        print(f"Error during login: {str(e)}")
-        return f"Error during login: {str(e)}", None, None, None
-
-# Gradio Signup Page
-def signup_page(name, email, phone, password):
-    response = signup(name, email, phone, password)
-    return response
-
-signup_interface = gr.Interface(
-    fn=signup_page,
-    inputs=[
-        gr.Textbox(label="Name"),
-        gr.Textbox(label="Email"),
-        gr.Textbox(label="Phone"),
-        gr.Textbox(label="Password", type="password"),
-    ],
-    outputs=gr.Textbox(label="Signup Status"),
-    title="Signup Page"
-)
-
-# Gradio Login Page
-def login_page(email, password):
-    login_status, name, email, phone = login(email, password)
-    if login_status == "Login successful!":
-        return login_status, name, email, phone
+    query = f"SELECT Name, Password__c FROM Customer_Login__c WHERE Email__c = '{email.strip()}'"
+    result = sf.query(query)
+
+    if len(result['records']) == 0:
+        return "Invalid email or password.", None
+
+    user = result['records'][0]
+    if verify_password(password.strip(), user['Password__c']):
+        return "Login successful!", user['Name']
     else:
-        return login_status, "Error", "Error", "Error"
-
-login_interface = gr.Interface(
-    fn=login_page,
-    inputs=[
-        gr.Textbox(label="Email"),
-        gr.Textbox(label="Password", type="password"),
-    ],
-    outputs=[
-        gr.Textbox(label="Login Status"),
-        gr.Textbox(label="Name"),
-        gr.Textbox(label="Email"),
-        gr.Textbox(label="Phone"),
-    ],
-    title="Login Page"
-)
-
-# Combine Pages in Gradio
+        return "Invalid email or password.", None
+
+# Fetch Menu Records Based on Filters
+def fetch_menu(veg, non_veg):
+    filters = []
+    if veg:
+        filters.append("'Veg'")
+    if non_veg:
+        filters.append("'Non Veg'")
+    if len(filters) == 0:
+        filters.append("'Veg', 'Non Veg', 'Both'")
+
+    query = f"SELECT Name, Price__c, Image1__c, Description__c FROM Menu_Item__c WHERE Veg_NonVeg__c IN ({', '.join(filters)})"
+    result = sf.query(query)
+    return [{"Name": record['Name'], "Price": record['Price__c'], "Image": record['Image1__c'], "Description": record['Description__c']} for record in result['records']]
+
+# Gradio Pages
 with gr.Blocks() as app:
+    with gr.Tab("Login"):
+        with gr.Row():
+            login_email = gr.Textbox(label="Email")
+            login_password = gr.Textbox(label="Password", type="password")
+            login_btn = gr.Button("Login")
+            login_output = gr.Textbox(label="Status")
+            signup_btn = gr.Button("Go to Signup")
+
+        def login_action(email, password):
+            status, user = login(email, password)
+            if status == "Login successful!":
+                return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True, value=f"Welcome, {user}!")
+            else:
+                return gr.update(value=status), gr.update(value="")
+
+        login_btn.click(login_action, [login_email, login_password], [login_output, gr.State()])
+
+        signup_btn.click(lambda: (gr.update(visible=False), gr.update(visible=True)), None, [gr.Row(), gr.Tab("Signup")])
+
     with gr.Tab("Signup"):
-        signup_interface.render()
+        with gr.Row():
+            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")
+            signup_btn = gr.Button("Signup")
+            signup_output = gr.Textbox(label="Status")
+            back_to_login = gr.Button("Go to Login")
 
-    with gr.Tab("Login"):
-        login_interface.render()
+        def signup_action(name, email, phone, password):
+            status = signup(name, email, phone, password)
+            return status
+
+        signup_btn.click(signup_action, [signup_name, signup_email, signup_phone, signup_password], [signup_output])
+        back_to_login.click(lambda: (gr.update(visible=False), gr.update(visible=True)), None, [gr.Row(), gr.Tab("Login")])
+
+    with gr.Tab("Menu"):
+        with gr.Row():
+            veg_filter = gr.Checkbox(label="Veg")
+            non_veg_filter = gr.Checkbox(label="Non-Veg")
+            show_menu_btn = gr.Button("Show Menu")
+
+        menu_display = gr.Dataframe(headers=["Name", "Price", "Image", "Description"])
+
+        def show_menu(veg, non_veg):
+            menu = fetch_menu(veg, non_veg)
+            return menu
+
+        show_menu_btn.click(show_menu, [veg_filter, non_veg_filter], menu_display)
 
-# Launch Gradio App
 app.launch()