Update app.py

app.py

@@ -883,40 +883,42 @@ def join_game_page():
 
 # ----------------- Play Page -----------------
 def play_page():
-    st.header("Play")
-    gid = st.session_state.get('game_id')
+    # Fetch game info
+    gid = st.session_state.get('current_game_id')
     uname = st.session_state.get('username')
-    avatar = st.session_state.get('avatar','🎮')
-    if not gid or not uname:
-        st.info("Join a game first.")
-        return
+    avatar = st.session_state.get('avatar', '🎮')
 
-    ok, msg = claim_session_unified(gid, uname)
-    if not ok:
-        st.error(msg)
+    if not gid or not uname:
+        st.error("No active game or username found.")
         return
 
-    heartbeat_unified(gid, uname)
-
     games = unified_get("games") or {}
     game = games.get(gid)
     if not game:
         st.error("Game not found.")
         return
-    if game.get('closed'):
-        st.error("Game closed.")
-        return
 
-    # Ensure questions exist
+    # Load questions
     questions = st.session_state.get('game_questions') or game.get('questions', [])
     if not questions:
         st.error("No questions loaded.")
         return
 
-    # Ensure timer exists
+    # Normalize questions to dict format
+    for i, q in enumerate(questions):
+        if isinstance(q, list) or isinstance(q, tuple):
+            questions[i] = {
+                "question": q[0],
+                "options": q[1],
+                "answer": q[2] if len(q) > 2 else ""
+            }
+    st.session_state['game_questions'] = questions
+
+    # Initialize timer
     if 'question_started_at' not in st.session_state or st.session_state['question_started_at'] is None:
         st.session_state['question_started_at'] = time.time()
 
+    # Current question index
     idx = st.session_state.get('current_index', 0)
     if idx >= len(questions):
         st.success("All done — submit!")
@@ -930,79 +932,81 @@ def play_page():
     time_limit = 15
     st.markdown(f"**Time left:** {max(0, time_limit - elapsed)} seconds")
 
+    # Choice selection
     choice = st.radio("Choose an answer:", q["options"], key=f"choice_{idx}")
 
-
     col1, col2 = st.columns(2)
 
+    # NEXT button
     with col1:
         if st.button("Next"):
-            taken = time.time() - st.session_state.get('question_started_at', time.time())
-
+            taken = time.time() - st.session_state['question_started_at']
             answers = st.session_state.get('answers', [""] * len(questions))
             times = st.session_state.get('answer_times', [None] * len(questions))
-
             answers[idx] = choice
             times[idx] = taken
-
             st.session_state['answers'] = answers
             st.session_state['answer_times'] = times
             st.session_state['current_index'] = idx + 1
+            st.session_state['question_started_at'] = time.time()  # reset timer
 
-            # Do NOT reset question_started_at to None
-            st.session_state['question_started_at'] = time.time()  # reset for next question
-
+            # Update heartbeat
             players = unified_get("players") or {}
             if players.get(gid, {}).get(uname):
                 players[gid][uname]['last_heartbeat'] = now_iso()
                 unified_set("players", players)
-
             heartbeat_unified(gid, uname)
             st.rerun()
 
+    # SUBMIT ALL button
     with col2:
-        if idx == len(questions)-1:
+        if idx == len(questions) - 1:
             if st.button("Submit All Answers"):
-                answers = st.session_state.get('answers', [""]*len(questions))
-                times = st.session_state.get('answer_times', [None]*len(questions))
+                taken = time.time() - st.session_state.get('question_started_at', time.time())
+                answers = st.session_state.get('answers', [""] * len(questions))
+                times = st.session_state.get('answer_times', [None] * len(questions))
                 answers[idx] = choice
-                times[idx] = time.time() - st.session_state.get('question_started_at', time.time())
+                times[idx] = taken
                 st.session_state['answers'] = answers
                 st.session_state['answer_times'] = times
+
+                # Compute score
                 score, flags = compute_score(questions, answers, times)
                 now = now_iso()
                 row = {
                     "name": uname,
                     "score": score,
                     "game_id": gid,
-                    "topics": ",".join(game.get('topics',[])),
+                    "topics": ",".join(game.get('topics', [])),
                     "timestamp": now,
                     "avatar": avatar,
                     "questions": " || ".join([q["question"] for q in questions]),
                     "answers": " || ".join([str(a) for a in answers]),
-                    "correct_flags": " || ".join(flags)
+                    "correct_flags": " || ".join(flags),
+                    "percentage": round(score / len(questions) * 100, 2)
                 }
                 unified_push_leaderboard(row)
-                players[gid][uname]['score'] = score
-                players[gid][uname]['percentage'] = round((score / len(questions)) * 100, 2)
+
+                # Update player submission
                 players = unified_get("players") or {}
                 if players.get(gid) and players[gid].get(uname):
                     players[gid][uname]['submitted'] = True
                     players[gid][uname]['submitted_at'] = now
                     players[gid][uname]['score'] = score
-                    players[gid][uname]['percentage'] = round((score / len(questions)) * 100, 2)
+                    players[gid][uname]['percentage'] = round(score / len(questions) * 100, 2)
                     unified_set("players", players)
+
+                # Auto-close game if enabled
                 if game.get('auto_close', True):
-                    games = unified_get("games") or {}
+                    games[gid]['closed'] = True
                     games[gid]['closed_at'] = now
                     unified_set("games", games)
+
                 st.success(f"Submitted! Score: {score}")
                 st.balloons()
                 st.session_state['last_score'] = score
                 st.session_state['last_game'] = gid
                 st.session_state['current_index'] = 0
-                st.rerun()
-            
 # Friends page
 def friends_page():
     st.header("Friends")