Update app.py

app.py

@@ -5,6 +5,7 @@ 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:
@@ -25,18 +26,19 @@ def save_users(users):
 def signup_user(name, phone, email, password):
     users = load_users()
     if email in users:
-        return "Email already exists. Please use a different email.", "signup"  # Redirect to signup
+        return "Email already exists. Please use a different email.", gr.update(visible=True), gr.update(visible=False), gr.update(visible=False)
     hashed_password = hashpw(password.encode(), gensalt()).decode()
     users[email] = {"Name": name, "Phone": phone, "Email": email, "Password": hashed_password}
     save_users(users)
-    return "Signup successful! Redirecting to login page...", "login"  # Redirect to login
+    return "Signup successful! Redirecting to login page...", gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)
 
 # 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 menu page...", "menu"  # Redirect to menu
-    return "Invalid email or password. Please try again.", "login"  # Redirect to login
+        return "Login successful! Redirecting to menu page...", gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
+    return "Invalid email or password. Please try again.", gr.update(visible=True), gr.update(visible=False), gr.update(visible=False)
+
 
 # Function to load the menu data
 def load_menu():
@@ -258,30 +260,27 @@ modal_and_cart_js = """
 """
 def app():
     with gr.Blocks() as demo:
-        # State to track the current page
-        current_page = gr.State("login")  # Default page is login
+        # Define visibility states
+        login_visible = gr.State(True)
+        signup_visible = gr.State(False)
+        menu_visible = gr.State(False)
 
         # Login Page
-        with gr.Row(visible=lambda x: x == "login", inputs=[current_page]):
+        with gr.Row(visible=login_visible):
             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()
 
-            # Function to handle login
-            def login(email, password):
-                message, next_page = validate_login(email, password)
-                return message, next_page
-
             login_btn.click(
-                login,
+                validate_login,
                 inputs=[login_email, login_password],
-                outputs=[login_message, current_page],  # Update message and redirect to the next page
+                outputs=[login_message, login_visible, signup_visible, menu_visible],
             )
 
         # Signup Page
-        with gr.Row(visible=lambda x: x == "signup", inputs=[current_page]):
+        with gr.Row(visible=signup_visible):
             gr.Markdown("### Signup Page")
             name = gr.Textbox(label="Name")
             phone = gr.Textbox(label="Phone Number")
@@ -290,21 +289,15 @@ def app():
             signup_btn = gr.Button("Signup")
             signup_message = gr.Label()
 
-            # Function to handle signup
-            def signup(name, phone, email, password):
-                message, next_page = signup_user(name, phone, email, password)
-                return message, next_page
-
             signup_btn.click(
-                signup,
+                signup_user,
                 inputs=[name, phone, email, password],
-                outputs=[signup_message, current_page],  # Update message and redirect to the next page
+                outputs=[signup_message, login_visible, signup_visible, menu_visible],
             )
 
         # Menu Page
-        with gr.Row(visible=lambda x: x == "menu", inputs=[current_page]):
+        with gr.Row(visible=menu_visible):
             gr.Markdown("### Menu Page")
-            # Radio button for selecting preference
             selected_preference = gr.Radio(
                 choices=["All", "Vegetarian", "Halal/Non-Veg", "Guilt-Free"],
                 value="All",