Upload 9 files

src/services/classroom.js

@@ -131,6 +131,7 @@ export async function submitPrompt(userId, roomCode, challengeId, prompt) {
         await updateDoc(docRef, {
             status: "completed",
             submission_prompt: text,
+            roomCode: roomCode, // Ensure roomCode is updated for legacy docs
             timestamp: serverTimestamp()
         });
     } else {
@@ -258,13 +259,8 @@ export function subscribeToRoom(roomCode, callback) {
  */
 export async function getPeerPrompts(roomCode, challengeId) {
     const progressRef = collection(db, PROGRESS_COLLECTION);
-    // We need nickname too. progress collection only has userId.
-    // We might need to fetch user info or store nickname in progress (denormalization).
-    // Let's store nickname in progress for easier read? Or fetch users.
-    // For now, let's fetch matching progress, then unique userIds, then fetch those users.
 
-    // Simplified query for prototype: Fetch ALL completions for this challenge, then filter in memory.
-    // This avoids needing complex Composite Indexes for every room/challenge combination.
+    // Query completions (filtered by challenge, status)
     const q = query(
         progressRef,
         where("challengeId", "==", challengeId),
@@ -278,27 +274,31 @@ export async function getPeerPrompts(roomCode, challengeId) {
         for (const docSnapshot of snapshot.docs) {
             const data = docSnapshot.data();
 
-            // In-Memory Filtering for Room Code
-            // Note: Older data might not have roomCode. If undefined and we are in a room, maybe exclude? 
-            // Or include if we want to share across global (but user said "this classroom").
-            // Let's strict check: Must match roomCode.
-            if (String(data.roomCode) !== String(roomCode)) {
+            // Fetch nickname & user room info
+            // We fetch user first to verify room if needed
+            const userSnap = await getDoc(doc(db, USERS_COLLECTION, data.userId));
+            if (!userSnap.exists()) continue;
+
+            const userData = userSnap.data();
+
+            // Room Code Check
+            // 1. Check direct reference in progress (Fastest)
+            // 2. Fallback to user's current room (Legacy support)
+            const targetRoom = data.roomCode || userData.current_room;
+
+            if (String(targetRoom) !== String(roomCode)) {
                 continue;
             }
 
-            // Fetch nickname
-            const userSnap = await getDoc(doc(db, USERS_COLLECTION, data.userId));
-            if (userSnap.exists()) {
-                entries.push({
-                    id: docSnapshot.id,
-                    userId: data.userId,
-                    nickname: userSnap.data().nickname,
-                    prompt: data.submission_prompt,
-                    timestamp: data.timestamp,
-                    likes: data.likes || 0,
-                    likedBy: data.likedBy || []
-                });
-            }
+            entries.push({
+                id: docSnapshot.id,
+                userId: data.userId,
+                nickname: userData.nickname,
+                prompt: data.submission_prompt,
+                timestamp: data.timestamp,
+                likes: data.likes || 0,
+                likedBy: data.likedBy || []
+            });
         }
         return entries;
 

src/views/StudentView.js

@@ -57,7 +57,7 @@ function renderTaskCard(c, userProgress) {
 
                 ${!isStarted ? `
                     <!-- Not Started State -->
-                    <div class="mt-4">
+                    <div class="mt-4 flex justify-center">
                         <button onclick="window.startLevel('${c.id}', '${c.link}')" 
                                 class="w-full sm:w-auto bg-gray-700 hover:bg-cyan-600 hover:text-white text-gray-200 font-bold py-3 px-6 rounded-xl transition-all flex items-center justify-center space-x-2 shadow-lg">
                             <span>🚀 開始任務 (Start Task)</span>
@@ -668,7 +668,11 @@ window.triggerEvolution = async (currentStage, nextStage, likes, classSize, curr
                             // DB Update with Monster ID
                             const userId = localStorage.getItem('vibecoding_user_id');
                             await updateUserMonster(userId, nextStage, nextMonster.id);
-                            window.location.reload();
+
+                            // Soft refresh to prevent screen flicker
+                            const app = document.querySelector('#app');
+                            if (app) app.innerHTML = await renderStudentView();
+                            // Also need to ensure monster container is updated (handle in renderStudentView)
                         }, 1200);
                     }, 1000);
                 }, 300);
@@ -678,8 +682,11 @@ window.triggerEvolution = async (currentStage, nextStage, likes, classSize, curr
         playFlicker();
 
     } catch (e) {
+        console.error(e);
         console.error(e);
         alert("進化失敗...");
-        window.location.reload();
+        // Re-render instead of reload to keep state
+        const app = document.querySelector('#app');
+        if (app) app.innerHTML = await renderStudentView();
     }
 };