Update app.py

app.py

@@ -799,6 +799,7 @@ def get_top3_and_player_count(game_id):
 # Home page
 
 HEARTBEAT_THRESHOLD_SECONDS = 60  # adjust if needed
+
 def home_page():
     st.header("Home")
     st.write("Create games, invite friends, play and climb the leaderboard.")
@@ -808,53 +809,48 @@ def home_page():
     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']} "
-            f"(Game {st.session_state.get('last_game')})"
-        )
+    # ---------------- SHOW LAST SCORE ----------------
+    last_score = st.session_state.get('last_score')
+    last_game = st.session_state.get('last_game')
+    if last_score is not None:
+        st.success(f"Your last score: {last_score} (Game {last_game})")
 
-    # Load games
+    # ---------------- LOAD GAMES ----------------
     games = unified_get("games") 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 {}
+
+        # Use players/submissions stored in game dict
+        players = g.get("players", [])
+        submissions = g.get("submissions", {})
 
         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')}")
 
-        # ---------------- GAME STATS ----------------
-        joined = len(players_here)
-        submitted = sum(1 for p in players_here.values() if p.get("submitted"))
+        joined = len(players)
+        submitted = len(submissions)
 
         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:
+        if submissions:
             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)}%)"
-                )
+            top_players = sorted(submissions.items(), key=lambda x: x[1], reverse=True)[:3]
+            for i, (uname_p, score) in enumerate(top_players, start=1):
+                st.write(f"{i}. 🎮 **{uname_p}** — {score} pts")
 
         # ---------------- PLAYER STATUS ----------------
-        if players_here:
+        if players:
             st.markdown("**👥 Player Status**")
-            for uname_p, info in players_here.items():
-                status = "✅ Submitted" if info.get("submitted") else "⏳ Playing"
-                st.write(f"{info.get('avatar','🎮')} **{uname_p}** — {status}")
+            for uname_p in players:
+                if uname_p in submissions:
+                    st.write(f"🎮 **{uname_p}** — ✅ Submitted ({submissions[uname_p]} pts)")
+                else:
+                    st.write(f"🎮 **{uname_p}** — ⏳ Playing")
 
         st.markdown("---")
 
@@ -882,35 +878,44 @@ def home_page():
                     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.rerun()
-
-       
+                    st.experimental_rerun()
 
-    # Weekly leaderboard
+    # ---------------- WEEKLY LEADERBOARD ----------------
     st.subheader("🏆 Weekly Leaderboard (Top 10)")
     weekly = get_weekly_leaderboard()
     if not weekly:
         st.info("No scores yet this week.")
     else:
         for i, r in enumerate(weekly, 1):
-            st.write(
-                f"{i}. {r.get('avatar','🎮')} **{r['name']}** "
-                f"(Game {r['game_id']}) — {r['score']} pts"
-            )
+            st.write(f"{i}. {r.get('avatar','🎮')} **{r['name']}** (Game {r['game_id']}) — {r['score']} pts")
 
-# ----------------------------
-# Play Page
-if 'active_game' not in st.session_state:
-    games = unified_get("games") or {}
-    if games:
-        first_game = list(games.keys())[0]
-        st.session_state['active_game'] = first_game
-    else:
-        st.warning("No games exist yet. Please create a game first.")
+    # ---------------- PLAY PAGE SETUP ----------------
+    if 'active_game' not in st.session_state:
+        if games:
+            st.session_state['active_game'] = list(games.keys())[0]
+        else:
+            st.warning("No games exist yet. Please create a game first.")
+
+    if 'username' not in st.session_state:
+        st.session_state['username'] = "Guest"
+
+    # Safely update player submissions if a game is active
+    active_game_id = st.session_state.get('active_game')
+    if active_game_id and 'final_score' in st.session_state:
+        game = unified_get(f"games/{active_game_id}") or {}
+        players = game.get("players", [])
+        username = st.session_state['username']
+
+        if username not in players:
+            players.append(username)
+
+        submissions = game.get("submissions", {})
+        submissions[username] = st.session_state['final_score']
+
+        game["players"] = players
+        game["submissions"] = submissions
+        unified_set(f"games/{active_game_id}", game)
 
-if 'username' not in st.session_state:
-    st.session_state['username'] = "Guest"  # temporary default username
-    
 def create_game(host=None, topics=[], num_questions=5, auto_close=True, ai_topic=None):
     games = unified_get("games") or {}
     gid = f"GAME{int(time.time())}"