Update app.py

app.py

@@ -5,14 +5,12 @@ 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()}
     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 {}
@@ -26,20 +24,32 @@ 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.", gr.update(visible=True), gr.update(visible=False), gr.update(visible=False)
+        return False, "Email already exists. Please use a different email."
     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...", gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)
+    return True, "Signup successful! Redirecting to the login page..."
 
 # 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...", 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)
+        return True, "Login successful! Redirecting to the menu page..."
+    return False, "Invalid email or password."
+
+# Session management
+active_sessions = {}
 
+def login_user(email, password):
+    success, message = validate_login(email, password)
+    if success:
+        active_sessions[email] = True
+        return True, message
+    return False, message
 
+def is_logged_in(email):
+    return active_sessions.get(email, False)
+    
 # Function to load the menu data
 def load_menu():
     menu_file = "menu.xlsx"  # Ensure this file exists in the same directory
@@ -258,29 +268,19 @@ modal_and_cart_js = """
     }
 </script>
 """
+
+
+# Gradio app
 def app():
     with gr.Blocks() as demo:
-        # Define visibility states
-        login_visible = gr.State(True)
-        signup_visible = gr.State(False)
-        menu_visible = gr.State(False)
-
-        # Login 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()
+        gr.Markdown("## Secure Food Ordering System")
 
-            login_btn.click(
-                validate_login,
-                inputs=[login_email, login_password],
-                outputs=[login_message, login_visible, signup_visible, menu_visible],
-            )
+        # State variables to track redirection
+        with gr.State() as current_page:  # Holds the current visible page
+            current_page.set("signup")  # Default to signup page
 
         # Signup Page
-        with gr.Row(visible=signup_visible):
+        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")
@@ -289,15 +289,45 @@ def app():
             signup_btn = gr.Button("Signup")
             signup_message = gr.Label()
 
+            # Handle Signup
+            def handle_signup(name, phone, email, password):
+                success, message = signup_user(name, phone, email, password)
+                if success:
+                    current_page.set("login")  # Redirect to login page
+                return message
+
             signup_btn.click(
-                signup_user,
+                handle_signup,
                 inputs=[name, phone, email, password],
-                outputs=[signup_message, login_visible, signup_visible, menu_visible],
+                outputs=[signup_message],
+            )
+
+        # 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()
+
+            # Handle Login
+            def handle_login(email, password):
+                success, message = login_user(email, password)
+                if success:
+                    current_page.set("menu")  # Redirect to menu page
+                return message
+
+            login_btn.click(
+                handle_login,
+                inputs=[login_email, login_password],
+                outputs=[login_message],
             )
 
         # Menu Page
-        with gr.Row(visible=menu_visible):
-            gr.Markdown("### Menu Page")
+        with gr.Row(visible=lambda state: state == "menu", state=current_page):
+            gr.Markdown("### Menu Page (Accessible Only After Login)")
+
+            # Radio button for selecting preference
             selected_preference = gr.Radio(
                 choices=["All", "Vegetarian", "Halal/Non-Veg", "Guilt-Free"],
                 value="All",
@@ -360,4 +390,4 @@ def app():
 
 
 if __name__ == "__main__":
-    app().launch()
+    app().launch()