Update app.py

app.py

@@ -257,7 +257,6 @@ modal_and_cart_js = """
 """
 
 
-# Gradio app
 # Gradio app
 def app():
     with gr.Blocks() as demo:
@@ -268,7 +267,7 @@ def app():
         active_user = gr.State(None)      # No user is active initially
 
         # Signup Page
-        with gr.Row(visible=True) as signup_page:
+        with gr.Row(visible=lambda current_page: current_page == "signup") as signup_page:
             gr.Markdown("### Signup Page")
             name = gr.Textbox(label="Name")
             phone = gr.Textbox(label="Phone Number")
@@ -277,62 +276,27 @@ def app():
             signup_btn = gr.Button("Signup")
             signup_message = gr.Label()
 
-            # Signup callback
-            def handle_signup(name, phone, email, password):
-                message, next_page = signup_user(name, phone, email, password)
-                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
-
-            signup_btn.click(
-                handle_signup,
-                inputs=[name, phone, email, password],
-                outputs=[signup_page, login_page, menu_page, signup_message],
-            )
-
         # Login Page
-        with gr.Row(visible=False) as login_page:
+        with gr.Row(visible=lambda current_page: current_page == "login") as login_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()
 
-            # Login callback
-            def handle_login(email, password):
-                message, next_page = validate_login(email, password)
-                if next_page == "menu":
-                    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, active_user, login_message],
-            )
-
         # Menu Page
-        with gr.Row(visible=False) as menu_page:
-            # Adding your original code here without any changes
+        with gr.Row(visible=lambda current_page: current_page == "menu") as menu_page:
             gr.Markdown("### Menu Page (Accessible Only After Login)")
 
-            # Radio button for selecting preference
+            # Adding your original code here without any changes
             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;">
@@ -342,7 +306,6 @@ def app():
                 <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>
@@ -353,54 +316,38 @@ def app():
                     <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])
-
-            # 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)
-
             logout_btn = gr.Button("Logout")
 
-            # Logout callback
-            def handle_logout():
-                return gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), None
+        # Callback functions for page navigation
+        def handle_signup(name, phone, email, password):
+            message, next_page = signup_user(name, phone, email, password)
+            return message, next_page
 
-            logout_btn.click(
-                handle_logout,
-                outputs=[signup_page, login_page, menu_page, active_user],
-            )
+        def handle_login(email, password):
+            message, next_page = validate_login(email, password)
+            return message, next_page
 
-        # 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)
+        def handle_logout():
+            return "Logged out!", "signup"
 
-        # Initial visibility setup
-        demo.load(
-            show_page,
-            inputs=[current_page],
-            outputs=[signup_page, login_page, menu_page],
-        )
+        # Button Click Callbacks
+        signup_btn.click(handle_signup, [name, phone, email, password], [signup_message, current_page])
+        login_btn.click(handle_login, [login_email, login_password], [login_message, current_page])
+        logout_btn.click(handle_logout, outputs=[menu_output, current_page])
 
     return demo