Update app.py

app.py

@@ -11,6 +11,7 @@ def load_users():
         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 {}
@@ -24,37 +25,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."
+        return "Email already exists. Please use a different email.", "signup"  # Redirect to signup
     hashed_password = hashpw(password.encode(), gensalt()).decode()
     users[email] = {"Name": name, "Phone": phone, "Email": email, "Password": hashed_password}
     save_users(users)
-    return "Signup successful! Please log in."
+    return "Signup successful! Redirecting to login page...", "login"  # Redirect 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 True, "Login successful!"
-    return False, "Invalid email or password."
+        return "Login successful! Redirecting to menu page...", "menu"  # Redirect to menu
+    return "Invalid email or password. Please try again.", "login"  # Redirect to login
 
-# Session management
-active_sessions = {}
-
-def login_user(email, password):
-    success, message = validate_login(email, password)
-    if success:
-        active_sessions[email] = True
-        return message
-    return message
-
-def is_logged_in(email):
-    return active_sessions.get(email, False)
-
-def logout_user(email):
-    if email in active_sessions:
-        del active_sessions[email]
-        return "Logged out successfully!"
-    return "No active session found for this email."
 # Function to load the menu data
 def load_menu():
     menu_file = "menu.xlsx"  # Ensure this file exists in the same directory
@@ -273,125 +256,113 @@ modal_and_cart_js = """
     }
 </script>
 """
-
-
-# Gradio app
 def app():
     with gr.Blocks() as demo:
-        gr.Markdown("## Secure Food Ordering System")
-
-        # Login and Signup Tabs
-        with gr.Tabs():
-            # Signup Tab
-            with gr.Tab("Signup"):
-                gr.Markdown("### Signup Page")
-                name = gr.Textbox(label="Name")
-                phone = gr.Textbox(label="Phone Number")
-                email = gr.Textbox(label="Email")
-                password = gr.Textbox(label="Password", type="password")
-                signup_btn = gr.Button("Signup")
-                signup_message = gr.Label()
-
-                signup_btn.click(
-                    signup_user,
-                    inputs=[name, phone, email, password],
-                    outputs=[signup_message],
-                )
-
-            # Login Tab
-            with gr.Tab("Login"):
-                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()
-
-                login_btn.click(
-                    login_user,
-                    inputs=[login_email, login_password],
-                    outputs=[login_message],
-                )
-
-            # Menu Page
-            with gr.Tab("Menu Page"):
-                gr.Markdown("### Menu Page (Accessible Only After Login)")
-
-                # Input for user email to verify login
-                email_input = gr.Textbox(label="Enter Email to Verify Access")
-                verify_btn = gr.Button("Load Menu")
-                menu_output = gr.HTML(value="")  # Output for menu items
-
-                def verify_and_load_menu(email):
-                    if is_logged_in(email):
-                        return filter_menu("All")  # Filtered menu based on preference
-                    return "Access Denied! Please log in."
-
-                verify_btn.click(
-                    verify_and_load_menu,
-                    inputs=[email_input],
-                    outputs=[menu_output],
-                )
-
-                # Radio button for selecting preference
-                selected_preference = gr.Radio(
-                    choices=["All", "Vegetarian", "Halal/Non-Veg", "Guilt-Free"],
-                    value="All",
-                    label="Choose a Preference",
-                )
-
-                # Output area for menu items
-                menu_output = gr.HTML(value=filter_menu("All"))
-
-                # Floating cart display
-                cart_output = gr.HTML(value="Your cart is empty.", elem_id="floating-cart")
-
-                # Final order display
-                final_order_output = gr.HTML(value="", elem_id="final-order")
-
-                # Modal window
-                modal_window = gr.HTML("""
-                <div id="modal" style="display: none; position: fixed; background: white; border-radius: 8px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); padding: 20px; z-index: 1000;">
-                    <div style="text-align: right;">
-                        <button onclick="closeModal()" style="background: none; border: none; font-size: 18px; cursor: pointer;">&times;</button>
-                    </div>
-                    <img id="modal-image" style="width: 100%; height: auto; border-radius: 8px; margin-bottom: 20px;" />
-                    <h2 id="modal-name"></h2>
-                    <p id="modal-description"></p>
-                    <p id="modal-price"></p>
-                    <!-- Biryani Extras -->
-                    <label for="biryani-extras">Biryani Extras :</label>
-                    <div id="biryani-extras-options" style="display: flex; flex-wrap: wrap; gap: 10px; margin: 10px 0;">
-                        <label><input type="checkbox" name="biryani-extra" value="Thums up" /> Thums up + $2.00</label>
-                        <label><input type="checkbox" name="biryani-extra" value="Sprite" /> Sprite + $2.00</label>
-                        <label><input type="checkbox" name="biryani-extra" value="Extra Raitha" /> Extra Raitha  + $1.00</label>
-                        <label><input type="checkbox" name="biryani-extra" value="Extra Salan" /> Extra Salan  + $2.00</label>
-                        <label><input type="checkbox" name="biryani-extra" value="Extra Onion & Lemon" /> Extra Onion & Lemon + $2.00</label>
-                        <label><input type="checkbox" name="biryani-extra" value="Chilli Chicken" /> Chilli Chicken + $14.00</label>
-                        <label><input type="checkbox" name="biryani-extra" value="Veg Manchurian" /> Veg Manchurian + $12.00</label>
-                    </div>
-                    <!-- Quantity and Special Instructions -->
-                    <label for="quantity">Quantity:</label>
-                    <input type="number" id="quantity" value="1" min="1" style="width: 50px;" />
-                    <br><br>
-                    <textarea id="special-instructions" placeholder="Add special instructions here..." style="width: 100%; height: 60px;"></textarea>
-                    <br><br>
-                    <!-- Add to Cart Button -->
-                    <button style="background-color: #28a745; color: white; border: none; padding: 10px 20px; font-size: 14px; border-radius: 5px; cursor: pointer;" onclick="addToCart()">Add to Cart</button>
+        # State to track the current page
+        current_page = gr.State("login")  # Default page is the login page
+
+        # === LOGIN PAGE ===
+        with gr.Row(visible_if=lambda x: x == "login", inputs=[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 login(email, password):
+                message, page = validate_login(email, password)
+                return message, page  # Redirect based on login status
+
+            login_btn.click(
+                login,
+                inputs=[login_email, login_password],
+                outputs=[login_message, current_page],  # Update message and page
+            )
+
+        # === SIGNUP PAGE ===
+        with gr.Row(visible_if=lambda x: x == "signup", inputs=[current_page]):
+            gr.Markdown("### Signup Page")
+            name = gr.Textbox(label="Name")
+            phone = gr.Textbox(label="Phone Number")
+            email = gr.Textbox(label="Email")
+            password = gr.Textbox(label="Password", type="password")
+            signup_btn = gr.Button("Signup")
+            signup_message = gr.Label()
+
+            def signup(name, phone, email, password):
+                message, page = signup_user(name, phone, email, password)
+                return message, page  # Redirect to login after signup
+
+            signup_btn.click(
+                signup,
+                inputs=[name, phone, email, password],
+                outputs=[signup_message, current_page],  # Update message and page
+            )
+
+        # === MENU PAGE ===
+        with gr.Row(visible_if=lambda x: x == "menu", inputs=[current_page]):
+            gr.Markdown("### Menu Page")
+
+            # Radio button for selecting preference
+            selected_preference = gr.Radio(
+                choices=["All", "Vegetarian", "Halal/Non-Veg", "Guilt-Free"],
+                value="All",
+                label="Choose a Preference",
+            )
+
+            # Output area for menu items
+            menu_output = gr.HTML(value=filter_menu("All"))
+
+            # Floating cart display
+            cart_output = gr.HTML(value="Your cart is empty.", elem_id="floating-cart")
+
+            # Final order display
+            final_order_output = gr.HTML(value="", elem_id="final-order")
+
+            # Modal window
+            modal_window = gr.HTML("""
+            <div id="modal" style="display: none; position: fixed; background: white; border-radius: 8px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); padding: 20px; z-index: 1000;">
+                <div style="text-align: right;">
+                    <button onclick="closeModal()" style="background: none; border: none; font-size: 18px; cursor: pointer;">&times;</button>
                 </div>
-                """)
+                <img id="modal-image" style="width: 100%; height: auto; border-radius: 8px; margin-bottom: 20px;" />
+                <h2 id="modal-name"></h2>
+                <p id="modal-description"></p>
+                <p id="modal-price"></p>
+                <!-- Biryani Extras -->
+                <label for="biryani-extras">Biryani Extras :</label>
+                <div id="biryani-extras-options" style="display: flex; flex-wrap: wrap; gap: 10px; margin: 10px 0;">
+                    <label><input type="checkbox" name="biryani-extra" value="Thums up" /> Thums up + $2.00</label>
+                    <label><input type="checkbox" name="biryani-extra" value="Sprite" /> Sprite + $2.00</label>
+                    <label><input type="checkbox" name="biryani-extra" value="Extra Raitha" /> Extra Raitha  + $1.00</label>
+                    <label><input type="checkbox" name="biryani-extra" value="Extra Salan" /> Extra Salan  + $2.00</label>
+                    <label><input type="checkbox" name="biryani-extra" value="Extra Onion & Lemon" /> Extra Onion & Lemon + $2.00</label>
+                    <label><input type="checkbox" name="biryani-extra" value="Chilli Chicken" /> Chilli Chicken + $14.00</label>
+                    <label><input type="checkbox" name="biryani-extra" value="Veg Manchurian" /> Veg Manchurian + $12.00</label>
+                </div>
+                <!-- Quantity and Special Instructions -->
+                <label for="quantity">Quantity:</label>
+                <input type="number" id="quantity" value="1" min="1" style="width: 50px;" />
+                <br><br>
+                <textarea id="special-instructions" placeholder="Add special instructions here..." style="width: 100%; height: 60px;"></textarea>
+                <br><br>
+                <!-- Add to Cart Button -->
+                <button style="background-color: #28a745; color: white; border: none; padding: 10px 20px; font-size: 14px; border-radius: 5px; cursor: pointer;" onclick="addToCart()">Add to Cart</button>
+            </div>
+            """)
 
-                # Update menu dynamically based on preference
-                selected_preference.change(filter_menu, inputs=[selected_preference], outputs=[menu_output])
+            # Update menu dynamically based on preference
+            selected_preference.change(filter_menu, inputs=[selected_preference], outputs=[menu_output])
 
-                # Layout
-                gr.Row([selected_preference])
-                gr.Row(menu_output)
-                gr.Row(cart_output)
-                gr.Row(modal_window)
-                gr.Row(final_order_output)
-                gr.HTML(modal_and_cart_js)
+            # Layout
+            gr.Row([selected_preference])
+            gr.Row(menu_output)
+            gr.Row(cart_output)
+            gr.Row(modal_window)
+            gr.Row(final_order_output)
+            gr.HTML(modal_and_cart_js)
 
-            return demo
+        return demo
 
 
 if __name__ == "__main__":