Update app.py

app.py

@@ -775,37 +775,74 @@ def home_page():
 
 # ----------------------------
 # Play Page
-# ----------------------------
 def play_page():
-    uname = st.session_state.get("username")
-    gid = st.session_state.get("current_game_id")
-    if not uname or not gid:
-        st.warning("No active game or username found. Please join or create a game first.")
-        return
+    st.header("🎮 Play Game")
+
+    # ✅ Ensure username
+    if "username" not in st.session_state or not st.session_state["username"]:
+        uname = st.text_input("Enter your username to play:", key="username_input")
+        if not uname:
+            st.info("Please enter a username to continue.")
+            return
+        st.session_state["username"] = uname
+    else:
+        uname = st.session_state["username"]
+
+    # ✅ Ensure current game
+    if "current_game_id" not in st.session_state or not st.session_state["current_game_id"]:
+        # Fetch available games
+        games = unified_get("games") or {}
+        if not games:
+            st.info("No active games available. Please create a game first.")
+            return
+
+        game_options = [f"{g['game_id']} (Host: {g['host']})" for g in games.values()]
+        selected = st.selectbox("Select a game to join:", game_options)
+
+        if st.button("Join Game"):
+            gid = selected.split(" ")[0]  # Extract game_id
+            st.session_state["current_game_id"] = gid
+
+            # Mark player as joined
+            players = unified_get("players") or {}
+            if gid not in players:
+                players[gid] = {}
+            players[gid][uname] = {"joined_at": datetime.utcnow().isoformat(), "submitted": False}
+            unified_set("players", players)
+
+            st.success(f"Joined game {gid} successfully!")
+            st.experimental_rerun()
+        else:
+            st.info("Select a game and click 'Join Game'.")
+            return
+    else:
+        gid = st.session_state["current_game_id"]
 
+    # ✅ Fetch questions
     games = unified_get("games") or {}
     game = games.get(gid)
     if not game:
-        st.error("Game not found.")
+        st.error("Game not found. Please join a valid game.")
         return
 
-    questions = st.session_state.get("game_questions") or game.get("questions", [])
+    questions = st.session_state.get('game_questions') or game.get('questions', [])
     if not questions:
-        st.error("No questions loaded.")
+        st.error("No questions loaded for this game.")
         return
 
-    # Timer
+    # Timer setup
     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()
 
     idx = st.session_state.get('current_index', 0)
     if idx >= len(questions):
-        st.success("All done — submit!")
+        st.success("All done — submit your answers!")
         return
 
     q = questions[idx]
     st.subheader(f"Question {idx+1}/{len(questions)}")
     st.write(q["question"])
+
     elapsed = int(time.time() - st.session_state['question_started_at'])
     time_limit = 15
     st.markdown(f"**Time left:** {max(0, time_limit - elapsed)} seconds")
@@ -814,38 +851,35 @@ def play_page():
 
     col1, col2 = st.columns(2)
     with col1:
-        if st.button("Next", key=f"next_{idx}"):
-            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))
+        if st.button("Next Question"):
+            # Save answer
+            answers = st.session_state.get('answers', [""] * len(questions))
+            times = st.session_state.get('answer_times', [None] * len(questions))
             answers[idx] = choice
-            times[idx] = taken
+            times[idx] = time.time() - st.session_state['question_started_at']
             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()
-
-            # 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.experimental_rerun()
 
     with col2:
-        if idx == len(questions) - 1:
-            if st.button("Submit All Answers", key=f"submit_{idx}"):
-                answers = st.session_state.get('answers', [""]*len(questions))
-                times = st.session_state.get('answer_times', [None]*len(questions))
+        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))
                 answers[idx] = choice
-                times[idx] = time.time() - st.session_state.get('question_started_at', time.time())
+                times[idx] = time.time() - st.session_state['question_started_at']
+
                 st.session_state['answers'] = answers
                 st.session_state['answer_times'] = times
 
+                # Compute score & save
                 score, flags = compute_score(questions, answers, times)
-                now = now_iso()
-                avatar = "🎮"
+                now = datetime.utcnow().isoformat()
+                avatar = "🎮"  # or fetch avatar
+
                 row = {
                     "name": uname,
                     "score": score,
@@ -855,21 +889,20 @@ def play_page():
                     "avatar": avatar,
                     "questions": " || ".join([q["question"] for q in questions]),
                     "answers": " || ".join([str(a) for a in answers]),
-                    "correct_flags": " || ".join(flags),
-                    "percentage": round(score / len(questions) * 100, 2)
+                    "correct_flags": " || ".join(flags)
                 }
                 unified_push_leaderboard(row)
 
-                # Mark player submitted
+                # Mark player as submitted
                 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'] = row['percentage']
+                    players[gid][uname]['percentage'] = round((score / len(questions)) * 100, 2)
                     unified_set("players", players)
 
-                # Auto close game
+                # Auto-close game
                 if game.get('auto_close', True):
                     games[gid]['closed'] = True
                     games[gid]['closed_at'] = now
@@ -880,6 +913,7 @@ def play_page():
                 st.session_state['last_score'] = score
                 st.session_state['last_game'] = gid
                 st.session_state['current_index'] = 0
+
 # ---------- PLAY PAGE ----------
 
 # Create game