Upload 62 files

models.js

@@ -31,7 +31,13 @@ const UserSchema = new mongoose.Schema({
         type: { type: String }, 
         targetClass: String, 
         status: String 
-    } 
+    },
+    // NEW: For Principal creating a new school
+    pendingSchoolData: {
+        name: String,
+        code: String,
+        type: String // e.g., Primary, Middle
+    }
 });
 const User = mongoose.model('User', UserSchema);
 
@@ -277,4 +283,4 @@ module.exports = {
     ConfigModel, NotificationModel, GameSessionModel, StudentRewardModel, LuckyDrawConfigModel, GameMonsterConfigModel, GameZenConfigModel,
     AchievementConfigModel, TeacherExchangeConfigModel, StudentAchievementModel, AttendanceModel, LeaveRequestModel, SchoolCalendarModel,
     WishModel, FeedbackModel, TodoModel, AIUsageModel
-};
+};

pages/Login.tsx

@@ -1,6 +1,6 @@
 
 import React, { useState, useEffect } from 'react';
-import { GraduationCap, Lock, User as UserIcon, AlertCircle, ArrowRight, Loader2, ArrowLeft, School as SchoolIcon, Mail, Phone, Smile, BookOpen, Users, Clipboard } from 'lucide-react';
+import { GraduationCap, Lock, User as UserIcon, AlertCircle, ArrowRight, Loader2, ArrowLeft, School as SchoolIcon, Mail, Phone, Smile, BookOpen, Users, Clipboard, PlusCircle, LogIn } from 'lucide-react';
 import { User, UserRole, School, ClassInfo, Subject } from '../types';
 import { api } from '../services/api';
 
@@ -49,7 +49,11 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
     schoolId: '', trueName: '', phone: '', email: '', avatar: '',
     teachingSubject: '', homeroomClass: '',
     // Student specific
-    seatNo: '', parentName: '', parentPhone: '', address: '', gender: 'Male', idCard: ''
+    seatNo: '', parentName: '', parentPhone: '', address: '', gender: 'Male', idCard: '',
+    // Principal specific (Create School)
+    isCreatingSchool: false,
+    newSchoolName: '',
+    newSchoolCode: ''
   });
 
   const [schools, setSchools] = useState<School[]>([]);
@@ -77,7 +81,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
 
   // When School ID changes, fetch meta data
   useEffect(() => {
-    if (regForm.schoolId) {
+    if (regForm.schoolId && !regForm.isCreatingSchool) {
        fetch(`${location.origin}/api/public/meta?schoolId=${regForm.schoolId}`)
          .then(res => res.json())
          .then(data => {
@@ -87,7 +91,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
          })
          .catch(console.error);
     }
-  }, [regForm.schoolId]);
+  }, [regForm.schoolId, regForm.isCreatingSchool]);
 
   const handleLogin = async (e: React.FormEvent) => {
     e.preventDefault();
@@ -123,7 +127,11 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
           setStep(1);
       }
     } catch (err: any) {
-      setError(err.message || '注册失败');
+      if (err.message === 'SCHOOL_EXISTS') {
+          setError('学校已存在！请选择“加入学校”模式进行注册。');
+      } else {
+          setError(err.message || '注册失败');
+      }
     } finally { setLoading(false); }
   };
 
@@ -142,6 +150,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
               setRegForm(prev => ({
                   ...prev, 
                   role: newRole,
+                  isCreatingSchool: false,
                   // If Admin, clear school ID immediately
                   schoolId: newRole === UserRole.ADMIN ? '' : prev.schoolId
               }));
@@ -157,28 +166,78 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
         )}
       </div>
 
-      <div>
-        <label className="text-sm font-medium text-gray-700">所属学校</label>
-        {regForm.role === UserRole.ADMIN ? (
-             <div className="w-full mt-1 p-2 border rounded-lg bg-gray-100 text-gray-500 text-sm h-10 flex items-center">
-                 全局权限 (无需指定学校)
-             </div>
-        ) : (
-            <select 
-            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>
+      {regForm.role === UserRole.PRINCIPAL && (
+          <div className="flex bg-gray-100 p-1 rounded-lg">
+              <button 
+                onClick={() => setRegForm({...regForm, isCreatingSchool: false, newSchoolName: '', newSchoolCode: ''})}
+                className={`flex-1 py-1.5 text-xs font-bold rounded-md flex items-center justify-center gap-1 transition-all ${!regForm.isCreatingSchool ? 'bg-white shadow text-blue-600' : 'text-gray-500'}`}
+              >
+                  <LogIn size={14}/> 加入学校
+              </button>
+              <button 
+                onClick={() => setRegForm({...regForm, isCreatingSchool: true, schoolId: ''})}
+                className={`flex-1 py-1.5 text-xs font-bold rounded-md flex items-center justify-center gap-1 transition-all ${regForm.isCreatingSchool ? 'bg-white shadow text-green-600' : 'text-gray-500'}`}
+              >
+                  <PlusCircle size={14}/> 创建学校
+              </button>
+          </div>
+      )}
+
+      {regForm.isCreatingSchool && regForm.role === UserRole.PRINCIPAL ? (
+          <div className="space-y-3 bg-green-50 p-3 rounded-lg border border-green-100">
+              <div>
+                  <label className="text-xs font-bold text-green-700 block mb-1">学校名称 (创建)</label>
+                  <input 
+                    className="w-full p-2 border border-green-200 rounded text-sm focus:ring-2 focus:ring-green-500 outline-none"
+                    placeholder="请输入完整的学校名称"
+                    value={regForm.newSchoolName}
+                    onChange={e => setRegForm({...regForm, newSchoolName: e.target.value})}
+                  />
+              </div>
+              <div>
+                  <label className="text-xs font-bold text-green-700 block mb-1">学校代码 (创建)</label>
+                  <input 
+                    className="w-full p-2 border border-green-200 rounded text-sm focus:ring-2 focus:ring-green-500 outline-none"
+                    placeholder="唯一代码 (如: SCH2024)"
+                    value={regForm.newSchoolCode}
+                    onChange={e => setRegForm({...regForm, newSchoolCode: e.target.value})}
+                  />
+              </div>
+              <p className="text-[10px] text-green-600">
+                  提交后需等待平台管理员审核。审核通过后，该学校将被创建，您将成为该校校长。
+              </p>
+          </div>
+      ) : (
+          <div>
+            <label className="text-sm font-medium text-gray-700">所属学校</label>
+            {regForm.role === UserRole.ADMIN ? (
+                <div className="w-full mt-1 p-2 border rounded-lg bg-gray-100 text-gray-500 text-sm h-10 flex items-center">
+                    全局权限 (无需指定学校)
+                </div>
+            ) : (
+                <select 
+                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>
+      )}
 
       <button 
         type="button" 
-        // Only require school ID if NOT admin
-        disabled={regForm.role !== UserRole.ADMIN && !regForm.schoolId}
+        // Logic: 
+        // 1. Admin: OK
+        // 2. Principal Create: Needs Name & Code
+        // 3. Principal Join / Others: Needs SchoolID
+        disabled={
+            (regForm.role === UserRole.ADMIN ? false : 
+                (regForm.isCreatingSchool ? (!regForm.newSchoolName || !regForm.newSchoolCode) : !regForm.schoolId)
+            )
+        }
         onClick={() => setStep(2)}
         className="w-full bg-blue-600 text-white py-2 rounded-lg disabled:opacity-50"
       >

routes/auth.js

@@ -1,7 +1,7 @@
 
 const express = require('express');
 const router = express.Router();
-const { User, Student, ClassModel, NotificationModel } = require('../models');
+const { User, Student, ClassModel, NotificationModel, School } = require('../models');
 
 // Helpers
 const getQueryFilter = (req) => { 
@@ -45,7 +45,7 @@ router.get('/me', async (req, res) => {
 });
 
 router.post('/register', async (req, res) => {
-    const { role, username, password, schoolId, trueName, seatNo } = req.body;
+    const { role, username, password, schoolId, trueName, seatNo, isCreatingSchool, newSchoolName, newSchoolCode } = req.body;
     const className = req.body.className || req.body.homeroomClass; 
     try {
         if (role === 'STUDENT') {
@@ -62,9 +62,30 @@ router.post('/register', async (req, res) => {
             await User.create({ username: finalUsername, password, role: 'STUDENT', trueName: cleanName, schoolId, status: 'pending', homeroomClass: cleanClass, studentNo: finalUsername, seatNo: seatNo || '', parentName: req.body.parentName, parentPhone: req.body.parentPhone, address: req.body.address, idCard: req.body.idCard, gender: req.body.gender || 'Male', createTime: new Date() });
             return res.json({ username: finalUsername });
         } 
+        
+        // Check Username Duplication
         const existing = await User.findOne({ username });
         if (existing) return res.status(409).json({ error: 'USERNAME_EXISTS', message: '用户名已存在' });
-        await User.create({...req.body, status: 'pending', createTime: new Date()});
+
+        // Handle Principal creating a school
+        let pendingSchoolData = null;
+        let finalSchoolId = schoolId;
+
+        if (role === 'PRINCIPAL' && isCreatingSchool) {
+            if (!newSchoolName || !newSchoolCode) return res.status(400).json({ error: 'MISSING_SCHOOL_INFO', message: '请输入学校名称和代码' });
+            
+            // Check if school already exists
+            const schoolExists = await School.findOne({ $or: [{ name: newSchoolName }, { code: newSchoolCode }] });
+            if (schoolExists) return res.status(409).json({ error: 'SCHOOL_EXISTS', message: '该学校名称或代码已存在，请选择“加入学校”' });
+            
+            pendingSchoolData = {
+                name: newSchoolName,
+                code: newSchoolCode
+            };
+            finalSchoolId = ''; // No school ID yet
+        }
+
+        await User.create({...req.body, schoolId: finalSchoolId, pendingSchoolData, status: 'pending', createTime: new Date()});
         res.json({ username });
     } catch(e) { res.status(500).json({ error: e.message }); }
 });
@@ -95,9 +116,32 @@ router.put('/:id', async (req, res) => {
     try {
         const user = await User.findById(userId);
         if (!user) return res.status(404).json({ error: 'User not found' });
+        
+        // Handle Student activation logic (existing)
         if (user.status !== 'active' && updates.status === 'active' && user.role === 'STUDENT') {
             await Student.findOneAndUpdate({ studentNo: user.studentNo, schoolId: user.schoolId }, { $set: { schoolId: user.schoolId, studentNo: user.studentNo, seatNo: user.seatNo, name: user.trueName, className: user.homeroomClass, gender: user.gender || 'Male', parentName: user.parentName, parentPhone: user.parentPhone, address: user.address, idCard: user.idCard, status: 'Enrolled', birthday: '2015-01-01' } }, { upsert: true, new: true });
         }
+
+        // NEW: Handle Principal School Creation on Activation
+        if (user.status !== 'active' && updates.status === 'active' && user.role === 'PRINCIPAL' && user.pendingSchoolData && user.pendingSchoolData.name) {
+            // Check again if school exists (double safety)
+            const exists = await School.findOne({ $or: [{ name: user.pendingSchoolData.name }, { code: user.pendingSchoolData.code }] });
+            if (exists) {
+                // Conflict! Just link to existing school? Or fail? 
+                // Let's link to existing to allow approval, but clear creation data.
+                updates.schoolId = exists._id;
+                updates.pendingSchoolData = null;
+            } else {
+                // Create New School
+                const newSchool = await School.create({
+                    name: user.pendingSchoolData.name,
+                    code: user.pendingSchoolData.code
+                });
+                updates.schoolId = newSchool._id;
+                updates.pendingSchoolData = null;
+            }
+        }
+
         await User.findByIdAndUpdate(userId, updates);
         res.json({});
     } catch (e) { res.status(500).json({ error: e.message }); }