Update app.py

app.py

@@ -217,6 +217,19 @@ COUNTRY_DIALECTS = {
     }
 }
 
+AGES = [
+    "5–9",   # Early childhood
+    "10–14", # Adolescence (early teens)
+    "15–19", # Late teens
+    "20–24", # Young adults
+    "25–34", # Early adulthood
+    "35–44", # Mid adulthood
+    "45–54", # Mature adulthood
+    "55–64", # Early senior
+    "65–74", # Seniors
+    "75–84", # Elderly
+    "85+"    # Oldest old
+]
 
 def get_dialect_code(country, dialect):
     """Generate full dialect code from country and dialect."""
@@ -451,7 +464,7 @@ def normalize_username(name, dialect_code, gender):
     gender_suffix = "_m" if gender == "Male" else "_f" if gender == "Female" else ""
     return f"{base_name}_{unique_id}_{dialect_code}{gender_suffix}"
 
-def register_user(name, email, password, country, dialect, city, gender, consent):
+def register_user(name, email, password, country, age, dialect, city, gender, consent):
     """Register a new user with country, dialect, city, and gender."""
     users = load_users()
     email = email.lower()
@@ -473,6 +486,7 @@ def register_user(name, email, password, country, dialect, city, gender, consent
         "email": email,
         "password": hashed_password,
         "country": country,
+        "age": age,
         "dialect": dialect,
         "dialect_code": dialect_code,
         "city": city,
@@ -700,6 +714,7 @@ def login_interface():
             register_email = gr.Textbox(label="Email")
             register_password = gr.Textbox(label="Password", type="password")
             register_country = gr.Dropdown(choices=COUNTRIES, label="Country", value="Saudi Arabia")
+            register_age = gr.Dropdown(choices=AGES, label="Age", value="19-24")
             register_dialect = gr.Dropdown(choices=[], label="Dialect", value=None)
             register_city = gr.Textbox(label="City", placeholder="Enter your city name")
             register_gender = gr.Dropdown(choices=GENDERS, label="Gender")
@@ -714,7 +729,7 @@ def login_interface():
     
     return (
         login_title, login_email, login_password, login_button, login_message,
-        register_name, register_email, register_password, register_country, register_dialect,
+        register_name, register_email, register_password, register_country, register_age, register_dialect,
         register_city, register_gender, register_consent, consent_details, 
         register_button, register_message
     )
@@ -753,8 +768,8 @@ def main_app_interface():
             )
     
     with gr.Row(visible=False) as button_row:
-        discard_button = gr.Button("Discard (D)", variant="primary")
-        save_button = gr.Button("Save & Next (N)", variant="stop")
+        discard_button = gr.Button("Discard (D)", variant="stop")
+        save_button = gr.Button("Save & Next (N)", variant="primary")
     with gr.Row(visible=False) as skip_row:
         skip_button = gr.Button("Skip (S)", variant="secondary")
     
@@ -798,7 +813,7 @@ def create_app():
         # Create interface components
         (
             login_title, login_email, login_password, login_button, login_message,
-            register_name, register_email, register_password, register_country, register_dialect,
+            register_name, register_email, register_password, register_country, register_age, register_dialect,
             register_city, register_gender, register_consent, consent_details, 
             register_button, register_message
         ) = login_interface()
@@ -873,6 +888,7 @@ def create_app():
                     gr.update(visible=False),  # register_email
                     gr.update(visible=False),  # register_password
                     gr.update(visible=False),  # register_country
+                    gr.update(visible=False),  # register_age
                     gr.update(visible=False),  # register_dialect
                     gr.update(visible=False),  # register_city
                     gr.update(visible=False),  # register_gender
@@ -912,6 +928,7 @@ def create_app():
                     gr.update(visible=True),   # register_email
                     gr.update(visible=True),   # register_password
                     gr.update(visible=True),   # register_country
+                    gr.update(visible=True),   # register_age
                     gr.update(visible=True),   # register_dialect
                     gr.update(visible=True),   # register_city
                     gr.update(visible=True),   # register_gender
@@ -941,14 +958,14 @@ def create_app():
                 )
 
         # Register function
-        def register(name, email, password, country, dialect, city, gender, consent, state_dict):
+        def register(name, email, password, country, age, dialect, city, gender, consent, state_dict):
             email = email.lower()
-            if not all([name, email, password, country, dialect, city, gender]):
+            if not all([name, email, password, country, age, dialect, city, gender]):
                 return state_dict, "Please fill in all fields", gr.update(visible=True)
             if not consent:
                 return state_dict, "You must agree to the research data usage terms to register", gr.update(visible=True)
             
-            success, result = register_user(name, email, password, country, dialect, city, gender, consent)
+            success, result = register_user(name, email, password, country, age, dialect, city, gender, consent)
             if success:
                 return state_dict, f"Registration successful! Your username is: {result}. Please go to the Login tab.", gr.update(visible=True)
             else:
@@ -980,6 +997,7 @@ def create_app():
                 gr.update(visible=True),   # register_email
                 gr.update(visible=True),   # register_password
                 gr.update(visible=True),   # register_country
+                gr.update(visible=True),   # register_age
                 gr.update(visible=True),   # register_dialect
                 gr.update(visible=True),   # register_city
                 gr.update(visible=True),   # register_gender
@@ -1249,7 +1267,7 @@ def create_app():
             inputs=[login_email, login_password, state],
             outputs=[
                 state, login_title, login_email, login_password, login_button, login_message,
-                register_name, register_email, register_password, register_country, register_dialect,
+                register_name, register_email, register_password, register_country, register_age, register_dialect,
                 register_city, register_gender, register_consent, consent_details, register_button,
                 register_message, main_title, user_row, username_display, logout_button,
                 instructions_accordion, instructions_display, recording_row, current_sentence_display,
@@ -1260,7 +1278,7 @@ def create_app():
 
         register_button.click(
             register,
-            inputs=[register_name, register_email, register_password, register_country, register_dialect,
+            inputs=[register_name, register_email, register_password, register_country, register_age, register_dialect,
                     register_city, register_gender, register_consent, state],
             outputs=[state, register_message, consent_details]
         )
@@ -1270,7 +1288,7 @@ def create_app():
             inputs=[state],
             outputs=[
                 state, login_title, login_email, login_password, login_button, login_message,
-                register_name, register_email, register_password, register_country, register_dialect,
+                register_name, register_email, register_password, register_country, register_age, register_dialect,
                 register_city, register_gender, register_consent, consent_details, register_button,
                 register_message, main_title, user_row, username_display, logout_button,
                 instructions_accordion, instructions_display, recording_row, current_sentence_display,