Update components/auth.py

components/auth.py

@@ -1,39 +1,50 @@
 # components/auth.py
 
-from utils.db import sign_up_user, login_user
+from utils.db import sign_up_user, login_user, supabase
 import gradio as gr
 
-def register(email, password):
-    """
-    Handler for the signup process.
-    On success, it will now also return empty strings to clear the input fields.
-    """
-    if not email or not password:
-        return "❌ Email and password cannot be empty.", gr.update(), gr.update()
+# The function now accepts 'gender' as a third argument
+def register(email, password, gender):
+    """Handler for the signup process, now including gender."""
+    # Check if all three inputs are provided
+    if not all([email, password, gender]):
+        # Return a no-op for all 4 output components on failure
+        return "❌ Email, password, and gender are required.", gr.update(), gr.update(), gr.update()
     
-    result = sign_up_user(email, password)
+    # The 'gender' is passed to the sign_up_user utility function
+    result = sign_up_user(email, password, gender)
 
     if result and result.user:
         message = "✅ Signup successful! You can now log in."
         if result.user and not result.session:
              message = "✅ Signup successful! Please check your email to confirm your account."
-        return message, "", "" 
+        # On success, clear all three signup fields
+        return message, "", "", None # Clear email, password, and gender radio
     
     if hasattr(result, 'error') and result.error:
-        return f"❌ Signup Failed: {result.error.message}", gr.update(), gr.update()
+        # On failure, don't clear the fields
+        return f"❌ Signup Failed: {result.error.message}", gr.update(), gr.update(), gr.update()
     
-    return "❌ Signup failed. An unknown error occurred.", gr.update(), gr.update()
+    # On unknown failure, don't clear the fields
+    return "❌ Signup failed. An unknown error occurred.", gr.update(), gr.update(), gr.update()
 
 
 def login(email, password, current_user_state):
-    """Handler for the login process."""
+    """Handler for login. Now fetches the user's gender from the public.users table."""
     if not email or not password:
         return "❌ Email and password cannot be empty.", current_user_state, gr.update()
 
     result = login_user(email, password)
     
     if result and result.session:
-        new_user_state = {"email": email, "id": result.user.id, "logged_in": True}
+        try:
+            profile = supabase.table("users").select("gender").eq("id", result.user.id).single().execute()
+            user_gender = profile.data.get("gender") if profile.data else None
+        except Exception as e:
+            print(f"Could not fetch user profile: {e}")
+            user_gender = None
+
+        new_user_state = {"email": email, "id": result.user.id, "logged_in": True, "gender": user_gender}
         return f"✅ Login successful! Redirecting...", new_user_state, gr.Tabs(selected="prediction_tab")
     
     if hasattr(result, 'error') and result.error:
@@ -43,24 +54,12 @@ def login(email, password, current_user_state):
 
 
 def logout(current_user_state):
-    """
-    Handler for the logout process.
-    Now also returns values to clear the login form, prediction form, AND the result box.
-    """
-    new_user_state = {"email": None, "id": None, "logged_in": False}
+    """Handler for logout. Now clears all state and form fields, including the pregnancies row visibility."""
+    new_user_state = {"email": None, "id": None, "logged_in": False, "gender": None}
     
-    # Message, new state, redirect, then empty values for all fields to be cleared.
+    # The return order must match the outputs list in app.py exactly
     return (
-        "👋 Logged out successfully.",
-        new_user_state,
-        gr.Tabs(selected="home_tab"),
-        "",          # Clear login email
-        "",          # Clear login password
-        None,        # Clear pregnancies
-        None,        # Clear glucose
-        None,        # Clear blood pressure
-        None,        # Clear insulin
-        None,        # Clear BMI
-        None,        # Clear age
-        ""           # NEW: Clear the prediction result output textbox
+        "👋 Logged out successfully.", new_user_state, gr.Tabs(selected="home_tab"),
+        "", "", None, None, None, None, None, None, "", # Clear forms
+        gr.update(visible=False) # Hide pregnancies row
     )