Upload 10 files

src/services/auth.js

@@ -1,5 +1,5 @@
 import { auth, googleProvider, db } from "./firebase.js";
-import { signInWithPopup, signOut } from "https://www.gstatic.com/firebasejs/10.7.1/firebase-auth.js";
+import { signInWithPopup, signInWithRedirect, signOut } from "https://www.gstatic.com/firebasejs/10.7.1/firebase-auth.js";
 import {
     doc,
     getDoc,
@@ -28,6 +28,20 @@ export async function signInWithGoogle() {
     }
 }
 
+/**
+ * Sign in with Google (Redirect Mode)
+ * Use this if popup is blocked
+ */
+export async function signInWithGoogleRedirect() {
+    try {
+        await signInWithRedirect(auth, googleProvider);
+        // Does not return value, page will redirect
+    } catch (error) {
+        console.error("Google Redirect Error:", error);
+        throw error;
+    }
+}
+
 /**
  * Sign out
  */

src/views/InstructorView.js

@@ -1,5 +1,5 @@
 import { createRoom, subscribeToRoom, getChallenges, resetProgress, removeUser } from "../services/classroom.js";
-import { signInWithGoogle, signOutUser, checkInstructorPermission, getInstructors, addInstructor, updateInstructor, removeInstructor } from "../services/auth.js";
+import { signInWithGoogle, signInWithGoogleRedirect, signOutUser, checkInstructorPermission, getInstructors, addInstructor, updateInstructor, removeInstructor } from "../services/auth.js";
 import { generateMonsterSVG, getNextMonster, MONSTER_DEFS } from "../utils/monsterUtils.js";
 
 // Load html-to-image dynamically (Better support than html2canvas)
@@ -384,8 +384,16 @@ export function setupInstructorEvents() {
             console.error(error);
             let msg = error.message;
             if (error.code === 'auth/popup-blocked') {
-                msg = "瀏覽器攔截了登入視窗。請允許此網站的彈出視窗，或不要在點擊後移動滑鼠。";
-                alert(msg);
+                msg = "瀏覽器攔截了登入視窗。";
+                // Show Redirect Option
+                if (confirm("瀏覽器攔截了彈出視窗。是否改用頁面跳轉方式登入？\n(將會重新整理頁面)")) {
+                    try {
+                        await signInWithGoogleRedirect();
+                    } catch (err) {
+                        alert("跳轉失敗: " + err.message);
+                    }
+                    return;
+                }
             }
             if (error.code === 'auth/operation-not-allowed' || error.message.includes('invalid')) {
                 msg = "Google 登入功能未啟用。請前往 Firebase Console > Authentication開啟 Google Sign-In。";