Update app.py

app.py

@@ -5,50 +5,66 @@ import os
 import shutil
 import datetime
 
-# Path to the data file
-DATA_FILE = os.path.join("data", "teamup_data.json")
+# Paths
+DATA_DIR = "data"
+DATA_FILE = os.path.join(DATA_DIR, "teamup_data.json")
+BACKUP_DIR = os.path.join(DATA_DIR, "backup")
+os.makedirs(DATA_DIR, exist_ok=True)
 
-# Load the ADMIN_CODE environment variable
-ADMIN_CODE = os.getenv("ADMIN_CODE", "")
-
-# Ensure data file exists
-os.makedirs("data", exist_ok=True)
+# Init data file
 if not os.path.exists(DATA_FILE) or os.path.getsize(DATA_FILE) == 0:
     with open(DATA_FILE, "w") as f:
         json.dump([], f)
 
-# Function to create a backup of the data
+# Country list
+ALL_COUNTRIES = sorted(list(set([
+    "United States of America", "United Kingdom", "India", "France", "Germany", "Canada", "Australia", "Japan", "Brazil", "Mexico",
+    # Add or reduce to most relevant countries only for dropdown
+] + [  # Fallback: full list
+    "Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Argentina", "Armenia", "Austria", "Azerbaijan",
+    "Bangladesh", "Belgium", "Bhutan", "Bolivia", "Bosnia and Herzegovina", "Botswana", "Bulgaria", "Cambodia",
+    "Chile", "China", "Colombia", "Croatia", "Cuba", "Czech Republic", "Denmark", "Dominican Republic", "Ecuador",
+    "Egypt", "Estonia", "Ethiopia", "Finland", "Greece", "Hungary", "Iceland", "Indonesia", "Iran", "Iraq", "Ireland",
+    "Israel", "Italy", "Jordan", "Kenya", "Kuwait", "Latvia", "Lithuania", "Luxembourg", "Malaysia", "Malta", "Morocco",
+    "Nepal", "Netherlands", "New Zealand", "Nigeria", "Norway", "Pakistan", "Peru", "Philippines", "Poland", "Portugal",
+    "Qatar", "Romania", "Russia", "Saudi Arabia", "Serbia", "Singapore", "Slovakia", "Slovenia", "South Africa", "South Korea",
+    "Spain", "Sri Lanka", "Sweden", "Switzerland", "Thailand", "Tunisia", "Turkey", "Ukraine", "United Arab Emirates", "Vietnam",
+    "Zambia", "Zimbabwe"
+])))
+
+# Backup
 def backup_data():
-    source_file = DATA_FILE
-    backup_dir = './data/backup'
-    os.makedirs(backup_dir, exist_ok=True)
-
+    os.makedirs(BACKUP_DIR, exist_ok=True)
     timestamp = datetime.datetime.now().strftime('%Y%m%d_%H%M%S')
-    backup_file = os.path.join(backup_dir, f'teamup_data_backup_{timestamp}.json')
+    backup_file = os.path.join(BACKUP_DIR, f'teamup_data_backup_{timestamp}.json')
+    shutil.copy(DATA_FILE, backup_file)
 
-    shutil.copy(source_file, backup_file)
-    print(f"✅ Backup created at {backup_file}")
+# Safe save
+def atomic_save(data, path):
+    tmp_path = path + ".tmp"
+    with open(tmp_path, "w") as f:
+        json.dump(data, f, indent=2)
+    os.replace(tmp_path, path)
 
-# Function to submit or update a profile
+# Profile submission
 def submit_profile(name, discord, city, country, address, looking, onlinecheck, languages, laptop, robot, skills, describe3, experience, idea):
-    print("🟢 Submit button clicked.")
-    print(f"Incoming: {discord=}, {city=}, {country=}, {languages=}, {laptop=}, {robot=}")
-
     if not discord or not city or not country or not laptop or not robot:
         return "❌ Please fill in all required fields."
-    if not languages or not isinstance(languages, list) or len(languages) == 0:
+
+    if not languages or not isinstance(languages, list):
         return "❌ Please select at least one language."
 
-    # Ensure country is stored as a string (in case form allows lists)
-    if isinstance(country, list):
-        country = country[0] if country else ""
+    # Normalize input
+    city = city.strip().title()
+    country = country.strip().title()
+    discord = discord.strip()
 
     with open(DATA_FILE, "r") as f:
         data = json.load(f)
 
-    for d in data:
-        if d["Discord"].lower() == discord.lower():
-            d.update({
+    for entry in data:
+        if entry["Discord"].lower() == discord.lower():
+            entry.update({
                 "Name": name,
                 "City": city,
                 "Country": country,
@@ -83,148 +99,101 @@ def submit_profile(name, discord, city, country, address, looking, onlinecheck,
         })
 
     try:
-        with open(DATA_FILE, "w") as f:
-            json.dump(data, f, indent=2)
-        print(f"✅ Successfully wrote {len(data)} profiles to {DATA_FILE}")
-        backup_data()  # Backup after every update
+        atomic_save(data, DATA_FILE)
+        backup_data()
+        return "✅ Profile saved!"
     except Exception as e:
-        print(f"❌ Failed to write to {DATA_FILE}: {e}")
-        return "❌ Error saving your profile. Please try again."
+        return f"❌ Failed to save: {e}"
+
+# City dropdown update
+def update_city_filter(country):
+    with open(DATA_FILE, "r") as f:
+        data = json.load(f)
+    df = pd.DataFrame(data)
+
+    if country != "All":
+        df = df[df["Country"].str.title() == country.title()]
 
-    return "✅ Profile saved!"
+    cities = sorted(set(df["City"].dropna().unique()))
+    return gr.update(choices=["All"] + cities, value="All")
 
-# Function to filter participants by fields
+# Filter participants
 def filter_by_fields(selected_country, selected_city, selected_language):
     with open(DATA_FILE, "r") as f:
         data = json.load(f)
-    df = pd.DataFrame(data)
 
-    # Convert list values to readable strings
-    df["Languages"] = df["Languages"].apply(lambda langs: ", ".join(langs) if isinstance(langs, list) else langs)
+    df = pd.DataFrame(data)
+    if df.empty:
+        return "<p>No data available.</p>"
 
-    if df.empty or "Country" not in df.columns or "Languages" not in df.columns:
-        return "<p>No participants found.</p>"
+    df["Languages"] = df["Languages"].apply(lambda x: ", ".join(x) if isinstance(x, list) else str(x))
 
     if selected_country != "All":
-        df = df[df["Country"] == selected_country]
-
+        df = df[df["Country"].str.title() == selected_country.title()]
     if selected_city != "All":
-        df = df[df["City"] == selected_city]
-
+        df = df[df["City"].str.title() == selected_city.title()]
     if selected_language != "All":
-        df = df[df["Languages"].apply(lambda langs: selected_language in langs)]
+        df = df[df["Languages"].str.contains(selected_language)]
 
-    # Hide address
     if "Address" in df.columns:
-        df = df.drop(columns=["Address"])
-
-    # Rename column headers for display only
-    display_names = {
-        "Discord": "Discord",
-        "Name": "Name",
-        "City": "City",
-        "Country": "Country",
-        "Looking for Team": "Looking for Team",
-        "Onlinecheck": "How?",
-        "Languages": "Languages",
-        "Laptop": "Laptop",
-        "Robot": "Robot",
-        "Skills": "Skills",
-        "Describe3": "Describe",
-        "Experience": "Experience",
-        "Project Idea": "Project Idea"
-    }
-
-    html = '<h3 style="margin-top:20px;">🔍 Find your matching Teammates & Register your team <a href="https://forms.gle/gJEMGD4CEA2emhD18" target="_blank">here</a>👈👈</h3>'
-    html += "<table style='width:100%; border-collapse: collapse;'>"
-
-    # Header row
-    html += "<tr>" + "".join(
-        f"<th style='border: 1px solid #ccc; padding: 6px;'>{display_names.get(col, col)}</th>"
-        for col in df.columns
-    ) + "</tr>"
-
-    # Data rows
-    for _, row in df.iterrows():
-        html += "<tr>"
-        for col in df.columns:
-            val = row[col]
-            if col == "Discord":
-                val = f"<a href='https://discord.com/users/{val}' target='_blank'>{val}</a>"
-            html += f"<td style='border: 1px solid #eee; padding: 6px;'>{val}</td>"
-        html += "</tr>"
+        df.drop(columns=["Address"], inplace=True)
+
+    if df.empty:
+        return "<p>No participants match your filters.</p>"
 
+    html = "<table style='width:100%; border-collapse: collapse;'>"
+    html += "<tr>" + "".join(f"<th style='border:1px solid #ccc;padding:6px'>{col}</th>" for col in df.columns) + "</tr>"
+    for _, row in df.iterrows():
+        html += "<tr>" + "".join(
+            f"<td style='border:1px solid #eee;padding:6px'>{row[col] if col != 'Discord' else f'<a href=\"https://discord.com/users/{row[col]}\" target=\"_blank\">{row[col]}</a>'}</td>"
+            for col in df.columns
+        ) + "</tr>"
     html += "</table>"
     return html
 
-# List of all countries in alphabetical order
-ALL_COUNTRIES = [
-    "Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Antigua and Barbuda", "Argentina", "Armenia", "Australia", "Austria",
-    "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", "Bhutan",
-    "Bolivia", "Bosnia and Herzegovina", "Botswana", "Brazil", "Brunei", "Bulgaria", "Burkina Faso", "Burundi", "Cabo Verde", "Cambodia",
-    "Cameroon", "Canada", "Central African Republic", "Chad", "Chile", "China", "Colombia", "Comoros", "Congo (Congo-Brazzaville)",
-    "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czechia (Czech Republic)", "Democratic Republic of the Congo", "Denmark", "Djibouti", "Dominica",
-    "Dominican Republic", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Eswatini (fmr. 'Swaziland')", "Ethiopia",
-    "Fiji", "Finland", "France", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Greece", "Grenada",
-    "Guatemala", "Guinea", "Guinea-Bissau", "Guyana", "Haiti", "Honduras", "Hungary", "Iceland", "India", "Indonesia",
-    "Iran", "Iraq", "Ireland", "Israel", "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan", "Kenya",
-    "Kiribati", "Korea, North", "Korea, South", "Kuwait", "Kyrgyzstan", "Laos", "Latvia", "Lebanon", "Lesotho", "Liberia",
-    "Libya", "Liechtenstein", "Lithuania", "Luxembourg", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta",
-    "Marshall Islands", "Mauritania", "Mauritius", "Mexico", "Micronesia", "Moldova", "Monaco", "Mongolia", "Montenegro", "Morocco",
-    "Mozambique", "Myanmar (formerly Burma)", "Namibia", "Nauru", "Nepal", "Netherlands", "New Zealand", "Nicaragua", "Niger", "Nigeria",
-    "North Macedonia", "Norway", "Oman", "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines",
-    "Poland", "Portugal", "Qatar", "Romania", "Russia", "Rwanda", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "Samoa",
-    "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia",
-    "Solomon Islands", "Somalia", "South Africa", "South Sudan", "Spain", "Sri Lanka", "Sudan", "Suriname", "Sweden", "Switzerland",
-    "Syria", "Taiwan", "Tajikistan", "Tanzania", "Thailand", "Timor-Leste", "Togo", "Tonga", "Trinidad and Tobago", "Tunisia",
-    "Turkey", "Turkmenistan", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom", "United States of America", "Uruguay",
-    "Uzbekistan", "Vanuatu", "Vatican City", "Venezuela", "Vietnam", "Yemen", "Zambia", "Zimbabwe"
-]
-
-# Function to update the dropdown choices
-def update_dropdown_choices():
-    return gr.update(choices=["All"] + ALL_COUNTRIES, value="All")
-
-# Setup Gradio interface
+# Gradio Interface
 with gr.Blocks(css=".gr-dropdown { max-height: 100px; overflow-y: auto; font-size: 12px; }") as demo:
-    gr.Markdown("# 🌍 LeRobot Worldwide Hackathon - Team-Up Dashboard")
-    gr.Markdown("1. Submit or update your profile to find matching teammates and contact them on Discord. (Required fields marked with *.) ")
+    gr.Markdown("# 🌍 LeRobot Hackathon: Global Team-Up Dashboard")
 
-    # Input fields and buttons setup
     with gr.Row():
         with gr.Column():
             name = gr.Text(label="Name")
             discord = gr.Text(label="👤 Discord Username *")
             city = gr.Text(label="📍 City *")
-            country = gr.Dropdown(label="🌍 Country *", choices=ALL_COUNTRIES, value="All")  # Dropdown for Country
+            country = gr.Dropdown(label="🌍 Country *", choices=ALL_COUNTRIES)
             address = gr.Text(label="Address (optional)")
             looking = gr.Radio(["Yes", "No"], label="🔍 Looking for a team?")
-            onlinecheck = gr.Radio(["Participate Online", "Join a Local Hackathon"], label="🚀 I will...")            
+            onlinecheck = gr.Radio(["Participate Online", "Join a Local Hackathon"], label="🚀 I will...")
             languages = gr.CheckboxGroup(choices=["English", "French", "Spanish", "German", "Portuguese", "Chinese", "Arabic", "Hindi"], label="Languages Spoken *")
             laptop = gr.Text(label="💻 Laptop Setup *")
-            robot = gr.Text(label="Robot Setup *")
-            skills = gr.Text(label="🧠 Your Skills (comma separated)")
-            describe3 = gr.Text(label="🤗 3 Words That Describe You")
+            robot = gr.Text(label="🤖 Robot Setup *")
+            skills = gr.Text(label="🧠 Skills (comma separated)")
+            describe3 = gr.Text(label="3 Words That Describe You")
             experience = gr.Dropdown(choices=["Beginner", "Intermediate", "Advanced"], label="Experience Level", value="Beginner")
             idea = gr.Textbox(label="Project Idea (optional)")
-            submit_btn = gr.Button("Submit or Update Profile ✅")
+            submit_btn = gr.Button("Submit or Update ✅")
             status = gr.Textbox(label="", interactive=False)
 
         with gr.Column():
-            gr.Markdown("🎯 2. Choose your preferences to find your teammates (country, city or language)")
-            country_filter = gr.Dropdown(label="Filter by Country", choices=["All"], value="All", allow_custom_value=False)
-            city_filter = gr.Dropdown(label="Filter by City", choices=["All"], value="All", allow_custom_value=False)
-            language_filter = gr.Dropdown(label="Filter by Language", choices=["All"], value="All", allow_custom_value=False)
-            table_html = gr.HTML(label="Matching Participants")
+            gr.Markdown("🎯 Find teammates by country, city, or language.")
+            country_filter = gr.Dropdown(label="Filter by Country", choices=["All"] + ALL_COUNTRIES, value="All")
+            city_filter = gr.Dropdown(label="Filter by City", choices=["All"], value="All")
+            language_filter = gr.Dropdown(label="Filter by Language", choices=["All", "English", "French", "Spanish", "German", "Portuguese", "Chinese", "Arabic", "Hindi"], value="All")
+            table_html = gr.HTML()
 
     submit_btn.click(
-        submit_profile,
+        fn=submit_profile,
         inputs=[name, discord, city, country, address, looking, onlinecheck, languages, laptop, robot, skills, describe3, experience, idea],
         outputs=[status]
+    ).then(
+        fn=filter_by_fields,
+        inputs=[country_filter, city_filter, language_filter],
+        outputs=[table_html]
     )
 
-    country_filter.change(fn=filter_by_fields, inputs=[country_filter, city_filter, language_filter], outputs=table_html)
-    city_filter.change(fn=filter_by_fields, inputs=[country_filter, city_filter, language_filter], outputs=table_html)
-    language_filter.change(fn=filter_by_fields, inputs=[country_filter, city_filter, language_filter], outputs=table_html)
+    country_filter.change(fn=update_city_filter, inputs=[country_filter], outputs=[city_filter])
+    for dropdown in [country_filter, city_filter, language_filter]:
+        dropdown.change(fn=filter_by_fields, inputs=[country_filter, city_filter, language_filter], outputs=[table_html])
 
 demo.launch()
+