Update app.py

app.py

@@ -270,21 +270,18 @@ modal_and_cart_js = """
 """
 
 
+# Gradio app
 # Gradio app
 def app():
     with gr.Blocks() as demo:
         gr.Markdown("## Secure Food Ordering System")
 
-        # State variable to track the current page
+        # 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
 
-        # Components for pages
-        signup_page = gr.Column(visible=True)
-        login_page = gr.Column(visible=False)
-        menu_page = gr.Column(visible=False)
-
-        # Signup Page Logic
-        with signup_page:
+        # Signup Page
+        with gr.Row(visible=True) as signup_page:
             gr.Markdown("### Signup Page")
             name = gr.Textbox(label="Name")
             phone = gr.Textbox(label="Phone Number")
@@ -296,7 +293,6 @@ def app():
             # Signup callback
             def handle_signup(name, phone, email, password):
                 message, next_page = signup_user(name, phone, email, password)
-                # Update visibility for redirection
                 if next_page == "login":
                     return gr.update(visible=False), gr.update(visible=True), gr.update(visible=False), message
                 return gr.update(), gr.update(), gr.update(), message
@@ -307,8 +303,8 @@ def app():
                 outputs=[signup_page, login_page, menu_page, signup_message],
             )
 
-        # Login Page Logic
-        with login_page:
+        # Login Page
+        with gr.Row(visible=False) as login_page:
             gr.Markdown("### Login Page")
             login_email = gr.Textbox(label="Email")
             login_password = gr.Textbox(label="Password", type="password")
@@ -317,20 +313,20 @@ def app():
 
             # Login callback
             def handle_login(email, password):
-                message, next_page = login_user(email, password)
-                # Update visibility for redirection
+                message, next_page = validate_login(email, password)
                 if next_page == "menu":
-                    return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True), message
-                return gr.update(), gr.update(), gr.update(), message
+                    return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True), email, message
+                return gr.update(), gr.update(), gr.update(), None, message
 
             login_btn.click(
                 handle_login,
                 inputs=[login_email, login_password],
-                outputs=[signup_page, login_page, menu_page, login_message],
+                outputs=[signup_page, login_page, menu_page, active_user, login_message],
             )
 
-        # Menu Page Logic
-        with menu_page:
+        # Menu Page
+        with gr.Row(visible=False) as menu_page:
+            # Adding your original code here without any changes
             gr.Markdown("### Menu Page (Accessible Only After Login)")
 
             # Radio button for selecting preference
@@ -392,7 +388,34 @@ def app():
             gr.Row(final_order_output)
             gr.HTML(modal_and_cart_js)
 
-        return demo
+            logout_btn = gr.Button("Logout")
+
+            # Logout callback
+            def handle_logout():
+                return gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), None
+
+            logout_btn.click(
+                handle_logout,
+                outputs=[signup_page, login_page, menu_page, active_user],
+            )
+
+        # Show the appropriate page based on the current state
+        def show_page(page):
+            if page == "signup":
+                return gr.update(visible=True), gr.update(visible=False), gr.update(visible=False)
+            elif page == "login":
+                return gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)
+            elif page == "menu":
+                return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
+
+        # Initial visibility setup
+        demo.load(
+            show_page,
+            inputs=[current_page],
+            outputs=[signup_page, login_page, menu_page],
+        )
+
+    return demo
 
 
 if __name__ == "__main__":