Update app.py

app.py

@@ -5,37 +5,43 @@ from bcrypt import hashpw, gensalt, checkpw
 # Path to the Excel file for user storage
 USER_FILE = "users.xlsx"
 
+# Load users from Excel
 # Load users from Excel
 def load_users():
     try:
         df = pd.read_excel(USER_FILE)
-        return {row['Email']: row for _, row in df.iterrows()}
+        return {row['Email']: row['Password'] for _, row in df.iterrows()}
     except FileNotFoundError:
+        # Create the file if it doesn't exist
         df = pd.DataFrame(columns=["Name", "Phone", "Email", "Password"])
         df.to_excel(USER_FILE, index=False)
         return {}
 
 # Save users to Excel
 def save_users(users):
-    df = pd.DataFrame(users.values())
+    df = pd.DataFrame(
+        [{"Name": name, "Phone": phone, "Email": email, "Password": password} for email, (name, phone, password) in users.items()],
+        columns=["Name", "Phone", "Email", "Password"]
+    )
     df.to_excel(USER_FILE, index=False)
 
 # Signup user
 def signup_user(name, phone, email, password):
     users = load_users()
     if email in users:
-        return False, "Email already exists. Please use a different email."
+        return "Email already exists. Please log in."
+    # Hash the password before saving
     hashed_password = hashpw(password.encode(), gensalt()).decode()
-    users[email] = {"Name": name, "Phone": phone, "Email": email, "Password": hashed_password}
+    users[email] = (name, phone, hashed_password)
     save_users(users)
-    return "Signup successful! Redirecting to the login page...","login"
+    return "Signup successful! Redirecting to login..."
 
 # Validate login
 def validate_login(email, password):
     users = load_users()
-    if email in users and checkpw(password.encode(), users[email]["Password"].encode()):
-        return "Login successful! Redirecting to the menu page...","menu"
-    return "Invalid email or password.", "login"
+    if email in users and checkpw(password.encode(), users[email][2].encode()):
+        return True, "Login successful! Redirecting to the menu page..."
+    return False, "Invalid email or password. Please try again."
     
 # Function to load the menu data
 def load_menu():
@@ -260,14 +266,10 @@ modal_and_cart_js = """
 # Gradio app
 def app():
     with gr.Blocks() as demo:
-        gr.Markdown("## Secure Food Ordering System")
-
-        # State variables to track the current page and active user
-        current_page = gr.State("signup")  # Default page is Signup
-        active_user = gr.State(None)      # No user is active initially
-
+        current_page = gr.State(value="signup")  # Track current visible page
+        
         # Signup Page
-        with gr.Row(visible=lambda current_page: current_page == "signup") as signup_page:
+        with gr.Row(visible=lambda state: state == "signup", state=current_page):
             gr.Markdown("### Signup Page")
             name = gr.Textbox(label="Name")
             phone = gr.Textbox(label="Phone Number")
@@ -276,16 +278,38 @@ def app():
             signup_btn = gr.Button("Signup")
             signup_message = gr.Label()
 
+            def handle_signup(name, phone, email, password):
+                message = signup_user(name, phone, email, password)
+                return "login", message
+
+            signup_btn.click(
+                handle_signup,
+                inputs=[name, phone, email, password],
+                outputs=[current_page, signup_message],
+            )
+
         # Login Page
-        with gr.Row(visible=lambda current_page: current_page == "login") as login_page:
+        with gr.Row(visible=lambda state: state == "login", state=current_page):
             gr.Markdown("### Login Page")
             login_email = gr.Textbox(label="Email")
             login_password = gr.Textbox(label="Password", type="password")
             login_btn = gr.Button("Login")
             login_message = gr.Label()
 
+            def handle_login(email, password):
+                success, message = validate_login(email, password)
+                if success:
+                    return "menu", message
+                return "login", message
+
+            login_btn.click(
+                handle_login,
+                inputs=[login_email, login_password],
+                outputs=[current_page, login_message],
+            )
+
         # Menu Page
-        with gr.Row(visible=lambda current_page: current_page == "menu") as menu_page:
+        with gr.Row(visible=lambda state: state == "menu", state=current_page):
             gr.Markdown("### Menu Page (Accessible Only After Login)")
 
             # Adding your original code here without any changes