Upload 45 files

pages/AchievementTeacher.tsx

@@ -13,7 +13,7 @@ const PRESET_ICONS = [
     { icon: '⏰', label: '守时' }, { icon: '📝', label: '写作' }, { icon: '🧮', label: '计算' }, { icon: '🔬', label: '科学' }
 ];
 
-export const AchievementTeacher: React.FC = () => {
+export const AchievementTeacher: React.FC<{className?: string}> = ({ className }) => {
     const [loading, setLoading] = useState(true);
     const [config, setConfig] = useState<AchievementConfig | null>(null);
     const [students, setStudents] = useState<Student[]>([]);
@@ -31,11 +31,12 @@ export const AchievementTeacher: React.FC = () => {
     const [selectedAchieveId, setSelectedAchieveId] = useState('');
 
     const currentUser = api.auth.getCurrentUser();
-    const homeroomClass = currentUser?.homeroomClass;
+    // Use prop or fallback
+    const homeroomClass = className || currentUser?.homeroomClass;
 
     useEffect(() => {
         loadData();
-    }, []);
+    }, [className]); // Reload when className changes
 
     const loadData = async () => {
         if (!homeroomClass) return;

pages/GameMountain.tsx

@@ -2,7 +2,7 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import { api } from '../services/api';
-import { GameSession, GameTeam, Student, GameRewardConfig, AchievementConfig } from '../types';
+import { GameSession, GameTeam, Student, GameRewardConfig, AchievementConfig, ClassInfo } from '../types';
 import { Settings, Plus, Minus, Users, CheckSquare, Loader2, Trash2, X, Flag, Gift, Star, Trophy, Maximize, Minimize, Lock } from 'lucide-react';
 import { Emoji } from '../components/Emoji';
 
@@ -200,16 +200,17 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
   useEffect(() => { loadData(); }, [targetClass]);
 
   const loadData = async () => {
-    if (!targetClass || targetClass === 'MY_CLASS' && !currentUser.homeroomClass) return; 
+    // FIX: Check for currentUser
+    if (!targetClass || targetClass === 'MY_CLASS' && !currentUser?.homeroomClass && currentUser?.role !== 'STUDENT') return; 
     setLoading(true);
     
     // Resolve "MY_CLASS" for students
     let resolvedClass = targetClass;
-    if (targetClass === 'MY_CLASS' && currentUser.role === 'STUDENT') {
+    if (targetClass === 'MY_CLASS' && currentUser?.role === 'STUDENT') {
         // We need to fetch student's class first? Actually dashboard loads it.
         // Assuming passed prop is correct or we fetch student
         const stus = await api.students.getAll();
-        const me = stus.find((s: Student) => s.name === (currentUser.trueName || currentUser.username));
+        const me = stus.find((s: Student) => s.name === (currentUser?.trueName || currentUser?.username));
         if(me) resolvedClass = me.className;
     }
 
@@ -221,7 +222,8 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
       
       const filteredStudents = allStudents.filter((s: Student) => s.className === resolvedClass);
       // Sort
-      filteredStudents.sort((a, b) => {
+      // FIX: Add explicit types for sort arguments
+      filteredStudents.sort((a: Student, b: Student) => {
           const seatA = parseInt(a.seatNo || '99999');
           const seatB = parseInt(b.seatNo || '99999');
           if (seatA !== seatB) return seatA - seatB;
@@ -254,11 +256,12 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
 
       // Permissions Check
       if (isAdmin) setCanEdit(true);
-      else if (isTeacher) {
+      else if (isTeacher && currentUser) {
           // Fetch class info to check homeroomTeacherIds
-          const clsList = await api.classes.getAll();
-          const cls = clsList.find(c => c.grade + c.className === resolvedClass);
-          if (cls && (cls.homeroomTeacherIds?.includes(currentUser._id) || cls.teacherName?.includes(currentUser.trueName || currentUser.username))) {
+          const clsList = await api.classes.getAll() as ClassInfo[];
+          // FIX: Add type for find callback parameter
+          const cls = clsList.find((c: ClassInfo) => c.grade + c.className === resolvedClass);
+          if (cls && (cls.homeroomTeacherIds?.includes(currentUser._id || '') || cls.teacherName?.includes(currentUser.trueName || currentUser.username))) {
               setCanEdit(true);
               // Only load Ach config if can edit
               const ac = await api.achievements.getConfig(resolvedClass);

pages/GameRewards.tsx

@@ -4,7 +4,7 @@ import { api } from '../services/api';
 import { StudentReward, Student } from '../types';
 import { Gift, Loader2, Search, Filter, Trash2, Edit, Save, X, ChevronLeft, ChevronRight } from 'lucide-react';
 
-export const GameRewards: React.FC = () => {
+export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
   const [rewards, setRewards] = useState<StudentReward[]>([]);
   const [total, setTotal] = useState(0);
   const [page, setPage] = useState(1);
@@ -32,6 +32,9 @@ export const GameRewards: React.FC = () => {
   const currentUser = api.auth.getCurrentUser();
   const isStudent = currentUser?.role === 'STUDENT';
   const isTeacher = currentUser?.role === 'TEACHER';
+  
+  // Use prop className or fallback to legacy homeroom
+  const homeroomClass = className || currentUser?.homeroomClass;
 
   const PAGE_SIZE = 15;
 
@@ -54,9 +57,9 @@ export const GameRewards: React.FC = () => {
          let targetClass = '';
          let filteredStudents = allStus;
          
-         if (isTeacher && currentUser.homeroomClass) {
-             targetClass = currentUser.homeroomClass;
-             filteredStudents = allStus.filter((s: Student) => s.className === currentUser.homeroomClass);
+         if (isTeacher && homeroomClass) {
+             targetClass = homeroomClass;
+             filteredStudents = allStus.filter((s: Student) => s.className === homeroomClass);
          }
          
          const res = await api.rewards.getClassRewards(page, PAGE_SIZE, targetClass);
@@ -77,7 +80,7 @@ export const GameRewards: React.FC = () => {
     finally { setLoading(false); }
   };
 
-  useEffect(() => { loadData(); }, [page]);
+  useEffect(() => { loadData(); }, [page, className]); // Reload when page or className prop changes
 
   const handleGrant = async () => {
      if(!grantForm.studentId) return alert('请选择学生');
@@ -139,7 +142,7 @@ export const GameRewards: React.FC = () => {
     <div className="flex flex-col h-full bg-white rounded-2xl shadow-sm border border-gray-100 overflow-hidden">
         <div className="p-4 md:p-6 border-b border-gray-100 flex flex-col md:flex-row justify-between items-start md:items-center gap-4 shrink-0">
             <h3 className="text-xl font-bold text-gray-800">
-                {isStudent ? '我的战利品清单' : '班级奖励核销台'}
+                {isStudent ? '我的战利品清单' : `${homeroomClass || '全校'} 奖励核销台`}
             </h3>
             
             <div className="flex flex-wrap items-center gap-3 w-full md:w-auto">