Upload 26 files

components/Header.tsx

@@ -13,18 +13,42 @@ interface HeaderProps {
 export const Header: React.FC<HeaderProps> = ({ user, title, onMenuClick }) => {
   const [schools, setSchools] = useState<School[]>([]);
   const [selectedSchool, setSelectedSchool] = useState(localStorage.getItem('admin_view_school_id') || '');
+  const [currentSchoolName, setCurrentSchoolName] = useState('');
 
   useEffect(() => {
     if (user.role === 'ADMIN') {
-      api.schools.getAll().then(setSchools).catch(console.error);
+      api.schools.getAll().then(data => {
+        setSchools(data);
+        // Enforce default school if none selected or invalid
+        if (data.length > 0) {
+           if (!selectedSchool || !data.find(s => s._id === selectedSchool)) {
+              const defaultId = data[0]._id!;
+              setSelectedSchool(defaultId);
+              localStorage.setItem('admin_view_school_id', defaultId);
+              // Force reload only if it changed from nothing to something, avoiding loops is handled by check above
+              // But initially we might need to trigger data fetch.
+              // Actually, simply setting state won't trigger re-fetch in other components unless we reload.
+              if (!localStorage.getItem('admin_view_school_id_init')) {
+                 localStorage.setItem('admin_view_school_id_init', 'true');
+                 window.location.reload();
+              }
+           }
+        }
+      }).catch(console.error);
+    } else {
+       // Fetch own school info to display name
+       api.schools.getPublic().then(data => {
+          const mySchool = data.find(s => s._id === user.schoolId);
+          if (mySchool) setCurrentSchoolName(mySchool.name);
+       });
     }
   }, [user]);
 
   const handleSchoolChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
     const newVal = e.target.value;
+    if (!newVal) return; // Prevent empty selection
     setSelectedSchool(newVal);
-    if (newVal) localStorage.setItem('admin_view_school_id', newVal);
-    else localStorage.removeItem('admin_view_school_id');
+    localStorage.setItem('admin_view_school_id', newVal);
     window.location.reload(); // Reload to refresh data context
   };
 
@@ -41,20 +65,21 @@ export const Header: React.FC<HeaderProps> = ({ user, title, onMenuClick }) => {
       </div>
 
       <div className="flex items-center space-x-2 md:space-x-6">
-        {/* Admin School Switcher */}
-        {user.role === 'ADMIN' && (
-          <div className="hidden md:flex items-center bg-gray-100 rounded-lg px-2 py-1">
+        {/* School Display / Switcher */}
+        <div className="hidden md:flex items-center bg-gray-100 rounded-lg px-3 py-1.5">
              <Building size={16} className="text-gray-500 mr-2"/>
-             <select 
-               className="bg-transparent text-sm border-none focus:ring-0 text-gray-700 font-medium cursor-pointer"
-               value={selectedSchool}
-               onChange={handleSchoolChange}
-             >
-                <option value="">-- 全平台视图 --</option>
-                {schools.map(s => <option key={s._id} value={s._id}>{s.name}</option>)}
-             </select>
-          </div>
-        )}
+             {user.role === 'ADMIN' ? (
+               <select 
+                 className="bg-transparent text-sm border-none focus:ring-0 text-gray-700 font-medium cursor-pointer min-w-[120px]"
+                 value={selectedSchool}
+                 onChange={handleSchoolChange}
+               >
+                  {schools.map(s => <option key={s._id} value={s._id}>{s.name}</option>)}
+               </select>
+             ) : (
+               <span className="text-sm font-medium text-gray-700">{currentSchoolName || '我的学校'}</span>
+             )}
+        </div>
 
         <div className="relative hidden md:block">
           <input
@@ -86,4 +111,4 @@ export const Header: React.FC<HeaderProps> = ({ user, title, onMenuClick }) => {
       </div>
     </header>
   );
-};
+};

pages/Login.tsx

@@ -1,7 +1,7 @@
 
 import React, { useState, useEffect } from 'react';
-import { GraduationCap, Lock, User as UserIcon, AlertCircle, ArrowRight, Loader2, ArrowLeft, School as SchoolIcon, Mail, Phone, Smile } from 'lucide-react';
-import { User, UserRole, School } from '../types';
+import { GraduationCap, Lock, User as UserIcon, AlertCircle, ArrowRight, Loader2, ArrowLeft, School as SchoolIcon, Mail, Phone, Smile, BookOpen, Users } from 'lucide-react';
+import { User, UserRole, School, ClassInfo, Subject } from '../types';
 import { api } from '../services/api';
 
 interface LoginProps {
@@ -17,18 +17,23 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
   const [view, setView] = useState<'login' | 'register'>('login');
   
   // Registration Wizard Step
-  const [step, setStep] = useState(1); // 1: School & Role, 2: Info, 3: Avatar
+  const [step, setStep] = useState(1); // 1: School, 2: Role & Info & Linkage, 3: Avatar
 
   // Login Form
   const [loginForm, setLoginForm] = useState({ username: '', password: '' });
   
   // Register Form
   const [regForm, setRegForm] = useState({
-    username: '', password: '', role: UserRole.STUDENT, 
-    schoolId: '', trueName: '', phone: '', email: '', avatar: '' 
+    username: '', password: '', role: UserRole.TEACHER, 
+    schoolId: '', trueName: '', phone: '', email: '', avatar: '',
+    teachingSubject: '', homeroomClass: ''
   });
 
   const [schools, setSchools] = useState<School[]>([]);
+  // School Specific Metadata for linkage
+  const [schoolClasses, setSchoolClasses] = useState<ClassInfo[]>([]);
+  const [schoolSubjects, setSchoolSubjects] = useState<Subject[]>([]);
+
   const [error, setError] = useState('');
   const [loading, setLoading] = useState(false);
   const [successMsg, setSuccessMsg] = useState('');
@@ -39,6 +44,19 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
     }
   }, [view]);
 
+  // When School ID changes, fetch meta data
+  useEffect(() => {
+    if (regForm.schoolId) {
+       fetch(`${location.origin}/api/public/meta?schoolId=${regForm.schoolId}`)
+         .then(res => res.json())
+         .then(data => {
+            setSchoolClasses(data.classes || []);
+            setSchoolSubjects(data.subjects || []);
+         })
+         .catch(console.error);
+    }
+  }, [regForm.schoolId]);
+
   const handleLogin = async (e: React.FormEvent) => {
     e.preventDefault();
     setError('');
@@ -71,28 +89,18 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
   // Render Steps
   const renderStep1 = () => (
     <div className="space-y-4 animate-in fade-in">
-      <h3 className="text-center font-bold text-gray-700 mb-4">第一步: 选择学校与身份</h3>
+      <h3 className="text-center font-bold text-gray-700 mb-4">第一步: 选择所属学校</h3>
       <div>
-        <label className="text-sm font-medium text-gray-700">所属学校</label>
+        <label className="text-sm font-medium text-gray-700">学校列表</label>
         <select 
-          className="w-full mt-1 p-2 border rounded-lg focus:ring-2 focus:ring-blue-500"
+          className="w-full mt-1 p-2 border rounded-lg focus:ring-2 focus:ring-blue-500 h-10 bg-white"
           value={regForm.schoolId}
           onChange={e => setRegForm({...regForm, schoolId: e.target.value})}
         >
           <option value="">-- 请选择 --</option>
           {schools.map(s => <option key={s._id} value={s._id}>{s.name}</option>)}
         </select>
-      </div>
-      <div>
-        <label className="text-sm font-medium text-gray-700">申请角色</label>
-        <select 
-          className="w-full mt-1 p-2 border rounded-lg"
-          value={regForm.role}
-          onChange={e => setRegForm({...regForm, role: e.target.value as UserRole})}
-        >
-          <option value={UserRole.STUDENT}>学生</option>
-          <option value={UserRole.TEACHER}>教师</option>
-        </select>
+        <p className="text-xs text-gray-500 mt-2">提示：系统仅面向教职工开放注册</p>
       </div>
       <button 
         type="button" 
@@ -107,28 +115,64 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
 
   const renderStep2 = () => (
     <div className="space-y-3 animate-in fade-in">
-      <h3 className="text-center font-bold text-gray-700 mb-2">第二步: 填写基本信息</h3>
-      <input 
-        className="w-full p-2 border rounded-lg" 
-        placeholder="用户名 (登录用)" 
-        value={regForm.username} onChange={e => setRegForm({...regForm, username: e.target.value})}
-      />
-      <input 
-        className="w-full p-2 border rounded-lg" 
-        type="password" placeholder="设置密码" 
-        value={regForm.password} onChange={e => setRegForm({...regForm, password: e.target.value})}
-      />
-      <input 
-        className="w-full p-2 border rounded-lg" 
-        placeholder="真实姓名" 
-        value={regForm.trueName} onChange={e => setRegForm({...regForm, trueName: e.target.value})}
-      />
-      <input 
-        className="w-full p-2 border rounded-lg" 
-        placeholder="联系电话" 
-        value={regForm.phone} onChange={e => setRegForm({...regForm, phone: e.target.value})}
-      />
-      <div className="flex gap-2">
+      <h3 className="text-center font-bold text-gray-700 mb-2">第二步: 完善教职工信息</h3>
+      
+      {/* Account Info */}
+      <div className="grid grid-cols-2 gap-2">
+        <input 
+          className="w-full p-2 border rounded-lg" 
+          placeholder="用户名 (登录)" 
+          value={regForm.username} onChange={e => setRegForm({...regForm, username: e.target.value})}
+        />
+        <input 
+          className="w-full p-2 border rounded-lg" 
+          type="password" placeholder="密码" 
+          value={regForm.password} onChange={e => setRegForm({...regForm, password: e.target.value})}
+        />
+      </div>
+      
+      {/* Personal Info */}
+      <div className="grid grid-cols-2 gap-2">
+        <input 
+          className="w-full p-2 border rounded-lg" 
+          placeholder="真实姓名" 
+          value={regForm.trueName} onChange={e => setRegForm({...regForm, trueName: e.target.value})}
+        />
+        <input 
+          className="w-full p-2 border rounded-lg" 
+          placeholder="手机号码" 
+          value={regForm.phone} onChange={e => setRegForm({...regForm, phone: e.target.value})}
+        />
+      </div>
+
+      {/* Teacher Linkage */}
+      <div className="bg-blue-50 p-3 rounded-lg space-y-2 border border-blue-100">
+         <p className="text-xs font-bold text-blue-600 uppercase">教学信息绑定</p>
+         <div>
+            <label className="text-xs text-gray-600 block mb-1">主要任教科目</label>
+            <select 
+               className="w-full p-1.5 border rounded text-sm"
+               value={regForm.teachingSubject}
+               onChange={e => setRegForm({...regForm, teachingSubject: e.target.value})}
+            >
+               <option value="">-- 请选择 --</option>
+               {schoolSubjects.map(s => <option key={s._id} value={s.name}>{s.name}</option>)}
+            </select>
+         </div>
+         <div>
+            <label className="text-xs text-gray-600 block mb-1">我是班主任 (可选)</label>
+            <select 
+               className="w-full p-1.5 border rounded text-sm"
+               value={regForm.homeroomClass}
+               onChange={e => setRegForm({...regForm, homeroomClass: e.target.value})}
+            >
+               <option value="">-- 非班主任 --</option>
+               {schoolClasses.map(c => <option key={c._id} value={c.grade+c.className}>{c.grade}{c.className}</option>)}
+            </select>
+         </div>
+      </div>
+
+      <div className="flex gap-2 pt-2">
         <button onClick={() => setStep(1)} className="flex-1 border py-2 rounded-lg">上一步</button>
         <button 
           onClick={() => setStep(3)} 
@@ -162,7 +206,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
       <div className="flex gap-2">
         <button onClick={() => setStep(2)} className="flex-1 border py-2 rounded-lg">上一步</button>
         <button onClick={handleRegister} disabled={loading} className="flex-1 bg-green-600 text-white py-2 rounded-lg">
-          {loading ? '提交中...' : '完成注册'}
+          {loading ? '提交申请' : '完成注册'}
         </button>
       </div>
     </div>
@@ -186,7 +230,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
           <div className="mb-6 flex justify-center">
              <div className="bg-gray-100 p-1 rounded-lg flex text-sm font-medium">
                 <button onClick={() => { setView('login'); setError(''); }} className={`px-6 py-2 rounded-md transition-all ${view==='login' ? 'bg-white text-blue-600 shadow-sm' : 'text-gray-500'}`}>登录</button>
-                <button onClick={() => { setView('register'); setError(''); }} className={`px-6 py-2 rounded-md transition-all ${view==='register' ? 'bg-white text-blue-600 shadow-sm' : 'text-gray-500'}`}>注册</button>
+                <button onClick={() => { setView('register'); setError(''); }} className={`px-6 py-2 rounded-md transition-all ${view==='register' ? 'bg-white text-blue-600 shadow-sm' : 'text-gray-500'}`}>教职工注册</button>
              </div>
           </div>
 
@@ -225,4 +269,4 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
       </div>
     </div>
   );
-};
+};

pages/UserList.tsx

@@ -23,7 +23,7 @@ export const UserList: React.FC = () => {
   useEffect(() => { loadData(); }, []);
 
   const handleApprove = async (user: User) => {
-    if (confirm(`确认批准 ${user.username} 的注册申请？`)) {
+    if (confirm(`确认批准 ${user.trueName || user.username} 的注册申请？`)) {
       await api.users.update(user._id || String(user.id), { status: UserStatus.ACTIVE });
       loadData();
     }
@@ -58,12 +58,13 @@ export const UserList: React.FC = () => {
       <h2 className="text-xl font-bold text-gray-800 mb-4">用户权限与审核</h2>
       
       <div className="overflow-x-auto">
-        <table className="w-full text-left border-collapse min-w-[800px]">
+        <table className="w-full text-left border-collapse min-w-[1000px]">
           <thead>
             <tr className="bg-gray-50 text-gray-500 text-xs uppercase">
               <th className="px-4 py-3">用户</th>
               <th className="px-4 py-3">联系方式</th>
               <th className="px-4 py-3">所属学校</th>
+              <th className="px-4 py-3">任教信息 (科目/班主任)</th>
               <th className="px-4 py-3">角色</th>
               <th className="px-4 py-3">状态</th>
               <th className="px-4 py-3 text-right">操作</th>
@@ -103,6 +104,18 @@ export const UserList: React.FC = () => {
                       </div>
                    )}
                 </td>
+                <td className="px-4 py-3 text-sm">
+                   {user.teachingSubject ? (
+                      <div className="space-y-1">
+                         <span className="bg-blue-50 text-blue-700 px-2 py-0.5 rounded text-xs">{user.teachingSubject}</span>
+                         {user.homeroomClass && (
+                            <span className="bg-amber-50 text-amber-700 px-2 py-0.5 rounded text-xs block w-fit">
+                               班主任: {user.homeroomClass}
+                            </span>
+                         )}
+                      </div>
+                   ) : <span className="text-gray-400 text-xs">-</span>}
+                </td>
                 <td className="px-4 py-3">
                    <select 
                      value={user.role} 
@@ -133,4 +146,4 @@ export const UserList: React.FC = () => {
       </div>
     </div>
   );
-};
+};

server.js

@@ -68,10 +68,12 @@ const UserSchema = new mongoose.Schema({
   phone: String,
   email: String,
   schoolId: String,
-  role: { type: String, enum: ['ADMIN', 'TEACHER', 'STUDENT'], default: 'STUDENT' },
+  role: { type: String, enum: ['ADMIN', 'TEACHER', 'STUDENT'], default: 'TEACHER' },
   status: { type: String, enum: ['active', 'pending', 'banned'], default: 'pending' },
   avatar: String,
-  createTime: { type: Date, default: Date.now }
+  createTime: { type: Date, default: Date.now },
+  teachingSubject: String, // e.g. "语文"
+  homeroomClass: String    // e.g. "六年级(1)班"
 });
 const User = mongoose.model('User', UserSchema);
 
@@ -200,11 +202,8 @@ mongoose.connection.once('open', initData);
 // Helper: Get School Context
 // ==========================================
 const getQueryFilter = (req) => {
-  // If we had real JWT middleware, we would extract user from token.
-  // For this setup, we rely on the client sending 'x-school-id'.
-  // Security Note: In a production app, verify this against the user's token claims.
   const schoolId = req.headers['x-school-id'];
-  if (!schoolId) return {}; // If Admin sees all (or specific logic)
+  if (!schoolId) return {}; 
   return { schoolId };
 };
 
@@ -224,6 +223,22 @@ app.get('/api/public/schools', async (req, res) => {
   res.json(schools);
 });
 
+app.get('/api/public/meta', async (req, res) => {
+  const { schoolId } = req.query;
+  if (!schoolId) return res.json({ classes: [], subjects: [] });
+
+  if (InMemoryDB.isFallback) {
+    return res.json({
+      classes: InMemoryDB.classes.filter(c => c.schoolId === schoolId),
+      subjects: InMemoryDB.subjects.filter(s => s.schoolId === schoolId)
+    });
+  }
+
+  const classes = await ClassModel.find({ schoolId });
+  const subjects = await SubjectModel.find({ schoolId });
+  res.json({ classes, subjects });
+});
+
 // --- Auth ---
 app.post('/api/auth/login', async (req, res) => {
   const { username, password } = req.body;
@@ -244,13 +259,17 @@ app.post('/api/auth/login', async (req, res) => {
 });
 
 app.post('/api/auth/register', async (req, res) => {
-  const { username, password, role, schoolId, trueName, phone, email, avatar } = req.body;
+  // Accepted fields
+  const { 
+    username, password, role, schoolId, trueName, phone, email, avatar,
+    teachingSubject, homeroomClass 
+  } = req.body;
   const status = 'pending'; 
 
   try {
     if (InMemoryDB.isFallback) {
       if (InMemoryDB.users.find(u => u.username === username)) return res.status(400).json({ error: 'Existed' });
-      const newUser = { id: Date.now(), username, password, role, status, schoolId, trueName, phone, email, avatar };
+      const newUser = { id: Date.now(), username, password, role, status, schoolId, trueName, phone, email, avatar, teachingSubject, homeroomClass };
       InMemoryDB.users.push(newUser);
       return res.json(newUser);
     }
@@ -258,7 +277,10 @@ app.post('/api/auth/register', async (req, res) => {
     const existing = await User.findOne({ username });
     if (existing) return res.status(400).json({ error: 'Existed' });
 
-    const newUser = await User.create({ username, password, role, status, schoolId, trueName, phone, email, avatar });
+    const newUser = await User.create({ 
+      username, password, role, status, schoolId, trueName, phone, email, avatar,
+      teachingSubject, homeroomClass
+    });
     res.json(newUser);
   } catch (e) { res.status(500).json({ error: e.message }); }
 });
@@ -291,12 +313,33 @@ app.get('/api/users', async (req, res) => {
 });
 app.put('/api/users/:id', async (req, res) => {
   try {
+    // Check if activating user
+    const updateData = req.body;
+    
     if (InMemoryDB.isFallback) {
       const idx = InMemoryDB.users.findIndex(u => u._id == req.params.id);
-      if(idx>=0) InMemoryDB.users[idx] = { ...InMemoryDB.users[idx], ...req.body };
+      if(idx>=0) InMemoryDB.users[idx] = { ...InMemoryDB.users[idx], ...updateData };
       return res.json({ success: true });
     }
-    await User.findByIdAndUpdate(req.params.id, req.body);
+
+    const user = await User.findByIdAndUpdate(req.params.id, updateData, { new: true });
+    
+    // Linkage Logic: If approving a teacher, and they are a homeroom teacher, update the Class record.
+    if (updateData.status === 'active' && user.role === 'TEACHER' && user.homeroomClass) {
+        // Find Class by name (e.g. "六年级(1)班") and SchoolId
+        // Need to parse grade and className or store exact match.
+        // Assuming user.homeroomClass stores "六年级(1)班", we need to match it.
+        // Simple regex or strict match if format aligns.
+        // For robustness, let's try to match concatenation.
+        const classes = await ClassModel.find({ schoolId: user.schoolId });
+        const targetClass = classes.find(c => (c.grade + c.className) === user.homeroomClass);
+        
+        if (targetClass) {
+           await ClassModel.findByIdAndUpdate(targetClass._id, { teacherName: user.trueName || user.username });
+           console.log(`Linked teacher ${user.trueName} to class ${targetClass.grade}${targetClass.className}`);
+        }
+    }
+
     res.json({ success: true });
   } catch (e) { res.status(500).json({ error: e.message }); }
 });
@@ -472,4 +515,4 @@ app.get('*', (req, res) => {
   res.sendFile(path.join(__dirname, 'dist', 'index.html'));
 });
 
-app.listen(PORT, () => console.log(`🚀 Service running on port ${PORT}`));
+app.listen(PORT, () => console.log(`🚀 Service running on port ${PORT}`));

types.ts

@@ -31,6 +31,9 @@ export interface User {
   status: UserStatus;
   avatar?: string;
   createTime?: string;
+  // Teacher Specific
+  teachingSubject?: string; // e.g. "语文"
+  homeroomClass?: string;   // e.g. "六年级(1)班" - Class Name string linkage
 }
 
 export interface ClassInfo {
@@ -38,7 +41,7 @@ export interface ClassInfo {
   _id?: string;
   schoolId?: string; // New
   grade: string;
-  className: string; // e.g., "(1)班"
+  className: string; // e.g. "(1)班"
   teacherName?: string;
   studentCount?: number; // Calculated field
 }
@@ -118,4 +121,4 @@ export interface ApiResponse<T> {
   message: string;
   data: T;
   timestamp: number;
-}
+}