Update app.py

app.py

@@ -415,6 +415,45 @@ def unified_push_leaderboard(row):
     df = pd.concat([df, pd.DataFrame([row])], ignore_index=True)
     df.to_csv(LEADERBOARD_FILE, index=False)
 
+
+def get_weekly_leaderboard(limit=10):
+    mode = st.session_state.get("mode_selection", "Offline")
+    rows = []
+
+    if mode == "Online":
+        ok, _ = init_firebase_if_needed()
+        if ok:
+            rows = fb_get("/leaderboard") or []
+    else:
+        try:
+            rows = pd.read_csv(LEADERBOARD_FILE).to_dict("records")
+        except Exception:
+            rows = []
+
+    if not rows:
+        return []
+
+    # Start of current week (Monday)
+    now = datetime.utcnow()
+    start_of_week = now - timedelta(days=now.weekday())
+
+    weekly = []
+    for r in rows:
+        ts = r.get("timestamp")
+        if not ts:
+            continue
+        try:
+            played = datetime.fromisoformat(ts)
+        except Exception:
+            continue
+
+        if played >= start_of_week:
+            weekly.append(r)
+
+    weekly.sort(key=lambda x: x.get("score", 0), reverse=True)
+    return weekly[:limit]
+
+
 # ----------------- Session & Presence helpers -----------------
 def now_iso():
     return datetime.utcnow().isoformat()
@@ -528,7 +567,16 @@ def compute_winners(game_id):
 
     return df.head(3).to_dict(orient="records")
 
+#------Total players--------------------
+def get_total_online_players():
+    players = unified_get("players") or {}
+    total = 0
+    for gid in players:
+        total += len(players[gid])
+    return total
+
 # ----------------- Create Game Page -----------------
+
 def create_game_page():
     st.header("Create Game")
 
@@ -695,75 +743,88 @@ def home_page():
     st.header("Home")
     st.write("Create games, invite friends, play and climb the leaderboard.")
 
+    # ---------------- TOTAL ONLINE PLAYERS ----------------
+    players_map = unified_get("players") or {}
+    total_online = sum(len(v) for v in players_map.values())
+    st.metric("🟢 Players Online", total_online)
+
     # Show last score
     if st.session_state.get('last_score') is not None:
-        st.success(f"Your last score: {st.session_state['last_score']} (Game {st.session_state.get('last_game')})")
+        st.success(
+            f"Your last score: {st.session_state['last_score']} "
+            f"(Game {st.session_state.get('last_game')})"
+        )
 
-    # Load games and players
+    # Load games
     games = unified_get("games") or {}
-    players_map = unified_get("players") or {}
 
     st.subheader("Recent games")
+
     for g in sorted(games.values(), key=lambda x: x.get("created_at", ""), reverse=True)[:10]:
         gid = g.get("game_id")
+        players_here = players_map.get(gid, {}) or {}
+
         st.markdown(f"### 🎮 Game: **{gid}** {'(Closed)' if g.get('closed') else ''}")
         st.write(f"Host: {g.get('host')} — Topics: {', '.join(g.get('topics', []))}")
         st.write(f"Created: {g.get('created_at')}")
 
-        # Players for this game
-        players_here = players_map.get(gid, {}) or {}
-        st.write(f"Players joined: **{len(players_here)}**")
-
-        # Submitted count
-        submitted_count = sum(1 for p in players_here.values() if p.get("submitted"))
-        st.write(f"Submitted: **{submitted_count} / {len(players_here)}**")
-
-        # Final scores
-        if players_here:
-            st.markdown("**📊 Final Scores**")
-            for uname_p, info in players_here.items():
-                if info.get("submitted"):
-                    st.write(
-                        f"{info.get('avatar','🎮')} **{uname_p}** — "
-                        f"Score: **{info.get('score', 0)}**, "
-                        f"Percentage: **{info.get('percentage', 0)}%**"
-                    )
+        # ---------------- GAME STATS ----------------
+        joined = len(players_here)
+        submitted = sum(1 for p in players_here.values() if p.get("submitted"))
+
+        st.write(f"Players joined: **{joined}**")
+        st.write(f"Submitted: **{submitted} / {joined}**")
+
+        # ---------------- TOP 3 PLAYERS ----------------
+        submitted_players = [
+            (u, d) for u, d in players_here.items() if d.get("submitted")
+        ]
+        submitted_players.sort(key=lambda x: x[1].get("score", 0), reverse=True)
+
+        if submitted_players:
+            st.markdown("🏆 **Top 3 Players**")
+            for i, (uname_p, info) in enumerate(submitted_players[:3], start=1):
+                st.write(
+                    f"{i}. {info.get('avatar','🎮')} **{uname_p}** — "
+                    f"{info.get('score',0)} pts ({info.get('percentage',0)}%)"
+                )
 
-        # Player status
+        # ---------------- PLAYER STATUS ----------------
         if players_here:
             st.markdown("**👥 Player Status**")
             for uname_p, info in players_here.items():
-                status = "✅ Submitted" if info.get('submitted') else "⏳ Playing"
+                status = "✅ Submitted" if info.get("submitted") else "⏳ Playing"
                 st.write(f"{info.get('avatar','🎮')} **{uname_p}** — {status}")
 
         st.markdown("---")
 
-        # Invite & challenge buttons
-        if not g.get('closed'):
+        # ---------------- INVITE & CHALLENGE ----------------
+        if not g.get("closed"):
             st.info(f"Share this Game ID: {gid}")
             render_copy_button(gid, gid)
 
-            if st.session_state.get('username'):
+            if st.session_state.get("username"):
                 if st.button(f"Invite your friends to {gid}", key=f"invite_{gid}"):
-                    friends = get_friends_map().get(st.session_state['username'], [])
+                    friends = get_friends_map().get(st.session_state["username"], [])
                     if not friends:
                         st.warning("No friends to invite.")
                     else:
                         for f in friends:
-                            send_game_invite(st.session_state['username'], f, gid)
+                            send_game_invite(st.session_state["username"], f, gid)
                         st.success("Invites sent to friends.")
 
                 if st.button(f"Challenge friends with a new game like {gid}", key=f"challenge_{gid}"):
                     new_id = create_game(
-                        st.session_state.get('username','Host'),
-                        g.get('topics', []),
-                        num_questions=len(g.get('questions', []))
+                        st.session_state.get("username", "Host"),
+                        g.get("topics", []),
+                        num_questions=len(g.get("questions", []))
                     )
-                    # Update session for new game
-                    st.session_state["current_game_id"] = new_id
+                    st.session_state["active_game_id"] = new_id
                     st.session_state["game_questions"] = games.get(new_id, {}).get("questions", [])
                     st.success(f"Challenge created: {new_id}")
-                    st.experimental_rerun()
+                    st.rerun()
+
+       
 
     # Weekly leaderboard
     st.subheader("🏆 Weekly Leaderboard (Top 10)")
@@ -1117,7 +1178,9 @@ def inbox_page():
 def leaderboard_page():
     st.header("Leaderboard")
 
-    rows = unified_get("leaderboard") or []
+    # ✅ Correct source (Online + Offline safe)
+    rows = unified_get("/leaderboard") or []
+
     if isinstance(rows, list) and rows:
         df = pd.DataFrame(rows)
     else:
@@ -1130,9 +1193,14 @@ def leaderboard_page():
         st.info("No scores yet.")
         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]
+
     if "timestamp" in df.columns:
         sort_cols.append("timestamp")
         asc.append(True)
@@ -1146,10 +1214,10 @@ def leaderboard_page():
     st.markdown(f"**👥 Total Players:** {total_players}")
     st.markdown(f"**🎮 Total Games:** {total_games}")
 
-    # 🔥 TOP 3 PODIUM
+    # 🔥 TOP 3 PODIUM (overall)
     st.markdown("### 🏆 Top 3 Overall")
     top3 = df_sorted.head(3)
-    for i, row in top3.iterrows():
+    for _, row in top3.iterrows():
         st.write(
             f"{row.get('avatar','🎮')} **{row.get('name','Unknown')}** — "
             f"{row.get('score',0)} pts"
@@ -1163,25 +1231,33 @@ def leaderboard_page():
     # Existing chart (unchanged)
     fig = px.bar(
         df_sorted.head(10),
-        x='name',
-        y='score'
+        x="name",
+        y="score"
     )
     st.plotly_chart(fig, use_container_width=True)
 
 
-def get_weekly_leaderboard():
-    rows = unified_get("leaderboard") or []
+
+def get_weekly_leaderboard(limit=10):
+    rows = unified_get("/leaderboard") or []
     one_week_ago = datetime.utcnow() - timedelta(days=7)
 
     weekly = []
     for r in rows:
-        ts = parse_iso(r.get("timestamp"))
-        if ts and ts >= one_week_ago:
+        ts = r.get("timestamp")
+        if not ts:
+            continue
+        try:
+            played_time = datetime.fromisoformat(ts)
+        except Exception:
+            continue
+
+        if played_time >= one_week_ago:
             weekly.append(r)
 
-    # Sort by score desc
+    # Sort by score DESC
     weekly.sort(key=lambda x: x.get("score", 0), reverse=True)
-    return weekly[:10]
+    return weekly[:limit]
 # Route pages
 if page == "Home":
     home_page()