fix: patch P0 security vulnerabilities and critical UX issues across 6 modules

Security: Add admin/layout.tsx auth guard; Add requirePermission() to 12 admin pages Dashboard: Fix StudentStatsGrid rendering; Fix teacher greeting; Add loading/error boundaries; Fix col-span; Add metadata Announcements: Fix audience filtering; Add user detail page; Trigger notifications on publish; Pass classes data; Add loading.tsx Messages: Implement soft delete; Add unread badge with polling; Add notification dropdown polling; Add keyword search; Add quiet hours DND Management: Add loading/error for 9 admin routes; Fix admin-classes-view to use Select for school/grade Profile/Settings: Add loading/error; Fix parent role routing; Create ParentSettingsView; Integrate AiProviderSettingsCard; Add Tab URL persistence; Add logout confirm; Add avatar; Fix Progress arbitrary class Schema: Add senderDeletedAt/receiverDeletedAt to messages; Add quietHours to notificationPreferences; Add uniqueIndex import Docs: Update architecture docs 004/005
2026-06-22 13:57:31 +08:00
parent 5ff7ab9e72
commit a4d096a6fc
81 changed files with 2145 additions and 124 deletions
--- a/src/modules/announcements/actions.ts
+++ b/src/modules/announcements/actions.ts
@@ -6,6 +6,13 @@ import { createId } from "@paralleldrive/cuid2"
 import { requirePermission, PermissionDeniedError } from "@/shared/lib/auth-guard"
 import { Permissions } from "@/shared/types/permissions"
 import type { ActionState } from "@/shared/types/action-state"
+import { sendBatchNotifications } from "@/modules/notifications"
+import type { NotificationPayload } from "@/modules/notifications"
+import { getAllUserIds, getUserIdsByGradeId } from "@/modules/users/data-access"
+import {
+  getStudentIdsByClassId,
+  getTeacherIdsByClassIds,
+} from "@/modules/classes/data-access"

 import { CreateAnnouncementSchema, UpdateAnnouncementSchema } from "./schema"
 import {
@@ -27,6 +34,60 @@ function handleActionError(e: unknown): ActionState<never> {
  return { success: false, message: "Unexpected error" }
 }

+/**
+ * 根据公告类型解析目标用户 ID 列表。
+ * - school: 全校所有用户
+ * - grade: 该年级下所有用户
+ * - class: 该班级学生 + 任课教师 + 班主任
+ */
+async function resolveTargetUserIds(announcement: Announcement): Promise<string[]> {
+  if (announcement.type === "school") {
+    return getAllUserIds()
+  }
+
+  if (announcement.type === "grade" && announcement.targetGradeId) {
+    return getUserIdsByGradeId(announcement.targetGradeId)
+  }
+
+  if (announcement.type === "class" && announcement.targetClassId) {
+    const [studentIds, teacherIds] = await Promise.all([
+      getStudentIdsByClassId(announcement.targetClassId),
+      getTeacherIdsByClassIds([announcement.targetClassId]),
+    ])
+    return Array.from(new Set([...studentIds, ...teacherIds]))
+  }
+
+  return []
+}
+
+/**
+ * 发布公告后向目标用户批量发送通知。
+ * 通知发送失败不影响公告发布本身，仅记录日志。
+ */
+async function notifyAnnouncementPublished(announcement: Announcement): Promise<void> {
+  try {
+    const targetUserIds = await resolveTargetUserIds(announcement)
+    if (targetUserIds.length === 0) return
+
+    const payloads: NotificationPayload[] = targetUserIds.map((userId) => ({
+      userId,
+      title: `新公告：${announcement.title}`,
+      content: announcement.content.slice(0, 200),
+      type: "info",
+      actionUrl: `/announcements/${announcement.id}`,
+      metadata: {
+        announcementId: announcement.id,
+        announcementType: announcement.type,
+      },
+    }))
+
+    await sendBatchNotifications(payloads)
+  } catch (error) {
+    // 通知发送失败不阻塞公告发布流程，仅记录错误
+    console.error("Failed to send announcement notifications:", error)
+  }
+}
+
 export async function createAnnouncementAction(
  prevState: ActionState<string> | null,
  formData: FormData
@@ -74,6 +135,14 @@ export async function createAnnouncementAction(
      publishedAt,
    })

+    // 如果创建时直接发布，触发通知（失败不阻塞）
+    if (isPublished) {
+      const created = await getAnnouncementById(id)
+      if (created) {
+        await notifyAnnouncementPublished(created)
+      }
+    }
+
    revalidatePath("/admin/announcements")
    revalidatePath("/announcements")

@@ -114,6 +183,7 @@ export async function updateAnnouncementAction(

    const input = parsed.data
    const isPublished = input.status === "published"
+    const wasPublished = existing.status === "published"
    const publishedAt = isPublished
      ? existing.publishedAt
        ? new Date(existing.publishedAt)
@@ -133,6 +203,14 @@ export async function updateAnnouncementAction(
      updatedAt: new Date(),
    })

+    // 当公告从非发布状态变为发布状态时，触发通知（失败不阻塞）
+    if (isPublished && !wasPublished) {
+      const updated = await getAnnouncementById(id)
+      if (updated) {
+        await notifyAnnouncementPublished(updated)
+      }
+    }
+
    revalidatePath("/admin/announcements")
    revalidatePath(`/admin/announcements/${id}`)
    revalidatePath("/announcements")
@@ -173,6 +251,9 @@ export async function publishAnnouncementAction(id: string): Promise<ActionState
      : new Date()
    await publishAnnouncementById(id, publishedAt)

+    // 发布成功后触发通知（失败不阻塞）
+    await notifyAnnouncementPublished(existing)
+
    revalidatePath("/admin/announcements")
    revalidatePath(`/admin/announcements/${id}`)
    revalidatePath("/announcements")
--- a/src/modules/announcements/data-access.ts
+++ b/src/modules/announcements/data-access.ts
@@ -1,7 +1,7 @@
 import "server-only"

 import { cache } from "react"
-import { and, desc, eq } from "drizzle-orm"
+import { and, desc, eq, or } from "drizzle-orm"

 import { db } from "@/shared/db"
 import { announcements, users } from "@/shared/db/schema"
@@ -61,6 +61,25 @@ export const getAnnouncements = cache(
      conditions.push(eq(announcements.type, params.type))
    }

+    // 受众过滤：当提供 audience 时，仅返回对该受众可见的公告
+    // (type = 'school') OR (type = 'grade' AND target_grade_id = audience.gradeId)
+    // OR (type = 'class' AND target_class_id = audience.classId)
+    if (params?.audience) {
+      const { gradeId, classId } = params.audience
+      const gradeClause = gradeId
+        ? and(eq(announcements.type, "grade"), eq(announcements.targetGradeId, gradeId))
+        : undefined
+      const classClause = classId
+        ? and(eq(announcements.type, "class"), eq(announcements.targetClassId, classId))
+        : undefined
+      const orClauses = [
+        eq(announcements.type, "school"),
+        gradeClause,
+        classClause,
+      ].filter((c): c is NonNullable<typeof c> => c !== undefined)
+      conditions.push(or(...orClauses))
+    }
+
    const rows = await db
      .select({
        id: announcements.id,
--- a/src/modules/announcements/types.ts
+++ b/src/modules/announcements/types.ts
@@ -24,6 +24,17 @@ export type GetAnnouncementsParams = {
  type?: AnnouncementType
  page?: number
  pageSize?: number
+  /**
+   * 受众过滤（用户端使用）：当提供时，仅返回对该受众可见的公告。
+   * - school 类型公告：对所有受众可见
+   * - grade 类型公告：仅当 targetGradeId 与 audience.gradeId 匹配时可见
+   * - class 类型公告：仅当 targetClassId 与 audience.classId 匹配时可见
+   * 未提供时（管理端）返回所有公告。
+   */
+  audience?: {
+    gradeId?: string
+    classId?: string
+  }
 }

 export interface AnnouncementInsertData {
--- a/src/modules/classes/components/admin-classes-view.tsx
+++ b/src/modules/classes/components/admin-classes-view.tsx
@@ -39,9 +39,13 @@ import { formatDate } from "@/shared/lib/utils"
 export function AdminClassesClient({
  classes,
  teachers,
+  schools,
+  grades,
 }: {
  classes: AdminClassListItem[]
  teachers: TeacherOption[]
+  schools: { id: string; name: string }[]
+  grades: { id: string; name: string; school: { id: string; name: string } }[]
 }) {
  const router = useRouter()
  const [isWorking, setIsWorking] = useState(false)
@@ -50,18 +54,34 @@ export function AdminClassesClient({
  const [deleteItem, setDeleteItem] = useState<AdminClassListItem | null>(null)

  const defaultTeacherId = useMemo(() => teachers[0]?.id ?? "", [teachers])
+  const defaultSchoolId = useMemo(() => schools[0]?.id ?? "", [schools])
  const [createTeacherId, setCreateTeacherId] = useState(defaultTeacherId)
+  const [createSchoolId, setCreateSchoolId] = useState(defaultSchoolId)
+  const [createGradeId, setCreateGradeId] = useState("")
  const [editTeacherId, setEditTeacherId] = useState("")
+  const [editSchoolId, setEditSchoolId] = useState("")
+  const [editGradeId, setEditGradeId] = useState("")
  const [editSubjectTeachers, setEditSubjectTeachers] = useState<Array<{ subject: string; teacherId: string | null }>>([])

+  const createGrades = useMemo(() => grades.filter((g) => g.school.id === createSchoolId), [grades, createSchoolId])
+  const editGrades = useMemo(() => grades.filter((g) => g.school.id === editSchoolId), [grades, editSchoolId])
+  const selectedCreateSchool = schools.find((s) => s.id === createSchoolId)
+  const selectedCreateGrade = grades.find((g) => g.id === createGradeId)
+  const selectedEditSchool = schools.find((s) => s.id === editSchoolId)
+  const selectedEditGrade = grades.find((g) => g.id === editGradeId)
+
  useEffect(() => {
    if (!createOpen) return
    setCreateTeacherId(defaultTeacherId)
-  }, [createOpen, defaultTeacherId])
+    setCreateSchoolId(defaultSchoolId)
+    setCreateGradeId("")
+  }, [createOpen, defaultTeacherId, defaultSchoolId])

  useEffect(() => {
    if (!editItem) return
    setEditTeacherId(editItem.teacher.id)
+    setEditSchoolId(editItem.schoolId ?? "")
+    setEditGradeId(editItem.gradeId ?? "")
    setEditSubjectTeachers(
      DEFAULT_CLASS_SUBJECTS.map((s) => ({
        subject: s,
@@ -227,10 +247,30 @@ export function AdminClassesClient({
          </DialogHeader>
          <form action={handleCreate} className="space-y-4">
            <div className="grid grid-cols-4 items-center gap-4">
-              <Label htmlFor="create-school-name" className="text-right">
-                School
-              </Label>
-              <Input id="create-school-name" name="schoolName" className="col-span-3" placeholder="e.g. First Primary School" />
+              <Label className="text-right">School</Label>
+              <div className="col-span-3">
+                <Select
+                  value={createSchoolId}
+                  onValueChange={(v) => {
+                    setCreateSchoolId(v)
+                    setCreateGradeId("")
+                  }}
+                  disabled={schools.length === 0}
+                >
+                  <SelectTrigger>
+                    <SelectValue placeholder={schools.length === 0 ? "No schools" : "Select a school"} />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {schools.map((s) => (
+                      <SelectItem key={s.id} value={s.id}>
+                        {s.name}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+                <input type="hidden" name="schoolId" value={createSchoolId} />
+                <input type="hidden" name="schoolName" value={selectedCreateSchool?.name ?? ""} />
+              </div>
            </div>

            <div className="grid grid-cols-4 items-center gap-4">
@@ -241,10 +281,27 @@ export function AdminClassesClient({
            </div>

            <div className="grid grid-cols-4 items-center gap-4">
-              <Label htmlFor="create-grade" className="text-right">
-                Grade
-              </Label>
-              <Input id="create-grade" name="grade" className="col-span-3" placeholder="e.g. Grade 10" />
+              <Label className="text-right">Grade</Label>
+              <div className="col-span-3">
+                <Select
+                  value={createGradeId}
+                  onValueChange={setCreateGradeId}
+                  disabled={createGrades.length === 0}
+                >
+                  <SelectTrigger>
+                    <SelectValue placeholder={createGrades.length === 0 ? "No grades" : "Select a grade"} />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {createGrades.map((g) => (
+                      <SelectItem key={g.id} value={g.id}>
+                        {g.name}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+                <input type="hidden" name="gradeId" value={createGradeId} />
+                <input type="hidden" name="grade" value={selectedCreateGrade?.name ?? ""} />
+              </div>
            </div>

            <div className="grid grid-cols-4 items-center gap-4">
@@ -284,7 +341,7 @@ export function AdminClassesClient({
              <Button type="button" variant="outline" onClick={() => setCreateOpen(false)} disabled={isWorking}>
                Cancel
              </Button>
-              <Button type="submit" disabled={isWorking || teachers.length === 0 || !createTeacherId}>
+              <Button type="submit" disabled={isWorking || teachers.length === 0 || !createTeacherId || !createGradeId}>
                Create
              </Button>
            </DialogFooter>
@@ -306,15 +363,30 @@ export function AdminClassesClient({
          {editItem ? (
            <form action={handleUpdate} className="space-y-4">
              <div className="grid grid-cols-4 items-center gap-4">
-                <Label htmlFor="edit-school-name" className="text-right">
-                  School
-                </Label>
-                <Input
-                  id="edit-school-name"
-                  name="schoolName"
-                  className="col-span-3"
-                  defaultValue={editItem.schoolName ?? ""}
-                />
+                <Label className="text-right">School</Label>
+                <div className="col-span-3">
+                  <Select
+                    value={editSchoolId}
+                    onValueChange={(v) => {
+                      setEditSchoolId(v)
+                      setEditGradeId("")
+                    }}
+                    disabled={schools.length === 0}
+                  >
+                    <SelectTrigger>
+                      <SelectValue placeholder={schools.length === 0 ? "No schools" : "Select a school"} />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {schools.map((s) => (
+                        <SelectItem key={s.id} value={s.id}>
+                          {s.name}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  <input type="hidden" name="schoolId" value={editSchoolId} />
+                  <input type="hidden" name="schoolName" value={selectedEditSchool?.name ?? ""} />
+                </div>
              </div>

              <div className="grid grid-cols-4 items-center gap-4">
@@ -325,10 +397,27 @@ export function AdminClassesClient({
              </div>

              <div className="grid grid-cols-4 items-center gap-4">
-                <Label htmlFor="edit-grade" className="text-right">
-                  Grade
-                </Label>
-                <Input id="edit-grade" name="grade" className="col-span-3" defaultValue={editItem.grade} />
+                <Label className="text-right">Grade</Label>
+                <div className="col-span-3">
+                  <Select
+                    value={editGradeId}
+                    onValueChange={setEditGradeId}
+                    disabled={editGrades.length === 0}
+                  >
+                    <SelectTrigger>
+                      <SelectValue placeholder={editGrades.length === 0 ? "No grades" : "Select a grade"} />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {editGrades.map((g) => (
+                        <SelectItem key={g.id} value={g.id}>
+                          {g.name}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  <input type="hidden" name="gradeId" value={editGradeId} />
+                  <input type="hidden" name="grade" value={selectedEditGrade?.name ?? ""} />
+                </div>
              </div>

              <div className="grid grid-cols-4 items-center gap-4">
--- a/src/modules/dashboard/components/student-dashboard/student-stats-grid.tsx
+++ b/src/modules/dashboard/components/student-dashboard/student-stats-grid.tsx
@@ -1,11 +1,13 @@
-import { PenTool, TriangleAlert, Trophy, TrendingUp } from "lucide-react"
+import { BookOpen, CheckCircle, PenTool, TriangleAlert, Trophy, TrendingUp } from "lucide-react"

 import { StatCard } from "@/shared/components/ui/stat-card"
 import type { StudentRanking } from "@/modules/homework/types"

 export function StudentStatsGrid({
+  enrolledClassCount,
  dueSoonCount,
  overdueCount,
+  gradedCount,
  ranking,
 }: {
  enrolledClassCount: number
@@ -16,12 +18,21 @@ export function StudentStatsGrid({
 }) {
  return (
    <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
+      <StatCard
+        title="Enrolled Classes"
+        value={String(enrolledClassCount)}
+        description="Active enrollments"
+        icon={BookOpen}
+        href="/student/learning/courses"
+        color="text-emerald-500"
+        valueClassName="text-emerald-500 tabular-nums"
+      />
      <StatCard
        title="Average Score"
        value={ranking ? `${Math.round(ranking.percentage)}%` : "-"}
        description={ranking ? "Overall performance" : "No grades yet"}
        icon={TrendingUp}
-        href="/student/learning/assignments"
+        href="/student/grades"
        color="text-blue-500"
        valueClassName={ranking ? "text-blue-500 tabular-nums" : "tabular-nums"}
      />
@@ -30,10 +41,19 @@ export function StudentStatsGrid({
        value={ranking ? `${ranking.rank}/${ranking.classSize}` : "-"}
        description={ranking ? "Current position" : "No ranking yet"}
        icon={Trophy}
-        href="/student/learning/assignments"
+        href="/student/grades"
        color="text-purple-500"
        valueClassName={ranking ? "text-purple-500 tabular-nums" : "tabular-nums"}
      />
+      <StatCard
+        title="Graded"
+        value={String(gradedCount)}
+        description="Completed assignments"
+        icon={CheckCircle}
+        href="/student/learning/assignments"
+        color="text-green-500"
+        valueClassName="text-green-500 tabular-nums"
+      />
      <StatCard
        title="Due Soon"
        value={String(dueSoonCount)}
--- a/src/modules/dashboard/components/student-dashboard/student-today-schedule-card.tsx
+++ b/src/modules/dashboard/components/student-dashboard/student-today-schedule-card.tsx
@@ -1,20 +1,59 @@
+"use client"
+
+import { useMemo } from "react"
+import Link from "next/link"
 import { CalendarDays, CalendarX } from "lucide-react"

+import { Button } from "@/shared/components/ui/button"
+import { Badge } from "@/shared/components/ui/badge"
 import { ScheduleList } from "@/shared/components/schedule/schedule-list"
 import { Card, CardContent, CardHeader, CardTitle } from "@/shared/components/ui/card"
 import { EmptyState } from "@/shared/components/ui/empty-state"
+import { cn } from "@/shared/lib/utils"
 import type { StudentTodayScheduleItem } from "@/modules/dashboard/types"

+/**
+ * Parse "HH:MM" time string into minutes since midnight for comparison.
+ */
+const timeToMinutes = (t: string): number => {
+  const [h, m] = t.split(":").map(Number)
+  return (h ?? 0) * 60 + (m ?? 0)
+}
+
 export function StudentTodayScheduleCard({ items }: { items: StudentTodayScheduleItem[] }) {
  const hasSchedule = items.length > 0

+  // Compute current/next class status based on client time
+  const { currentId, nextId } = useMemo(() => {
+    const now = new Date()
+    const nowMin = now.getHours() * 60 + now.getMinutes()
+    let currentId: string | null = null
+    let nextId: string | null = null
+    for (const item of items) {
+      const start = timeToMinutes(item.startTime)
+      const end = timeToMinutes(item.endTime)
+      if (nowMin >= start && nowMin < end) {
+        currentId = item.id
+        break
+      }
+      if (nowMin < start) {
+        nextId = item.id
+        break
+      }
+    }
+    return { currentId, nextId }
+  }, [items])
+
  return (
-    <Card className="lg:col-span-3">
-      <CardHeader>
+    <Card>
+      <CardHeader className="flex flex-row items-center justify-between">
        <CardTitle className="flex items-center gap-2">
          <CalendarDays className="h-4 w-4 text-muted-foreground" />
          Today&apos;s Schedule
        </CardTitle>
+        <Button asChild variant="outline" size="sm">
+          <Link href="/student/schedule">View all</Link>
+        </Button>
      </CardHeader>
      <CardContent>
        {!hasSchedule ? (
@@ -29,6 +68,30 @@ export function StudentTodayScheduleCard({ items }: { items: StudentTodaySchedul
            items={items}
            variant="separator"
            spacingClassName="space-y-4"
+            renderTrailing={(item) => {
+              const isCurrent = item.id === currentId
+              const isNext = item.id === nextId
+              if (isCurrent) {
+                return (
+                  <Badge className="shrink-0 bg-emerald-500 text-white hover:bg-emerald-500">
+                    In Progress
+                  </Badge>
+                )
+              }
+              if (isNext) {
+                return (
+                  <Badge variant="outline" className="shrink-0 border-primary text-primary">
+                    Up Next
+                  </Badge>
+                )
+              }
+              return item.className ? (
+                <Badge variant="secondary" className="shrink-0">
+                  {item.className}
+                </Badge>
+              ) : null
+            }}
+            className={cn(currentId && "[&_div:first-child]:bg-emerald-50/50")}
          />
        )}
      </CardContent>
--- a/src/modules/dashboard/components/student-dashboard/student-upcoming-assignments-card.tsx
+++ b/src/modules/dashboard/components/student-dashboard/student-upcoming-assignments-card.tsx
@@ -5,23 +5,14 @@ import { Badge } from "@/shared/components/ui/badge"
 import { Button } from "@/shared/components/ui/button"
 import { Card, CardContent, CardHeader, CardTitle } from "@/shared/components/ui/card"
 import { EmptyState } from "@/shared/components/ui/empty-state"
+import { StatusBadge } from "@/shared/components/ui/status-badge"
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/shared/components/ui/table"
 import { formatDate, cn } from "@/shared/lib/utils"
 import type { StudentHomeworkAssignmentListItem } from "@/modules/homework/types"
-
-const getStatusVariant = (status: string): "default" | "secondary" | "outline" => {
-  if (status === "graded") return "default"
-  if (status === "submitted") return "secondary"
-  if (status === "in_progress") return "secondary"
-  return "outline"
-}
-
-const getStatusLabel = (status: string) => {
-  if (status === "graded") return "Graded"
-  if (status === "submitted") return "Submitted"
-  if (status === "in_progress") return "In progress"
-  return "Not started"
-}
+import {
+  STUDENT_HOMEWORK_PROGRESS_VARIANT,
+  STUDENT_HOMEWORK_PROGRESS_LABEL,
+} from "@/modules/homework/types"

 const getActionLabel = (status: string) => {
  if (status === "graded") return "Review"
@@ -51,7 +42,7 @@ export function StudentUpcomingAssignmentsCard({ upcomingAssignments }: { upcomi
  const hasAssignments = upcomingAssignments.length > 0

  return (
-    <Card className="lg:col-span-4">
+    <Card>
      <CardHeader className="flex flex-row items-center justify-between">
        <CardTitle className="text-base flex items-center gap-2">
          <PenTool className="h-4 w-4 text-muted-foreground" />
@@ -99,9 +90,11 @@ export function StudentUpcomingAssignmentsCard({ upcomingAssignments }: { upcomi
                        </div>
                      </TableCell>
                      <TableCell>
-                        <Badge variant={getStatusVariant(a.progressStatus)} className="capitalize">
-                          {getStatusLabel(a.progressStatus)}
-                        </Badge>
+                        <StatusBadge
+                          status={a.progressStatus}
+                          variantMap={STUDENT_HOMEWORK_PROGRESS_VARIANT}
+                          labelMap={STUDENT_HOMEWORK_PROGRESS_LABEL}
+                        />
                      </TableCell>
                      <TableCell className={cn(
                        "text-muted-foreground",
--- a/src/modules/dashboard/components/teacher-dashboard/teacher-dashboard-header.tsx
+++ b/src/modules/dashboard/components/teacher-dashboard/teacher-dashboard-header.tsx
@@ -1,3 +1,6 @@
+"use client"
+
+import { formatLongDate } from "@/shared/lib/utils"
 import { TeacherQuickActions } from "./teacher-quick-actions"

 interface TeacherDashboardHeaderProps {
@@ -5,18 +8,18 @@ interface TeacherDashboardHeaderProps {
 }

 export function TeacherDashboardHeader({ teacherName }: TeacherDashboardHeaderProps) {
-  const today = new Date().toLocaleDateString("en-US", {
-    weekday: "long",
-    year: "numeric",
-    month: "long",
-    day: "numeric",
-  })
+  const today = formatLongDate(new Date())
+  const hour = new Date().getHours()
+  let greeting = "欢迎回来"
+  if (hour < 12) greeting = "早上好"
+  else if (hour < 18) greeting = "下午好"
+  else greeting = "晚上好"

  return (
    <div className="flex flex-col justify-between space-y-4 md:flex-row md:items-center md:space-y-0">
      <div>
-        <h2 className="text-2xl font-bold tracking-tight">Good morning, {teacherName}</h2>
-        <p className="text-muted-foreground">It&apos;s {today}. Here&apos;s your daily overview.</p>
+        <h2 className="text-2xl font-bold tracking-tight">{greeting}，{teacherName}</h2>
+        <p className="text-muted-foreground">今天是 {today}，以下是今日概览。</p>
      </div>
      <TeacherQuickActions />
    </div>
--- a/src/modules/dashboard/components/teacher-dashboard/teacher-dashboard-view.tsx
+++ b/src/modules/dashboard/components/teacher-dashboard/teacher-dashboard-view.tsx
@@ -7,6 +7,7 @@ import { RecentSubmissions } from "./recent-submissions"
 import { TeacherSchedule } from "./teacher-schedule"
 import { TeacherStats } from "./teacher-stats"
 import { TeacherGradeTrends } from "./teacher-grade-trends"
+import { TeacherTodoCard, type TeacherTodoItem } from "./teacher-todo-card"

 const toWeekday = (d: Date): 1 | 2 | 3 | 4 | 5 | 6 | 7 => {
  const day = d.getDay()
@@ -32,16 +33,12 @@ export function TeacherDashboardView({ data }: { data: TeacherDashboardData }) {

  const submittedSubmissions = data.submissions.filter((s) => Boolean(s.submittedAt))
  const toGradeCount = submittedSubmissions.filter((s) => s.status === "submitted").length
-  
-  // Filter for submissions that actually need grading (status === "submitted")
-  // If we have less than 5 to grade, maybe also show some recently graded ones?
-  // For now, let's stick to "Needs Grading" as it's more useful.
+
  const submissionsToGrade = submittedSubmissions
    .filter(s => s.status === "submitted")
-    .sort((a, b) => new Date(a.submittedAt!).getTime() - new Date(b.submittedAt!).getTime()) // Oldest first? Or Newest? Usually oldest first for queue.
+    .sort((a, b) => (a.submittedAt ? new Date(a.submittedAt).getTime() : 0) - (b.submittedAt ? new Date(b.submittedAt).getTime() : 0))
    .slice(0, 6);

-  // Calculate stats for the dashboard
  const activeAssignmentsCount = data.assignments.filter(a => a.status === "published").length
  
  const totalTrendScore = data.gradeTrends.reduce((acc, curr) => acc + curr.averageScore, 0)
@@ -51,6 +48,13 @@ export function TeacherDashboardView({ data }: { data: TeacherDashboardData }) {
  const totalPotentialSubmissions = data.gradeTrends.reduce((acc, curr) => acc + curr.totalStudents, 0)
  const submissionRate = totalPotentialSubmissions > 0 ? (totalSubmissions / totalPotentialSubmissions) * 100 : 0

+  // 待办聚合
+  const todoItems: TeacherTodoItem[] = [
+    { label: "待批改作业", count: toGradeCount, href: "/teacher/homework/submissions", variant: toGradeCount > 0 ? "urgent" : "normal" },
+    { label: "今日待考勤", count: todayScheduleItems.length, href: "/teacher/attendance/sheet", variant: "info" },
+    { label: "进行中作业", count: activeAssignmentsCount, href: "/teacher/homework/assignments", variant: "normal" },
+  ]
+
  return (
    <div className="flex h-full flex-col space-y-6 p-8">
      <TeacherDashboardHeader teacherName={data.teacherName} />
@@ -63,18 +67,25 @@ export function TeacherDashboardView({ data }: { data: TeacherDashboardData }) {
      />

      <div className="grid gap-6 lg:grid-cols-12">
+        {/* 移动端优先展示：今日课表 → 待办 → 待批改 */}
        <div className="flex flex-col gap-6 lg:col-span-8">
+            <div className="lg:hidden">
+              <TeacherSchedule items={todayScheduleItems} />
+            </div>
+            <TeacherTodoCard items={todoItems} />
            <TeacherGradeTrends trends={data.gradeTrends} />
            <RecentSubmissions 
                submissions={submissionsToGrade} 
-                title="Needs Grading"
-                emptyTitle="All caught up!"
-                emptyDescription="You have no pending submissions to grade."
+                title="待批改"
+                emptyTitle="全部批改完成！"
+                emptyDescription="暂无待批改的提交。"
            />
        </div>
        
        <div className="flex flex-col gap-6 lg:col-span-4">
-            <TeacherSchedule items={todayScheduleItems} />
+            <div className="hidden lg:block">
+              <TeacherSchedule items={todayScheduleItems} />
+            </div>
            <TeacherHomeworkCard assignments={data.assignments} />
            <TeacherClassesCard classes={data.classes} />
        </div>
--- a/src/modules/messaging/actions.ts
+++ b/src/modules/messaging/actions.ts
@@ -18,11 +18,13 @@ import {
  markMessageAsRead,
  deleteMessage,
  getRecipients,
+  getUnreadMessageCount,
 } from "./data-access"
 import {
  getNotifications,
  markNotificationAsRead,
  markAllNotificationsAsRead,
+  getUnreadNotificationCount,
 } from "@/modules/notifications/data-access"
 import {
  getNotificationPreferences,
@@ -129,7 +131,7 @@ export async function deleteMessageAction(messageId: string): Promise<ActionStat
 }

 export async function getMessagesAction(
-  params: { type: MessageType; page?: number; pageSize?: number }
+  params: { type: MessageType; page?: number; pageSize?: number; keyword?: string }
 ): Promise<ActionState<{ items: Message[]; total: number; page: number; pageSize: number; totalPages: number }>> {
  try {
    const ctx = await requirePermission(Permissions.MESSAGE_READ)
@@ -179,6 +181,30 @@ export async function getRecipientsAction(): Promise<ActionState<RecipientOption
  }
 }

+export async function getUnreadMessageCountAction(): Promise<ActionState<number>> {
+  try {
+    const ctx = await requirePermission(Permissions.MESSAGE_READ)
+    const count = await getUnreadMessageCount(ctx.userId)
+    return { success: true, data: count }
+  } catch (e) {
+    if (e instanceof PermissionDeniedError) return { success: false, message: e.message }
+    if (e instanceof Error) return { success: false, message: e.message }
+    return { success: false, message: "Unexpected error" }
+  }
+}
+
+export async function getUnreadNotificationCountAction(): Promise<ActionState<number>> {
+  try {
+    const ctx = await requirePermission(Permissions.MESSAGE_READ)
+    const count = await getUnreadNotificationCount(ctx.userId)
+    return { success: true, data: count }
+  } catch (e) {
+    if (e instanceof PermissionDeniedError) return { success: false, message: e.message }
+    if (e instanceof Error) return { success: false, message: e.message }
+    return { success: false, message: "Unexpected error" }
+  }
+}
+
 export async function getNotificationsAction(
  params?: { page?: number; pageSize?: number; unreadOnly?: boolean }
 ): Promise<ActionState<{ items: Notification[]; total: number; page: number; pageSize: number; totalPages: number }>> {
@@ -242,6 +268,13 @@ export async function updateNotificationPreferencesAction(

    // 从 FormData 中解析布尔值（checkbox 提交 "on" 或不提交）
    const parseBool = (key: string): boolean => formData.get(key) === "on"
+    // 从 FormData 中解析时间字符串（"HH:mm"），空字符串转为 null
+    const parseTime = (key: string): string | null => {
+      const v = formData.get(key)
+      if (typeof v !== "string") return null
+      const trimmed = v.trim()
+      return trimmed.length > 0 ? trimmed : null
+    }

    const parsed = UpdateNotificationPreferencesSchema.safeParse({
      emailEnabled: parseBool("emailEnabled"),
@@ -252,6 +285,9 @@ export async function updateNotificationPreferencesAction(
      announcementNotifications: parseBool("announcementNotifications"),
      messageNotifications: parseBool("messageNotifications"),
      attendanceNotifications: parseBool("attendanceNotifications"),
+      quietHoursEnabled: parseBool("quietHoursEnabled"),
+      quietHoursStart: parseTime("quietHoursStart"),
+      quietHoursEnd: parseTime("quietHoursEnd"),
    })

    if (!parsed.success) {
--- a/src/modules/messaging/components/message-list.tsx
+++ b/src/modules/messaging/components/message-list.tsx
@@ -1,18 +1,20 @@
 "use client"

-import { useMemo, useState } from "react"
+import { useEffect, useMemo, useState } from "react"
 import Link from "next/link"
-import { Mail, MailOpen, Plus, Send, Inbox } from "lucide-react"
+import { Mail, MailOpen, Plus, Send, Inbox, Search, Loader2 } from "lucide-react"

 import { Badge } from "@/shared/components/ui/badge"
 import { Button } from "@/shared/components/ui/button"
 import { Card, CardContent, CardHeader } from "@/shared/components/ui/card"
 import { EmptyState } from "@/shared/components/ui/empty-state"
+import { Input } from "@/shared/components/ui/input"
 import { Tabs, TabsList, TabsTrigger } from "@/shared/components/ui/tabs"
 import { cn, formatDate } from "@/shared/lib/utils"
 import { usePermission } from "@/shared/hooks/use-permission"
 import { Permissions } from "@/shared/types/permissions"

+import { getMessagesAction } from "../actions"
 import type { Message, MessageType } from "../types"

 type Tab = "inbox" | "sent"
@@ -27,13 +29,49 @@ export function MessageList({
  initialType?: MessageType
 }) {
  const [tab, setTab] = useState<Tab>(initialType === "sent" ? "sent" : "inbox")
+  const [keyword, setKeyword] = useState("")
+  const [searchResults, setSearchResults] = useState<{ kw: string; tab: Tab; items: Message[] } | null>(null)
  const { hasPermission } = usePermission()
  const canSend = hasPermission(Permissions.MESSAGE_SEND)

+  // 防抖搜索：keyword 或 tab 变化时调用 getMessagesAction
+  useEffect(() => {
+    const kw = keyword.trim()
+    if (kw.length === 0) {
+      return
+    }
+
+    let cancelled = false
+    const timer = setTimeout(async () => {
+      if (cancelled) return
+      const res = await getMessagesAction({ type: tab, keyword: kw })
+      if (cancelled) return
+      if (res.success && res.data) {
+        setSearchResults({ kw, tab, items: res.data.items })
+      }
+    }, 400)
+
+    return () => {
+      cancelled = true
+      clearTimeout(timer)
+    }
+  }, [keyword, tab])
+
+  // 当前搜索结果是否匹配最新的 keyword 和 tab
+  const currentResults = searchResults && searchResults.kw === keyword.trim() && searchResults.tab === tab
+    ? searchResults.items
+    : null
+
+  // 搜索中：keyword 非空且尚无匹配结果
+  const searching = keyword.trim().length > 0 && currentResults === null
+
+  // 当 keyword 为空时使用 prop messages，否则使用搜索结果
+  const displayMessages = currentResults ?? messages
+
  const filtered = useMemo(() => {
-    if (tab === "inbox") return messages.filter((m) => m.receiverId === currentUserId)
-    return messages.filter((m) => m.senderId === currentUserId)
-  }, [messages, tab, currentUserId])
+    if (tab === "inbox") return displayMessages.filter((m) => m.receiverId === currentUserId)
+    return displayMessages.filter((m) => m.senderId === currentUserId)
+  }, [displayMessages, tab, currentUserId])

  return (
    <div className="space-y-6">
@@ -60,6 +98,21 @@ export function MessageList({
        ) : null}
      </div>

+      {/* 搜索框 */}
+      <div className="relative">
+        <Search className="text-muted-foreground absolute left-3 top-1/2 size-4 -translate-y-1/2" />
+        <Input
+          type="search"
+          placeholder="Search messages by subject or content..."
+          value={keyword}
+          onChange={(e) => setKeyword(e.target.value)}
+          className="pl-9"
+        />
+        {searching ? (
+          <Loader2 className="text-muted-foreground absolute right-3 top-1/2 size-4 -translate-y-1/2 animate-spin" />
+        ) : null}
+      </div>
+
      {filtered.length === 0 ? (
        <EmptyState
          title={tab === "inbox" ? "Inbox is empty" : "No sent messages"}
--- a/src/modules/messaging/components/notification-dropdown.tsx
+++ b/src/modules/messaging/components/notification-dropdown.tsx
@@ -20,6 +20,7 @@ import { cn, formatDate } from "@/shared/lib/utils"

 import {
  getNotificationsAction,
+  getUnreadNotificationCountAction,
  markAllNotificationsAsReadAction,
  markNotificationAsReadAction,
 } from "../actions"
@@ -40,16 +41,35 @@ export function NotificationDropdown() {

  useEffect(() => {
    let active = true
-    void (async () => {
+
+    const fetchNotifications = async () => {
      const res = await getNotificationsAction({ pageSize: 10 })
      if (!active) return
      if (res.success && res.data) {
        setNotifications(res.data.items)
-        setUnreadCount(res.data.items.filter((n) => !n.isRead).length)
      }
-    })()
+    }
+
+    const fetchUnreadCount = async () => {
+      const res = await getUnreadNotificationCountAction()
+      if (!active) return
+      if (res.success && typeof res.data === "number") {
+        setUnreadCount(res.data)
+      }
+    }
+
+    void fetchNotifications()
+    void fetchUnreadCount()
+
+    // 每 30 秒轮询刷新通知和未读计数
+    const timer = setInterval(() => {
+      void fetchNotifications()
+      void fetchUnreadCount()
+    }, 30_000)
+
    return () => {
      active = false
+      clearInterval(timer)
    }
  }, [])

--- a/src/modules/messaging/components/unread-message-badge.tsx
+++ b/src/modules/messaging/components/unread-message-badge.tsx
@@ -0,0 +1,51 @@
+"use client"
+
+import { useEffect, useState } from "react"
+
+import { Badge } from "@/shared/components/ui/badge"
+
+import { getUnreadMessageCountAction } from "../actions"
+
+/**
+ * 未读消息计数徽章
+ *
+ * 在侧边栏 Messages 导航项旁显示未读私信数。
+ * 每 60 秒轮询一次以保持计数更新。
+ */
+export function UnreadMessageBadge() {
+  const [count, setCount] = useState(0)
+
+  useEffect(() => {
+    let active = true
+
+    const fetchCount = async () => {
+      const res = await getUnreadMessageCountAction()
+      if (!active) return
+      if (res.success && typeof res.data === "number") {
+        setCount(res.data)
+      }
+    }
+
+    void fetchCount()
+
+    const timer = setInterval(() => {
+      void fetchCount()
+    }, 60_000)
+
+    return () => {
+      active = false
+      clearInterval(timer)
+    }
+  }, [])
+
+  if (count <= 0) return null
+
+  return (
+    <Badge
+      variant="destructive"
+      className="ml-auto flex h-5 min-w-5 items-center justify-center px-1.5 text-[10px]"
+    >
+      {count > 99 ? "99+" : count}
+    </Badge>
+  )
+}
--- a/src/modules/messaging/data-access.ts
+++ b/src/modules/messaging/data-access.ts
@@ -16,7 +16,7 @@ import "server-only"

 import { cache } from "react"
 import { createId } from "@paralleldrive/cuid2"
-import { and, count, desc, eq, inArray, or, type SQL } from "drizzle-orm"
+import { and, count, desc, eq, inArray, isNull, like, or, type SQL } from "drizzle-orm"

 import { db } from "@/shared/db"
 import {
@@ -86,13 +86,28 @@ export const getMessages = cache(
    const offset = (page - 1) * pageSize

    const conds: SQL[] = []
-    if (params.type === "inbox") conds.push(eq(messages.receiverId, params.userId))
-    else if (params.type === "sent") conds.push(eq(messages.senderId, params.userId))
-    else {
-      const cond = or(eq(messages.receiverId, params.userId), eq(messages.senderId, params.userId))
+    if (params.type === "inbox") {
+      conds.push(eq(messages.receiverId, params.userId))
+      conds.push(isNull(messages.receiverDeletedAt))
+    } else if (params.type === "sent") {
+      conds.push(eq(messages.senderId, params.userId))
+      conds.push(isNull(messages.senderDeletedAt))
+    } else {
+      // all: 仅返回当前用户未删除的消息（发送方未删 或 接收方未删）
+      const cond = or(
+        and(eq(messages.receiverId, params.userId), isNull(messages.receiverDeletedAt)),
+        and(eq(messages.senderId, params.userId), isNull(messages.senderDeletedAt))
+      )
      if (cond) conds.push(cond)
    }

+    // 关键词搜索（匹配 subject 或 content）
+    if (params.keyword && params.keyword.trim().length > 0) {
+      const kw = `%${params.keyword.trim()}%`
+      const kwCond = or(like(messages.subject, kw), like(messages.content, kw))
+      if (kwCond) conds.push(kwCond)
+    }
+
    const where = and(...conds)
    const [rows, [totalRow]] = await Promise.all([
      db.select().from(messages).where(where).orderBy(desc(messages.createdAt)).limit(pageSize).offset(offset),
@@ -111,7 +126,15 @@ export const getMessageById = cache(
    const [row] = await db
      .select()
      .from(messages)
-      .where(and(eq(messages.id, id), or(eq(messages.senderId, userId), eq(messages.receiverId, userId))))
+      .where(
+        and(
+          eq(messages.id, id),
+          or(
+            and(eq(messages.senderId, userId), isNull(messages.senderDeletedAt)),
+            and(eq(messages.receiverId, userId), isNull(messages.receiverDeletedAt))
+          )
+        )
+      )
      .limit(1)
    if (!row) return null
    const nameMap = await resolveUserNames([row.senderId, row.receiverId])
@@ -155,16 +178,23 @@ export async function markMessageAsRead(id: string, userId: string): Promise<voi
 }

 export async function deleteMessage(id: string, userId: string): Promise<void> {
+  const now = new Date()
+  // 软删除：发送方删除设置 senderDeletedAt，接收方删除设置 receiverDeletedAt，互不影响
  await db
-    .delete(messages)
-    .where(and(eq(messages.id, id), or(eq(messages.senderId, userId), eq(messages.receiverId, userId))))
+    .update(messages)
+    .set({ senderDeletedAt: now })
+    .where(and(eq(messages.id, id), eq(messages.senderId, userId)))
+  await db
+    .update(messages)
+    .set({ receiverDeletedAt: now })
+    .where(and(eq(messages.id, id), eq(messages.receiverId, userId)))
 }

 export const getUnreadMessageCount = cache(async (userId: string): Promise<number> => {
  const [row] = await db
    .select({ value: count() })
    .from(messages)
-    .where(and(eq(messages.receiverId, userId), eq(messages.isRead, false)))
+    .where(and(eq(messages.receiverId, userId), eq(messages.isRead, false), isNull(messages.receiverDeletedAt)))
  return Number(row?.value ?? 0)
 })

--- a/src/modules/messaging/schema.ts
+++ b/src/modules/messaging/schema.ts
@@ -24,7 +24,7 @@ export const MessageIdSchema = z.object({

 export type MessageIdInput = z.infer<typeof MessageIdSchema>

-/** 校验通知偏好更新表单（8 个布尔字段，来自 checkbox FormData） */
+/** 校验通知偏好更新表单（8 个布尔字段 + 免打扰时段，来自 checkbox/FormData） */
 export const UpdateNotificationPreferencesSchema = z.object({
  emailEnabled: z.boolean(),
  smsEnabled: z.boolean(),
@@ -34,6 +34,9 @@ export const UpdateNotificationPreferencesSchema = z.object({
  announcementNotifications: z.boolean(),
  messageNotifications: z.boolean(),
  attendanceNotifications: z.boolean(),
+  quietHoursEnabled: z.boolean(),
+  quietHoursStart: z.string().trim().regex(/^([01]\d|2[0-3]):[0-5]\d$/, "Invalid time format").nullable().optional(),
+  quietHoursEnd: z.string().trim().regex(/^([01]\d|2[0-3]):[0-5]\d$/, "Invalid time format").nullable().optional(),
 })

 export type UpdateNotificationPreferencesFormInput = z.infer<
--- a/src/modules/messaging/types.ts
+++ b/src/modules/messaging/types.ts
@@ -33,6 +33,7 @@ export interface GetMessagesParams {
  type: MessageType
  page?: number
  pageSize?: number
+  keyword?: string
 }

 export interface CreateMessageInput {
--- a/src/modules/notifications/preferences.ts
+++ b/src/modules/notifications/preferences.ts
@@ -39,6 +39,9 @@ const mapRow = (
  announcementNotifications: row.announcementNotifications,
  messageNotifications: row.messageNotifications,
  attendanceNotifications: row.attendanceNotifications,
+  quietHoursEnabled: row.quietHoursEnabled,
+  quietHoursStart: row.quietHoursStart,
+  quietHoursEnd: row.quietHoursEnd,
  createdAt: toIso(row.createdAt),
  updatedAt: toIso(row.updatedAt),
 })
@@ -53,6 +56,9 @@ const DEFAULTS = {
  announcementNotifications: true,
  messageNotifications: true,
  attendanceNotifications: true,
+  quietHoursEnabled: false,
+  quietHoursStart: null,
+  quietHoursEnd: null,
 }

 /**
@@ -133,6 +139,9 @@ export async function upsertNotificationPreferences(
    if (input.announcementNotifications !== undefined) updateData.announcementNotifications = input.announcementNotifications
    if (input.messageNotifications !== undefined) updateData.messageNotifications = input.messageNotifications
    if (input.attendanceNotifications !== undefined) updateData.attendanceNotifications = input.attendanceNotifications
+    if (input.quietHoursEnabled !== undefined) updateData.quietHoursEnabled = input.quietHoursEnabled
+    if (input.quietHoursStart !== undefined) updateData.quietHoursStart = input.quietHoursStart
+    if (input.quietHoursEnd !== undefined) updateData.quietHoursEnd = input.quietHoursEnd

    if (Object.keys(updateData).length === 0) {
      return mapRow(existing)
@@ -165,6 +174,9 @@ export async function upsertNotificationPreferences(
      announcementNotifications: input.announcementNotifications ?? DEFAULTS.announcementNotifications,
      messageNotifications: input.messageNotifications ?? DEFAULTS.messageNotifications,
      attendanceNotifications: input.attendanceNotifications ?? DEFAULTS.attendanceNotifications,
+      quietHoursEnabled: input.quietHoursEnabled ?? DEFAULTS.quietHoursEnabled,
+      quietHoursStart: input.quietHoursStart ?? DEFAULTS.quietHoursStart,
+      quietHoursEnd: input.quietHoursEnd ?? DEFAULTS.quietHoursEnd,
    })

    const [created] = await db
--- a/src/modules/notifications/types.ts
+++ b/src/modules/notifications/types.ts
@@ -95,6 +95,9 @@ export interface NotificationPreferences {
  announcementNotifications: boolean
  messageNotifications: boolean
  attendanceNotifications: boolean
+  quietHoursEnabled: boolean
+  quietHoursStart: string | null
+  quietHoursEnd: string | null
  createdAt: string
  updatedAt: string
 }
@@ -109,6 +112,9 @@ export interface UpdateNotificationPreferencesInput {
  announcementNotifications?: boolean
  messageNotifications?: boolean
  attendanceNotifications?: boolean
+  quietHoursEnabled?: boolean
+  quietHoursStart?: string | null
+  quietHoursEnd?: string | null
 }

 /** SMS 渠道配置 */
--- a/src/modules/settings/components/notification-preferences-form.tsx
+++ b/src/modules/settings/components/notification-preferences-form.tsx
@@ -3,14 +3,16 @@
 import * as React from "react"
 import { useActionState } from "react"
 import { useFormStatus } from "react-dom"
-import { Loader2, Save, Bell, Mail, MessageSquare, Megaphone, GraduationCap, BookOpen, CalendarCheck } from "lucide-react"
+import { Loader2, Save, Bell, Mail, MessageSquare, Megaphone, GraduationCap, BookOpen, CalendarCheck, Moon } from "lucide-react"
 import { toast } from "sonner"

 import { Button } from "@/shared/components/ui/button"
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/shared/components/ui/card"
+import { Input } from "@/shared/components/ui/input"
 import { Switch } from "@/shared/components/ui/switch"
 import { Label } from "@/shared/components/ui/label"
 import { Separator } from "@/shared/components/ui/separator"
+import { cn } from "@/shared/lib/utils"
 import { updateNotificationPreferencesAction } from "@/modules/messaging/actions"
 import type { NotificationPreferences } from "@/modules/notifications/types"

@@ -131,6 +133,11 @@ export function NotificationPreferencesForm({ preferences }: NotificationPrefere
    messageNotifications: preferences.messageNotifications,
    attendanceNotifications: preferences.attendanceNotifications,
  })
+  const [quietHours, setQuietHours] = React.useState({
+    quietHoursEnabled: preferences.quietHoursEnabled,
+    quietHoursStart: preferences.quietHoursStart ?? "",
+    quietHoursEnd: preferences.quietHoursEnd ?? "",
+  })

  React.useEffect(() => {
    if (state?.success) {
@@ -148,6 +155,10 @@ export function NotificationPreferencesForm({ preferences }: NotificationPrefere
    setCategories((prev) => ({ ...prev, [key]: !prev[key] }))
  }

+  const toggleQuietHours = () => {
+    setQuietHours((prev) => ({ ...prev, quietHoursEnabled: !prev.quietHoursEnabled }))
+  }
+
  return (
    <Card>
      <CardHeader>
@@ -250,6 +261,80 @@ export function NotificationPreferencesForm({ preferences }: NotificationPrefere
              )
            })}
          </div>
+
+          <Separator />
+
+          {/* 免打扰时段 */}
+          <div className="space-y-4">
+            <div>
+              <h4 className="text-sm font-medium">Quiet Hours</h4>
+              <p className="text-xs text-muted-foreground">
+                Suppress non-urgent notifications during a specified time period each day.
+              </p>
+            </div>
+            <div className="flex items-center justify-between gap-4">
+              <div className="flex items-start gap-3">
+                <div className="flex h-9 w-9 items-center justify-center rounded-md bg-muted">
+                  <Moon className="h-4 w-4 text-muted-foreground" />
+                </div>
+                <div className="space-y-0.5">
+                  <Label htmlFor="quietHoursEnabled" className="text-sm font-medium cursor-pointer">
+                    Enable Quiet Hours
+                  </Label>
+                  <p className="text-xs text-muted-foreground">
+                    When enabled, only urgent notifications will be delivered during the specified hours.
+                  </p>
+                </div>
+              </div>
+              <div className="flex items-center gap-2">
+                <input
+                  type="checkbox"
+                  name="quietHoursEnabled"
+                  checked={quietHours.quietHoursEnabled}
+                  onChange={toggleQuietHours}
+                  className="sr-only"
+                  tabIndex={-1}
+                />
+                <Switch
+                  id="quietHoursEnabled"
+                  checked={quietHours.quietHoursEnabled}
+                  onCheckedChange={toggleQuietHours}
+                  aria-label="Enable Quiet Hours"
+                />
+              </div>
+            </div>
+            <div className={cn(
+              "grid gap-4 sm:grid-cols-2 transition-opacity",
+              !quietHours.quietHoursEnabled && "pointer-events-none opacity-50"
+            )}>
+              <div className="space-y-2">
+                <Label htmlFor="quietHoursStart" className="text-xs font-medium">
+                  Start Time
+                </Label>
+                <Input
+                  id="quietHoursStart"
+                  name="quietHoursStart"
+                  type="time"
+                  value={quietHours.quietHoursStart}
+                  onChange={(e) => setQuietHours((prev) => ({ ...prev, quietHoursStart: e.target.value }))}
+                  disabled={!quietHours.quietHoursEnabled}
+                />
+              </div>
+              <div className="space-y-2">
+                <Label htmlFor="quietHoursEnd" className="text-xs font-medium">
+                  End Time
+                </Label>
+                <Input
+                  id="quietHoursEnd"
+                  name="quietHoursEnd"
+                  type="time"
+                  value={quietHours.quietHoursEnd}
+                  onChange={(e) => setQuietHours((prev) => ({ ...prev, quietHoursEnd: e.target.value }))}
+                  disabled={!quietHours.quietHoursEnabled}
+                />
+              </div>
+            </div>
+          </div>
        </CardContent>
        <CardFooter className="flex justify-end border-t px-6 py-4">
          <SubmitButton />
--- a/src/modules/settings/components/parent-settings-view.tsx
+++ b/src/modules/settings/components/parent-settings-view.tsx
@@ -0,0 +1,65 @@
+"use client"
+
+import Link from "next/link"
+import { LayoutDashboard, GraduationCap, CalendarDays, ClipboardList } from "lucide-react"
+
+import { SettingsView } from "@/modules/settings/components/settings-view"
+import { Button } from "@/shared/components/ui/button"
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/shared/components/ui/card"
+import { UserProfile } from "@/modules/users/data-access"
+import type { NotificationPreferences } from "@/modules/notifications/types"
+
+interface ParentSettingsViewProps {
+  user: UserProfile
+  notificationPreferences: NotificationPreferences
+}
+
+export function ParentSettingsView({ user, notificationPreferences }: ParentSettingsViewProps) {
+  const generalExtra = (
+    <Card>
+      <CardHeader>
+        <CardTitle>Quick links</CardTitle>
+        <CardDescription>Common places you may want to visit.</CardDescription>
+      </CardHeader>
+      <CardContent className="flex flex-wrap gap-2">
+        <Button asChild variant="outline">
+          <Link href="/profile">Profile</Link>
+        </Button>
+        <Button asChild variant="outline" className="gap-2">
+          <Link href="/parent/dashboard">
+            <LayoutDashboard className="h-4 w-4" />
+            Dashboard
+          </Link>
+        </Button>
+        <Button asChild variant="outline" className="gap-2">
+          <Link href="/parent/children">
+            <GraduationCap className="h-4 w-4" />
+            Children
+          </Link>
+        </Button>
+        <Button asChild variant="outline" className="gap-2">
+          <Link href="/parent/grades">
+            <ClipboardList className="h-4 w-4" />
+            Grades
+          </Link>
+        </Button>
+        <Button asChild variant="outline" className="gap-2">
+          <Link href="/parent/attendance">
+            <CalendarDays className="h-4 w-4" />
+            Attendance
+          </Link>
+        </Button>
+      </CardContent>
+    </Card>
+  )
+
+  return (
+    <SettingsView
+      description="Manage your preferences and family account access."
+      backHref="/parent/dashboard"
+      user={user}
+      notificationPreferences={notificationPreferences}
+      generalExtra={generalExtra}
+    />
+  )
+}
--- a/src/modules/settings/components/password-change-form.tsx
+++ b/src/modules/settings/components/password-change-form.tsx
@@ -18,10 +18,10 @@ import {
 } from "@/shared/lib/password-policy"
 import type { ActionState } from "@/shared/types/action-state"

-const STRENGTH_META: Record<PasswordStrength, { value: number; label: string; barClass: string }> = {
-  weak: { value: 33, label: "Weak", barClass: "h-2 [&>div]:bg-red-500" },
-  medium: { value: 66, label: "Medium", barClass: "h-2 [&>div]:bg-yellow-500" },
-  strong: { value: 100, label: "Strong", barClass: "h-2 [&>div]:bg-green-500" },
+const STRENGTH_META: Record<PasswordStrength, { value: number; label: string; barClassName: string; indicatorClassName: string }> = {
+  weak: { value: 33, label: "Weak", barClassName: "h-2", indicatorClassName: "bg-red-500" },
+  medium: { value: 66, label: "Medium", barClassName: "h-2", indicatorClassName: "bg-yellow-500" },
+  strong: { value: 100, label: "Strong", barClassName: "h-2", indicatorClassName: "bg-green-500" },
 }

 function SubmitButton() {
@@ -130,7 +130,7 @@ export function PasswordChangeForm() {
                  <span className="text-muted-foreground">Password strength</span>
                  <span className="font-medium">{meta.label}</span>
                </div>
-                <Progress value={meta.value} className={meta.barClass} />
+                <Progress value={meta.value} className={meta.barClassName} indicatorClassName={meta.indicatorClassName} />
              </div>
            )}
          </div>
--- a/src/modules/settings/components/settings-view.tsx
+++ b/src/modules/settings/components/settings-view.tsx
@@ -1,19 +1,34 @@
 "use client"

 import Link from "next/link"
-import type { ReactNode } from "react"
-import { User, Palette, Lock, Bell } from "lucide-react"
+import { useRouter, useSearchParams } from "next/navigation"
+import { Suspense, type ReactNode } from "react"
+import { User, Palette, Lock, Bell, Sparkles } from "lucide-react"
 import { signOut } from "next-auth/react"

 import { ThemePreferencesCard } from "@/modules/settings/components/theme-preferences-card"
 import { ProfileSettingsForm } from "@/modules/settings/components/profile-settings-form"
 import { PasswordChangeForm } from "@/modules/settings/components/password-change-form"
 import { NotificationPreferencesForm } from "@/modules/settings/components/notification-preferences-form"
+import { AiProviderSettingsCard } from "@/modules/settings/components/ai-provider-settings-card"
 import { Button } from "@/shared/components/ui/button"
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/shared/components/ui/card"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/shared/components/ui/tabs"
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@/shared/components/ui/alert-dialog"
 import { UserProfile } from "@/modules/users/data-access"
 import type { NotificationPreferences } from "@/modules/notifications/types"
+import { usePermission } from "@/shared/hooks/use-permission"
+import { Permissions } from "@/shared/types/permissions"

 interface SettingsViewProps {
  /** 页面副标题描述 */
@@ -28,24 +43,52 @@ interface SettingsViewProps {
  generalExtra?: ReactNode
 }

+const VALID_TABS = ["general", "notifications", "appearance", "security", "ai"] as const
+type TabValue = (typeof VALID_TABS)[number]
+
+function isTabValue(value: string | null): value is TabValue {
+  return value !== null && (VALID_TABS as readonly string[]).includes(value)
+}
+
 /**
 * 统一设置页视图
 *
- * 消除 admin / teacher / student 三个设置视图的重复布局：
+ * 消除 admin / teacher / student / parent 四个设置视图的重复布局：
 * - 相同的页面头部（标题 + 描述 + 返回按钮）
- * - 相同的 4 个标签页（General / Notifications / Appearance / Security）
+ * - 相同的标签页（General / Notifications / Appearance / Security / AI）
 * - 相同的 Notifications / Appearance / Security 标签页内容
 * - 相同的 Session 卡片（登出）
 *
 * 角色差异通过 `description`、`backHref` 和 `generalExtra` 三个 props 注入。
+ * 当前激活的标签页通过 URL `?tab=` 参数持久化。
 */
-export function SettingsView({
+function SettingsViewInner({
  description,
  backHref,
  user,
  notificationPreferences,
  generalExtra,
 }: SettingsViewProps) {
+  const router = useRouter()
+  const searchParams = useSearchParams()
+  const { hasPermission } = usePermission()
+
+  const tabParam = searchParams.get("tab")
+  const activeTab: TabValue = isTabValue(tabParam) ? tabParam : "general"
+
+  const handleTabChange = (value: string) => {
+    const params = new URLSearchParams(searchParams.toString())
+    if (value === "general") {
+      params.delete("tab")
+    } else {
+      params.set("tab", value)
+    }
+    const query = params.toString()
+    router.push(query ? `?${query}` : "?", { scroll: false })
+  }
+
+  const canConfigureAi = hasPermission(Permissions.AI_CONFIGURE)
+
  return (
    <div className="flex h-full flex-col gap-8 p-8">
      <div className="flex flex-col justify-between gap-4 md:flex-row md:items-center">
@@ -60,7 +103,7 @@ export function SettingsView({
        </div>
      </div>

-      <Tabs defaultValue="general" className="w-full">
+      <Tabs value={activeTab} onValueChange={handleTabChange} className="w-full">
        <TabsList className="w-full justify-start">
          <TabsTrigger value="general" className="gap-2">
            <User className="h-4 w-4" />
@@ -78,6 +121,12 @@ export function SettingsView({
            <Lock className="h-4 w-4" />
            Security
          </TabsTrigger>
+          {canConfigureAi ? (
+            <TabsTrigger value="ai" className="gap-2">
+              <Sparkles className="h-4 w-4" />
+              AI
+            </TabsTrigger>
+          ) : null}
        </TabsList>

        <TabsContent value="general" className="mt-6 space-y-6">
@@ -105,13 +154,43 @@ export function SettingsView({
                <div className="text-sm font-medium">Sign out</div>
                <div className="text-sm text-muted-foreground">Return to the login screen.</div>
              </div>
-              <Button variant="outline" onClick={() => signOut({ callbackUrl: "/login" })}>
-                Log out
-              </Button>
+              <AlertDialog>
+                <AlertDialogTrigger asChild>
+                  <Button variant="outline">Log out</Button>
+                </AlertDialogTrigger>
+                <AlertDialogContent>
+                  <AlertDialogHeader>
+                    <AlertDialogTitle>Confirm sign out</AlertDialogTitle>
+                    <AlertDialogDescription>
+                      Are you sure you want to sign out? You will be returned to the login screen.
+                    </AlertDialogDescription>
+                  </AlertDialogHeader>
+                  <AlertDialogFooter>
+                    <AlertDialogCancel>Cancel</AlertDialogCancel>
+                    <AlertDialogAction onClick={() => signOut({ callbackUrl: "/login" })}>
+                      Sign out
+                    </AlertDialogAction>
+                  </AlertDialogFooter>
+                </AlertDialogContent>
+              </AlertDialog>
            </CardContent>
          </Card>
        </TabsContent>
+
+        {canConfigureAi ? (
+          <TabsContent value="ai" className="mt-6 space-y-6">
+            <AiProviderSettingsCard />
+          </TabsContent>
+        ) : null}
      </Tabs>
    </div>
  )
 }
+
+export function SettingsView(props: SettingsViewProps) {
+  return (
+    <Suspense fallback={null}>
+      <SettingsViewInner {...props} />
+    </Suspense>
+  )
+}