Update app.py

app.py

@@ -4,8 +4,6 @@ import gradio as gr
 from components.auth import register, login, logout
 from components.predict import predict
 from components.report_generator import create_report
-# --- NEW IMPORTS ---
-# Import the render functions from our new content components
 from components.diabetes_factors import render_factors_info
 from components.food_suggestions import render_food_guide
 from components.doctor_info import render_doctor_list
@@ -27,10 +25,10 @@ with gr.Blocks(title="DiaSpark: Your Health Management Platform", css=css) as de
     with gr.Row(visible=False) as logged_in_header:
         welcome_message = gr.Markdown()
 
-    # --- Main Tabs ---
+    # --- Main Tabs  ---
     with gr.Tabs() as main_tabs:
 
-        # --- Homepage Tab ---
+        # --- Tab 1: Homepage ---
         with gr.TabItem("Home 🏠", id="home_tab"):
             gr.Markdown(
                 "<h2 class='centered-text'>A Smart First Step in Understanding Your Health</h2>",
@@ -71,8 +69,33 @@ with gr.Blocks(title="DiaSpark: Your Health Management Platform", css=css) as de
                     The results from DiaSpark are for informational purposes only. Always seek the advice of your physician or another qualified health provider with any questions you may have regarding a medical condition. Never disregard professional medical advice or delay in seeking it because of something you have read or seen on this application.
                     """
                 )
-        
-        # --- NEW INFORMATIONAL TABS ---
+
+        # --- Tab 2: Authentication (Moved Up) ---
+        with gr.TabItem("Login / Signup", id="auth_tab"):
+            auth_message = gr.Markdown()
+            
+            with gr.Column(visible=True) as login_col:
+                gr.Markdown("### Login to Your Account")
+                email_login = gr.Textbox(label="Email", placeholder="Enter your email")
+                pwd_login = gr.Textbox(label="Password", type="password", placeholder="Enter your password")
+                login_btn = gr.Button("Login", variant="primary")
+                show_signup_btn = gr.Button("New user? Sign up here.", variant="secondary")
+
+            with gr.Column(visible=False) as signup_col:
+                gr.Markdown("### Create a New Account")
+                username_signup = gr.Textbox(label="Username", placeholder="Choose a unique username")
+                email_signup = gr.Textbox(label="Email", placeholder="Enter your email")
+                pwd_signup = gr.Textbox(
+                    label="Password",
+                    type="password",
+                    placeholder="Create a password",
+                    info="Must be at least 6 characters long."
+                )
+                gender_signup = gr.Radio(["Female", "Male"], label="Gender", info="This determines if the 'Pregnancies' field is shown.")
+                signup_btn = gr.Button("Sign Up", variant="primary")
+                show_login_btn = gr.Button("Already have an account? Login.", variant="secondary")
+
+        # --- The rest of the informational and tool tabs ---
         with gr.TabItem("Learn About Diabetes 📚"):
             render_factors_info()
             
@@ -82,7 +105,6 @@ with gr.Blocks(title="DiaSpark: Your Health Management Platform", css=css) as de
         with gr.TabItem("Find a Specialist 🧑‍⚕️"):
             render_doctor_list()
 
-        # --- Interactive Prediction Tab ---
         with gr.TabItem("Prediction Tool 🔬", id="prediction_tab"):
             
             with gr.Column(visible=False) as prediction_view:
@@ -121,61 +143,26 @@ with gr.Blocks(title="DiaSpark: Your Health Management Platform", css=css) as de
                     """
                 )
 
-        # --- Authentication Tab ---
-        with gr.TabItem("Login / Signup", id="auth_tab"):
-            auth_message = gr.Markdown()
-            
-            with gr.Column(visible=True) as login_col:
-                gr.Markdown("### Login to Your Account")
-                email_login = gr.Textbox(label="Email", placeholder="Enter your email")
-                pwd_login = gr.Textbox(label="Password", type="password", placeholder="Enter your password")
-                login_btn = gr.Button("Login", variant="primary")
-                show_signup_btn = gr.Button("New user? Sign up here.", variant="secondary")
-
-            with gr.Column(visible=False) as signup_col:
-                gr.Markdown("### Create a New Account")
-                username_signup = gr.Textbox(label="Username", placeholder="Choose a unique username")
-                email_signup = gr.Textbox(label="Email", placeholder="Enter your email")
-                pwd_signup = gr.Textbox(
-                    label="Password",
-                    type="password",
-                    placeholder="Create a password",
-                    info="Must be at least 6 characters long."
-                )
-                gender_signup = gr.Radio(["Female", "Male"], label="Gender", info="This determines if the 'Pregnancies' field is shown.")
-                signup_btn = gr.Button("Sign Up", variant="primary")
-                show_login_btn = gr.Button("Already have an account? Login.", variant="secondary")
-
-
     # --- Component Logic (Event Handlers) ---
-
-    # Handlers for UI switching
+    # NOTE: No changes are needed in the event handlers for this reordering.
+    
     def switch_to_signup(): return gr.update(visible=False), gr.update(visible=True)
     def switch_to_login(): return gr.update(visible=True), gr.update(visible=False)
     show_signup_btn.click(fn=switch_to_signup, outputs=[login_col, signup_col])
     show_login_btn.click(fn=switch_to_login, outputs=[login_col, signup_col])
     
-    # Handler for main state changes (login/logout UI updates)
     def handle_user_state_change(user_data):
         is_logged_in = user_data.get("logged_in", False)
         is_female = user_data.get("gender") == "Female"
         username = user_data.get("username", "User")
         welcome_text = f"### 👋 Welcome, {username}!"
-        return (
-            gr.update(visible=is_logged_in), 
-            gr.update(visible=not is_logged_in), 
-            gr.update(visible=is_female), 
-            gr.update(value=welcome_text), 
-            gr.update(visible=is_logged_in)
-        )
+        return (gr.update(visible=is_logged_in), gr.update(visible=not is_logged_in), gr.update(visible=is_female), gr.update(value=welcome_text), gr.update(visible=is_logged_in))
     user_state.change(fn=handle_user_state_change, inputs=user_state, outputs=[prediction_view, logged_out_view, pregnancies_row, welcome_message, logged_in_header])
 
-    # Handlers for core auth actions
     signup_btn.click(fn=register, inputs=[email_signup, pwd_signup, gender_signup, username_signup], outputs=[auth_message, email_signup, pwd_signup, gender_signup, username_signup])
     login_btn.click(fn=login, inputs=[email_login, pwd_login, user_state], outputs=[auth_message, user_state, main_tabs])
     logout_btn.click(fn=logout, inputs=[user_state], outputs=[auth_message, user_state, main_tabs, email_login, pwd_login, preg, glucose, bp, insulin, bmi, age, result_output, pregnancies_row])
 
-    # Handlers for prediction and report generation
     def handle_create_report(user, p, g, b, i, bm, a, result):
         if not result:
             return gr.update(visible=False)