Update app.py

app.py

@@ -982,27 +982,26 @@ def play_page():
             st.session_state['question_started_at'] = time.time()
             st.rerun()
 
+    # ---------------- SUBMIT ----------------
     # ---------------- SUBMIT ----------------
     with col2:
         if idx == len(questions) - 1:
             if st.button("Submit All Answers", key=f"submit_{gid}_{idx}"):
-
                 answers = st.session_state['answers']
                 times = st.session_state['answer_times']
-
+                
                 answers[idx] = choice
                 times[idx] = time.time() - st.session_state['question_started_at']
 
-                # ---------------- FIX 5 : CORRECT SCORING ----------------
+                # Compute score
                 score, flags = compute_score(
                     questions,
                     answers,
                     times
                 )
-
                 percentage = int(score / (len(questions) * 15) * 100)
-
-                # Update players
+                
+                # Update players dict
                 players = unified_get("players") or {}
                 players.setdefault(gid, {})
                 players[gid][uname] = {
@@ -1014,8 +1013,22 @@ def play_page():
                     "timestamp": now_iso()
                 }
                 unified_set("players", players)
-
-                # Auto-close game
+                # Push to leaderboard CSV / Firebase
+                row = {
+                    "name": uname,
+                    "avatar": st.session_state.get("avatar", "🎮"),
+                    "score": score,
+                    "percentage": percentage,
+                    "game_id": gid,
+                    "topics": game.get("topics", []),
+                    "timestamp": now_iso(),
+                    "questions": len(questions),
+                    "answers": answers,
+                    "correct_flags": flags
+                }
+                unified_push_leaderboard(row)  # <--- THIS IS KEY
+                
+                # Auto-close game if needed
                 if game.get('auto_close', True):
                     games[gid]['closed'] = True
                     games[gid]['closed_at'] = now_iso()
@@ -1025,12 +1038,11 @@ def play_page():
                     f"Submitted! Score: {score} / {len(questions) * 15} ({percentage}%)"
                 )
                 st.balloons()
-
                 st.session_state['last_score'] = score
                 st.session_state['last_game'] = gid
                 st.session_state['current_index'] = 0
-
-                
+                st.rerun()
+        
 # Join game
 def join_game_page():
     st.header("Join Game")
@@ -1072,12 +1084,8 @@ def join_game_page():
         else:
             st.error(msg)
 
-
-
 # Play page
 # ----------------- Create Game -----------------
-
-
     
 # Friends page
 def friends_page():
@@ -1175,66 +1183,60 @@ def inbox_page():
                     st.error(msg)
 
 # Leaderboard page
+# ----------------- Leaderboard Page -----------------
 def leaderboard_page():
-    st.header("Leaderboard")
-
-    # ✅ Correct source (Online + Offline safe)
-    rows = unified_get("/leaderboard") or []
-
-    if isinstance(rows, list) and rows:
-        df = pd.DataFrame(rows)
-    else:
-        try:
-            df = pd.read_csv(LEADERBOARD_FILE)
-        except Exception:
-            df = pd.DataFrame()
+    st.header("🏆 Leaderboard")
 
-    if df.empty:
-        st.info("No scores yet.")
+    rows = unified_get("leaderboard") or []
+    if not rows:
+        st.info("No scores yet. Play some games first!")
         return
 
-    # ✅ Ensure numeric score
-    if "score" in df.columns:
-        df["score"] = pd.to_numeric(df["score"], errors="coerce").fillna(0)
-
-    # 🔒 Stable sorting
-    sort_cols = ["score"]
-    asc = [False]
+    # Convert to DataFrame
+    df = pd.DataFrame(rows)
 
-    if "timestamp" in df.columns:
-        sort_cols.append("timestamp")
-        asc.append(True)
+    # Ensure columns exist
+    for col in ["name", "score", "game_id", "avatar", "timestamp"]:
+        if col not in df.columns:
+            df[col] = ""
 
-    df_sorted = df.sort_values(by=sort_cols, ascending=asc)
+    # ---------------- Weekly Leaderboard ----------------
+    st.subheader("This Week — Top 10")
+    now = datetime.utcnow()
+    start_of_week = now - timedelta(days=now.weekday())
+    df['ts'] = pd.to_datetime(df['timestamp'], errors='coerce')
+    weekly_df = df[df['ts'] >= start_of_week].copy()
 
-    # 🔥 SUMMARY (NO UI CHANGE)
-    total_players = df["name"].nunique() if "name" in df.columns else len(df)
-    total_games = df["game_id"].nunique() if "game_id" in df.columns else 1
+    if weekly_df.empty:
+        st.info("No scores recorded this week.")
+    else:
+        weekly_df = weekly_df.sort_values(by='score', ascending=False).head(10)
+        for i, row in weekly_df.iterrows():
+            user_marker = "👈 You" if row['name'] == st.session_state.get('username') else ""
+            st.write(f"{i+1}. {row.get('avatar','🎮')} **{row['name']}** (Game {row['game_id']}) — {row['score']} pts {user_marker}")
 
-    st.markdown(f"**👥 Total Players:** {total_players}")
-    st.markdown(f"**🎮 Total Games:** {total_games}")
+    st.markdown("---")
 
-    # 🔥 TOP 3 PODIUM (overall)
-    st.markdown("### 🏆 Top 3 Overall")
-    top3 = df_sorted.head(3)
-    for _, row in top3.iterrows():
-        st.write(
-            f"{row.get('avatar','🎮')} **{row.get('name','Unknown')}** — "
-            f"{row.get('score',0)} pts"
-        )
+    # ---------------- All-time Leaderboard ----------------
+    st.subheader("All-Time Top 10")
+    alltime_df = df.sort_values(by='score', ascending=False).head(10)
+    for i, row in alltime_df.iterrows():
+        user_marker = "👈 You" if row['name'] == st.session_state.get('username') else ""
+        st.write(f"{i+1}. {row.get('avatar','🎮')} **{row['name']}** (Game {row['game_id']}) — {row['score']} pts {user_marker}")
 
     st.markdown("---")
 
-    # Existing table (unchanged)
-    st.dataframe(df_sorted.head(200))
+    # Optional: allow search by username
+    search_user = st.text_input("Search leaderboard by username")
+    if search_user:
+        search_df = df[df['name'].str.lower() == search_user.lower()]
+        if search_df.empty:
+            st.info(f"No scores found for {search_user}.")
+        else:
+            st.subheader(f"Scores for {search_user}")
+            for i, row in search_df.iterrows():
+                st.write(f"Game {row['game_id']} — {row['score']} pts — {row.get('avatar','🎮')} — {row['timestamp']}")
 
-    # Existing chart (unchanged)
-    fig = px.bar(
-        df_sorted.head(10),
-        x="name",
-        y="score"
-    )
-    st.plotly_chart(fig, use_container_width=True)