Update app.py

app.py

@@ -776,118 +776,103 @@ def home_page():
 # ----------------------------
 # Play Page
 def play_page():
-    st.header("🎮 Play Game")
+    # Get active game and username
+    gid = st.session_state.get('active_game')
+    uname = st.session_state.get('username')
+    avatar = st.session_state.get('avatar', '🎮')
 
-    # ✅ 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.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. Please join a valid game.")
+    if not gid or not uname:
+        st.warning("No active game or username found. Please join or create a game first.")
         return
 
-    questions = st.session_state.get('game_questions') or game.get('questions', [])
+    # Load questions from session or game
+    questions = st.session_state.get('game_questions') or st.session_state.get('game_data', {}).get('questions', [])
     if not questions:
-        st.error("No questions loaded for this game.")
+        st.error("No questions loaded.")
         return
 
-    # Timer setup
+    # Ensure timer exists
     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 your answers!")
+        st.success("All questions done — submit!")
         return
 
+    # Get current question safely (dict or list)
     q = questions[idx]
+    if isinstance(q, dict):
+        question_text = q.get("question", "")
+        options = q.get("options", [])
+    elif isinstance(q, list):
+        # Assumes format: [question, options_list, answer]
+        question_text = q[0]
+        options = q[1]
+    else:
+        st.error(f"Invalid question format at index {idx}.")
+        return
+
     st.subheader(f"Question {idx+1}/{len(questions)}")
-    st.write(q["question"])
+    st.write(question_text)
 
+    # Timer
     elapsed = int(time.time() - st.session_state['question_started_at'])
     time_limit = 15
     st.markdown(f"**Time left:** {max(0, time_limit - elapsed)} seconds")
 
-    choice = st.radio("Choose an answer:", q["options"], key=f"choice_{idx}")
+    # Choice selection
+    choice = st.radio("Choose an answer:", options, key=f"choice_{idx}")
 
     col1, col2 = st.columns(2)
+
+    # Next button
     with col1:
-        if st.button("Next Question"):
-            # Save answer
+        if st.button("Next"):
+            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] = time.time() - st.session_state['question_started_at']
+            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()
-            st.rerun()
+            st.session_state['question_started_at'] = time.time()  # reset timer for next question
 
+            st.experimental_rerun()
+
+    # Submit button on last question
     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))
+
+                # Save last answer
+                taken = time.time() - st.session_state.get('question_started_at', time.time())
                 answers[idx] = choice
-                times[idx] = time.time() - st.session_state['question_started_at']
+                times[idx] = taken
 
                 st.session_state['answers'] = answers
                 st.session_state['answer_times'] = times
 
-                # Compute score & save
+                # Compute score (you already have this function)
                 score, flags = compute_score(questions, answers, times)
-                now = datetime.utcnow().isoformat()
-                avatar = "🎮"  # or fetch avatar
+                now = now_iso()
 
+                # Push leaderboard
                 row = {
                     "name": uname,
                     "score": score,
                     "game_id": gid,
-                    "topics": ",".join(game.get('topics', [])),
+                    "topics": ",".join(st.session_state.get('game_data', {}).get('topics', [])),
                     "timestamp": now,
                     "avatar": avatar,
-                    "questions": " || ".join([q["question"] for q in questions]),
+                    "questions": " || ".join([q[0] if isinstance(q, list) else q.get("question","") for q in questions]),
                     "answers": " || ".join([str(a) for a in answers]),
                     "correct_flags": " || ".join(flags)
                 }
@@ -899,14 +884,15 @@ def play_page():
                     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)
                     unified_set("players", players)
 
-                # Auto-close game
-                if game.get('auto_close', True):
-                    games[gid]['closed'] = True
-                    games[gid]['closed_at'] = now
-                    unified_set("games", games)
+                # Auto-close game if enabled
+                games = unified_get("games") or {}
+                if st.session_state.get('game_data', {}).get('auto_close', True):
+                    if gid in games:
+                        games[gid]['closed'] = True
+                        games[gid]['closed_at'] = now
+                        unified_set("games", games)
 
                 st.success(f"Submitted! Score: {score}")
                 st.balloons()