diff --git a/.env.example b/.env.example
index 93d1691..ede6073 100644
--- a/.env.example
+++ b/.env.example
@@ -12,4 +12,6 @@ NEXT_PUBLIC_CLERK_AFTER_SIGN_OUT_URL=/sign-in
 
 # Cloudinary
 NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME=your_cloud_name
-NEXT_PUBLIC_CLOUDINARY_API_KEY=your_api_key
\ No newline at end of file
+CLOUDINARY_API_KEY=your_api_key
+CLOUDINARY_API_SECRET=your_api_secret
+CRON_SECRET=your_api_secret
\ No newline at end of file
diff --git a/README.md b/README.md
index 4eb67d7..1e05ced 100644
--- a/README.md
+++ b/README.md
@@ -1,60 +1,150 @@
 # Academix
 
-**Academix** is a full-stack school management and assessment platform designed to centralize academic workflows such as attendance tracking, scheduling, assessments, and grading.
+Academix is a modern **School Management and Assessment System** designed to streamline academic operations and improve collaboration between administrators, teachers, students, and parents. It provides a centralized platform for managing users, classes, assessments, attendance, communication, and academic performance through dedicated role-based portals.
+
+<p align="center">
+  <img src="./assets/hero-dashboard.png" alt="Academix Dashboard" width="100%">
+</p>
+
+---
+
+## 🚀 Live Demo
+
+🔗 https://academix-edu.vercel.app
 
 ---
 
-## Overview
+## ✨ Features
+
+### Administration
+
+- Manage students, teachers, parents, and classes
+- Organize academic years, subjects, and schedules
+- School-wide analytics and reporting
+- User and role management
+
+### Teachers
+
+- Create and manage assignments
+- Create and manage online examinations
+- Record attendance
+- Grade submissions
+- Publish results
+- Manage announcements
 
-Academix is a web-based system that helps educational institutions manage academic operations through a centralized platform.
+### Students
 
-The system provides role-based access for administrators, teachers, and students, enabling structured and transparent interaction with academic processes.
+- Access assignments and online exams
+- Submit coursework
+- View grades and academic performance
+- Access schedules and announcements
+
+### Parents
+
+- Monitor student progress
+- Track attendance records
+- View grades
+- Stay updated with school announcements
+
+### Assessment System
+
+- Multiple Choice Questions
+- True / False Questions
+- Text Answer Questions
+- File Upload Questions
+- Automatic Grading
+- Manual Review
+- AI-Assisted Evaluation
+- Performance Tracking
 
 ---
 
-## Tech Stack
+## 👥 User Roles
 
-- Next.js (App Router)
-- React
-- TypeScript
-- Tailwind CSS
-- Prisma ORM
-- PostgreSQL
-- Docker
+- 👨‍💼 Administrator
+- 👨‍🏫 Teacher
+- 🎓 Student
+- 👨‍👩‍👧 Parent
 
 ---
 
-## Core Features
+## 🛠️ Tech Stack
+
+- **Frontend:** Next.js, React, TypeScript
+- **Styling:** Tailwind CSS
+- **Backend:** Next.js Server Actions
+- **Database:** PostgreSQL, Prisma ORM
+- **Authentication:** Clerk
+- **Forms & Validation:** React Hook Form, Zod
+- **Internationalization:** next-intl
+- **AI Integration:** Google Gemini API
+- **File Storage:** Cloudinary
+- **Email:** Nodemailer
+- **Data Visualization:** Recharts
+- **Scheduling:** React Big Calendar
+- **Deployment:** Vercel
 
-- Role-based dashboards (Admin, Teacher, Student)
-- Student and class management
-- Attendance tracking
-- Exams and assignments management
-- Grade and results system
-- Scheduling and notifications
+---
+
+## 📸 Screenshots
+
+### Admin & Student Portals
+
+<p align="center">
+  <img src="./assets/admin-dashboard.png" alt="Admin Dashboard" width="49%">
+  <img src="./assets/student-dashboard.png" alt="Student Dashboard" width="49%">
+</p>
+
+Dedicated dashboards tailored to each role, providing quick access to courses, assignments, examinations, grades, and classroom management tools.
+
+---
+
+### Assessment System
+
+<p align="center">
+  <img src="./assets/assessment-management.png" alt="Assessment Management" width="49%">
+  <img src="./assets/online-exam.png" alt="Online Examination" width="49%">
+</p>
+
+Manage assessments, create online exams, and review student submissions through a streamlined workflow.
+
+---
+
+### Subject Virtual Classroom
+
+<p align="center">
+  <img src="./assets/virtual-classroom.png" alt="Subject Virtual Classroom" width="100%">
+</p>
+
+A dedicated workspace for each subject where teachers and students can collaborate through announcements, assignments, learning materials, examinations, and discussions.
 
 ---
 
-## Getting Started
+### AI-Assisted Evaluation
+
+<p align="center">
+  <img src="./assets/ai-evaluation.jpeg" alt="AI-Assisted Evaluation" width="100%">
+</p>
 
-### 1. Clone the repository
+Teachers can leverage AI-generated grading suggestions and feedback for written responses while maintaining full control over the final evaluation.
+
+---
 
-```bash
-git clone https://github.com/academix-platform/academix.git
-cd academix
-2. Setup environment variables
-cp .env.example .env
-3. Start the database
-docker compose up -d
-4. Install dependencies
-npm install
-5. Setup the database
-npx prisma db push
-npx prisma db seed
-6. Run the app
-npm run dev
+## 🌟 Project Highlights
+
+- Multi-tenant school architecture
+- Role-based authentication and authorization
+- Complete online examination workflow
+- Assignment management
+- Attendance tracking
+- AI-assisted assessment evaluation
+- Academic performance analytics
+- Responsive design
+- Secure file uploads
+- Modern and intuitive user interface
+
+---
 
-App runs at:
+## 📄 License
 
-http://localhost:3000
-```
+This project is intended for educational and demonstration purposes.
diff --git a/assets/admin-dashboard.png b/assets/admin-dashboard.png
new file mode 100644
index 0000000..4113c88
Binary files /dev/null and b/assets/admin-dashboard.png differ
diff --git a/assets/ai-evaluation.jpeg b/assets/ai-evaluation.jpeg
new file mode 100644
index 0000000..d5d8b37
Binary files /dev/null and b/assets/ai-evaluation.jpeg differ
diff --git a/assets/assessment-management.png b/assets/assessment-management.png
new file mode 100644
index 0000000..e3e6907
Binary files /dev/null and b/assets/assessment-management.png differ
diff --git a/assets/hero-dashboard.png b/assets/hero-dashboard.png
new file mode 100644
index 0000000..68d1a1f
Binary files /dev/null and b/assets/hero-dashboard.png differ
diff --git a/assets/image.png b/assets/image.png
new file mode 100644
index 0000000..a10e97c
Binary files /dev/null and b/assets/image.png differ
diff --git a/assets/online-exam.png b/assets/online-exam.png
new file mode 100644
index 0000000..3ea5947
Binary files /dev/null and b/assets/online-exam.png differ
diff --git a/assets/student-dashboard.png b/assets/student-dashboard.png
new file mode 100644
index 0000000..8409f6d
Binary files /dev/null and b/assets/student-dashboard.png differ
diff --git a/assets/virtual-classroom.png b/assets/virtual-classroom.png
new file mode 100644
index 0000000..67369b9
Binary files /dev/null and b/assets/virtual-classroom.png differ
diff --git a/docker-compose.yml b/docker-compose.yml
index 7b92ba5..383a6db 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,6 @@ services:
     image: postgres:15
     container_name: postgres
     restart: always
-
     environment:
       POSTGRES_USER: dev
       POSTGRES_PASSWORD: dev123
diff --git a/messages/ar.json b/messages/ar.json
new file mode 100644
index 0000000..a0af475
--- /dev/null
+++ b/messages/ar.json
@@ -0,0 +1,1451 @@
+{
+  "common": {
+    "brand": "أكاديميكس",
+    "dashboard": "لوحة التحكم",
+    "search": "بحث..."
+  },
+  "states": {
+    "loading": "جار التحميل...",
+    "errorTitle": "حدث خطأ ما",
+    "errorDescription": "تعذر تحميل هذا المحتوى. يرجى المحاولة مرة أخرى.",
+    "tryAgain": "حاول مرة أخرى",
+    "retrying": "جار إعادة المحاولة...",
+    "applicationErrorTitle": "خطأ في التطبيق",
+    "applicationErrorDescription": "حدث خطأ غير متوقع أثناء تحميل التطبيق.",
+    "pageErrorTitle": "تعذر تحميل هذه الصفحة",
+    "pageErrorDescription": "يرجى التحديث أو المحاولة مرة أخرى.",
+    "unauthorizedTitle": "وصول غير مصرح",
+    "unauthorizedDescription": "ليس لديك صلاحية للوصول إلى هذه الصفحة بدورك الحالي أو حالة حسابك.",
+    "noDataYet": "لا توجد بيانات بعد",
+    "academicYearNotStarted": "لم تبدأ السنة الأكاديمية بعد.",
+    "noCurrentYear": "لم يتم اختيار سنة حالية",
+    "selectCurrentYear": "اختر سنة أكاديمية حالية لعرض البيانات.",
+    "goToSettings": "الانتقال إلى الإعدادات",
+    "noStudentsLinked": "لم يتم العثور على طلاب",
+    "noStudentsLinkedDescription": "لا يوجد طلاب مرتبطون بحساب ولي الأمر هذا بعد.",
+    "noClassAssigned": "لا يوجد صف معين",
+    "selectedStudentNoClass": "الطالب المحدد غير معين إلى صف بعد."
+  },
+  "sidebar": {
+    "sections": {
+      "main": "القائمة",
+      "other": "أخرى"
+    },
+    "items": {
+      "dashboard": "لوحة التحكم",
+      "schools": "المدارس",
+      "teachers": "المعلمون",
+      "students": "الطلاب",
+      "parents": "أولياء الأمور",
+      "subjects": "المواد",
+      "classes": "الصفوف",
+      "grades": "المراحل",
+      "schedules": "الجداول",
+      "exams": "الامتحانات",
+      "assignments": "الواجبات",
+      "results": "النتائج",
+      "attendance": "الحضور",
+      "events": "الأحداث",
+      "messages": "الرسائل",
+      "announcements": "الإعلانات",
+      "notifications": "الإشعارات",
+      "archive": "الأرشيف",
+      "feedback": "الملاحظات",
+      "feedbacks": "الملاحظات",
+      "profile": "الملف الشخصي",
+      "settings": "الإعدادات",
+      "logout": "تسجيل الخروج",
+      "finalResults": "المعدلات النهائية"
+    }
+  },
+  "navbar": {
+    "openMenu": "فتح القائمة",
+    "closeMenu": "إغلاق القائمة",
+    "expandMenu": "توسيع القائمة",
+    "collapseMenu": "طي القائمة",
+    "messages": "الرسائل",
+    "userFallback": "مستخدم",
+    "language": {
+      "label": "اللغة",
+      "en": "English",
+      "ar": "العربية"
+    },
+    "userMenu": {
+      "open": "فتح قائمة المستخدم",
+      "avatarAlt": "صورة المستخدم",
+      "noRole": "لا يوجد دور"
+    },
+    "notifications": {
+      "label": "الإشعارات",
+      "newCount": "{count} جديد",
+      "markAllRead": "تعليم الكل كمقروء",
+      "allRead": "الكل مقروء",
+      "empty": "لا توجد إشعارات بعد",
+      "viewAll": "عرض كل الإشعارات",
+      "close": "إغلاق"
+    }
+  },
+  "home": {
+    "nav": {
+      "home": "الرئيسية",
+      "about": "عن المنصة",
+      "features": "المزايا",
+      "users": "المستخدمون",
+      "howItWorks": "كيف تعمل",
+      "signIn": "تسجيل الدخول",
+      "signUp": "إنشاء حساب",
+      "openMenu": "فتح القائمة",
+      "closeMenu": "إغلاق القائمة"
+    },
+    "hero": {
+      "badge": "الآن مع مزايا الذكاء الاصطناعي الجديدة",
+      "title": "مرحبا بك في أكاديميكس",
+      "highlight": "أكاديميكس",
+      "description": "منصة حديثة لإدارة المدارس صممت لتبسيط سير العمل الأكاديمي للمديرين والمعلمين والطلاب وأولياء الأمور.",
+      "signIn": "تسجيل الدخول",
+      "signUp": "إنشاء حساب"
+    },
+    "about": {
+      "title": "عن أكاديميكس",
+      "description": "يربط أكاديميكس كل أجزاء الإدارة المدرسية في نظام موحد، من التسجيل والحضور إلى التقييمات والدرجات والتواصل.",
+      "highlights": {
+        "multilingual": {
+          "title": "دعم متعدد اللغات",
+          "description": "محسن للإنجليزية والعربية مع تخطيطات مناسبة لاتجاه RTL ومحتوى مترجم."
+        },
+        "roleAccess": {
+          "title": "وصول حسب الدور",
+          "description": "لوحات آمنة وصلاحيات مخصصة لمديري المدارس والمعلمين والطلاب وأولياء الأمور."
+        },
+        "insights": {
+          "title": "رؤى فورية",
+          "description": "تابع الأداء والحضور والتفاعل من خلال لوحات مباشرة وتصدير البيانات."
+        }
+      }
+    },
+    "features": {
+      "title": "المزايا الرئيسية",
+      "description": "كل ما تحتاجه مؤسستك لتعمل بذكاء أكبر كل يوم.",
+      "items": {
+        "students": {
+          "title": "إدارة الطلاب",
+          "description": "نظم ملفات الطلاب وسجل التسجيل والبيانات الأكاديمية في مكان واحد."
+        },
+        "courses": {
+          "title": "إدارة المواد",
+          "description": "خطط المواد، وعيّن المعلمين، ونظم جداول الصفوف لكل مرحلة."
+        },
+        "assessments": {
+          "title": "التقييمات",
+          "description": "أنشئ الواجبات والامتحانات، ثم تابع التسليمات والتقييم."
+        },
+        "attendance": {
+          "title": "تتبع الحضور",
+          "description": "حوّل الحضور اليومي إلى نظام رقمي مع ملخصات وتقارير عملية."
+        },
+        "reports": {
+          "title": "الدرجات والتقارير",
+          "description": "أنشئ كشوف العلامات والتحليلات لدعم قرارات أكاديمية أفضل."
+        },
+        "learning": {
+          "title": "مساحة تعلم افتراضية",
+          "description": "شارك الموارد والإعلانات ومحتوى المواد ضمن تجربة موحدة للطلاب."
+        }
+      }
+    },
+    "roles": {
+      "title": "مصمم لكل دور",
+      "description": "تجارب مخصصة للمديرين والمعلمين والطلاب.",
+      "items": {
+        "administrator": {
+          "title": "المدير",
+          "description": "أدر المعلمين والصفوف والمواد والعمليات المدرسية من لوحة واحدة.",
+          "actions": {
+            "users": "إدارة جميع المستخدمين",
+            "settings": "ضبط إعدادات المدرسة",
+            "reports": "إنشاء التقارير",
+            "operations": "متابعة العمليات"
+          }
+        },
+        "teacher": {
+          "title": "المعلم",
+          "description": "خطط الدروس، وأنشئ التقييمات، وتابع التسليمات وتقدم الصف.",
+          "actions": {
+            "assessments": "إنشاء التقييمات",
+            "attendance": "تسجيل الحضور",
+            "grading": "تقييم التسليمات",
+            "resources": "إدارة موارد الصف"
+          }
+        },
+        "student": {
+          "title": "الطالب",
+          "description": "ادخل إلى المواد، وأكمل الواجبات، وتابع الدرجات والإعلانات.",
+          "actions": {
+            "courses": "عرض المواد المسجلة",
+            "assignments": "تسليم الواجبات",
+            "grades": "متابعة الدرجات",
+            "attendance": "مراجعة الحضور"
+          }
+        }
+      }
+    },
+    "howItWorks": {
+      "title": "كيف تعمل",
+      "description": "ابدأ مساحة مدرستك بخطوات موجهة قليلة.",
+      "steps": {
+        "account": {
+          "title": "إنشاء حساب",
+          "description": "سجل مدرستك وادع فريقك خلال دقائق."
+        },
+        "setup": {
+          "title": "إعداد المدرسة",
+          "description": "اضبط الصفوف والمواد والأدوار والفترات الأكاديمية."
+        },
+        "operations": {
+          "title": "تشغيل العمليات",
+          "description": "أدر الحضور والامتحانات والتواصل وسير العمل اليومي."
+        },
+        "outcomes": {
+          "title": "تحسين النتائج",
+          "description": "استخدم التقارير والتحليلات لاتخاذ قرارات أذكى."
+        }
+      }
+    },
+    "cta": {
+      "title": "هل أنت جاهز لتطوير مدرستك؟",
+      "description": "انضم إلى أكاديميكس وبسّط عمليات المدرسة بمنصة واحدة للتعلم والتقييم والإدارة.",
+      "button": "ابدأ مجانا"
+    },
+    "footer": {
+      "copyright": "© 2026 أكاديميكس. جميع الحقوق محفوظة."
+    }
+  },
+  "roles": {
+    "admin": "مدير",
+    "teacher": "معلم",
+    "student": "طالب",
+    "parent": "ولي أمر",
+    "superAdmin": "مدير عام"
+  },
+  "actions": {
+    "add": "إضافة",
+    "create": "إنشاء",
+    "update": "تعديل",
+    "edit": "تعديل",
+    "delete": "حذف",
+    "deleting": "جار الحذف...",
+    "saving": "جار الحفظ...",
+    "uploading": "جار الرفع...",
+    "adding": "جار الإضافة...",
+    "creating": "جار الإنشاء...",
+    "updating": "جار التحديث...",
+    "close": "إغلاق",
+    "yes": "نعم",
+    "no": "لا",
+    "somethingWentWrong": "حدث خطأ ما!",
+    "deleteConfirmation": "سيتم فقدان جميع البيانات. هل أنت متأكد من حذف {entity}؟",
+    "deleteSuccess": "تم حذف {entity} بنجاح",
+    "exportCsv": "تصدير CSV",
+    "filter": "تصفية",
+    "sort": "ترتيب",
+    "apply": "تطبيق",
+    "clear": "مسح",
+    "markAllRead": "تعليم الكل كمقروء",
+    "deleteAll": "حذف الكل",
+    "signOut": "تسجيل الخروج",
+    "signingOut": "جار تسجيل الخروج...",
+    "formNotFound": "لم يتم العثور على النموذج!"
+  },
+  "tables": {
+    "grade": "المرحلة",
+    "subject": "المادة",
+    "class": "الصف",
+    "teacher": "المعلم",
+    "student": "الطالب",
+    "parent": "ولي الأمر",
+    "exam": "الامتحان",
+    "assignment": "الواجب",
+    "result": "النتيجة",
+    "lesson": "الحصة",
+    "attendance": "الحضور",
+    "event": "الحدث",
+    "announcement": "الإعلان",
+    "message": "الرسالة"
+  },
+  "tableHeaders": {
+    "info": "المعلومات",
+    "studentId": "معرف الطالب",
+    "student": "الطالب",
+    "teacherId": "معرف المعلم",
+    "parent": "ولي الأمر",
+    "studentNames": "أسماء الطلاب",
+    "title": "العنوان",
+    "content": "المحتوى",
+    "subject": "المادة",
+    "subjects": "المواد",
+    "class": "الصف",
+    "classes": "الصفوف",
+    "className": "اسم الصف",
+    "grade": "المرحلة",
+    "gradeLevel": "مستوى المرحلة",
+    "teacher": "المعلم",
+    "phone": "الهاتف",
+    "address": "العنوان",
+    "actions": "الإجراءات",
+    "submission": "التسليم",
+    "score": "الدرجة",
+    "endDate": "تاريخ الانتهاء",
+    "startTime": "وقت البدء",
+    "endTime": "وقت الانتهاء",
+    "status": "الحالة",
+    "date": "التاريخ",
+    "time": "الوقت",
+    "sentTo": "مرسل إلى",
+    "assessment": "التقييم",
+    "capacity": "السعة",
+    "supervisor": "المشرف",
+    "school": "المدرسة",
+    "adminUsername": "اسم مستخدم المدير",
+    "pauseReason": "سبب الإيقاف",
+    "file": "الملف",
+    "submitted": "تم التسليم",
+    "submittedAt": "وقت التسليم",
+    "name": "الاسم",
+    "username": "اسم المستخدم",
+    "email": "البريد الإلكتروني",
+    "statusValue": "الحالة / القيمة",
+    "range": "النطاق",
+    "current": "الحالي",
+    "type": "النوع",
+    "assessmentCount": "التقييمات",
+    "averageScore": "المعدل %",
+    "finalGrade": "الدرجة النهائية"
+  },
+  "filters": {
+    "all": "الكل",
+    "allClasses": "كل الصفوف",
+    "allGrades": "كل المراحل",
+    "allSubjects": "كل المواد",
+    "gradeLevel": "المرحلة {level}",
+    "dataType": "نوع البيانات",
+    "academicYear": "السنة الأكاديمية",
+    "status": "الحالة",
+    "repeatedTimes": "مرات الإعادة",
+    "regular": "منتظم",
+    "repeated": "معاد",
+    "graduated": "متخرج",
+    "left": "منسحب",
+    "time": "مرة",
+    "times": "مرات",
+    "pending": "قيد الانتظار",
+    "reviewed": "تمت المراجعة",
+    "resolved": "تم الحل",
+    "suggestions": "اقتراحات",
+    "complaints": "شكاوى",
+    "active": "نشط",
+    "paused": "موقوف",
+    "students": "الطلاب",
+    "teachers": "المعلمون",
+    "parents": "أولياء الأمور",
+    "exams": "الامتحانات",
+    "assignments": "الواجبات",
+    "results": "النتائج",
+    "attendance": "الحضور",
+    "subjects": "المواد",
+    "classes": "الصفوف",
+    "grades": "المراحل",
+    "announcements": "الإعلانات",
+    "events": "الأحداث",
+    "messages": "الرسائل",
+    "feedback": "الملاحظات",
+    "allTypes": "كل الأنواع",
+    "assignmentUpdates": "تحديثات الواجبات",
+    "gradeUpdates": "تحديثات الدرجات",
+    "schedule": "الجدول",
+    "supervisor": "المشرف",
+    "newest": "الأحدث",
+    "oldest": "الأقدم",
+    "searchStudent": "بحث عن طالب..."
+  },
+  "attendance": {
+    "filter": "تصفية",
+    "present": "حاضر",
+    "absent": "غائب",
+    "save": "حفظ الحضور",
+    "saved": "تم حفظ الحضور",
+    "noRecordsPage": "لا توجد سجلات في هذه الصفحة",
+    "noScopeFound": "لم يتم العثور على {scope}",
+    "noRecordsDate": "لا توجد سجلات حضور للتاريخ المحدد.",
+    "tryAnotherPage": "جرّب الانتقال إلى صفحة أخرى.",
+    "noClassesAssigned": "لا توجد صفوف معينة",
+    "noClassesAssignedDescription": "لم يتم تعيينك للإشراف على أي صف بعد.",
+    "dateOutsideAcademicYear": "هذا التاريخ خارج نطاق السنة الأكاديمية الحالية ({start} إلى {end})."
+  },
+  "archivePage": {
+    "previewData": "معاينة البيانات",
+    "unknownStudent": "طالب غير معروف",
+    "present": "حاضر",
+    "absent": "غائب",
+    "noData": "لا توجد بيانات",
+    "showMore": "عرض المزيد"
+  },
+  "feedbackPage": {
+    "pendingCount": "{count} قيد الانتظار",
+    "shownCount": "{count} معروض",
+    "noFeedbacks": "لم يتم العثور على ملاحظات.",
+    "resolvedLocked": "تم حل هذه الملاحظة وهي مقفلة.",
+    "markReviewed": "تعليم كمراجع",
+    "markResolved": "تعليم كمحلول",
+    "markPending": "تعليم كقيد الانتظار",
+    "historyTitle": "سجل ملاحظاتي",
+    "historyDescription": "تابع اقتراحاتك وشكاويك السابقة.",
+    "submittedCount": "{count} مرسلة",
+    "emptyHistory": "لم ترسل أي ملاحظات بعد.",
+    "submit": "إرسال ملاحظة",
+    "description": "أرسل اقتراحا أو شكوى إلى إدارة المدرسة.",
+    "type": "النوع",
+    "message": "الرسالة",
+    "messagePlaceholder": "اكتب رسالتك...",
+    "cancel": "إلغاء",
+    "send": "إرسال الملاحظة",
+    "sending": "جار الإرسال...",
+    "close": "إغلاق",
+    "unauthorized": "غير مصرح",
+    "unexpectedError": "حدث خطأ ما!",
+    "types": {
+      "suggestion": "اقتراح",
+      "complaint": "شكوى"
+    },
+    "statuses": {
+      "pending": "قيد الانتظار",
+      "reviewed": "تمت المراجعة",
+      "resolved": "تم الحل"
+    }
+  },
+  "examList": {
+    "addExam": "إضافة امتحان",
+    "submissions": "التسليمات",
+    "takeExam": "بدء الامتحان",
+    "continue": "متابعة",
+    "editWorkflow": "تعديل مسار الامتحان",
+    "noExams": "لم يتم العثور على امتحانات",
+    "emptyDescription": "جرّب تغيير عوامل التصفية أو كلمات البحث.",
+    "readyToStart": "هل أنت جاهز للبدء؟",
+    "instructions": "التعليمات",
+    "noInstructions": "لم تتم إضافة تعليمات خاصة لهذا الامتحان.",
+    "continueNotice": "عند المتابعة سيتم فتح جلسة الامتحان.",
+    "cancel": "إلغاء",
+    "startExam": "ابدأ الامتحان",
+    "starting": "جار البدء...",
+    "close": "إغلاق",
+    "statuses": {
+      "notStarted": "لم يبدأ",
+      "inProgress": "قيد التنفيذ",
+      "submitted": "تم التسليم",
+      "graded": "تم التقييم",
+      "published": "منشور"
+    }
+  },
+  "examTaking": {
+    "pageLabel": "صفحة {current} من {total}",
+    "submitExam": "تسليم الامتحان",
+    "submitting": "جار التسليم...",
+    "saving": "جار الحفظ...",
+    "saved": "تم الحفظ",
+    "error": "خطأ",
+    "point": "{count} نقطة",
+    "fileUpload": "رفع ملف",
+    "previous": "السابق",
+    "next": "التالي",
+    "confirmEyebrow": "تسليم الامتحان",
+    "confirmTitle": "هل أنت متأكد؟",
+    "confirmBody": "بعد التسليم لن تتمكن من تعديل إجاباتك لهذا الامتحان.",
+    "confirmNotice": "سيتم تسليم إجاباتك المحفوظة للتقييم.",
+    "cancel": "إلغاء",
+    "close": "إغلاق",
+    "true": "صحيح",
+    "false": "خطأ",
+    "multiAnswerHint": "يمكنك اختيار أكثر من إجابة.",
+    "textPlaceholder": "اكتب إجابتك هنا...",
+    "toast": {
+      "saveFailed": "فشل حفظ الإجابة.",
+      "previousDisabled": "التنقل إلى الصفحات السابقة معطل.",
+      "answerBeforeProceeding": "يرجى الإجابة عن جميع الأسئلة في هذه الصفحة قبل المتابعة.",
+      "answerBeforeSubmitting": "يرجى الإجابة عن جميع الأسئلة في هذه الصفحة قبل التسليم.",
+      "submitted": "تم تسليم الامتحان بنجاح!",
+      "timeUp": "انتهى وقت الامتحان! جار التسليم التلقائي..."
+    },
+    "uploading": "جار الرفع... {progress}%",
+    "uploadFailed": "فشل الرفع",
+    "failedToUpload": "فشل رفع \"{fileName}\"",
+    "tryAgain": "حاول مرة أخرى",
+    "metadataSaveFailed": "فشل حفظ بيانات الملف. تم حفظ ملفك محليا وستتم إعادة المحاولة.",
+    "removeFileFailed": "فشل إزالة الملف.",
+    "accepted": "المقبول:",
+    "maxSize": "الحجم الأقصى:",
+    "chooseFile": "اختر ملفا",
+    "replace": "استبدال",
+    "remove": "إزالة",
+    "removingFile": "جار إزالة الملف...",
+    "identicalFileConfirm": "يبدو أن هذا الملف مطابق للملف الحالي. هل تريد استبداله على أي حال؟",
+    "fileTypeBlocked": "نوع الملف \".{extension}\" غير مسموح.",
+    "allowedFilesOnly": "يسمح فقط بملفات {extensions}.",
+    "minFileSize": "يجب ألا يقل حجم الملف عن {size} MB.",
+    "maxFileSize": "يتجاوز حجم الملف الحد الأقصى {size} MB."
+  },
+  "directMessage": {
+    "titleMessageRequired": "العنوان والرسالة مطلوبان",
+    "sendFailed": "فشل إرسال الرسالة",
+    "errorOccurred": "حدث خطأ",
+    "sentTo": "تم إرسال الرسالة إلى {name}",
+    "heading": "إرسال رسالة إلى {name}",
+    "title": "العنوان",
+    "titlePlaceholder": "أدخل عنوان الرسالة",
+    "message": "الرسالة",
+    "messagePlaceholder": "أدخل محتوى الرسالة",
+    "cancel": "إلغاء",
+    "send": "إرسال",
+    "sending": "جار الإرسال..."
+  },
+  "submissionsModal": {
+    "open": "التسليمات",
+    "title": "تسليمات الطلاب",
+    "deadlinePassed": "انتهى الموعد النهائي - جاهز للتقييم",
+    "submitted": "{count} تم التسليم",
+    "pending": "{count} قيد الانتظار",
+    "graded": "{count} مقيمة",
+    "emptyTitle": "لا توجد تسليمات بعد",
+    "emptyDescription": "لم يسلم الطلاب أي شيء لهذا الواجب بعد.",
+    "scoreRequired": "الدرجة مطلوبة",
+    "gradesPublished": "تم نشر الدرجات بنجاح!",
+    "published": "منشور",
+    "draft": "مسودة",
+    "ungraded": "غير مقيم",
+    "late": "متأخر (+{time})",
+    "early": "{time} مبكر",
+    "downloadSubmission": "تنزيل التسليم",
+    "editGrade": "تعديل الدرجة",
+    "addGrade": "إضافة درجة",
+    "editFeedback": "تعديل الملاحظات",
+    "addFeedback": "إضافة ملاحظات",
+    "publishing": "جار النشر...",
+    "publishGrades": "نشر الدرجات ({published}/{graded})",
+    "close": "إغلاق",
+    "gradeTitle": "تقييم التسليم",
+    "student": "الطالب:",
+    "score": "الدرجة",
+    "gradeHelp": "حفظ الدرجة يبقيها مخفية حتى تنشر الدرجات.",
+    "cancel": "إلغاء",
+    "saving": "جار الحفظ...",
+    "saveGrade": "حفظ الدرجة",
+    "feedbackTitle": "ملاحظات المعلم",
+    "feedbackPlaceholder": "اكتب ملاحظاتك لهذا الطالب...",
+    "saveFeedback": "حفظ الملاحظات",
+    "day": "{count} يوم",
+    "hour": "{count} ساعة",
+    "minute": "{count} دقيقة"
+  },
+  "schoolSignup": {
+    "statusTitle": "حالة الوصول للمدرسة",
+    "statusDescription": "طلب مدرستك بانتظار الموافقة. سيراجع فريق Academix الطلب ويفعل حسابك بعد اكتمال التحقق.",
+    "goToSignIn": "الانتقال إلى تسجيل الدخول",
+    "title": "إنشاء حساب مدرسة",
+    "description": "املأ بيانات المدرسة والمدير الأساسي كاملة.",
+    "step": "الخطوة {number}",
+    "schoolInfo": "معلومات المدرسة",
+    "adminInfo": "حساب المدير الأساسي",
+    "fields": {
+      "schoolName": "اسم المدرسة",
+      "registrationNumber": "رقم التسجيل",
+      "schoolEmail": "بريد المدرسة الإلكتروني",
+      "schoolPhone": "هاتف المدرسة",
+      "country": "الدولة",
+      "city": "المدينة",
+      "website": "الموقع الإلكتروني",
+      "schoolAddress": "عنوان المدرسة",
+      "adminName": "اسم المدير الكامل",
+      "adminEmailOptional": "بريد المدير الإلكتروني (اختياري)",
+      "adminUsername": "اسم مستخدم المدير",
+      "adminPassword": "كلمة مرور المدير"
+    },
+    "validation": {
+      "schoolNameRequired": "اسم المدرسة مطلوب.",
+      "schoolEmailRequired": "بريد المدرسة الإلكتروني مطلوب.",
+      "schoolPhoneRequired": "هاتف المدرسة مطلوب.",
+      "countryRequired": "الدولة مطلوبة.",
+      "cityRequired": "المدينة مطلوبة.",
+      "addressRequired": "عنوان المدرسة مطلوب.",
+      "adminNameRequired": "اسم المدير الكامل مطلوب.",
+      "adminUsernameRequired": "اسم مستخدم المدير مطلوب.",
+      "adminPasswordRequired": "كلمة مرور المدير مطلوبة."
+    },
+    "submitting": "جار الإرسال...",
+    "submit": "إرسال",
+    "page": {
+      "goBack": "رجوع",
+      "titleStart": "تسجيل",
+      "titleHighlight": "المدرسة",
+      "description": "سجل بيانات مدرستك وأنشئ حساب المدير الأساسي. بعد المراجعة، سيتم تفعيل المدرسة بواسطة أكاديميكس.",
+      "steps": {
+        "profile": "إرسال ملف المدرسة الكامل",
+        "verification": "التحقق بواسطة أكاديميكس",
+        "access": "منح الوصول إلى لوحة التحكم"
+      }
+    }
+  },
+  "auth": {
+    "login": {
+      "welcomeBack": "مرحبا بعودتك",
+      "redirecting": "جار تحويلك إلى لوحة التحكم...",
+      "goHome": "العودة للرئيسية",
+      "title": "تسجيل الدخول إلى حسابك",
+      "identifier": "اسم المستخدم أو البريد الإلكتروني",
+      "password": "كلمة المرور",
+      "showPassword": "إظهار كلمة المرور",
+      "hidePassword": "إخفاء كلمة المرور",
+      "signingIn": "جار تسجيل الدخول...",
+      "signIn": "تسجيل الدخول",
+      "newSchool": "مدرسة جديدة؟",
+      "signupRequest": "إرسال طلب تسجيل"
+    },
+    "signOut": {
+      "signingOut": "جار تسجيل الخروج...",
+      "backToSignIn": "العودة لتسجيل الدخول"
+    },
+    "schoolAccess": {
+      "title": "حالة الوصول للمدرسة",
+      "pending": "طلب مدرستك بانتظار الموافقة. سيراجع فريق أكاديميكس الطلب ويفعل حسابك بعد اكتمال التحقق.",
+      "paused": "مدرستك موقوفة حاليا.",
+      "reason": "السبب:",
+      "noReason": "لم يتم تقديم سبب.",
+      "active": "حساب مدرستك نشط."
+    }
+  },
+  "schoolStatus": {
+    "alreadyActive": "هذه المدرسة نشطة بالفعل.",
+    "alreadyPaused": "هذه المدرسة موقوفة بالفعل.",
+    "activated": "تم تفعيل المدرسة بنجاح.",
+    "activateFailed": "فشل تفعيل المدرسة.",
+    "pauseReasonRequired": "سبب الإيقاف مطلوب.",
+    "paused": "تم إيقاف المدرسة بنجاح.",
+    "pauseFailed": "فشل إيقاف المدرسة.",
+    "activate": "تفعيل",
+    "pause": "إيقاف",
+    "confirmActivation": "تأكيد التفعيل",
+    "confirmPause": "تأكيد الإيقاف",
+    "activateConfirm": "هل أنت متأكد من تفعيل {name}؟",
+    "pauseConfirm": "أدخل سببا قبل إيقاف {name}.",
+    "pauseReason": "سبب الإيقاف",
+    "cancel": "إلغاء",
+    "confirm": "تأكيد",
+    "activating": "جار التفعيل...",
+    "pausing": "جار الإيقاف...",
+    "closeModal": "إغلاق النافذة"
+  },
+  "promotion": {
+    "button": "تحديث مراحل الطلاب",
+    "academicYear": "السنة الأكاديمية",
+    "status": "الحالة",
+    "stillInProgress": "السنة الأكاديمية لا تزال قيد التنفيذ",
+    "confirmTitle": "تأكيد ترقية الطلاب",
+    "completed": "اكتملت الترقية",
+    "failed": "تعذّر إكمال الترقية",
+    "notFinishedBody": "تنتهي السنة الأكاديمية {year} في {date}. يمكنك تحديث الطلاب بعد مرور آخر يوم.",
+    "confirmBody": "The academic year {year} has finished. Confirm this action to update students based on their final average. Students with 60% or higher pass.",
+    "promoted": "تمت الترقية",
+    "graduated": "متخرجون",
+    "repeated": "معادون",
+    "successFallback": "تمت ترقية الطلاب بنجاح.",
+    "confirm": "تأكيد",
+    "updating": "جار التحديث...",
+    "ok": "حسنا",
+    "close": "إغلاق نافذة ترقية الطلاب"
+  },
+  "messageView": {
+    "view": "عرض الرسالة",
+    "close": "إغلاق عرض الرسالة",
+    "title": "العنوان",
+    "body": "المحتوى",
+    "date": "التاريخ",
+    "time": "الوقت"
+  },
+  "pages": {
+    "archive": "الأرشيف",
+    "settings": "إعدادات المدرسة",
+    "announcements": "الإعلانات",
+    "events": "الأحداث",
+    "feedbacks": "الملاحظات",
+    "feedbackHistory": "سجل ملاحظاتي",
+    "allStudents": "كل الطلاب",
+    "allTeachers": "كل المعلمين",
+    "allParents": "كل أولياء الأمور",
+    "allSubjects": "كل المواد",
+    "allClasses": "كل الصفوف",
+    "allGrades": "كل المراحل",
+    "allExams": "كل الامتحانات",
+    "allAssignments": "كل الواجبات",
+    "allResults": "كل النتائج",
+    "allEvents": "كل الأحداث",
+    "allAnnouncements": "كل الإعلانات",
+    "allMessages": "كل الرسائل",
+    "allNotifications": "كل الإشعارات",
+    "attendance": "الحضور",
+    "messages": "الرسائل",
+    "notifications": "الإشعارات",
+    "finalResults": "المعدلات النهائية",
+    "finalAverages": "المعدلات النهائية"
+  },
+  "dashboardCards": {
+    "admin": "المديرون",
+    "teacher": "المعلمون",
+    "student": "الطلاب",
+    "parent": "أولياء الأمور"
+  },
+  "profile": {
+    "avatarAlt": "الملف الشخصي",
+    "notFound": "لم يتم العثور على الملف الشخصي",
+    "notProvided": "غير متوفر",
+    "fields": {
+      "adminUsername": "اسم مستخدم المدير",
+      "schoolName": "اسم المدرسة",
+      "schoolId": "رقم المدرسة",
+      "createdAt": "تاريخ الإنشاء",
+      "updatedAt": "تاريخ التحديث",
+      "name": "الاسم",
+      "username": "اسم المستخدم",
+      "email": "البريد الإلكتروني",
+      "phone": "الهاتف",
+      "address": "العنوان",
+      "bloodType": "فصيلة الدم",
+      "gender": "الجنس",
+      "birthday": "تاريخ الميلاد",
+      "subjects": "المواد",
+      "classes": "الصفوف",
+      "school": "المدرسة",
+      "grade": "المرحلة",
+      "class": "الصف",
+      "status": "الحالة",
+      "parent": "ولي الأمر",
+      "children": "الأبناء"
+    }
+  },
+  "settings": {
+    "description": "اضبط إعدادات الجدول الأسبوعي المستخدمة في الحصص والتقويم.",
+    "workingDaysDescription": "حدد أيام العمل المدرسية وأضف عطلات أو أيام توقف حسب التاريخ.",
+    "sections": {
+      "scheduleDefaults": "إعدادات الجدول",
+      "workingDaysHolidays": "أيام العمل والعطلات",
+      "academicYears": "السنوات الأكاديمية"
+    },
+    "scheduleForm": {
+      "title": "إعدادات الجدول",
+      "workDayStart": "بداية يوم العمل",
+      "workDayEnd": "نهاية يوم العمل",
+      "lessonDuration": "مدة الحصة (بالدقائق)",
+      "lessonsPerDay": "عدد الحصص في اليوم",
+      "save": "حفظ الإعدادات",
+      "updated": "تم تحديث إعدادات المدرسة."
+    },
+    "academicYears": {
+      "title": "السنوات الأكاديمية",
+      "description": "أنشئ وحافظ على نطاقات السنوات الأكاديمية.",
+      "add": "إضافة سنة أكاديمية",
+      "editTitle": "تعديل السنة الأكاديمية",
+      "create": "إنشاء سنة أكاديمية",
+      "update": "تحديث السنة الأكاديمية",
+      "startDate": "تاريخ البداية",
+      "endDate": "تاريخ النهاية",
+      "markCurrent": "تعيين كسنة أكاديمية حالية",
+      "empty": "لا توجد سنوات أكاديمية بعد.",
+      "created": "تم إنشاء السنة الأكاديمية.",
+      "updated": "تم تحديث السنة الأكاديمية."
+    },
+    "workingDays": {
+      "weeklyWorkingDays": "أيام العمل الأسبوعية",
+      "saveWorkingDays": "حفظ أيام العمل",
+      "holidaysOffDays": "العطلات وأيام التوقف",
+      "addException": "إضافة استثناء",
+      "addDayException": "إضافة استثناء يوم",
+      "nameOptional": "الاسم (اختياري)",
+      "namePlaceholder": "مثال: عطلة العيد",
+      "notesOptional": "ملاحظات (اختياري)",
+      "empty": "لا توجد استثناءات أيام بعد.",
+      "workingDaysUpdated": "تم تحديث أيام العمل.",
+      "exceptionSaved": "تم حفظ استثناء اليوم.",
+      "exceptionRemoved": "تم حذف استثناء اليوم.",
+      "days": {
+        "SATURDAY": "السبت",
+        "SUNDAY": "الأحد",
+        "MONDAY": "الاثنين",
+        "TUESDAY": "الثلاثاء",
+        "WEDNESDAY": "الأربعاء",
+        "THURSDAY": "الخميس",
+        "FRIDAY": "الجمعة"
+      },
+      "types": {
+        "HOLIDAY": "عطلة",
+        "OFF_DAY": "يوم توقف",
+        "WORKING_OVERRIDE": "يوم عمل استثنائي"
+      }
+    }
+  },
+  "profilePages": {
+    "cards": {
+      "attendance": "الحضور",
+      "grade": "المرحلة",
+      "lessons": "الحصص",
+      "class": "الصف",
+      "subjects": "المواد",
+      "classes": "الصفوف"
+    },
+    "shortcuts": {
+      "title": "الاختصارات"
+    },
+    "student": {
+      "schedule": "جدول الطالب",
+      "lessons": "حصص الطالب",
+      "teachers": "معلمو الطالب",
+      "exams": "امتحانات الطالب",
+      "assignments": "واجبات الطالب",
+      "results": "نتائج الطالب"
+    },
+    "teacher": {
+      "schedule": "جدول المعلم",
+      "classes": "صفوف المعلم",
+      "students": "طلاب المعلم",
+      "exams": "امتحانات المعلم",
+      "assignments": "واجبات المعلم"
+    }
+  },
+  "lessonsPage": {
+    "title": "جدول الحصص",
+    "grade": "المرحلة",
+    "classes": "الصفوف",
+    "scheduleFor": "جدول المرحلة {grade} - {className}",
+    "empty": {
+      "noClassesTitle": "لم يتم العثور على صفوف",
+      "noClassesDescription": "لا توجد صفوف لديها حصص متاحة لهذا العرض.",
+      "noClassesForGrade": "لم يتم العثور على صفوف للمرحلة المحددة."
+    }
+  },
+  "forms": {
+    "common": {
+      "submitting": "جار الإرسال...",
+      "selected": "{count} محدد",
+      "optional": "اختياري",
+      "searchTeachers": "بحث عن معلمين...",
+      "searchParents": "بحث عن أولياء أمور...",
+      "searchStudents": "بحث عن طلاب...",
+      "searchSubjects": "بحث عن مواد...",
+      "noTeachersFound": "لم يتم العثور على معلمين.",
+      "noParentsFound": "لم يتم العثور على أولياء أمور.",
+      "noStudentsFound": "لم يتم العثور على طلاب.",
+      "noSubjectsFound": "لم يتم العثور على مواد.",
+      "noResultsFound": "لم يتم العثور على نتائج",
+      "gradeLevel": "المرحلة {level}",
+      "selectGrade": "اختر المرحلة",
+      "selectSex": "اختر الجنس",
+      "somethingWentWrong": "حدث خطأ ما!",
+      "authenticationInfo": "معلومات تسجيل الدخول",
+      "personalInfo": "المعلومات الشخصية",
+      "username": "اسم المستخدم",
+      "email": "البريد الإلكتروني",
+      "password": "كلمة المرور",
+      "showPassword": "إظهار كلمة المرور",
+      "hidePassword": "إخفاء كلمة المرور",
+      "fullName": "الاسم الكامل",
+      "name": "الاسم",
+      "phone": "الهاتف",
+      "address": "العنوان",
+      "bloodType": "فصيلة الدم",
+      "birthday": "تاريخ الميلاد",
+      "sex": "الجنس",
+      "male": "ذكر",
+      "female": "أنثى",
+      "status": "الحالة",
+      "regular": "منتظم",
+      "repeated": "معاد",
+      "graduated": "متخرج",
+      "left": "منسحب",
+      "photoUploaded": "تم رفع الصورة بنجاح",
+      "removePhoto": "إزالة الصورة",
+      "selectAll": "تحديد الكل",
+      "selectedClasses": "تم تحديد {count} صف",
+      "description": "الوصف",
+      "date": "التاريخ",
+      "startDate": "تاريخ البداية",
+      "endDate": "تاريخ النهاية",
+      "title": "العنوان",
+      "classes": "الصفوف"
+    },
+    "grade": {
+      "createTitle": "إنشاء مرحلة جديدة",
+      "level": "مستوى المرحلة",
+      "created": "تم إنشاء المرحلة بنجاح!"
+    },
+    "class": {
+      "createTitle": "إنشاء صف جديد",
+      "updateTitle": "تحديث الصف",
+      "name": "اسم الصف",
+      "capacity": "السعة",
+      "grade": "المرحلة",
+      "supervisor": "المشرف",
+      "created": "تم إنشاء الصف بنجاح!",
+      "updated": "تم تحديث الصف بنجاح!"
+    },
+    "subject": {
+      "createTitle": "إنشاء مادة جديدة",
+      "updateTitle": "تحديث المادة",
+      "name": "اسم المادة",
+      "grade": "المرحلة",
+      "teachers": "المعلمون",
+      "teachersHelp": "اختر معلما واحدا أو أكثر لتعيينهم لهذه المادة.",
+      "noTeachersSelected": "لم يتم اختيار أي معلم بعد.",
+      "created": "تم إنشاء المادة بنجاح!",
+      "updated": "تم تحديث المادة بنجاح!"
+    },
+    "student": {
+      "createTitle": "إنشاء طالب جديد",
+      "updateTitle": "تحديث الطالب",
+      "parent": "ولي الأمر",
+      "grade": "المرحلة",
+      "class": "الصف",
+      "classCapacity": "{className} - {students}/{capacity} السعة",
+      "uploadPhoto": "رفع صورة الطالب",
+      "previewAlt": "معاينة الطالب",
+      "create": "إنشاء طالب",
+      "update": "تحديث الطالب",
+      "created": "تم إنشاء الطالب!",
+      "updated": "تم تحديث الطالب!"
+    },
+    "teacher": {
+      "createTitle": "إنشاء معلم",
+      "updateTitle": "تحديث المعلم",
+      "subjects": "المواد",
+      "subjectsHelp": "اختر مادة واحدة أو أكثر سيقوم هذا المعلم بتدريسها.",
+      "noSubjectsSelected": "لم يتم اختيار أي مادة بعد.",
+      "removeSubject": "إزالة {subject}",
+      "uploadPhoto": "رفع صورة المعلم",
+      "previewAlt": "معاينة المعلم",
+      "create": "إنشاء معلم",
+      "update": "تحديث المعلم",
+      "created": "تم إنشاء المعلم بنجاح!",
+      "updated": "تم تحديث المعلم بنجاح!"
+    },
+    "parent": {
+      "createTitle": "إنشاء ولي أمر جديد",
+      "updateTitle": "تحديث ولي الأمر",
+      "students": "الطلاب",
+      "selectStudentRequired": "اختر طالبا واحدا على الأقل.",
+      "selectStudentBeforeCreate": "اختر طالبا واحدا على الأقل قبل إنشاء ولي الأمر.",
+      "create": "إنشاء ولي أمر",
+      "update": "تحديث ولي الأمر",
+      "created": "تم إنشاء ولي الأمر!",
+      "updated": "تم تحديث ولي الأمر!"
+    },
+    "event": {
+      "createTitle": "إنشاء حدث جديد",
+      "updateTitle": "تحديث الحدث",
+      "title": "عنوان الحدث",
+      "titlePlaceholder": "مثال: اليوم الرياضي",
+      "descriptionPlaceholder": "وصف الحدث",
+      "created": "تم إنشاء الحدث!",
+      "updated": "تم تحديث الحدث!"
+    },
+    "announcement": {
+      "createTitle": "إنشاء إعلان جديد",
+      "updateTitle": "تحديث الإعلان",
+      "title": "عنوان الإعلان",
+      "titlePlaceholder": "مثال: اجتماع أولياء الأمور",
+      "descriptionPlaceholder": "تفاصيل الإعلان",
+      "created": "تم إنشاء الإعلان!",
+      "updated": "تم تحديث الإعلان!"
+    },
+    "message": {
+      "createTitle": "إنشاء رسالة جديدة",
+      "updateTitle": "تحديث الرسالة",
+      "recipients": "المستلمون",
+      "content": "محتوى الرسالة",
+      "title": "عنوان الرسالة",
+      "titlePlaceholder": "مثال: تذكير",
+      "descriptionPlaceholder": "تفاصيل الرسالة",
+      "studentRecipients": "مستلمو الطلاب",
+      "parentRecipients": "مستلمو أولياء الأمور",
+      "teacherRecipients": "مستلمو المعلمين",
+      "classesOptional": "الصفوف (اختياري)",
+      "searchRecipients": "بحث في {label}...",
+      "openRecipientSearch": "فتح نتائج بحث {label}",
+      "created": "تم إنشاء الرسالة!",
+      "updated": "تم تحديث الرسالة!"
+    },
+    "result": {
+      "createTitle": "إنشاء نتيجة جديدة",
+      "updateTitle": "تحديث النتيجة",
+      "student": "الطالب",
+      "assessmentType": "نوع التقييم",
+      "assessment": "التقييم",
+      "selectAssessment": "اختر التقييم",
+      "exam": "امتحان",
+      "assignment": "واجب",
+      "score": "الدرجة",
+      "created": "تم إنشاء النتيجة!",
+      "updated": "تم تحديث النتيجة!"
+    },
+    "lesson": {
+      "createTitle": "إنشاء جدول حصص أسبوعي",
+      "updateTitle": "تحديث جدول الحصص الأسبوعي",
+      "class": "الصف",
+      "selectClass": "اختر الصف",
+      "lesson": "الحصة {slot}",
+      "noSubject": "لا توجد مادة",
+      "selectTeacher": "اختر المعلم",
+      "teacherRequired": "اختر معلما",
+      "saved": "تم حفظ جدول الحصص الأسبوعي.",
+      "save": "حفظ الجدول الأسبوعي",
+      "days": {
+        "SATURDAY": "السبت",
+        "SUNDAY": "الأحد",
+        "MONDAY": "الاثنين",
+        "TUESDAY": "الثلاثاء",
+        "WEDNESDAY": "الأربعاء",
+        "THURSDAY": "الخميس",
+        "FRIDAY": "الجمعة"
+      }
+    },
+    "exam": {
+      "createTitle": "إنشاء امتحان جديد",
+      "updateTitle": "تحديث الامتحان",
+      "title": "عنوان الامتحان",
+      "titlePlaceholder": "مثال: اختبار منتصف الفصل",
+      "subject": "المادة",
+      "selectSubject": "اختر المادة",
+      "noClassesAvailable": "لا توجد صفوف متاحة.",
+      "created": "تم إنشاء الامتحان!",
+      "updated": "تم تحديث الامتحان!"
+    },
+    "assignment": {
+      "createTitle": "إنشاء واجب جديد",
+      "updateTitle": "تحديث الواجب",
+      "title": "عنوان الواجب",
+      "titlePlaceholder": "مثال: واجب الفصل الرابع",
+      "marks": "العلامات",
+      "assignedTeacher": "المعلم المسؤول",
+      "assignedTeacherHelp": "سيتمكن هذا المعلم من الوصول إلى التسليمات وتقييمها.",
+      "subject": "المادة",
+      "subjectFallback": "مادة رقم {id}",
+      "searchSubject": "بحث عن مادة...",
+      "clearSubject": "مسح المادة",
+      "noClassesForSubject": "لم يتم العثور على صفوف لهذه المادة.",
+      "selectSubjectFirst": "اختر مادة أولا لعرض الصفوف المتاحة.",
+      "rubric": "الإجابة النموذجية / سلم التقييم",
+      "rubricPlaceholder": "اكتب الإجابة المتوقعة أو وضح كيفية توزيع العلامات...",
+      "rubricHelp": "يستخدم لتوجيه تقييم الواجب والتقييم الذكي.",
+      "fileOptional": "ملف الواجب (اختياري)",
+      "currentFile": "الملف الحالي",
+      "downloadCurrentFile": "تحميل الملف الحالي",
+      "removeCurrentFile": "إزالة الملف الحالي",
+      "changeFile": "تغيير الملف",
+      "replaceFile": "استبدال الملف",
+      "uploadFile": "رفع ملف",
+      "removeSelected": "إزالة المحدد",
+      "noFileAttached": "لا يوجد ملف مرفق بعد. ارفع ملفا عند الحاجة.",
+      "currentFileWillBeReplaced": "سيتم استبدال الملف الحالي.",
+      "allowLateSubmission": "السماح بالتسليم المتأخر",
+      "lateAllowed": "يمكن للطلاب التسليم بعد الموعد النهائي",
+      "lateNotAllowed": "لا يمكن للطلاب التسليم بعد الموعد النهائي",
+      "created": "تم إنشاء الواجب!",
+      "updated": "تم تحديث الواجب!"
+    },
+    "studentDelete": {
+      "title": "حذف الطالب",
+      "confirm": "هل أنت متأكد من حذف {name}؟",
+      "fallbackName": "هذا الطالب",
+      "linkedParent": "هذا الطالب مرتبط بولي الأمر {parent}.",
+      "canDeleteBoth": "يمكنك حذف الطالب فقط، أو حذف الطالب وولي الأمر معا.",
+      "parentHasMoreStudents": "لدى ولي الأمر أكثر من طالب، لذلك يمكن حذف الطالب فقط.",
+      "deleteStudent": "حذف الطالب",
+      "deleteBoth": "حذف الاثنين",
+      "studentDeleted": "تم حذف الطالب بنجاح",
+      "studentAndParentDeleted": "تم حذف الطالب وولي الأمر بنجاح"
+    },
+    "gradeDelete": {
+      "title": "حذف المرحلة",
+      "deleted": "تم حذف المرحلة بنجاح!",
+      "warning": "تحذير: هذه المرحلة مرتبطة بـ {count} صف.",
+      "cascadeWarning": "حذف هذه المرحلة سيؤدي أيضا إلى حذف تلك الصفوف والسجلات المرتبطة بجدولها.",
+      "classes": "الصفوف: {classes}",
+      "noClasses": "المرحلة {level} لا تحتوي على صفوف ويمكن حذفها.",
+      "confirm": "هل أنت متأكد من حذف المرحلة {level}؟",
+      "delete": "حذف المرحلة"
+    },
+    "classDelete": {
+      "title": "حذف الصف",
+      "deleted": "تم حذف الصف بنجاح!",
+      "deletedAndReassigned": "تم حذف الصف وإعادة تعيين الطلاب بنجاح!",
+      "hasStudents": "هذا الصف يحتوي على {count} طالب. انقلهم إلى صف آخر أو أنشئ صفا جديدا قبل حذف هذا الصف.",
+      "noStudents": "لا يوجد طلاب في هذا الصف، لذلك يمكن حذفه الآن.",
+      "moveExisting": "نقل إلى صف موجود",
+      "createNew": "إنشاء صف جديد",
+      "targetClass": "الصف الهدف",
+      "selectExisting": "اختر صفا موجودا",
+      "newClassName": "اسم الصف الجديد",
+      "newClassPlaceholder": "مثال: 3B",
+      "capacity": "السعة",
+      "grade": "المرحلة",
+      "supervisor": "المشرف",
+      "noSupervisor": "لا يوجد مشرف",
+      "selectTargetError": "اختر صفا لنقل الطلاب إليه.",
+      "nameRequired": "اسم الصف الجديد مطلوب.",
+      "capacityRequired": "يجب أن تكون سعة الصف الجديد 1 على الأقل.",
+      "gradeRequired": "اختر مرحلة للصف الجديد.",
+      "delete": "حذف الصف"
+    },
+    "examWorkflow": {
+      "basicInfo": "1. المعلومات الأساسية",
+      "settings": "2. الإعدادات",
+      "instructions": "3. التعليمات",
+      "questions": "4. الأسئلة",
+      "examTitle": "عنوان الامتحان",
+      "startTime": "وقت البداية",
+      "endTime": "وقت النهاية",
+      "assignedTeacher": "المعلم المسؤول",
+      "assignedTeacherHelp": "سيتمكن هذا المعلم من الوصول إلى التسليمات وتقييمها.",
+      "subject": "المادة",
+      "selectSubject": "اختر مادة...",
+      "classes": "الصفوف",
+      "noClassesForSubject": "لم يتم العثور على صفوف لهذه المادة.",
+      "selectSubjectFirst": "اختر مادة أولا لعرض الصفوف المتاحة.",
+      "showTimer": "إظهار المؤقت",
+      "autoSave": "الحفظ التلقائي",
+      "navigation": "التنقل إلى الصفحة السابقة",
+      "autoSubmit": "التسليم التلقائي عند انتهاء الوقت",
+      "duration": "المدة (بالدقائق)",
+      "questionsPerPage": "عدد الأسئلة في الصفحة",
+      "studentInstructions": "تعليمات الطالب",
+      "instructionsPlaceholder": "أضف أي تعليمات يجب أن يقرأها الطلاب قبل البدء...",
+      "addQuestion": "+ إضافة سؤال",
+      "createExam": "إنشاء امتحان",
+      "updateExam": "تحديث الامتحان",
+      "created": "تم إنشاء الامتحان بنجاح!",
+      "updated": "تم تحديث الامتحان بنجاح!",
+      "unexpectedError": "حدث خطأ غير متوقع.",
+      "emptyOptionsForQuestion": "السؤال رقم {number} يحتوي على خيارات فارغة. يرجى تعبئة كل الخيارات.",
+      "selectCorrectForQuestion": "يرجى اختيار إجابة صحيحة واحدة على الأقل للسؤال رقم {number}.",
+      "question": {
+        "text": "نص السؤال",
+        "type": "النوع",
+        "points": "النقاط",
+        "textAnswer": "إجابة نصية",
+        "mcq": "اختيار من متعدد",
+        "trueFalse": "صح / خطأ",
+        "file": "رفع ملف",
+        "allowMultiple": "السماح بأكثر من إجابة صحيحة",
+        "options": "الخيارات",
+        "addOption": "+ إضافة خيار",
+        "optionPlaceholder": "الخيار {number}",
+        "correct": "صحيح",
+        "remove": "إزالة",
+        "emptyOptions": "يجب تعبئة كل حقول الخيارات. لا تترك خيارات فارغة.",
+        "optionTextRequired": "اكتب نص الخيار قبل تحديده كإجابة صحيحة!",
+        "answerHelp": "اختر إجابة صحيحة واحدة، أو أكثر إذا كان مسموحا بتعدد الإجابات.",
+        "correctAnswer": "الإجابة الصحيحة",
+        "true": "صح",
+        "false": "خطأ",
+        "rubric": "الإجابة النموذجية / سلم التقييم",
+        "rubricPlaceholder": "اكتب الإجابة المتوقعة أو وضح كيفية توزيع العلامات...",
+        "rubricHelp": "يستخدم لتوجيه التقييم اليدوي والتقييم الذكي.",
+        "fileSettings": "إعدادات رفع الملف",
+        "allowedExtensions": "امتدادات الملفات المسموحة",
+        "allowedExtensionsPlaceholder": "مثال: pdf, docx, jpg",
+        "allowedExtensionsHelp": "اتركه فارغا لقبول كل أنواع الملفات (اختياري)",
+        "minFileSize": "أقل حجم للملف (MB)",
+        "maxFileSize": "أكبر حجم للملف (MB)",
+        "systemMax": "الحد الأقصى للنظام: 10 MB",
+        "fileInstructions": "تعليمات للطالب (اختياري)",
+        "fileInstructionsPlaceholder": "مثال: ارفع مقالك بصيغة PDF...",
+        "pdfAiHelp": "يمكن تقييم ملفات PDF بالذكاء الاصطناعي باستخدام الإجابة النموذجية / سلم التقييم أعلاه."
+      }
+    }
+  },
+  "assignmentSubmissions": {
+    "breadcrumb": "الواجبات",
+    "title": "تسليمات الواجب",
+    "subjectFallback": "لا توجد مادة",
+    "marks": "{count} علامة",
+    "stats": {
+      "visibleSubmissions": "التسليمات المعروضة",
+      "graded": "مقيّمة",
+      "draftGrades": "درجات مسودة",
+      "published": "منشورة"
+    },
+    "status": {
+      "published": "منشور",
+      "draftGrade": "درجة مسودة",
+      "submitted": "تم التسليم"
+    },
+    "actions": {
+      "publishGrades": "نشر الدرجات",
+      "gradesPublished": "تم نشر الدرجات",
+      "increaseAll": "زيادة الكل",
+      "decreaseAll": "إنقاص الكل",
+      "view": "عرض",
+      "download": "تنزيل"
+    },
+    "fields": {
+      "marks": "علامات",
+      "scoreAdjustmentAmount": "قيمة تعديل الدرجة"
+    },
+    "empty": {
+      "title": "لم يتم العثور على تسليمات",
+      "description": "لا توجد تسليمات طلاب تطابق عوامل التصفية الحالية.",
+      "previewUnavailable": "المعاينة غير متاحة"
+    },
+    "validation": {
+      "positiveAmount": "أدخل قيمة تعديل موجبة.",
+      "maxAmount": "لا يمكن أن تكون القيمة أكبر من {maxScore}."
+    }
+  },
+  "examSubmissions": {
+    "breadcrumb": "الامتحانات",
+    "title": "تسليمات الامتحان",
+    "gradeTitle": "تقييم التسليم",
+    "subjectFallback": "لا توجد مادة",
+    "marks": "{count} علامة",
+    "gradedCount": "{graded} من {total} مقيّمة",
+    "stats": {
+      "visible": "المعروضة",
+      "submitted": "تم التسليم",
+      "graded": "مقيّمة",
+      "inProgress": "قيد الحل",
+      "published": "منشورة"
+    },
+    "status": {
+      "inProgress": "قيد الحل",
+      "submitted": "تم التسليم",
+      "graded": "مقيّم",
+      "saving": "جار الحفظ...",
+      "saved": "تم الحفظ",
+      "error": "خطأ",
+      "allGraded": "تم تقييم الكل",
+      "autoGraded": "مقيّم تلقائيا"
+    },
+    "actions": {
+      "publishGrades": "نشر الدرجات",
+      "gradesPublished": "تم نشر الدرجات",
+      "view": "عرض",
+      "grade": "تقييم",
+      "downloadFile": "تنزيل الملف",
+      "backToSubmissions": "العودة إلى التسليمات",
+      "finalizing": "جار الإنهاء...",
+      "finalizedReapprove": "تم إنهاء التقييم (إعادة اعتماد)",
+      "approveFinalize": "اعتماد وإنهاء التقييم"
+    },
+    "answers": {
+      "noAnswer": "لم يتم تقديم إجابة",
+      "studentAnswer": "إجابة الطالب:",
+      "correctAnswer": "الإجابة الصحيحة:",
+      "score": "الدرجة:",
+      "uploadedFile": "ملف مرفوع",
+      "file": "ملف",
+      "uploaded": "تم الرفع",
+      "noFile": "لم يتم تسليم ملف.",
+      "previewUnavailable": "المعاينة غير متاحة"
+    },
+    "empty": {
+      "title": "لا توجد تسليمات بعد",
+      "description": "لم يقم الطلاب بتسليم هذا الامتحان بعد."
+    },
+    "toast": {
+      "publishedSynced": "تمت مزامنة الدرجات المنشورة مع النتائج.",
+      "gradesPublished": "تم نشر الدرجات للطلاب.",
+      "publishFailed": "تعذر نشر الدرجات.",
+      "scorePositive": "يجب أن تكون الدرجة رقما موجبا.",
+      "scoreMax": "لا يمكن أن تتجاوز الدرجة {maxPoints} نقطة.",
+      "somethingWrong": "حدث خطأ ما.",
+      "autoSaveFailed": "فشل الحفظ التلقائي للدرجة.",
+      "scoreRequired": "يرجى إدخال درجة.",
+      "scoreSaved": "تم حفظ الدرجة!",
+      "finalized": "تم اعتماد التقييم وإنهاؤه بنجاح!",
+      "finalizeError": "حدث خطأ أثناء إنهاء التقييم."
+    },
+    "ai": {
+      "pdfOnly": "يدعم التقييم الذكي إجابات ملفات PDF فقط."
+    }
+  },
+  "aiEvaluation": {
+    "title": "التقييم الذكي",
+    "evaluate": "قيّم بالذكاء الاصطناعي",
+    "saved": "تم حفظ التقييم الذكي.",
+    "failed": "فشل التقييم الذكي.",
+    "manualFallback": "فشل التقييم الذكي. لا يزال التقييم اليدوي متاحا.",
+    "appliedDraftScore": "درجة المسودة المطبقة: {score} / {maxScore}",
+    "needsReview": "تحتاج مراجعة",
+    "noFeedback": "لم يتم تقديم ملاحظات.",
+    "strengths": "نقاط القوة",
+    "weaknesses": "نقاط الضعف",
+    "pdfSubmissionsOnly": "يدعم التقييم الذكي تسليمات PDF فقط."
+  },
+  "assignmentsPage": {
+    "actions": {
+      "submit": "تسليم",
+      "submitLate": "تسليم متأخر",
+      "submitLateShort": "تسليم متأخر",
+      "replaceFile": "استبدال الملف",
+      "viewSubmission": "عرض التسليم",
+      "deadlinePassed": "انتهى الموعد",
+      "download": "تنزيل",
+      "submissions": "التسليمات",
+      "cancel": "إلغاء",
+      "close": "إغلاق",
+      "processing": "جار المعالجة..."
+    },
+    "status": {
+      "gradePublished": "تم نشر الدرجة",
+      "feedbackReady": "الملاحظات جاهزة",
+      "submitted": "تم التسليم",
+      "notSubmitted": "لم يتم التسليم",
+      "assignmentSubmitted": "تم تسليم الواجب",
+      "gradePublishedMessage": "تم نشر درجتك أدناه.",
+      "waitingReview": "بانتظار مراجعة المعلم."
+    },
+    "modal": {
+      "mySubmission": "تسليمي",
+      "replaceSubmittedFile": "استبدال الملف المسلّم",
+      "submitAssignment": "تسليم الواجب",
+      "due": "الموعد: {date}",
+      "lateWarning": "أنت تسلّم بعد الموعد النهائي. التسليم المتأخر مسموح لهذا الواجب.",
+      "submittedFile": "الملف المسلّم",
+      "submittedDate": "تم التسليم: {date}",
+      "replaceWarning": "رفع ملف جديد سيستبدل الملف الحالي نهائيا.",
+      "publishedGrade": "الدرجة المنشورة",
+      "newFile": "ملف جديد",
+      "file": "ملف",
+      "maxFileSize": "(الحد الأقصى 20MB)",
+      "chooseFile": "اختر ملفا",
+      "noFileChosen": "لم يتم اختيار ملف",
+      "pdfHint": "ارفع ملف PDF إن أمكن للحصول على أفضل تجربة مراجعة.",
+      "note": "ملاحظة",
+      "optional": "(اختياري)",
+      "notePlaceholder": "أضف ملاحظة للمعلم..."
+    },
+    "empty": {
+      "title": "لم يتم العثور على واجبات",
+      "description": "جرّب تغيير عوامل التصفية أو كلمات البحث."
+    }
+  },
+  "widgets": {
+    "viewAll": "عرض الكل",
+    "noEventsForDay": "لا توجد أحداث لهذا اليوم."
+  },
+  "emptyStates": {
+    "defaultTitle": "لا توجد بيانات",
+    "defaultDescription": "لا يوجد شيء لعرضه الآن.",
+    "noResults": "لم يتم العثور على نتائج",
+    "filterDescription": "جرّب تغيير عوامل التصفية أو كلمات البحث.",
+    "searchDescription": "جرّب تغيير كلمات البحث.",
+    "announcements": "لم يتم العثور على إعلانات",
+    "classes": "لم يتم العثور على صفوف",
+    "events": "لم يتم العثور على أحداث",
+    "grades": "لم يتم العثور على مراحل",
+    "teachers": "لم يتم العثور على معلمين",
+    "results": "لم يتم العثور على نتائج",
+    "messages": "لم يتم العثور على رسائل",
+    "students": "لم يتم العثور على طلاب",
+    "parents": "لم يتم العثور على أولياء أمور",
+    "subjects": "لم يتم العثور على مواد",
+    "notifications": "لم يتم العثور على إشعارات",
+    "studyMaterials": "لا توجد مواد دراسية بعد",
+    "uploadFirstMaterial": "ارفع أول مادة باستخدام زر الرفع.",
+    "noStudyMaterialsForStudent": "لم يرفع معلمك أي مواد بعد.",
+    "uploadMaterial": "رفع مادة",
+    "uploadStudyMaterial": "رفع مادة دراسية",
+    "assignments": "لا توجد واجبات بعد.",
+    "teachersAssigned": "لا يوجد معلمون معينون بعد.",
+    "finalResults": "لا توجد معدلات نهائية",
+    "finalAverages": "لا توجد معدلات نهائية"
+  },
+  "finalResultStatus": {
+    "PASS": "ناجح",
+    "FAIL": "راسب",
+    "NO_RESULTS": "لا توجد نتائج",
+    "NOT_UPDATED": "لم يتم التحديث"
+  },
+  "subjectDetails": {
+    "subjects": "المواد",
+    "grade": "الصف",
+    "gradeLevel": "الصف {level}",
+    "teacherCount": "{count, plural, one {# معلم} other {# معلمين}}",
+    "teachers": "المعلمون",
+    "classes": "الصفوف",
+    "assignments": "الواجبات",
+    "materials": "المواد الدراسية",
+    "exams": "الامتحانات",
+    "subjectInfo": "معلومات المادة",
+    "subjectTeacher": "معلم المادة",
+    "yourTeachers": "{count, plural, one {معلمك} other {معلموك}}",
+    "createExam": "إنشاء امتحان",
+    "manageAssignments": "إدارة الواجبات",
+    "manageExams": "إدارة الامتحانات",
+    "class": "الصف",
+    "due": "الموعد",
+    "overdue": "متأخر",
+    "download": "تنزيل",
+    "downloadAssignmentFile": "تنزيل ملف الواجب",
+    "noExams": "لا توجد امتحانات مجدولة.",
+    "studyMaterials": "المواد الدراسية",
+    "upload": "رفع",
+    "delete": "حذف",
+    "tabs": {
+      "materials": "المواد",
+      "assignments": "الواجبات",
+      "exams": "الامتحانات"
+    },
+    "editor": {
+      "trigger": "تعديل الصفحة",
+      "title": "تعديل صفحة المادة",
+      "bannerImage": "صورة الغلاف",
+      "bannerPreviewAlt": "معاينة الغلاف",
+      "uploadBanner": "اضغط لرفع صورة الغلاف",
+      "bannerHint": "الحد الأقصى 5MB - JPG, PNG, WebP",
+      "height": "الارتفاع:",
+      "heights": {
+        "sm": "صغير",
+        "md": "متوسط",
+        "lg": "كبير"
+      },
+      "announcement": "إعلان",
+      "announcementHint": "(يظهر أعلى الصفحة للطلاب)",
+      "announcementPlaceholder": "مثال: \"مرحبا بكم في الرياضيات!\"",
+      "courseDescription": "وصف المادة",
+      "descriptionPlaceholder": "وصف مختصر لهذه المادة...",
+      "wordCount": "{count}/{max} كلمة",
+      "cancel": "إلغاء",
+      "saveChanges": "حفظ التغييرات"
+    },
+    "materialUpload": {
+      "title": "رفع مادة دراسية",
+      "submit": "رفع المادة",
+      "maxSize": "(الحد الأقصى 20MB)",
+      "fields": {
+        "title": "العنوان",
+        "description": "الوصف",
+        "file": "الملف"
+      },
+      "placeholders": {
+        "title": "مثال: ملاحظات الفصل 3",
+        "description": "وصف اختياري..."
+      },
+      "chooseFile": "اختر ملفا",
+      "noFileChosen": "لم يتم اختيار ملف"
+    }
+  },
+  "finalGradeEdit": {
+    "edit": "تعديل الدرجة النهائية",
+    "title": "تعديل الدرجة النهائية",
+    "finalGrade": "الدرجة النهائية (%)",
+    "cancel": "إلغاء",
+    "save": "حفظ",
+    "saving": "جار الحفظ...",
+    "updated": "تم تحديث الدرجة النهائية."
+  }
+}
diff --git a/messages/en.json b/messages/en.json
new file mode 100644
index 0000000..7098c43
--- /dev/null
+++ b/messages/en.json
@@ -0,0 +1,1451 @@
+{
+  "common": {
+    "brand": "ACADEMIX",
+    "dashboard": "Dashboard",
+    "search": "Search..."
+  },
+  "states": {
+    "loading": "Loading...",
+    "errorTitle": "Something went wrong",
+    "errorDescription": "We could not load this content. Please try again.",
+    "tryAgain": "Try again",
+    "retrying": "Retrying...",
+    "applicationErrorTitle": "Application error",
+    "applicationErrorDescription": "An unexpected error happened while loading the app.",
+    "pageErrorTitle": "Could not load this page",
+    "pageErrorDescription": "Please refresh or try again.",
+    "unauthorizedTitle": "Unauthorized Access",
+    "unauthorizedDescription": "You do not have permission to access this page with your current role or account status.",
+    "noDataYet": "No data yet",
+    "academicYearNotStarted": "Academic year did not begin yet.",
+    "noCurrentYear": "No current year selected",
+    "selectCurrentYear": "Select a current academic year to view data.",
+    "goToSettings": "Go to settings",
+    "noStudentsLinked": "No students found",
+    "noStudentsLinkedDescription": "There are no linked students on this parent account yet.",
+    "noClassAssigned": "No class assigned",
+    "selectedStudentNoClass": "The selected student is not assigned to a class yet."
+  },
+  "sidebar": {
+    "sections": {
+      "main": "Menu",
+      "other": "Other"
+    },
+    "items": {
+      "dashboard": "Dashboard",
+      "schools": "Schools",
+      "teachers": "Teachers",
+      "students": "Students",
+      "parents": "Parents",
+      "subjects": "Subjects",
+      "classes": "Classes",
+      "grades": "Grades",
+      "schedules": "Schedules",
+      "exams": "Exams",
+      "assignments": "Assignments",
+      "results": "Results",
+      "finalResults": "Final Averages",
+      "attendance": "Attendance",
+      "events": "Events",
+      "messages": "Messages",
+      "announcements": "Announcements",
+      "notifications": "Notifications",
+      "archive": "Archive",
+      "feedback": "Feedback",
+      "feedbacks": "Feedbacks",
+      "profile": "Profile",
+      "settings": "Settings",
+      "logout": "Logout"
+    }
+  },
+  "navbar": {
+    "openMenu": "Open menu",
+    "closeMenu": "Close menu",
+    "expandMenu": "Expand menu",
+    "collapseMenu": "Collapse menu",
+    "messages": "Messages",
+    "userFallback": "User",
+    "language": {
+      "label": "Language",
+      "en": "English",
+      "ar": "العربية"
+    },
+    "userMenu": {
+      "open": "Open user menu",
+      "avatarAlt": "User avatar",
+      "noRole": "No role"
+    },
+    "notifications": {
+      "label": "Notifications",
+      "newCount": "{count} new",
+      "markAllRead": "Mark all as read",
+      "allRead": "All read",
+      "empty": "No notifications yet",
+      "viewAll": "View all notifications",
+      "close": "Close"
+    }
+  },
+  "home": {
+    "nav": {
+      "home": "Home",
+      "about": "About",
+      "features": "Features",
+      "users": "Users",
+      "howItWorks": "How It Works",
+      "signIn": "Sign In",
+      "signUp": "Sign Up",
+      "openMenu": "Open menu",
+      "closeMenu": "Close menu"
+    },
+    "hero": {
+      "badge": "Powered with new AI features",
+      "title": "Welcome to Academix",
+      "highlight": "Academix",
+      "description": "A modern school management platform designed to streamline academic workflows for administrators, teachers, students, and parents.",
+      "signIn": "Sign In",
+      "signUp": "Sign Up"
+    },
+    "about": {
+      "title": "About Academix",
+      "description": "Academix connects every part of school administration into one unified system, from enrollment and attendance to assessments, grading, and communication.",
+      "highlights": {
+        "multilingual": {
+          "title": "Multilingual Support",
+          "description": "Optimized for English and Arabic with RTL-friendly layouts and localized content."
+        },
+        "roleAccess": {
+          "title": "Role-Based Access",
+          "description": "Secure dashboards and permissions for school admins, teachers, students, and guardians."
+        },
+        "insights": {
+          "title": "Real-Time Insights",
+          "description": "Track performance, attendance, and engagement with live dashboards and exports."
+        }
+      }
+    },
+    "features": {
+      "title": "Key Features",
+      "description": "Everything your institution needs to run smarter every day.",
+      "items": {
+        "students": {
+          "title": "Student Management",
+          "description": "Keep student profiles, enrollment history, and academic records organized in one place."
+        },
+        "courses": {
+          "title": "Course Management",
+          "description": "Plan subjects, assign teachers, and structure class schedules for every grade level."
+        },
+        "assessments": {
+          "title": "Assessments",
+          "description": "Create assignments and exams, then monitor submissions and grading progress."
+        },
+        "attendance": {
+          "title": "Attendance Tracking",
+          "description": "Digitize daily attendance with automated summaries and actionable reports."
+        },
+        "reports": {
+          "title": "Grades & Reports",
+          "description": "Generate report cards and analytics to support better academic decisions."
+        },
+        "learning": {
+          "title": "Virtual Learning Space",
+          "description": "Share resources, announcements, and course content in a unified student experience."
+        }
+      }
+    },
+    "roles": {
+      "title": "Designed for Every Role",
+      "description": "Tailored experiences for administrators, teachers, and students.",
+      "items": {
+        "administrator": {
+          "title": "Administrator",
+          "description": "Manage teachers, classes, subjects, and school-wide operations from one dashboard.",
+          "actions": {
+            "users": "Manage all users",
+            "settings": "Configure school settings",
+            "reports": "Generate reports",
+            "operations": "Oversee operations"
+          }
+        },
+        "teacher": {
+          "title": "Teacher",
+          "description": "Plan lessons, create assessments, track submissions, and monitor classroom progress.",
+          "actions": {
+            "assessments": "Create assessments",
+            "attendance": "Take attendance",
+            "grading": "Grade submissions",
+            "resources": "Manage class resources"
+          }
+        },
+        "student": {
+          "title": "Student",
+          "description": "Access courses, complete assignments, track grades, and stay updated with announcements.",
+          "actions": {
+            "courses": "View enrolled courses",
+            "assignments": "Submit assignments",
+            "grades": "Track grades",
+            "attendance": "Review attendance"
+          }
+        }
+      }
+    },
+    "howItWorks": {
+      "title": "How It Works",
+      "description": "Launch your school workspace in a few guided steps.",
+      "steps": {
+        "account": {
+          "title": "Create Account",
+          "description": "Sign up your school and invite your team in minutes."
+        },
+        "setup": {
+          "title": "Set Up School",
+          "description": "Configure classes, subjects, roles, and academic terms."
+        },
+        "operations": {
+          "title": "Run Operations",
+          "description": "Handle attendance, exams, communication, and daily workflows."
+        },
+        "outcomes": {
+          "title": "Improve Outcomes",
+          "description": "Use reports and analytics to drive smarter decisions."
+        }
+      }
+    },
+    "cta": {
+      "title": "Ready to Transform Your School?",
+      "description": "Join Academix and simplify school operations with one platform for learning, assessment, and administration.",
+      "button": "Get Started Free"
+    },
+    "footer": {
+      "copyright": "© 2026 Academix. All rights reserved."
+    }
+  },
+  "roles": {
+    "admin": "Admin",
+    "teacher": "Teacher",
+    "student": "Student",
+    "parent": "Parent",
+    "superAdmin": "Super Admin"
+  },
+  "actions": {
+    "add": "Add",
+    "create": "Create",
+    "update": "Edit",
+    "edit": "Edit",
+    "delete": "Delete",
+    "deleting": "Deleting...",
+    "saving": "Saving...",
+    "uploading": "Uploading...",
+    "adding": "Adding...",
+    "creating": "Creating...",
+    "updating": "Updating...",
+    "close": "Close",
+    "yes": "Yes",
+    "no": "No",
+    "somethingWentWrong": "Something went wrong!",
+    "deleteConfirmation": "All data will be lost. Are you sure you want to delete this {entity}?",
+    "deleteSuccess": "{entity} deleted successfully",
+    "exportCsv": "Export CSV",
+    "filter": "Filter",
+    "sort": "Sort",
+    "apply": "Apply",
+    "clear": "Clear",
+    "markAllRead": "Mark all read",
+    "deleteAll": "Delete all",
+    "signOut": "Sign out",
+    "signingOut": "Signing out...",
+    "formNotFound": "Form not found!"
+  },
+  "tables": {
+    "grade": "grade",
+    "subject": "subject",
+    "class": "class",
+    "teacher": "teacher",
+    "student": "student",
+    "parent": "parent",
+    "exam": "exam",
+    "assignment": "assignment",
+    "result": "result",
+    "lesson": "lesson",
+    "attendance": "attendance",
+    "event": "event",
+    "announcement": "announcement",
+    "message": "message"
+  },
+  "tableHeaders": {
+    "info": "Info",
+    "studentId": "Student ID",
+    "student": "Student",
+    "teacherId": "Teacher ID",
+    "parent": "Parent",
+    "studentNames": "Student Names",
+    "title": "Title",
+    "content": "Content",
+    "subject": "Subject",
+    "subjects": "Subjects",
+    "class": "Class",
+    "classes": "Classes",
+    "className": "Class Name",
+    "grade": "Grade",
+    "finalGrade": "Final Grade",
+    "gradeLevel": "Grade Level",
+    "teacher": "Teacher",
+    "phone": "Phone",
+    "address": "Address",
+    "actions": "Actions",
+    "submission": "Submission",
+    "score": "Score",
+    "endDate": "End Date",
+    "startTime": "Start Time",
+    "endTime": "End Time",
+    "status": "Status",
+    "date": "Date",
+    "time": "Time",
+    "sentTo": "Sent To",
+    "assessment": "Assessment",
+    "assessmentCount": "Assessments",
+    "averageScore": "Average %",
+    "capacity": "Capacity",
+    "supervisor": "Supervisor",
+    "school": "School",
+    "adminUsername": "Admin Username",
+    "pauseReason": "Pause Reason",
+    "file": "File",
+    "submitted": "Submitted",
+    "submittedAt": "Submitted At",
+    "name": "Name",
+    "username": "Username",
+    "email": "Email",
+    "statusValue": "Status / Value",
+    "range": "Range",
+    "current": "Current",
+    "type": "Type"
+  },
+  "filters": {
+    "all": "All",
+    "allClasses": "All Classes",
+    "allGrades": "All Grades",
+    "allSubjects": "All Subjects",
+    "gradeLevel": "Grade {level}",
+    "dataType": "Data Type",
+    "academicYear": "Academic Year",
+    "status": "Status",
+    "repeatedTimes": "Repeated Times",
+    "regular": "Regular",
+    "repeated": "Repeated",
+    "graduated": "Graduated",
+    "left": "Left",
+    "time": "time",
+    "times": "times",
+    "pending": "Pending",
+    "reviewed": "Reviewed",
+    "resolved": "Resolved",
+    "suggestions": "Suggestions",
+    "complaints": "Complaints",
+    "active": "Active",
+    "paused": "Paused",
+    "students": "Students",
+    "teachers": "Teachers",
+    "parents": "Parents",
+    "exams": "Exams",
+    "assignments": "Assignments",
+    "results": "Results",
+    "attendance": "Attendance",
+    "subjects": "Subjects",
+    "classes": "Classes",
+    "grades": "Grades",
+    "announcements": "Announcements",
+    "events": "Events",
+    "messages": "Messages",
+    "feedback": "Feedback",
+    "allTypes": "All Types",
+    "assignmentUpdates": "Assignment Updates",
+    "gradeUpdates": "Grade Updates",
+    "schedule": "Schedule",
+    "supervisor": "Supervisor",
+    "newest": "Newest",
+    "oldest": "Oldest",
+    "searchStudent": "Search student..."
+  },
+  "finalResultStatus": {
+    "PASS": "Pass",
+    "FAIL": "Fail",
+    "NO_RESULTS": "No results",
+    "NOT_UPDATED": "Not updated"
+  },
+  "attendance": {
+    "filter": "Filter",
+    "present": "Present",
+    "absent": "Absent",
+    "save": "Save Attendance",
+    "saved": "Attendance saved",
+    "noRecordsPage": "No records on this page",
+    "noScopeFound": "No {scope} found",
+    "noRecordsDate": "There are no attendance records for the selected date.",
+    "tryAnotherPage": "Try moving to another page.",
+    "noClassesAssigned": "No classes assigned",
+    "noClassesAssignedDescription": "You are not assigned to supervise any class yet.",
+    "dateOutsideAcademicYear": "This date is outside the current academic year ({start} to {end})."
+  },
+  "archivePage": {
+    "previewData": "Preview Data",
+    "unknownStudent": "Unknown student",
+    "present": "Present",
+    "absent": "Absent",
+    "noData": "No data found",
+    "showMore": "Show More"
+  },
+  "feedbackPage": {
+    "pendingCount": "{count} pending",
+    "shownCount": "{count} shown",
+    "noFeedbacks": "No feedbacks found.",
+    "resolvedLocked": "This feedback is resolved and locked.",
+    "markReviewed": "Mark Reviewed",
+    "markResolved": "Mark Resolved",
+    "markPending": "Mark Pending",
+    "historyTitle": "My Feedback History",
+    "historyDescription": "Track your previous suggestions and complaints.",
+    "submittedCount": "{count} submitted",
+    "emptyHistory": "You have not submitted any feedback yet.",
+    "submit": "Submit Feedback",
+    "description": "Send a suggestion or complaint to the school administration.",
+    "type": "Type",
+    "message": "Message",
+    "messagePlaceholder": "Write your message...",
+    "cancel": "Cancel",
+    "send": "Send Feedback",
+    "sending": "Sending...",
+    "close": "Close",
+    "unauthorized": "Unauthorized",
+    "unexpectedError": "Something went wrong!",
+    "types": {
+      "suggestion": "Suggestion",
+      "complaint": "Complaint"
+    },
+    "statuses": {
+      "pending": "Pending",
+      "reviewed": "Reviewed",
+      "resolved": "Resolved"
+    }
+  },
+  "examList": {
+    "addExam": "Add Exam",
+    "submissions": "Submissions",
+    "takeExam": "Take Exam",
+    "continue": "Continue",
+    "editWorkflow": "Edit exam workflow",
+    "noExams": "No exams found",
+    "emptyDescription": "Try changing your filters or search terms.",
+    "readyToStart": "Ready to start?",
+    "instructions": "Instructions",
+    "noInstructions": "No special instructions were added for this exam.",
+    "continueNotice": "Once you continue, the exam session will open.",
+    "cancel": "Cancel",
+    "startExam": "Start Exam",
+    "starting": "Starting...",
+    "close": "Close",
+    "statuses": {
+      "notStarted": "Not Started",
+      "inProgress": "In Progress",
+      "submitted": "Submitted",
+      "graded": "Graded",
+      "published": "Published"
+    }
+  },
+  "examTaking": {
+    "pageLabel": "Page {current} of {total}",
+    "submitExam": "Submit Exam",
+    "submitting": "Submitting...",
+    "saving": "Saving...",
+    "saved": "Saved",
+    "error": "Error",
+    "point": "{count, plural, one {# point} other {# points}}",
+    "fileUpload": "File upload",
+    "previous": "Previous",
+    "next": "Next",
+    "confirmEyebrow": "Submit exam",
+    "confirmTitle": "Are you sure?",
+    "confirmBody": "Once you submit, you cannot change your answers for this exam.",
+    "confirmNotice": "Your saved answers will be submitted for grading.",
+    "cancel": "Cancel",
+    "close": "Close",
+    "true": "True",
+    "false": "False",
+    "multiAnswerHint": "You may select more than one answer.",
+    "textPlaceholder": "Write your answer here...",
+    "toast": {
+      "saveFailed": "Failed to save answer.",
+      "previousDisabled": "Navigation to previous pages is disabled.",
+      "answerBeforeProceeding": "Please answer all questions on this page before proceeding.",
+      "answerBeforeSubmitting": "Please answer all questions on this page before submitting.",
+      "submitted": "Exam submitted successfully!",
+      "timeUp": "Exam time is up! Auto-submitting..."
+    },
+    "uploading": "Uploading... {progress}%",
+    "uploadFailed": "Upload failed",
+    "failedToUpload": "Failed to upload \"{fileName}\"",
+    "tryAgain": "Try again",
+    "metadataSaveFailed": "Failed to save file metadata. Your file is saved locally and will be retried.",
+    "removeFileFailed": "Failed to remove file.",
+    "accepted": "Accepted:",
+    "maxSize": "Max size:",
+    "chooseFile": "Choose File",
+    "replace": "Replace",
+    "remove": "Remove",
+    "removingFile": "Removing file...",
+    "identicalFileConfirm": "This file appears identical to the current upload. Replace anyway?",
+    "fileTypeBlocked": "File type \".{extension}\" is not allowed.",
+    "allowedFilesOnly": "Only {extensions} files are allowed.",
+    "minFileSize": "File size must be at least {size} MB.",
+    "maxFileSize": "File size exceeds {size} MB limit."
+  },
+  "directMessage": {
+    "titleMessageRequired": "Title and message are required",
+    "sendFailed": "Failed to send message",
+    "errorOccurred": "An error occurred",
+    "sentTo": "Message sent to {name}",
+    "heading": "Send Message to {name}",
+    "title": "Title",
+    "titlePlaceholder": "Enter message title",
+    "message": "Message",
+    "messagePlaceholder": "Enter message body",
+    "cancel": "Cancel",
+    "send": "Send",
+    "sending": "Sending..."
+  },
+  "submissionsModal": {
+    "open": "Submissions",
+    "title": "Student Submissions",
+    "deadlinePassed": "Deadline passed - ready for grading",
+    "submitted": "{count} Submitted",
+    "pending": "{count} Pending",
+    "graded": "{count} Graded",
+    "emptyTitle": "No submissions yet",
+    "emptyDescription": "Students haven't submitted anything for this assignment.",
+    "scoreRequired": "Score is required",
+    "gradesPublished": "Grades published successfully!",
+    "published": "Published",
+    "draft": "Draft",
+    "ungraded": "Ungraded",
+    "late": "Late (+{time})",
+    "early": "{time} early",
+    "downloadSubmission": "Download submission",
+    "editGrade": "Edit grade",
+    "addGrade": "Add grade",
+    "editFeedback": "Edit feedback",
+    "addFeedback": "Add feedback",
+    "publishing": "Publishing...",
+    "publishGrades": "Publish Grades ({published}/{graded})",
+    "close": "Close",
+    "gradeTitle": "Grade Submission",
+    "student": "Student:",
+    "score": "Score",
+    "gradeHelp": "Saving a grade keeps it hidden until you publish grades.",
+    "cancel": "Cancel",
+    "saving": "Saving...",
+    "saveGrade": "Save Grade",
+    "feedbackTitle": "Teacher Feedback",
+    "feedbackPlaceholder": "Write your feedback for this student...",
+    "saveFeedback": "Save Feedback",
+    "day": "{count, plural, one {# day} other {# days}}",
+    "hour": "{count, plural, one {# hour} other {# hours}}",
+    "minute": "{count, plural, one {# minute} other {# minutes}}"
+  },
+  "schoolSignup": {
+    "statusTitle": "School Access Status",
+    "statusDescription": "Your school is pending approval. Academix team will review your request and activate your account once verification is complete.",
+    "goToSignIn": "Go to sign-in",
+    "title": "Create School Account",
+    "description": "Fill in complete school and primary admin details.",
+    "step": "Step {number}",
+    "schoolInfo": "School Information",
+    "adminInfo": "Primary Admin Account",
+    "fields": {
+      "schoolName": "School Name",
+      "registrationNumber": "Registration Number",
+      "schoolEmail": "School Email",
+      "schoolPhone": "School Phone",
+      "country": "Country",
+      "city": "City",
+      "website": "Website",
+      "schoolAddress": "School Address",
+      "adminName": "Admin Full Name",
+      "adminEmailOptional": "Admin Email (Optional)",
+      "adminUsername": "Admin Username",
+      "adminPassword": "Admin Password"
+    },
+    "validation": {
+      "schoolNameRequired": "School name is required.",
+      "schoolEmailRequired": "School email is required.",
+      "schoolPhoneRequired": "School phone is required.",
+      "countryRequired": "Country is required.",
+      "cityRequired": "City is required.",
+      "addressRequired": "School address is required.",
+      "adminNameRequired": "Admin full name is required.",
+      "adminUsernameRequired": "Admin username is required.",
+      "adminPasswordRequired": "Admin password is required."
+    },
+    "submitting": "Submitting...",
+    "submit": "Submit",
+    "page": {
+      "goBack": "Go back",
+      "titleStart": "School",
+      "titleHighlight": "Signup",
+      "description": "Register your school details and create your primary admin account. After review, the school will be activated by Academix.",
+      "steps": {
+        "profile": "Submit complete school profile",
+        "verification": "Verification by Academix",
+        "access": "Access granted to dashboard"
+      }
+    }
+  },
+  "auth": {
+    "login": {
+      "welcomeBack": "Welcome back",
+      "redirecting": "Redirecting to your dashboard...",
+      "goHome": "Go home",
+      "title": "Sign in to your account",
+      "identifier": "Username or Email",
+      "password": "Password",
+      "showPassword": "Show password",
+      "hidePassword": "Hide password",
+      "signingIn": "Signing in...",
+      "signIn": "Sign In",
+      "newSchool": "New school?",
+      "signupRequest": "Submit signup request"
+    },
+    "signOut": {
+      "signingOut": "Signing out...",
+      "backToSignIn": "Back to sign-in"
+    },
+    "schoolAccess": {
+      "title": "School Access Status",
+      "pending": "Your school is pending approval. Academix team will review your request and activate your account once verification is complete.",
+      "paused": "Your school is currently paused.",
+      "reason": "Reason:",
+      "noReason": "No reason provided.",
+      "active": "Your school account is active."
+    }
+  },
+  "schoolStatus": {
+    "alreadyActive": "This school is already active.",
+    "alreadyPaused": "This school is already paused.",
+    "activated": "School activated successfully.",
+    "activateFailed": "Failed to activate school.",
+    "pauseReasonRequired": "Pause reason is required.",
+    "paused": "School paused successfully.",
+    "pauseFailed": "Failed to pause school.",
+    "activate": "Activate",
+    "pause": "Pause",
+    "confirmActivation": "Confirm Activation",
+    "confirmPause": "Confirm Pause",
+    "activateConfirm": "Are you sure you want to activate {name}?",
+    "pauseConfirm": "Enter a reason before pausing {name}.",
+    "pauseReason": "Pause reason",
+    "cancel": "Cancel",
+    "confirm": "Confirm",
+    "activating": "Activating...",
+    "pausing": "Pausing...",
+    "closeModal": "Close modal"
+  },
+  "promotion": {
+    "button": "Update Students Grades",
+    "academicYear": "Academic Year",
+    "status": "Status",
+    "stillInProgress": "Academic year is still in progress",
+    "confirmTitle": "Confirm student promotion",
+    "completed": "Promotion completed",
+    "failed": "Promotion could not be completed",
+    "notFinishedBody": "The academic year {year} ends on {date}. You can update the students once the last day has passed.",
+    "confirmBody": "The academic year {year} has finished. Confirm this action to update students based on their final average. Students with 60% or higher pass.",
+    "promoted": "Promoted",
+    "graduated": "Graduated",
+    "repeated": "Repeated",
+    "successFallback": "Students promoted successfully.",
+    "confirm": "Confirm",
+    "updating": "Updating...",
+    "ok": "Ok",
+    "close": "Close promotion dialog"
+  },
+  "messageView": {
+    "view": "View message",
+    "close": "Close message view",
+    "title": "Title",
+    "body": "Body",
+    "date": "Date",
+    "time": "Time"
+  },
+  "pages": {
+    "archive": "Archive",
+    "settings": "School Settings",
+    "announcements": "Announcements",
+    "events": "Events",
+    "feedbacks": "Feedbacks",
+    "feedbackHistory": "My Feedback History",
+    "allStudents": "All Students",
+    "allTeachers": "All Teachers",
+    "allParents": "All Parents",
+    "allSubjects": "All Subjects",
+    "allClasses": "All Classes",
+    "allGrades": "All Grades",
+    "allExams": "All Exams",
+    "allAssignments": "All Assignments",
+    "allResults": "All Results",
+    "finalResults": "Final Averages",
+    "finalAverages": "Final Averages",
+    "allEvents": "All Events",
+    "allAnnouncements": "All Announcements",
+    "allMessages": "All Messages",
+    "allNotifications": "All Notifications",
+    "attendance": "Attendance",
+    "messages": "Messages",
+    "notifications": "Notifications"
+  },
+  "dashboardCards": {
+    "admin": "Admins",
+    "teacher": "Teachers",
+    "student": "Students",
+    "parent": "Parents"
+  },
+  "profile": {
+    "avatarAlt": "Profile",
+    "notFound": "Profile not found",
+    "notProvided": "Not provided",
+    "fields": {
+      "adminUsername": "Admin Username",
+      "schoolName": "School Name",
+      "schoolId": "School ID",
+      "createdAt": "Created At",
+      "updatedAt": "Updated At",
+      "name": "Name",
+      "username": "Username",
+      "email": "Email",
+      "phone": "Phone",
+      "address": "Address",
+      "bloodType": "Blood Type",
+      "gender": "Gender",
+      "birthday": "Birthday",
+      "subjects": "Subjects",
+      "classes": "Classes",
+      "school": "School",
+      "grade": "Grade",
+      "class": "Class",
+      "status": "Status",
+      "parent": "Parent",
+      "children": "Children"
+    }
+  },
+  "settings": {
+    "description": "Configure weekly schedule defaults used by lessons and calendar rendering.",
+    "workingDaysDescription": "Define school working days and add date-specific holidays or off-day overrides.",
+    "sections": {
+      "scheduleDefaults": "Schedule Defaults",
+      "workingDaysHolidays": "Working Days & Holidays",
+      "academicYears": "Academic Years"
+    },
+    "scheduleForm": {
+      "title": "Schedule Defaults",
+      "workDayStart": "Work Day Start",
+      "workDayEnd": "Work Day End",
+      "lessonDuration": "Lesson Duration (minutes)",
+      "lessonsPerDay": "Lessons Per Day",
+      "save": "Save Settings",
+      "updated": "School settings updated."
+    },
+    "academicYears": {
+      "title": "Academic Years",
+      "description": "Create and maintain academic year ranges.",
+      "add": "Add Academic Year",
+      "editTitle": "Edit Academic Year",
+      "create": "Create Academic Year",
+      "update": "Update Academic Year",
+      "startDate": "Start Date",
+      "endDate": "End Date",
+      "markCurrent": "Mark as current academic year",
+      "empty": "No academic years yet.",
+      "created": "Academic year created.",
+      "updated": "Academic year updated."
+    },
+    "workingDays": {
+      "weeklyWorkingDays": "Weekly Working Days",
+      "saveWorkingDays": "Save Working Days",
+      "holidaysOffDays": "Holidays and Off Days",
+      "addException": "Add Exception",
+      "addDayException": "Add Day Exception",
+      "nameOptional": "Name (optional)",
+      "namePlaceholder": "e.g. Eid Holiday",
+      "notesOptional": "Notes (optional)",
+      "empty": "No day exceptions yet.",
+      "workingDaysUpdated": "Working days updated.",
+      "exceptionSaved": "Day exception saved.",
+      "exceptionRemoved": "Day exception removed.",
+      "days": {
+        "SATURDAY": "Saturday",
+        "SUNDAY": "Sunday",
+        "MONDAY": "Monday",
+        "TUESDAY": "Tuesday",
+        "WEDNESDAY": "Wednesday",
+        "THURSDAY": "Thursday",
+        "FRIDAY": "Friday"
+      },
+      "types": {
+        "HOLIDAY": "Holiday",
+        "OFF_DAY": "Off Day",
+        "WORKING_OVERRIDE": "Working Override"
+      }
+    }
+  },
+  "profilePages": {
+    "cards": {
+      "attendance": "Attendance",
+      "grade": "Grade",
+      "lessons": "Lessons",
+      "class": "Class",
+      "subjects": "Subjects",
+      "classes": "Classes"
+    },
+    "shortcuts": {
+      "title": "Shortcuts"
+    },
+    "student": {
+      "schedule": "Student's Schedule",
+      "lessons": "Student's Lessons",
+      "teachers": "Student's Teachers",
+      "exams": "Student's Exams",
+      "assignments": "Student's Assignments",
+      "results": "Student's Results"
+    },
+    "teacher": {
+      "schedule": "Teacher's Schedule",
+      "classes": "Teacher's Classes",
+      "students": "Teacher's Students",
+      "exams": "Teacher's Exams",
+      "assignments": "Teacher's Assignments"
+    }
+  },
+  "lessonsPage": {
+    "title": "Lessons Calendar",
+    "grade": "Grade",
+    "classes": "Classes",
+    "scheduleFor": "Schedule for Grade {grade} - {className}",
+    "empty": {
+      "noClassesTitle": "No classes found",
+      "noClassesDescription": "No classes with lessons are available for this view.",
+      "noClassesForGrade": "No classes were found for the selected grade."
+    }
+  },
+  "forms": {
+    "common": {
+      "submitting": "Submitting...",
+      "selected": "{count} selected",
+      "optional": "optional",
+      "searchTeachers": "Search teachers...",
+      "searchParents": "Search parents...",
+      "searchStudents": "Search students...",
+      "searchSubjects": "Search subjects...",
+      "noTeachersFound": "No teachers found.",
+      "noParentsFound": "No parents found.",
+      "noStudentsFound": "No students found.",
+      "noSubjectsFound": "No subjects found.",
+      "noResultsFound": "No results found",
+      "gradeLevel": "Grade {level}",
+      "selectGrade": "Select a grade",
+      "selectSex": "Select sex",
+      "somethingWentWrong": "Something went wrong!",
+      "authenticationInfo": "Authentication Information",
+      "personalInfo": "Personal Information",
+      "username": "Username",
+      "email": "Email",
+      "password": "Password",
+      "showPassword": "Show password",
+      "hidePassword": "Hide password",
+      "fullName": "Full Name",
+      "name": "Name",
+      "phone": "Phone",
+      "address": "Address",
+      "bloodType": "Blood Type",
+      "birthday": "Birthday",
+      "sex": "Sex",
+      "male": "Male",
+      "female": "Female",
+      "status": "Status",
+      "regular": "Regular",
+      "repeated": "Repeated",
+      "graduated": "Graduated",
+      "left": "Left",
+      "photoUploaded": "Photo uploaded successfully",
+      "removePhoto": "Remove photo",
+      "selectAll": "Select all",
+      "selectedClasses": "{count} {count, plural, one {class is} other {classes are}} selected",
+      "description": "Description",
+      "date": "Date",
+      "startDate": "Start Date",
+      "endDate": "End Date",
+      "title": "Title",
+      "classes": "Classes"
+    },
+    "grade": {
+      "createTitle": "Create a new grade",
+      "level": "Grade Level",
+      "created": "Grade created successfully!"
+    },
+    "class": {
+      "createTitle": "Create a new class",
+      "updateTitle": "Update the class",
+      "name": "Class Name",
+      "capacity": "Capacity",
+      "grade": "Grade",
+      "supervisor": "Supervisor",
+      "created": "Class created successfully!",
+      "updated": "Class updated successfully!"
+    },
+    "subject": {
+      "createTitle": "Create a new subject",
+      "updateTitle": "Update the subject",
+      "name": "Subject Name",
+      "grade": "Grade",
+      "teachers": "Teachers",
+      "teachersHelp": "Choose one or more teachers who will be assigned to this subject.",
+      "noTeachersSelected": "No teachers selected yet.",
+      "created": "Subject created successfully!",
+      "updated": "Subject updated successfully!"
+    },
+    "student": {
+      "createTitle": "Create a new student",
+      "updateTitle": "Update the student",
+      "parent": "Parent",
+      "grade": "Grade",
+      "class": "Class",
+      "classCapacity": "{className} - {students}/{capacity} Capacity",
+      "uploadPhoto": "Upload Student Photo",
+      "previewAlt": "Student preview",
+      "create": "Create Student",
+      "update": "Update Student",
+      "created": "Student has been created!",
+      "updated": "Student has been updated!"
+    },
+    "teacher": {
+      "createTitle": "Create Teacher",
+      "updateTitle": "Update Teacher",
+      "subjects": "Subjects",
+      "subjectsHelp": "Choose one or more subjects this teacher will teach.",
+      "noSubjectsSelected": "No subjects selected yet.",
+      "removeSubject": "Remove {subject}",
+      "uploadPhoto": "Upload Teacher Photo",
+      "previewAlt": "Teacher preview",
+      "create": "Create Teacher",
+      "update": "Update Teacher",
+      "created": "Teacher created successfully!",
+      "updated": "Teacher updated successfully!"
+    },
+    "parent": {
+      "createTitle": "Create a new parent",
+      "updateTitle": "Update the parent",
+      "students": "Students",
+      "selectStudentRequired": "Select at least one student.",
+      "selectStudentBeforeCreate": "Select at least one student before creating a parent.",
+      "create": "Create Parent",
+      "update": "Update Parent",
+      "created": "Parent has been created!",
+      "updated": "Parent has been updated!"
+    },
+    "event": {
+      "createTitle": "Create a new event",
+      "updateTitle": "Update the event",
+      "title": "Event Title",
+      "titlePlaceholder": "e.g. Sports Day",
+      "descriptionPlaceholder": "Event description",
+      "created": "Event has been created!",
+      "updated": "Event has been updated!"
+    },
+    "announcement": {
+      "createTitle": "Create a new announcement",
+      "updateTitle": "Update the announcement",
+      "title": "Announcement Title",
+      "titlePlaceholder": "e.g. Parent Meeting",
+      "descriptionPlaceholder": "Announcement details",
+      "created": "Announcement has been created!",
+      "updated": "Announcement has been updated!"
+    },
+    "message": {
+      "createTitle": "Create a new message",
+      "updateTitle": "Update the message",
+      "recipients": "Recipients",
+      "content": "Message Content",
+      "title": "Message Title",
+      "titlePlaceholder": "e.g. Reminder",
+      "descriptionPlaceholder": "Message details",
+      "studentRecipients": "Student recipients",
+      "parentRecipients": "Parent recipients",
+      "teacherRecipients": "Teacher recipients",
+      "classesOptional": "Classes (optional)",
+      "searchRecipients": "Search {label}...",
+      "openRecipientSearch": "Open {label} search results",
+      "created": "Message has been created!",
+      "updated": "Message has been updated!"
+    },
+    "result": {
+      "createTitle": "Create a new result",
+      "updateTitle": "Update the result",
+      "student": "Student",
+      "assessmentType": "Assessment Type",
+      "assessment": "Assessment",
+      "selectAssessment": "Select assessment",
+      "exam": "Exam",
+      "assignment": "Assignment",
+      "score": "Score",
+      "created": "Result has been created!",
+      "updated": "Result has been updated!"
+    },
+    "lesson": {
+      "createTitle": "Create weekly lesson schedule",
+      "updateTitle": "Update weekly lesson schedule",
+      "class": "Class",
+      "selectClass": "Select class",
+      "lesson": "Lesson {slot}",
+      "noSubject": "No subject",
+      "selectTeacher": "Select teacher",
+      "teacherRequired": "Select a teacher",
+      "saved": "Weekly lesson schedule has been saved.",
+      "save": "Save Weekly Schedule",
+      "days": {
+        "SATURDAY": "SAT",
+        "SUNDAY": "SUN",
+        "MONDAY": "MON",
+        "TUESDAY": "TUE",
+        "WEDNESDAY": "WED",
+        "THURSDAY": "THU",
+        "FRIDAY": "FRI"
+      }
+    },
+    "exam": {
+      "createTitle": "Create a new exam",
+      "updateTitle": "Update the exam",
+      "title": "Exam Title",
+      "titlePlaceholder": "e.g. Midterm Quiz",
+      "subject": "Subject",
+      "selectSubject": "Select subject",
+      "noClassesAvailable": "No classes available.",
+      "created": "Exam has been created!",
+      "updated": "Exam has been updated!"
+    },
+    "assignment": {
+      "createTitle": "Create a new assignment",
+      "updateTitle": "Update the assignment",
+      "title": "Assignment Title",
+      "titlePlaceholder": "e.g. Chapter 4 Homework",
+      "marks": "Marks",
+      "assignedTeacher": "Assigned Teacher",
+      "assignedTeacherHelp": "This teacher will be able to access and evaluate submissions.",
+      "subject": "Subject",
+      "subjectFallback": "Subject #{id}",
+      "searchSubject": "Search subject...",
+      "clearSubject": "Clear subject",
+      "noClassesForSubject": "No classes found for this subject.",
+      "selectSubjectFirst": "Select a subject first to see available classes.",
+      "rubric": "Model Answer / Rubric",
+      "rubricPlaceholder": "Write the expected answer or explain how marks should be awarded...",
+      "rubricHelp": "Used to guide assignment grading and AI evaluation.",
+      "fileOptional": "Assignment File (optional)",
+      "currentFile": "Current file",
+      "downloadCurrentFile": "Download current file",
+      "removeCurrentFile": "Remove current file",
+      "changeFile": "Change File",
+      "replaceFile": "Replace File",
+      "uploadFile": "Upload File",
+      "removeSelected": "Remove selected",
+      "noFileAttached": "No file attached yet. Upload one if needed.",
+      "currentFileWillBeReplaced": "The current file will be replaced.",
+      "allowLateSubmission": "Allow Late Submission",
+      "lateAllowed": "Students can submit after the deadline",
+      "lateNotAllowed": "Students cannot submit after the deadline",
+      "created": "Assignment has been created!",
+      "updated": "Assignment has been updated!"
+    },
+    "studentDelete": {
+      "title": "Delete student",
+      "confirm": "Are you sure you want to delete {name}?",
+      "fallbackName": "this student",
+      "linkedParent": "This student is linked to parent {parent}.",
+      "canDeleteBoth": "You can delete the student only, or delete both the student and the parent.",
+      "parentHasMoreStudents": "The parent has more than one student, so only the student can be deleted.",
+      "deleteStudent": "Delete Student",
+      "deleteBoth": "Delete both",
+      "studentDeleted": "Student deleted successfully",
+      "studentAndParentDeleted": "Student and parent deleted successfully"
+    },
+    "gradeDelete": {
+      "title": "Delete grade",
+      "deleted": "Grade deleted successfully!",
+      "warning": "Warning: This grade has {count} {count, plural, one {class} other {classes}} attached.",
+      "cascadeWarning": "Deleting this grade will also delete those classes and their schedule-related records.",
+      "classes": "Classes: {classes}",
+      "noClasses": "Grade {level} has no classes attached and can be deleted.",
+      "confirm": "Are you sure you want to delete Grade {level}?",
+      "delete": "Delete grade"
+    },
+    "classDelete": {
+      "title": "Delete class",
+      "deleted": "Class deleted successfully!",
+      "deletedAndReassigned": "Class deleted and students reassigned successfully!",
+      "hasStudents": "This class has {count} {count, plural, one {student} other {students}}. Move them to another class or create a new class before deleting this one.",
+      "noStudents": "This class has no students, so it can be deleted now.",
+      "moveExisting": "Move to existing class",
+      "createNew": "Create new class",
+      "targetClass": "Target class",
+      "selectExisting": "Select an existing class",
+      "newClassName": "New class name",
+      "newClassPlaceholder": "e.g. 3B",
+      "capacity": "Capacity",
+      "grade": "Grade",
+      "supervisor": "Supervisor",
+      "noSupervisor": "No supervisor",
+      "selectTargetError": "Please select a class to move the students to.",
+      "nameRequired": "New class name is required.",
+      "capacityRequired": "New class capacity must be at least 1.",
+      "gradeRequired": "Please select a grade for the new class.",
+      "delete": "Delete class"
+    },
+    "examWorkflow": {
+      "basicInfo": "1. Basic Information",
+      "settings": "2. Settings",
+      "instructions": "3. Instructions",
+      "questions": "4. Questions",
+      "examTitle": "Exam Title",
+      "startTime": "Start Time",
+      "endTime": "End Time",
+      "assignedTeacher": "Assigned Teacher",
+      "assignedTeacherHelp": "This teacher will be able to access and evaluate submissions.",
+      "subject": "Subject",
+      "selectSubject": "Select a subject...",
+      "classes": "Classes",
+      "noClassesForSubject": "No classes found for this subject.",
+      "selectSubjectFirst": "Select a subject first to see available classes.",
+      "showTimer": "Show Timer",
+      "autoSave": "Auto-Save",
+      "navigation": "Previous Page Navigation",
+      "autoSubmit": "Auto-Submit when time is up",
+      "duration": "Duration (minutes)",
+      "questionsPerPage": "Questions Per Page",
+      "studentInstructions": "Student Instructions",
+      "instructionsPlaceholder": "Add anything students should read before starting...",
+      "addQuestion": "+ Add Question",
+      "createExam": "Create Exam",
+      "updateExam": "Update Exam",
+      "created": "Exam created successfully!",
+      "updated": "Exam updated successfully!",
+      "unexpectedError": "An unexpected error occurred.",
+      "emptyOptionsForQuestion": "Question #{number} has empty options! Please fill in all option fields.",
+      "selectCorrectForQuestion": "Please select at least one correct answer for Question #{number}.",
+      "question": {
+        "text": "Question Text",
+        "type": "Type",
+        "points": "Points",
+        "textAnswer": "Text Answer",
+        "mcq": "Multiple Choice",
+        "trueFalse": "True / False",
+        "file": "File Upload",
+        "allowMultiple": "Allow multiple correct answers",
+        "options": "Options",
+        "addOption": "+ Add Option",
+        "optionPlaceholder": "Option {number}",
+        "correct": "Correct",
+        "remove": "Remove",
+        "emptyOptions": "All option fields must be filled. Please do not leave empty options.",
+        "optionTextRequired": "Please write the option text before marking it as correct!",
+        "answerHelp": "Select one correct answer, or more if multiple answers are allowed.",
+        "correctAnswer": "Correct Answer",
+        "true": "True",
+        "false": "False",
+        "rubric": "Model Answer / Rubric",
+        "rubricPlaceholder": "Write the expected answer or explain how marks should be awarded...",
+        "rubricHelp": "Used to guide manual grading and AI evaluation.",
+        "fileSettings": "File Upload Settings",
+        "allowedExtensions": "Allowed File Extensions",
+        "allowedExtensionsPlaceholder": "e.g. pdf, docx, jpg",
+        "allowedExtensionsHelp": "Leave empty to accept all file types (Optional)",
+        "minFileSize": "Min File Size (MB)",
+        "maxFileSize": "Max File Size (MB)",
+        "systemMax": "System max: 10 MB",
+        "fileInstructions": "Instructions for Student (optional)",
+        "fileInstructionsPlaceholder": "e.g. Upload your essay as a PDF file...",
+        "pdfAiHelp": "PDF submissions can be evaluated with AI using the model answer / rubric above."
+      }
+    }
+  },
+  "assignmentSubmissions": {
+    "breadcrumb": "Assignments",
+    "title": "Assignment Submissions",
+    "subjectFallback": "No subject",
+    "marks": "{count} marks",
+    "stats": {
+      "visibleSubmissions": "Visible Submissions",
+      "graded": "Graded",
+      "draftGrades": "Draft Grades",
+      "published": "Published"
+    },
+    "status": {
+      "published": "Published",
+      "draftGrade": "Draft Grade",
+      "submitted": "Submitted"
+    },
+    "actions": {
+      "publishGrades": "Publish Grades",
+      "gradesPublished": "Grades Published",
+      "increaseAll": "Increase All",
+      "decreaseAll": "Decrease All",
+      "view": "View",
+      "download": "Download"
+    },
+    "fields": {
+      "marks": "marks",
+      "scoreAdjustmentAmount": "Score adjustment amount"
+    },
+    "empty": {
+      "title": "No submissions found",
+      "description": "No student submissions match the current filters.",
+      "previewUnavailable": "Preview unavailable"
+    },
+    "validation": {
+      "positiveAmount": "Enter a positive adjustment amount.",
+      "maxAmount": "Amount cannot be greater than {maxScore}."
+    }
+  },
+  "examSubmissions": {
+    "breadcrumb": "Exams",
+    "title": "Exam Submissions",
+    "gradeTitle": "Grade Submission",
+    "subjectFallback": "No subject",
+    "marks": "{count} marks",
+    "gradedCount": "{graded} of {total} graded",
+    "stats": {
+      "visible": "Visible",
+      "submitted": "Submitted",
+      "graded": "Graded",
+      "inProgress": "In Progress",
+      "published": "Published"
+    },
+    "status": {
+      "inProgress": "In Progress",
+      "submitted": "Submitted",
+      "graded": "Graded",
+      "saving": "Saving...",
+      "saved": "Saved",
+      "error": "Error",
+      "allGraded": "All graded",
+      "autoGraded": "Auto-graded"
+    },
+    "actions": {
+      "publishGrades": "Publish Grades",
+      "gradesPublished": "Grades Published",
+      "view": "View",
+      "grade": "Grade",
+      "downloadFile": "Download File",
+      "backToSubmissions": "Back to Submissions",
+      "finalizing": "Finalizing...",
+      "finalizedReapprove": "Grading Finalized (Re-Approve)",
+      "approveFinalize": "Approve & Finalize Grading"
+    },
+    "answers": {
+      "noAnswer": "No answer provided",
+      "studentAnswer": "Student Answer:",
+      "correctAnswer": "Correct Answer:",
+      "score": "Score:",
+      "uploadedFile": "Uploaded file",
+      "file": "FILE",
+      "uploaded": "Uploaded",
+      "noFile": "No file submitted.",
+      "previewUnavailable": "Preview unavailable"
+    },
+    "empty": {
+      "title": "No submissions yet",
+      "description": "Students have not submitted this exam yet."
+    },
+    "toast": {
+      "publishedSynced": "Published grades synced to results.",
+      "gradesPublished": "Grades published to students.",
+      "publishFailed": "Could not publish grades.",
+      "scorePositive": "Score must be a positive number.",
+      "scoreMax": "Score cannot exceed {maxPoints} points.",
+      "somethingWrong": "Something went wrong.",
+      "autoSaveFailed": "Failed to auto-save score.",
+      "scoreRequired": "Please enter a score.",
+      "scoreSaved": "Score saved!",
+      "finalized": "Grading approved and finalized successfully!",
+      "finalizeError": "An error occurred while finalizing grading."
+    },
+    "ai": {
+      "pdfOnly": "AI evaluation supports PDF file answers only."
+    }
+  },
+  "aiEvaluation": {
+    "title": "AI Evaluation",
+    "evaluate": "Evaluate with AI",
+    "saved": "AI evaluation saved.",
+    "failed": "AI evaluation failed.",
+    "manualFallback": "AI evaluation failed. Manual grading still works.",
+    "appliedDraftScore": "Applied draft score: {score} / {maxScore}",
+    "needsReview": "Needs review",
+    "noFeedback": "No feedback provided.",
+    "strengths": "Strengths",
+    "weaknesses": "Weaknesses",
+    "pdfSubmissionsOnly": "AI evaluation supports PDF submissions only."
+  },
+  "assignmentsPage": {
+    "actions": {
+      "submit": "Submit",
+      "submitLate": "Submit Late",
+      "submitLateShort": "Submit (Late)",
+      "replaceFile": "Replace File",
+      "viewSubmission": "View Submission",
+      "deadlinePassed": "Deadline Passed",
+      "download": "Download",
+      "submissions": "Submissions",
+      "cancel": "Cancel",
+      "close": "Close",
+      "processing": "Processing..."
+    },
+    "status": {
+      "gradePublished": "Grade published",
+      "feedbackReady": "Feedback ready",
+      "submitted": "Submitted",
+      "notSubmitted": "Not submitted",
+      "assignmentSubmitted": "Assignment submitted",
+      "gradePublishedMessage": "Your grade is published below.",
+      "waitingReview": "Waiting for your teacher to review it."
+    },
+    "modal": {
+      "mySubmission": "My Submission",
+      "replaceSubmittedFile": "Replace Submitted File",
+      "submitAssignment": "Submit Assignment",
+      "due": "Due: {date}",
+      "lateWarning": "You are submitting after the deadline. Late submission is allowed for this assignment.",
+      "submittedFile": "Submitted file",
+      "submittedDate": "Submitted: {date}",
+      "replaceWarning": "Uploading a new file will permanently replace the current one.",
+      "publishedGrade": "Published Grade",
+      "newFile": "New File",
+      "file": "File",
+      "maxFileSize": "(Max 20MB)",
+      "chooseFile": "Choose File",
+      "noFileChosen": "No file chosen",
+      "pdfHint": "Upload a PDF if possible for the best review experience.",
+      "note": "Note",
+      "optional": "(optional)",
+      "notePlaceholder": "Add a note for your teacher..."
+    },
+    "empty": {
+      "title": "No assignments found",
+      "description": "Try changing your filters or search terms."
+    }
+  },
+  "widgets": {
+    "viewAll": "View All",
+    "noEventsForDay": "No events for this day."
+  },
+  "emptyStates": {
+    "defaultTitle": "No data found",
+    "defaultDescription": "There is nothing to display right now.",
+    "noResults": "No results found",
+    "filterDescription": "Try changing your filters or search terms.",
+    "searchDescription": "Try changing your search terms.",
+    "announcements": "No announcements found",
+    "classes": "No classes found",
+    "events": "No events found",
+    "grades": "No grades found",
+    "teachers": "No teachers found",
+    "results": "No results found",
+    "finalResults": "No final averages found",
+    "finalAverages": "No final averages found",
+    "messages": "No messages found",
+    "students": "No students found",
+    "parents": "No parents found",
+    "subjects": "No subjects found",
+    "notifications": "No notifications found",
+    "studyMaterials": "No study materials yet",
+    "uploadFirstMaterial": "Upload the first material using the upload button.",
+    "noStudyMaterialsForStudent": "Your teacher hasn't uploaded any materials yet.",
+    "uploadMaterial": "Upload Material",
+    "uploadStudyMaterial": "Upload Study Material",
+    "assignments": "No assignments yet.",
+    "teachersAssigned": "No teachers assigned yet."
+  },
+  "subjectDetails": {
+    "subjects": "Subjects",
+    "grade": "Grade",
+    "gradeLevel": "Grade {level}",
+    "teacherCount": "{count, plural, one {# teacher} other {# teachers}}",
+    "teachers": "Teachers",
+    "classes": "Classes",
+    "assignments": "Assignments",
+    "materials": "Materials",
+    "exams": "Exams",
+    "subjectInfo": "Subject Info",
+    "subjectTeacher": "Subject Teacher",
+    "yourTeachers": "{count, plural, one {Your Teacher} other {Your Teachers}}",
+    "createExam": "Create Exam",
+    "manageAssignments": "Manage Assignments",
+    "manageExams": "Manage Exams",
+    "class": "Class",
+    "due": "Due",
+    "overdue": "Overdue",
+    "download": "Download",
+    "downloadAssignmentFile": "Download assignment file",
+    "noExams": "No exams scheduled.",
+    "studyMaterials": "Study Materials",
+    "upload": "Upload",
+    "delete": "Delete",
+    "tabs": {
+      "materials": "Materials",
+      "assignments": "Assignments",
+      "exams": "Exams"
+    },
+    "editor": {
+      "trigger": "Edit Page",
+      "title": "Edit Subject Page",
+      "bannerImage": "Banner Image",
+      "bannerPreviewAlt": "Banner preview",
+      "uploadBanner": "Click to upload banner",
+      "bannerHint": "Max 5MB - JPG, PNG, WebP",
+      "height": "Height:",
+      "heights": {
+        "sm": "Small",
+        "md": "Medium",
+        "lg": "Large"
+      },
+      "announcement": "Announcement",
+      "announcementHint": "(shown at top for students)",
+      "announcementPlaceholder": "e.g. \"Welcome to Mathematics! Please review chapter 3 before Monday.\"",
+      "courseDescription": "Course Description",
+      "descriptionPlaceholder": "Brief description of this subject...",
+      "wordCount": "{count}/{max} words",
+      "cancel": "Cancel",
+      "saveChanges": "Save Changes"
+    },
+    "materialUpload": {
+      "title": "Upload Study Material",
+      "submit": "Upload Material",
+      "maxSize": "(Max 20MB)",
+      "fields": {
+        "title": "Title",
+        "description": "Description",
+        "file": "File"
+      },
+      "placeholders": {
+        "title": "e.g. Chapter 3 Notes",
+        "description": "Optional description..."
+      },
+      "chooseFile": "Choose File",
+      "noFileChosen": "No file chosen"
+    }
+  },
+  "finalGradeEdit": {
+    "edit": "Edit final grade",
+    "title": "Edit Final Grade",
+    "finalGrade": "Final Grade (%)",
+    "cancel": "Cancel",
+    "save": "Save",
+    "saving": "Saving...",
+    "updated": "Final grade updated."
+  }
+}
diff --git a/next.config.mjs b/next.config.mjs
index 0cfa573..b3c1b37 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -1,3 +1,7 @@
+import createNextIntlPlugin from "next-intl/plugin";
+
+const withNextIntl = createNextIntlPlugin();
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   images: {
@@ -7,6 +11,11 @@ const nextConfig = {
       { hostname: "img.clerk.com" },
     ],
   },
+  experimental: {
+    serverActions: {
+      bodySizeLimit: "25mb",
+    },
+  },
 };
 
-export default nextConfig;
+export default withNextIntl(nextConfig);
diff --git a/package-lock.json b/package-lock.json
index e5ddbc6..ee71c54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,19 +7,24 @@
     "": {
       "name": "academix-dev-next-dashboard",
       "version": "0.1.0",
+      "hasInstallScript": true,
       "dependencies": {
         "@clerk/nextjs": "^7.0.12",
+        "@google/genai": "^2.7.0",
         "@hookform/resolvers": "^3.9.0",
         "@prisma/adapter-pg": "^7.6.0",
-        "@prisma/client": "^7.6.0",
+        "@prisma/client": "^7.8.0",
         "@types/react-big-calendar": "^1.8.9",
+        "cloudinary": "^2.10.0",
         "date-fns": "^4.1.0",
         "dotenv": "^17.4.0",
         "lucide-react": "^1.7.0",
         "moment": "^2.30.1",
         "next": "16.2.3",
         "next-cloudinary": "^6.17.5",
-        "pg": "^8.20.0",
+        "next-intl": "^4.13.0",
+        "nodemailer": "^8.0.10",
+        "pg": "^8.21.0",
         "prisma": "^7.6.0",
         "react": "^19.2.3",
         "react-big-calendar": "^1.13.2",
@@ -32,11 +37,13 @@
       },
       "devDependencies": {
         "@types/node": "^20",
+        "@types/nodemailer": "^8.0.0",
         "@types/react": "19.2.2",
         "@types/react-dom": "19.2.2",
         "eslint": "^9.39.0",
         "eslint-config-next": "16.2.3",
         "postcss": "^8",
+        "prisma": "^7.8.0",
         "tailwindcss": "^3.4.1",
         "tsx": "^4.21.0",
         "typescript": "^5"
@@ -56,13 +63,13 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
-      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
+      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/helper-validator-identifier": "^7.29.7",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -71,9 +78,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
-      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
+      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -81,21 +88,21 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
-      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
+      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.29.0",
-        "@babel/generator": "^7.29.0",
-        "@babel/helper-compilation-targets": "^7.28.6",
-        "@babel/helper-module-transforms": "^7.28.6",
-        "@babel/helpers": "^7.28.6",
-        "@babel/parser": "^7.29.0",
-        "@babel/template": "^7.28.6",
-        "@babel/traverse": "^7.29.0",
-        "@babel/types": "^7.29.0",
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helpers": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7",
         "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -112,14 +119,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.29.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
-      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz",
+      "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.29.0",
-        "@babel/types": "^7.29.0",
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -129,14 +136,14 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
-      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
+      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.28.6",
-        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/compat-data": "^7.29.7",
+        "@babel/helper-validator-option": "^7.29.7",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -146,9 +153,9 @@
       }
     },
     "node_modules/@babel/helper-globals": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
-      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
+      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -156,29 +163,29 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
-      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
+      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
-      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
+      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.28.6",
-        "@babel/helper-validator-identifier": "^7.28.5",
-        "@babel/traverse": "^7.28.6"
+        "@babel/helper-module-imports": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -188,9 +195,9 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -198,9 +205,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
-      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -208,9 +215,9 @@
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
-      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
+      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -218,27 +225,27 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.29.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz",
-      "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz",
+      "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.28.6",
-        "@babel/types": "^7.29.0"
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.29.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
-      "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz",
+      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.29.0"
+        "@babel/types": "^7.29.7"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -248,42 +255,42 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.29.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz",
-      "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz",
+      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
-      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
+      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.28.6",
-        "@babel/parser": "^7.28.6",
-        "@babel/types": "^7.28.6"
+        "@babel/code-frame": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
-      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz",
+      "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.29.0",
-        "@babel/generator": "^7.29.0",
-        "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.29.0",
-        "@babel/template": "^7.28.6",
-        "@babel/types": "^7.29.0",
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-globals": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -291,26 +298,26 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
-      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz",
+      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.28.5"
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@clerk/backend": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/@clerk/backend/-/backend-3.2.8.tgz",
-      "integrity": "sha512-N9yqCQCdkn/4XpfiVnaoS6wXDeC2yQf85ioHGolOIOCWXOPwMd63fONUfRhwOZSlXGTAsgyUNZu87Ps0tcVYsg==",
+      "version": "3.4.14",
+      "resolved": "https://registry.npmjs.org/@clerk/backend/-/backend-3.4.14.tgz",
+      "integrity": "sha512-0iaMT7k4wDk31QVC3HMaoeVFttblwsCECTHKNQpbRzIyD8j2gHdKEw/FNjffoyqyBqPw869IQlk1YokUlwVAqQ==",
       "license": "MIT",
       "dependencies": {
-        "@clerk/shared": "^4.6.0",
+        "@clerk/shared": "^4.14.0",
         "standardwebhooks": "^1.0.0",
         "tslib": "2.8.1"
       },
@@ -319,14 +326,14 @@
       }
     },
     "node_modules/@clerk/nextjs": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@clerk/nextjs/-/nextjs-7.0.12.tgz",
-      "integrity": "sha512-dq4iOLKf5PImLlA2YAs7c2E+yBiOYlbMlnw386xw+sTe/kv4KpRQPk2g/7PeEvFxFaV1gY764iy2sr4jy2bdQA==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/@clerk/nextjs/-/nextjs-7.4.2.tgz",
+      "integrity": "sha512-DpqljtLkTtMNsi03XRWYaWYyt0tb4S07HjS9fSmUtN//CKNqM7QAVMZzpgMAZz5yb2QhIVIVF1Uir2c7f72+MA==",
       "license": "MIT",
       "dependencies": {
-        "@clerk/backend": "^3.2.8",
-        "@clerk/react": "^6.2.1",
-        "@clerk/shared": "^4.6.0",
+        "@clerk/backend": "^3.4.14",
+        "@clerk/react": "^6.7.2",
+        "@clerk/shared": "^4.14.0",
         "server-only": "0.0.1",
         "tslib": "2.8.1"
       },
@@ -340,12 +347,12 @@
       }
     },
     "node_modules/@clerk/react": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@clerk/react/-/react-6.2.1.tgz",
-      "integrity": "sha512-fZpCBHTRgxkLk1S7FPp8iDpl2ZoZ/VFKvQWs3CFRX4Z9FFEcC5eAMPYbEL3treUv3TzQxcGTSgp5gd9+mFx4LQ==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@clerk/react/-/react-6.7.2.tgz",
+      "integrity": "sha512-tgRWWTfW+ejXj6WiZqx7iMbtvh45h0445uEvbSNVCyJBEOaBlCF0/ZfAfXlWAQNbRZ+bPIphEfNUmatadZgGOQ==",
       "license": "MIT",
       "dependencies": {
-        "@clerk/shared": "^4.6.0",
+        "@clerk/shared": "^4.14.0",
         "tslib": "2.8.1"
       },
       "engines": {
@@ -357,16 +364,16 @@
       }
     },
     "node_modules/@clerk/shared": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@clerk/shared/-/shared-4.6.0.tgz",
-      "integrity": "sha512-dtbsO/+xK5e+qWuOAY1ekZ8BJxsB0F0LYDpXWjRON7JSoFKSaqqaH5cwBvdjbbWaehb6jz1YUQmWVV8gBOx6Ag==",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/@clerk/shared/-/shared-4.14.0.tgz",
+      "integrity": "sha512-StZCFJ2rg0ITE3fYjIN9CKuKq8ZACW6l2+5qGCFPPYd4hZphA+VDselmh/lHPsF1ex/WRVUSHvquykAHR8cQbQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.90.16",
+        "@tanstack/query-core": "^5.100.6",
         "dequal": "2.0.3",
         "glob-to-regexp": "0.4.1",
-        "js-cookie": "3.0.5",
+        "js-cookie": "3.0.7",
         "std-env": "^3.9.0"
       },
       "engines": {
@@ -437,12 +444,14 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@electric-sql/pglite/-/pglite-0.4.1.tgz",
       "integrity": "sha512-mZ9NzzUSYPOCnxHH1oAHPRzoMFJHY472raDKwXl/+6oPbpdJ7g8LsCN4FSaIIfkiCKHhb3iF/Zqo3NYxaIhU7Q==",
+      "devOptional": true,
       "license": "Apache-2.0"
     },
     "node_modules/@electric-sql/pglite-socket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/@electric-sql/pglite-socket/-/pglite-socket-0.1.1.tgz",
       "integrity": "sha512-p2hoXw3Z3LQHwTeikdZNsFBOvXGqKY2hk51BBw+8NKND8eoH+8LFOtW9Z8CQKmTJ2qqGYu82ipqiyFZOTTXNfw==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "bin": {
         "pglite-server": "dist/scripts/server.js"
@@ -455,15 +464,16 @@
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/@electric-sql/pglite-tools/-/pglite-tools-0.3.1.tgz",
       "integrity": "sha512-C+T3oivmy9bpQvSxVqXA1UDY8cB9Eb9vZHL9zxWwEUfDixbXv4G3r2LjoTdR33LD8aomR3O9ZXEO3XEwr/cUCA==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "peerDependencies": {
         "@electric-sql/pglite": "0.4.1"
       }
     },
     "node_modules/@emnapi/core": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.2.tgz",
-      "integrity": "sha512-UC+ZhH3XtczQYfOlu3lNEkdW/p4dsJ1r/bP7H8+rhao3TTTMO1ATq/4DdIi23XuGoFY+Cz0JmCbdVl0hz9jZcA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -473,9 +483,9 @@
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.2.tgz",
-      "integrity": "sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
+      "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -494,9 +504,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz",
-      "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz",
+      "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==",
       "cpu": [
         "ppc64"
       ],
@@ -511,9 +521,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz",
-      "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz",
+      "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==",
       "cpu": [
         "arm"
       ],
@@ -528,9 +538,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz",
-      "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz",
+      "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==",
       "cpu": [
         "arm64"
       ],
@@ -545,9 +555,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz",
-      "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz",
+      "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==",
       "cpu": [
         "x64"
       ],
@@ -562,9 +572,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz",
-      "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz",
+      "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==",
       "cpu": [
         "arm64"
       ],
@@ -579,9 +589,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz",
-      "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz",
+      "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==",
       "cpu": [
         "x64"
       ],
@@ -596,9 +606,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz",
-      "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz",
+      "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==",
       "cpu": [
         "arm64"
       ],
@@ -613,9 +623,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz",
-      "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz",
+      "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==",
       "cpu": [
         "x64"
       ],
@@ -630,9 +640,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz",
-      "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz",
+      "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==",
       "cpu": [
         "arm"
       ],
@@ -647,9 +657,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz",
-      "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz",
+      "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==",
       "cpu": [
         "arm64"
       ],
@@ -664,9 +674,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz",
-      "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz",
+      "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==",
       "cpu": [
         "ia32"
       ],
@@ -681,9 +691,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz",
-      "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz",
+      "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==",
       "cpu": [
         "loong64"
       ],
@@ -698,9 +708,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz",
-      "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz",
+      "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==",
       "cpu": [
         "mips64el"
       ],
@@ -715,9 +725,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz",
-      "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz",
+      "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==",
       "cpu": [
         "ppc64"
       ],
@@ -732,9 +742,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz",
-      "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz",
+      "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==",
       "cpu": [
         "riscv64"
       ],
@@ -749,9 +759,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz",
-      "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz",
+      "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==",
       "cpu": [
         "s390x"
       ],
@@ -766,9 +776,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz",
-      "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz",
+      "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==",
       "cpu": [
         "x64"
       ],
@@ -783,9 +793,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz",
-      "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz",
+      "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==",
       "cpu": [
         "arm64"
       ],
@@ -800,9 +810,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz",
-      "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz",
+      "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==",
       "cpu": [
         "x64"
       ],
@@ -817,9 +827,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz",
-      "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz",
+      "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==",
       "cpu": [
         "arm64"
       ],
@@ -834,9 +844,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz",
-      "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz",
+      "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==",
       "cpu": [
         "x64"
       ],
@@ -851,9 +861,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz",
-      "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz",
+      "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==",
       "cpu": [
         "arm64"
       ],
@@ -868,9 +878,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz",
-      "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz",
+      "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==",
       "cpu": [
         "x64"
       ],
@@ -885,9 +895,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz",
-      "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz",
+      "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==",
       "cpu": [
         "arm64"
       ],
@@ -902,9 +912,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz",
-      "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz",
+      "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==",
       "cpu": [
         "ia32"
       ],
@@ -919,9 +929,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz",
-      "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz",
+      "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==",
       "cpu": [
         "x64"
       ],
@@ -1079,10 +1089,65 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@formatjs/fast-memoize": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-3.1.6.tgz",
+      "integrity": "sha512-H5aexk1Le7T9TPmscacZ+1pR6CTa2n1wq+HDVGXhH8TzUlQQpeXzZs91dRtmFHrbeNbjPFPfQujUqm7MHgVoXQ==",
+      "license": "MIT"
+    },
+    "node_modules/@formatjs/icu-messageformat-parser": {
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-3.5.11.tgz",
+      "integrity": "sha512-NVsuNsc2dUVG9+4HBJ/srScxtA/18LqGgwtop/tuN/OIBjVl6QA+0KhfZQddDD9sEh2LeVjLFPGVU3ixa3blcA==",
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/icu-skeleton-parser": "2.1.10"
+      }
+    },
+    "node_modules/@formatjs/icu-skeleton-parser": {
+      "version": "2.1.10",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-2.1.10.tgz",
+      "integrity": "sha512-XuSva+8ZGawk8VnD5VD6UeH8KarQ/Z022zgjHDoHmlNiAewstXuuzXc0Hk5pGFSdG+nNw5bfJKXqj1ZXHn9yUA==",
+      "license": "MIT"
+    },
+    "node_modules/@formatjs/intl-localematcher": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.8.10.tgz",
+      "integrity": "sha512-P/IC3qws3jH+1fEs+o0RIFgXKRaQlFehjS5W0FPAqdo6hgzawLl+eD0q0JjheQ3XtoOe5n8WSYfX06KQZI/QJA==",
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/fast-memoize": "3.1.6"
+      }
+    },
+    "node_modules/@google/genai": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/@google/genai/-/genai-2.7.0.tgz",
+      "integrity": "sha512-tv0DRtcndt2oEhBYy+5mA0TaXH98+L1Gt0AP9unBfH7DP20KhB7+O3QqAN1Lz+laMARGTHS7BFQSNpLbl4gm1g==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "google-auth-library": "^10.3.0",
+        "p-retry": "^4.6.2",
+        "protobufjs": "^7.5.4",
+        "ws": "^8.18.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "@modelcontextprotocol/sdk": "^1.25.2"
+      },
+      "peerDependenciesMeta": {
+        "@modelcontextprotocol/sdk": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@hono/node-server": {
       "version": "1.19.11",
       "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.11.tgz",
       "integrity": "sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=18.14.1"
@@ -1101,29 +1166,43 @@
       }
     },
     "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",
+      "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/types": "^0.15.0"
+      },
       "engines": {
         "node": ">=18.18.0"
       }
     },
     "node_modules/@humanfs/node": {
-      "version": "0.16.7",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
-      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz",
+      "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanfs/core": "^0.19.1",
+        "@humanfs/core": "^0.19.2",
+        "@humanfs/types": "^0.15.0",
         "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
         "node": ">=18.18.0"
       }
     },
+    "node_modules/@humanfs/types": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz",
+      "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -1672,19 +1751,26 @@
       "version": "0.3.4",
       "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.4.tgz",
       "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.12",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
-      "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
+      "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/core": "^1.4.3",
-        "@emnapi/runtime": "^1.4.3",
-        "@tybys/wasm-util": "^0.10.0"
+        "@tybys/wasm-util": "^0.10.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "peerDependencies": {
+        "@emnapi/core": "^1.7.1",
+        "@emnapi/runtime": "^1.7.1"
       }
     },
     "node_modules/@next/env": {
@@ -1879,6 +1965,313 @@
         "node": ">=12.4.0"
       }
     },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
+      "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-libc": "^2.0.3",
+        "is-glob": "^4.0.3",
+        "node-addon-api": "^7.0.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.6",
+        "@parcel/watcher-darwin-arm64": "2.5.6",
+        "@parcel/watcher-darwin-x64": "2.5.6",
+        "@parcel/watcher-freebsd-x64": "2.5.6",
+        "@parcel/watcher-linux-arm-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm-musl": "2.5.6",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm64-musl": "2.5.6",
+        "@parcel/watcher-linux-x64-glibc": "2.5.6",
+        "@parcel/watcher-linux-x64-musl": "2.5.6",
+        "@parcel/watcher-win32-arm64": "2.5.6",
+        "@parcel/watcher-win32-ia32": "2.5.6",
+        "@parcel/watcher-win32-x64": "2.5.6"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
+      "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
+      "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
+      "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
+      "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
+      "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
+      "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
+      "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
+      "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
+      "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
+      "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
+      "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
+      "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
+      "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher/node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@popperjs/core": {
       "version": "2.11.8",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
@@ -1890,24 +2283,24 @@
       }
     },
     "node_modules/@prisma/adapter-pg": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@prisma/adapter-pg/-/adapter-pg-7.7.0.tgz",
-      "integrity": "sha512-q33Ta8sKbgzEpAy0lx45tAq//yMv0qcb+8nj+TCA3P4wiAY+OBFEFk/NDkZncAfHaNJeGo5WJpJdpbL+ijYx8g==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/adapter-pg/-/adapter-pg-7.8.0.tgz",
+      "integrity": "sha512-ygb3UkerK3v8MDpXVgCISdRNDozpxh6+JVJgiIGbSr5KBgz10LLf5ejUskPGoXlsIjxsOu6nuy1JVQr2EKGSlg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@prisma/driver-adapter-utils": "7.7.0",
+        "@prisma/driver-adapter-utils": "7.8.0",
         "@types/pg": "^8.16.0",
         "pg": "^8.16.3",
         "postgres-array": "3.0.4"
       }
     },
     "node_modules/@prisma/client": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-7.7.0.tgz",
-      "integrity": "sha512-5Ar4OsZpJ54s21sy5oDNNW9gQtd4NuxCaiM7+JDTOU07D6VvlpLjYzAVCMB1+JzokN+08dAVomlx+b7bhJd3ww==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-7.8.0.tgz",
+      "integrity": "sha512-HFp3Dawv/3sU3JtlPha90IB+48lS7zHiH4LKZPjmcE8YH5P9DOXGPvo8dqOtO7MqLDd1p2hOWMcFlRT1DMblHw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@prisma/client-runtime-utils": "7.7.0"
+        "@prisma/client-runtime-utils": "7.8.0"
       },
       "engines": {
         "node": "^20.19 || ^22.12 || >=24.0"
@@ -1926,33 +2319,35 @@
       }
     },
     "node_modules/@prisma/client-runtime-utils": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@prisma/client-runtime-utils/-/client-runtime-utils-7.7.0.tgz",
-      "integrity": "sha512-BLyd0UpFYOtyJFTHm7jS9vesHW7P83abibodQMiIofqjBKzDHQ1VAsQkdfvXyYDkPlONPfOTz7/rv3x/+CQqvQ==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/client-runtime-utils/-/client-runtime-utils-7.8.0.tgz",
+      "integrity": "sha512-5NQZztQ0oY/ADFkmd9gPuweH5A1/CCY8YQPorLLO0Mu6a87mY5gsnDkzmFmIHs9NFaLnZojzgddFVN4RpKYrdw==",
       "license": "Apache-2.0"
     },
     "node_modules/@prisma/config": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@prisma/config/-/config-7.7.0.tgz",
-      "integrity": "sha512-hmPI3tKLO2aP0Y5vugbjcnA9qqlfJndiT6ds4tw28U5hNHLWg+mHJEWAhjsSPgxjtmxhJ/EDIeIlyh+3Us0OPg==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/config/-/config-7.8.0.tgz",
+      "integrity": "sha512-HFESzd9rx2ZQxlK+TL7tu1HPvCqrHiL6LCxYykI2c34mvaUuIVVl3lYuicJD/MNnzgPnyeBEMlK4WTomJCV5jw==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "c12": "3.1.0",
+        "c12": "3.3.4",
         "deepmerge-ts": "7.1.5",
         "effect": "3.20.0",
         "empathic": "2.0.0"
       }
     },
     "node_modules/@prisma/debug": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-7.7.0.tgz",
-      "integrity": "sha512-12J62XdqCmpiwJHhHdQxZeY3ckVCWIFmcJP8hg5dPTceeiQ0wiojXGFYTluKqFQfu46fRLgb/rLALZMAx3+dTA==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-7.8.0.tgz",
+      "integrity": "sha512-p+QZReysDUqXC+mk17q9a+Y/qzh4c2KYliDK30buYUyfrGeTGSyfmc0AIrJRhZJrLHhRiJa9Au/J72h3C+szvA==",
       "license": "Apache-2.0"
     },
     "node_modules/@prisma/dev": {
       "version": "0.24.3",
       "resolved": "https://registry.npmjs.org/@prisma/dev/-/dev-0.24.3.tgz",
       "integrity": "sha512-ffHlQuKXZiaDt9Go0OnCTdJZrHxK0k7omJKNV86/VjpsXu5EIHZLK0T7JSWgvNlJwh56kW9JFu9v0qJciFzepg==",
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "@electric-sql/pglite": "0.4.1",
@@ -1975,66 +2370,79 @@
       }
     },
     "node_modules/@prisma/driver-adapter-utils": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@prisma/driver-adapter-utils/-/driver-adapter-utils-7.7.0.tgz",
-      "integrity": "sha512-gZXREeu6mOk7zXfGFJgh86p7Vhj0sXNKp+4Cg1tWYo7V2dfncP2qxS2BiTmbIIha8xPqItkl0WSw38RuSq1HoQ==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/driver-adapter-utils/-/driver-adapter-utils-7.8.0.tgz",
+      "integrity": "sha512-/Q13o0ZT0rjc1Xk0Q9KhZYwuq2EW/vSbWUBKfgEKkaCuB/Sg6bqnjmTZqC5cD4d6y1vfFAEwBRzfzoSMIVJ55A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@prisma/debug": "7.7.0"
+        "@prisma/debug": "7.8.0"
       }
     },
     "node_modules/@prisma/engines": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-7.7.0.tgz",
-      "integrity": "sha512-7fmcbT7HHXBq/b+3h/dO1JI3fd8l8q7erf7xP7pRprh58hmSSnG8mg9K3yjW3h9WaHWUwngVFpSxxxivaitQ2w==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-7.8.0.tgz",
+      "integrity": "sha512-jx3rCnNNrt5uzbkKlegtQ2GZHxSlihMCzutgT/BP6UIDF1r9tDI39hV/0T/cHZgzJ3ELbuQPXlVZy+Y1n0pcgw==",
+      "devOptional": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@prisma/debug": "7.7.0",
-        "@prisma/engines-version": "7.6.0-1.75cbdc1eb7150937890ad5465d861175c6624711",
-        "@prisma/fetch-engine": "7.7.0",
-        "@prisma/get-platform": "7.7.0"
+        "@prisma/debug": "7.8.0",
+        "@prisma/engines-version": "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a",
+        "@prisma/fetch-engine": "7.8.0",
+        "@prisma/get-platform": "7.8.0"
       }
     },
     "node_modules/@prisma/engines-version": {
-      "version": "7.6.0-1.75cbdc1eb7150937890ad5465d861175c6624711",
-      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-7.6.0-1.75cbdc1eb7150937890ad5465d861175c6624711.tgz",
-      "integrity": "sha512-r51DLcJ8bDRSrBEJF3J4cinoWyGA7rfP2mG6lD90VqIbGNOkbfcLcXalSVjq5Y6brQS3vcjrq4GbyUb1Cb7vkw==",
+      "version": "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a",
+      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a.tgz",
+      "integrity": "sha512-fJPQxCkLgA5EayWaW8eArgCvjJ+N+Kz3VyeNKMEeYiQC4alNkxRKFVAGxv/ZUzuJISKqdw+zGeDbS6mn6RCPOA==",
+      "devOptional": true,
       "license": "Apache-2.0"
     },
     "node_modules/@prisma/engines/node_modules/@prisma/get-platform": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-7.7.0.tgz",
-      "integrity": "sha512-MEUNzvKxvYnJ7kgvd6oNRnMmmiGNS9TYLB2weMeIXplnHdL/UWEGnvavYGnN7KLJ2n0iI4dDAyzSkHI3c7AscQ==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-7.8.0.tgz",
+      "integrity": "sha512-WlxgRGnolL8VH2EmkH1R/DkKNr/mVdS3G2h42IZFFZ3eUrH9OT6t73kIOSlkkrv50wG123Iq8d96ufv5LlZktw==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@prisma/debug": "7.7.0"
+        "@prisma/debug": "7.8.0"
       }
     },
     "node_modules/@prisma/fetch-engine": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-7.7.0.tgz",
-      "integrity": "sha512-TfyzveBQoK4xALzsTpVhB/0KG1N8zOK0ap+RnBMkzGUu3f98fnQ4QtXa2wlKPhsO2X8a3N5ugFQgcKNoHGmDfw==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-7.8.0.tgz",
+      "integrity": "sha512-gwB0Euiz/DDRyxFRpLXYlK3RfaZUj1c5dAYMuhZYfApg7arknJlcb9bIsOHDppJmbqYaVA+yBIiFMDBfprsNPQ==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@prisma/debug": "7.7.0",
-        "@prisma/engines-version": "7.6.0-1.75cbdc1eb7150937890ad5465d861175c6624711",
-        "@prisma/get-platform": "7.7.0"
+        "@prisma/debug": "7.8.0",
+        "@prisma/engines-version": "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a",
+        "@prisma/get-platform": "7.8.0"
       }
     },
+    "node_modules/@prisma/fetch-engine/node_modules/@prisma/debug": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-7.8.0.tgz",
+      "integrity": "sha512-p+QZReysDUqXC+mk17q9a+Y/qzh4c2KYliDK30buYUyfrGeTGSyfmc0AIrJRhZJrLHhRiJa9Au/J72h3C+szvA==",
+      "devOptional": true,
+      "license": "Apache-2.0"
+    },
     "node_modules/@prisma/fetch-engine/node_modules/@prisma/get-platform": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-7.7.0.tgz",
-      "integrity": "sha512-MEUNzvKxvYnJ7kgvd6oNRnMmmiGNS9TYLB2weMeIXplnHdL/UWEGnvavYGnN7KLJ2n0iI4dDAyzSkHI3c7AscQ==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-7.8.0.tgz",
+      "integrity": "sha512-WlxgRGnolL8VH2EmkH1R/DkKNr/mVdS3G2h42IZFFZ3eUrH9OT6t73kIOSlkkrv50wG123Iq8d96ufv5LlZktw==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@prisma/debug": "7.7.0"
+        "@prisma/debug": "7.8.0"
       }
     },
     "node_modules/@prisma/get-platform": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-7.2.0.tgz",
       "integrity": "sha512-k1V0l0Td1732EHpAfi2eySTezyllok9dXb6UQanajkJQzPUGi3vO2z7jdkz67SypFTdmbnyGYxvEvYZdZsMAVA==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@prisma/debug": "7.2.0"
@@ -2044,18 +2452,21 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-7.2.0.tgz",
       "integrity": "sha512-YSGTiSlBAVJPzX4ONZmMotL+ozJwQjRmZweQNIq/ER0tQJKJynNkRB3kyvt37eOfsbMCXk3gnLF6J9OJ4QWftw==",
+      "devOptional": true,
       "license": "Apache-2.0"
     },
     "node_modules/@prisma/query-plan-executor": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@prisma/query-plan-executor/-/query-plan-executor-7.2.0.tgz",
       "integrity": "sha512-EOZmNzcV8uJ0mae3DhTsiHgoNCuu1J9mULQpGCh62zN3PxPTd+qI9tJvk5jOst8WHKQNwJWR3b39t0XvfBB0WQ==",
+      "devOptional": true,
       "license": "Apache-2.0"
     },
     "node_modules/@prisma/streams-local": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@prisma/streams-local/-/streams-local-0.1.2.tgz",
       "integrity": "sha512-l49yTxKKF2odFxaAXTmwmkBKL3+bVQ1tFOooGifu4xkdb9NMNLxHj27XAhTylWZod8I+ISGM5erU1xcl/oBCtg==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
         "ajv": "^8.12.0",
@@ -2069,9 +2480,10 @@
       }
     },
     "node_modules/@prisma/streams-local/node_modules/ajv": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+      "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -2088,12 +2500,14 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/@prisma/studio-core": {
       "version": "0.27.3",
       "resolved": "https://registry.npmjs.org/@prisma/studio-core/-/studio-core-0.27.3.tgz",
       "integrity": "sha512-AADjNFPdsrglxHQVTmHFqv6DuKQZ5WY4p5/gVFY017twvNrSwpLJ9lqUbYYxEu2W7nbvVxTZA8deJ8LseNALsw==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@radix-ui/react-toggle": "1.1.10",
@@ -2109,16 +2523,81 @@
         "react-dom": "^18.0.0 || ^19.0.0"
       }
     },
+    "node_modules/@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/codegen": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.5.tgz",
+      "integrity": "sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/eventemitter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.1.tgz",
+      "integrity": "sha512-vW1GmwMZNnL+gMRaovlh9yZX74kc+TTU3FObkkurpMaRtBfLP3ldjS9KQWlwZgraRE0+dheEEoAxdzcJQ8eXZg==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/fetch": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.1.tgz",
+      "integrity": "sha512-GpptLrs57adMSuHi3VNj0mAF8dwh36LMaYF6XyJ6JMWlVsc+t42tm1HSEDmOs3A8fC9yyeisgLhsTVQokOZ0zw==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.1"
+      }
+    },
+    "node_modules/@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/inquire": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.2.tgz",
+      "integrity": "sha512-pa0vFRuws4wkvaXKK1uXZMAwAX4/t8ANaJo45iw/oQHNQ9q5xUzwgFmVJGXiga2BeN+zpX7Vf9vmsiIa2J+MUw==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/utf8": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.1.tgz",
+      "integrity": "sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/@radix-ui/primitive": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz",
       "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/@radix-ui/react-compose-refs": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz",
       "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==",
+      "devOptional": true,
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
@@ -2134,6 +2613,7 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
       "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@radix-ui/react-slot": "1.2.3"
@@ -2157,6 +2637,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
       "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.2"
@@ -2175,6 +2656,7 @@
       "version": "1.1.10",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.10.tgz",
       "integrity": "sha512-lS1odchhFTeZv3xwHH31YPObmJn8gOg7Lq12inrr0+BH/l3Tsq32VfjqH1oh80ARM3mlkfMic15n0kg4sD1poQ==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.3",
@@ -2200,6 +2682,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz",
       "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@radix-ui/react-use-effect-event": "0.0.2",
@@ -2219,6 +2702,7 @@
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz",
       "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@radix-ui/react-use-layout-effect": "1.1.1"
@@ -2237,6 +2721,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz",
       "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==",
+      "devOptional": true,
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
@@ -2260,24 +2745,229 @@
         "react": ">=16.8.0"
       }
     },
-    "node_modules/@rtsao/scc": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
-      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@stablelib/base64": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@stablelib/base64/-/base64-1.0.1.tgz",
-      "integrity": "sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ==",
-      "license": "MIT"
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@schummar/icu-type-parser": {
+      "version": "1.21.5",
+      "resolved": "https://registry.npmjs.org/@schummar/icu-type-parser/-/icu-type-parser-1.21.5.tgz",
+      "integrity": "sha512-bXHSaW5jRTmke9Vd0h5P7BtWZG9Znqb8gSDxZnxaGSJnGwPLDPfS+3g0BKzeWqzgZPsIVZkM7m2tbo18cm5HBw==",
+      "license": "MIT"
+    },
+    "node_modules/@stablelib/base64": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@stablelib/base64/-/base64-1.0.1.tgz",
+      "integrity": "sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ==",
+      "license": "MIT"
+    },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
+      "devOptional": true,
+      "license": "MIT"
+    },
+    "node_modules/@swc/core-darwin-arm64": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.40.tgz",
+      "integrity": "sha512-PaYyclfmQ++77D8ityYvmmVzHv9aG8ROwt2GfG6/ccloy4Hgf80qtOnzb9VYvPsUT7Ty1uhuDRhv3XYpf62qhQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-darwin-x64": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.40.tgz",
+      "integrity": "sha512-HbbPzvfLBUXjIB1Ezks+//lNUjmLjfyd63XSwprJgrZaXYdm70kohXPJUWdqKZozolFxbPaO+xtBaiUp6BoueA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm-gnueabihf": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.40.tgz",
+      "integrity": "sha512-SlRZsCjOCPR2LvFs0Ri/Xrx/5o5TCt8vl4gW6mX1hEZOG0a625RxzRHpHdAQNGykmAN/7IeaFAJG+QnNmxlHcA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-gnu": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.40.tgz",
+      "integrity": "sha512-Q8byxJt2fh8CR3EUX6snBpy47AoBVm+In/+Z3rjDHMjC38ZvR9/gtUUNCT0tfrn4EdVsO8/QPi59nxrxvqxvBQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-musl": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.40.tgz",
+      "integrity": "sha512-4z0MgHU+7M0pZDqBN1El7mFXDI1SBwinfcUkAyA4v8QrhOIUOZltySt2aStQLZGrdXVXM4Y4ylfiTC04ED+MoQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-ppc64-gnu": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.40.tgz",
+      "integrity": "sha512-fLI4iUgeSZu0eRWUXwe6YzPFx9gHbFiPkl8Rp3mJfP8OpNR3nTQCGPvHdDh9xniW7mVvgMY4ni7A4VzqI1KrpA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-s390x-gnu": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.40.tgz",
+      "integrity": "sha512-YqeKMAb7d4nQSGMJQ454IlaCENpzcDqhvBE9+CPfdnYpnUXxd+BSrB6Xk0YjW8UyoEhUj4p6quATCxbsp6J3jg==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-gnu": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.40.tgz",
+      "integrity": "sha512-7HOuS1iGcme/j/TuL1TfmmLGiMQrjv/GmjyZeydl00FKPtpGXEldwqfI56xgd1YzrzoB2svWjxbGGyQ0TEASxg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-musl": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.40.tgz",
+      "integrity": "sha512-h4kZYHc7dpc9P9u4brRJaS8Pl7tPVHAeiLSzw7T5RfIJgAoSdaCMKzI/2Uay9gFhaw8uyCDl0L5q37r0EpAfIA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-arm64-msvc": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.40.tgz",
+      "integrity": "sha512-+mQgKZXSj6mV38Zh05QaxSjUDmGP/R2JWlXZTDLSPkDzHU6p3GxN9eeSf5dfyDVU86946fmCvSzyl/ucImx8+A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-ia32-msvc": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.40.tgz",
+      "integrity": "sha512-yvwdPLGd25mcj/mNatjNQ0lZujtQD6psH3v9PNmMb+fSzjbNG8KIDxjFWrcV+fsFVLOkyOmdJsFmX7NAFjVyPw==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-x64-msvc": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.40.tgz",
+      "integrity": "sha512-OXtKsLU1bVtInzzDEAY2sYiF/rl4tvAnLLLpuMp3HzAOQZ5A+i69AKDhA1YLQTaMAqO3vzyYNVAYVRMPtSYD4w==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
     },
-    "node_modules/@standard-schema/spec": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
-      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
-      "license": "MIT"
+    "node_modules/@swc/counter": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+      "license": "Apache-2.0"
     },
     "node_modules/@swc/helpers": {
       "version": "0.5.15",
@@ -2288,10 +2978,19 @@
         "tslib": "^2.8.0"
       }
     },
+    "node_modules/@swc/types": {
+      "version": "0.1.26",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.26.tgz",
+      "integrity": "sha512-lyMwd7WGgG79RS7EERZV3T8wMdmPq3xwyg+1nmAM64kIhx5yl+juO2PYIHb7vTiPgPCj8LYjsNV2T5wiQHUEaw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/counter": "^0.1.3"
+      }
+    },
     "node_modules/@tanstack/query-core": {
-      "version": "5.90.16",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.16.tgz",
-      "integrity": "sha512-MvtWckSVufs/ja463/K4PyJeqT+HMlJWtw6PrCpywznd2NSgO3m4KwO9RqbFqGg6iDE8vVMFWMeQI4Io3eEYww==",
+      "version": "5.100.14",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.100.14.tgz",
+      "integrity": "sha512-5X41dGpxgeaHISCRW2oYwcSycZeULZzAunaudXT9ov1KOTj9xwt0CH6hbwqP1/z74ZWF7rYFnDpyYH07XFcZew==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -2299,9 +2998,9 @@
       }
     },
     "node_modules/@tybys/wasm-util": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
-      "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
+      "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -2379,9 +3078,9 @@
       "license": "MIT"
     },
     "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "dev": true,
       "license": "MIT"
     },
@@ -2400,14 +3099,24 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.19.39",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.39.tgz",
-      "integrity": "sha512-orrrD74MBUyK8jOAD/r0+lfa1I2MO6I+vAkmAWzMYbCcgrN4lCrmK52gRFQq/JRxfYPfonkr4b0jcY7Olqdqbw==",
+      "version": "20.19.41",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.41.tgz",
+      "integrity": "sha512-ECymXOukMnOoVkC2bb1Vc/w/836DXncOg5m8Xj1RH7xSHZJWNYY6Zh7EH477vcnD5egKNNfy2RpNOmuChhFPgQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
       }
     },
+    "node_modules/@types/nodemailer": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-8.0.0.tgz",
+      "integrity": "sha512-fyf8jWULsCo0d0BuoQ75i6IeoHs47qcqxWc7yUdUcV0pOZGjUTTOvwdG1PRXUDqN/8A64yQdQdnA2pZgcdi+cA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/pg": {
       "version": "8.20.0",
       "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.20.0.tgz",
@@ -2449,12 +3158,18 @@
       "version": "19.2.2",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.2.tgz",
       "integrity": "sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "^19.2.0"
       }
     },
+    "node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "license": "MIT"
+    },
     "node_modules/@types/warning": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.4.tgz",
@@ -2462,17 +3177,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.1.tgz",
-      "integrity": "sha512-eSkwoemjo76bdXl2MYqtxg51HNwUSkWfODUOQ3PaTLZGh9uIWWFZIjyjaJnex7wXDu+TRx+ATsnSxdN9YWfRTQ==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.60.0.tgz",
+      "integrity": "sha512-QYb/sa74/s7OKMbACMjrYnGspj9Hs5YI5aaffSL65UfeBUzVzBJfVo3oWSpbzPurvm7yaCCo2Lk7lVj610HqKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.58.1",
-        "@typescript-eslint/type-utils": "8.58.1",
-        "@typescript-eslint/utils": "8.58.1",
-        "@typescript-eslint/visitor-keys": "8.58.1",
+        "@typescript-eslint/scope-manager": "8.60.0",
+        "@typescript-eslint/type-utils": "8.60.0",
+        "@typescript-eslint/utils": "8.60.0",
+        "@typescript-eslint/visitor-keys": "8.60.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
         "ts-api-utils": "^2.5.0"
@@ -2485,7 +3200,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.58.1",
+        "@typescript-eslint/parser": "^8.60.0",
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
         "typescript": ">=4.8.4 <6.1.0"
       }
@@ -2501,16 +3216,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.58.1.tgz",
-      "integrity": "sha512-gGkiNMPqerb2cJSVcruigx9eHBlLG14fSdPdqMoOcBfh+vvn4iCq2C8MzUB89PrxOXk0y3GZ1yIWb9aOzL93bw==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.60.0.tgz",
+      "integrity": "sha512-fcqpj/MyK4sxDPcbe7STNPbpQL4RLZOPWuaTmwZYuc+hJKzRf58yRxfhqGpc6PIq9ZyfSBpfHgmUHmHs0KwHwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.58.1",
-        "@typescript-eslint/types": "8.58.1",
-        "@typescript-eslint/typescript-estree": "8.58.1",
-        "@typescript-eslint/visitor-keys": "8.58.1",
+        "@typescript-eslint/scope-manager": "8.60.0",
+        "@typescript-eslint/types": "8.60.0",
+        "@typescript-eslint/typescript-estree": "8.60.0",
+        "@typescript-eslint/visitor-keys": "8.60.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -2526,14 +3241,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.58.1.tgz",
-      "integrity": "sha512-gfQ8fk6cxhtptek+/8ZIqw8YrRW5048Gug8Ts5IYcMLCw18iUgrZAEY/D7s4hkI0FxEfGakKuPK/XUMPzPxi5g==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.0.tgz",
+      "integrity": "sha512-aZu74NNKJeUWqCjDddzdiKaS82dgYgV/vmf+Ui3ZdZejmgfXR/q+pRumgobnQ2cCJTgGTWp4ypiwsuofFubavg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.58.1",
-        "@typescript-eslint/types": "^8.58.1",
+        "@typescript-eslint/tsconfig-utils": "^8.60.0",
+        "@typescript-eslint/types": "^8.60.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -2548,14 +3263,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.58.1.tgz",
-      "integrity": "sha512-TPYUEqJK6avLcEjumWsIuTpuYODTTDAtoMdt8ZZa93uWMTX13Nb8L5leSje1NluammvU+oI3QRr5lLXPgihX3w==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.0.tgz",
+      "integrity": "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.58.1",
-        "@typescript-eslint/visitor-keys": "8.58.1"
+        "@typescript-eslint/types": "8.60.0",
+        "@typescript-eslint/visitor-keys": "8.60.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2566,9 +3281,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.1.tgz",
-      "integrity": "sha512-JAr2hOIct2Q+qk3G+8YFfqkqi7sC86uNryT+2i5HzMa2MPjw4qNFvtjnw1IiA1rP7QhNKVe21mSSLaSjwA1Olw==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.0.tgz",
+      "integrity": "sha512-BZPR3RGYlAXnly6ymAxfkVn5rCbZzQNou0rxv3GfWZ8cTQp+hhVd73khbGLAd8k1TlAPLISH337M+tAgAnaJDQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2583,15 +3298,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.58.1.tgz",
-      "integrity": "sha512-HUFxvTJVroT+0rXVJC7eD5zol6ID+Sn5npVPWoFuHGg9Ncq5Q4EYstqR+UOqaNRFXi5TYkpXXkLhoCHe3G0+7w==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.60.0.tgz",
+      "integrity": "sha512-SX46wEUtitCpq7AN38HkUU/+zvUpdKf7ephtWAFgckH8O7PQIyL5gvrhQgBLuEYgLfuKWOVvWVskMbuFHAz5xg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.58.1",
-        "@typescript-eslint/typescript-estree": "8.58.1",
-        "@typescript-eslint/utils": "8.58.1",
+        "@typescript-eslint/types": "8.60.0",
+        "@typescript-eslint/typescript-estree": "8.60.0",
+        "@typescript-eslint/utils": "8.60.0",
         "debug": "^4.4.3",
         "ts-api-utils": "^2.5.0"
       },
@@ -2608,9 +3323,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.58.1.tgz",
-      "integrity": "sha512-io/dV5Aw5ezwzfPBBWLoT+5QfVtP8O7q4Kftjn5azJ88bYyp/ZMCsyW1lpKK46EXJcaYMZ1JtYj+s/7TdzmQMw==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.0.tgz",
+      "integrity": "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2622,16 +3337,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.1.tgz",
-      "integrity": "sha512-w4w7WR7GHOjqqPnvAYbazq+Y5oS68b9CzasGtnd6jIeOIeKUzYzupGTB2T4LTPSv4d+WPeccbxuneTFHYgAAWg==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.0.tgz",
+      "integrity": "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.58.1",
-        "@typescript-eslint/tsconfig-utils": "8.58.1",
-        "@typescript-eslint/types": "8.58.1",
-        "@typescript-eslint/visitor-keys": "8.58.1",
+        "@typescript-eslint/project-service": "8.60.0",
+        "@typescript-eslint/tsconfig-utils": "8.60.0",
+        "@typescript-eslint/types": "8.60.0",
+        "@typescript-eslint/visitor-keys": "8.60.0",
         "debug": "^4.4.3",
         "minimatch": "^10.2.2",
         "semver": "^7.7.3",
@@ -2660,9 +3375,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
-      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
+      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2689,9 +3404,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.1.tgz",
+      "integrity": "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -2702,16 +3417,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.58.1.tgz",
-      "integrity": "sha512-Ln8R0tmWC7pTtLOzgJzYTXSCjJ9rDNHAqTaVONF4FEi2qwce8mD9iSOxOpLFFvWp/wBFlew0mjM1L1ihYWfBdQ==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.0.tgz",
+      "integrity": "sha512-HtXuPfrHTyBDkameWpl+vJb1Uevu2tznAyahM1Oc4AENidCLTPiZDWIo4GfcxNdC/RcfGcadzzkqbRG87dUrQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.58.1",
-        "@typescript-eslint/types": "8.58.1",
-        "@typescript-eslint/typescript-estree": "8.58.1"
+        "@typescript-eslint/scope-manager": "8.60.0",
+        "@typescript-eslint/types": "8.60.0",
+        "@typescript-eslint/typescript-estree": "8.60.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2726,13 +3441,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.1.tgz",
-      "integrity": "sha512-y+vH7QE8ycjoa0bWciFg7OpFcipUuem1ujhrdLtq1gByKwfbC7bPeKsiny9e0urg93DqwGcHey+bGRKCnF1nZQ==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.0.tgz",
+      "integrity": "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.58.1",
+        "@typescript-eslint/types": "8.60.0",
         "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
@@ -2757,9 +3472,9 @@
       }
     },
     "node_modules/@unrs/resolver-binding-android-arm-eabi": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
-      "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.12.2.tgz",
+      "integrity": "sha512-g5T90pqg1bo/7mytQx6F4iBNC0Wsh9cu+z9veDbFjc7HjpesJFWD7QMS0NGStXM075+7dJPPVvBbpZlnrdpi/w==",
       "cpu": [
         "arm"
       ],
@@ -2771,9 +3486,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-android-arm64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
-      "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.12.2.tgz",
+      "integrity": "sha512-YGCRZv/9GLhwmz6mYDeTsm/92BAyR28l6c2ReweVW5pWgfsitWLY8upvfRlGdoyD8HjeTHSYJWyZGD4KJA/nFQ==",
       "cpu": [
         "arm64"
       ],
@@ -2785,9 +3500,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-darwin-arm64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
-      "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.12.2.tgz",
+      "integrity": "sha512-u9DiNT1auQMO20A9SyTuG3wUgQWB9Z7KjAg0uFuCDR1FsAY8A0CG2S6JpHS1xwm/w1G08bjXZDcyOCjv1WAm2w==",
       "cpu": [
         "arm64"
       ],
@@ -2799,9 +3514,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-darwin-x64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
-      "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.12.2.tgz",
+      "integrity": "sha512-f7rPLi/T1HVKZu/u6t87lroib16n8vrSzcyxI7lg4BGO9UF26KhQL44sd9eOUgrTYhvRXtWOIZT5PejdPyJfUA==",
       "cpu": [
         "x64"
       ],
@@ -2813,9 +3528,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-freebsd-x64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
-      "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.12.2.tgz",
+      "integrity": "sha512-BpcOjWCJub6nRZUS2zA20pmLvjtqAtGejETaIyRLiZiQf++cbrjltLA5NN/xaXfqeOBOSlMFbemIl5/S5tljmg==",
       "cpu": [
         "x64"
       ],
@@ -2827,9 +3542,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
-      "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.12.2.tgz",
+      "integrity": "sha512-vZTDvdSISZjJx66OzJqtsOhzifbqRjbmI1Mnu49fQDwog5GtDI4QidRiEAYbZCRj9C8YZEW+3ZjqsyS9GR4k2A==",
       "cpu": [
         "arm"
       ],
@@ -2841,9 +3556,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
-      "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.12.2.tgz",
+      "integrity": "sha512-BiPI+IrIlwcW4nLLMM21+B1dFPzd55yAVgVGrdgDjNef+ch03GdxrcyaIz8X9SsQirh/kCQ7mviyWlMxdh2D7g==",
       "cpu": [
         "arm"
       ],
@@ -2855,9 +3570,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
-      "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.12.2.tgz",
+      "integrity": "sha512-zJc0H99FEPoFfSrNpa91HYfxzfAJCr502oxNK1cfdC9hlaFI43RT+JFCann9JUgZmLzzntChHyn13Sgn9ljHNg==",
       "cpu": [
         "arm64"
       ],
@@ -2869,9 +3584,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
-      "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.12.2.tgz",
+      "integrity": "sha512-KQ3Lki6l+Pz1k/eBipN41ES+YUK30beLGb9YqcB1O542cyLCNE6GaxrfcY3T6EezmGGk84wb5XyO9loTM9tkcA==",
       "cpu": [
         "arm64"
       ],
@@ -2882,10 +3597,38 @@
         "linux"
       ]
     },
+    "node_modules/@unrs/resolver-binding-linux-loong64-gnu": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-loong64-gnu/-/resolver-binding-linux-loong64-gnu-1.12.2.tgz",
+      "integrity": "sha512-3SJGEh1DborhG6pyxvhPzCT4bbSIVihsvgJc13P1bHG7KLdNDaF9T3gsTwFc7Jw/5Y5/iWOjkEx7Zy0NvCGX3Q==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-loong64-musl": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-loong64-musl/-/resolver-binding-linux-loong64-musl-1.12.2.tgz",
+      "integrity": "sha512-jiuG/Obbel7uw1PwHNFfrkiKhLAF6mnyZ6aWlOAVN9WqKm8v0OFGnciJIHu8+CMvXLQ8AD51LPzAoUfT21D5Ew==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
-      "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.12.2.tgz",
+      "integrity": "sha512-q7xRvVpmcfeL+LlZg8Pbbo6QaTZwDU5BaGZbwfhkEsXJn3Was8xYfE0RBH266xZt0rM6B7i8xAYIvjthuUIWHg==",
       "cpu": [
         "ppc64"
       ],
@@ -2897,9 +3640,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
-      "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.12.2.tgz",
+      "integrity": "sha512-0CVdx6lcnT3Q9inOH8tsMIOJ6ImndllMjqJHg8RLVdB7Vq4SfkEXl9mCSsVNuNA4MCYycRicCUxPCabVHJRr6A==",
       "cpu": [
         "riscv64"
       ],
@@ -2911,9 +3654,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
-      "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.12.2.tgz",
+      "integrity": "sha512-iOwlRo9vnp6R6ohHQS11n0NnfdXx/omhkocmIfaPRpQhKZ+3BDMkkdRVh53qjkFkpPddf+FETA28NwGN7l5l+w==",
       "cpu": [
         "riscv64"
       ],
@@ -2925,9 +3668,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
-      "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.12.2.tgz",
+      "integrity": "sha512-HYJtLfXq94q8iZNFT1lknx258wlkkWhZeUXJRqzKBBUJ00CvZ+N33zgbCqimLjsyw5Va6uUxhVa12mI+kaveEw==",
       "cpu": [
         "s390x"
       ],
@@ -2939,9 +3682,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
-      "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.12.2.tgz",
+      "integrity": "sha512-mPsUhunKKDih5O96Y6enDQyHc1SqBPlY1E/SfMWDM3EdJ95Z9CArPeCVwCCqbP45ljvivdEk8Fxn+SIb1rDAJQ==",
       "cpu": [
         "x64"
       ],
@@ -2953,9 +3696,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-x64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
-      "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.12.2.tgz",
+      "integrity": "sha512-azrt6+5ydLd8Vt210AAFis/lZevSfPw93EJRIJG+xPu4WCJ8K0kppCTpMyLPcKT7H15M4Jnt2tMp5bOvCkRC6A==",
       "cpu": [
         "x64"
       ],
@@ -2966,10 +3709,24 @@
         "linux"
       ]
     },
+    "node_modules/@unrs/resolver-binding-openharmony-arm64": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-openharmony-arm64/-/resolver-binding-openharmony-arm64-1.12.2.tgz",
+      "integrity": "sha512-YZ9hP4O0X9PQb8eO980qmLNGH4zT3I9+SZTdt0Pr0YyuGQhYKoOZkV02VzrzyOZJ5xIJ3UFIenKkUkGg8GjgWQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
     "node_modules/@unrs/resolver-binding-wasm32-wasi": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
-      "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.12.2.tgz",
+      "integrity": "sha512-tYFDIkMxSflfEc/h92ZWNsZlHSwgimbNHSO3PL2JWQHfCuC2q316jMyYU9TIWZsFK2bQwyK5VAdYgn8ygPj69A==",
       "cpu": [
         "wasm32"
       ],
@@ -2977,16 +3734,18 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@napi-rs/wasm-runtime": "^0.2.11"
+        "@emnapi/core": "1.10.0",
+        "@emnapi/runtime": "1.10.0",
+        "@napi-rs/wasm-runtime": "^1.1.4"
       },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
-      "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.12.2.tgz",
+      "integrity": "sha512-qzNyg3xL0VPQmCaUh+N5jSitce6k+uCBfMDesWRnlULOZaqUkaJ0ybdT+UqlAWJoQjuqfIU/0Ptx9bteN4D82g==",
       "cpu": [
         "arm64"
       ],
@@ -2998,9 +3757,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
-      "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.12.2.tgz",
+      "integrity": "sha512-WD9sY00OfpHVGfsnHZoA8jVT+esS/Bg8z8jzxp5BnDCjjwsuKsPQrzswwpFy4J1AUJbXPRfkpcX0mXrzeXW79g==",
       "cpu": [
         "ia32"
       ],
@@ -3012,9 +3771,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
-      "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.12.2.tgz",
+      "integrity": "sha512-nAB74NfSNKknqQ1RrYj6uz8FcXEomu/MATJZxh/x+BArzN2U3JbOYC0APYzUIGhVY3m5hRxA8VPNdPBoG8txlA==",
       "cpu": [
         "x64"
       ],
@@ -3057,10 +3816,19 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/ajv": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
-      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",
+      "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3332,15 +4100,16 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz",
       "integrity": "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">= 6.0.0"
       }
     },
     "node_modules/axe-core": {
-      "version": "4.11.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.2.tgz",
-      "integrity": "sha512-byD6KPdvo72y/wj2T/4zGEvvlis+PsZsn/yPS3pEO+sFpcrqRpX/TJCxvVaEsNeMrfQbCr7w163YqoD9IYwHXw==",
+      "version": "4.11.4",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.4.tgz",
+      "integrity": "sha512-KunSNx+TVpkAw/6ULfhnx+HWRecjqZGTOyquAoWHYLRSdK1tB5Ihce1ZW+UY3fj33bYAFWPu7W/GRSmmrCGuxA==",
       "dev": true,
       "license": "MPL-2.0",
       "engines": {
@@ -3364,10 +4133,30 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.17",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.17.tgz",
-      "integrity": "sha512-HdrkN8eVG2CXxeifv/VdJ4A4RSra1DTW8dc/hdxzhGHN8QePs6gKaWM9pHPcpCoxYZJuOZ8drHmbdpLHjCYjLA==",
+      "version": "2.10.33",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.33.tgz",
+      "integrity": "sha512-bA6+tcSLpz2tIEdDXZPpPTIuxBcC4+w6SieaYyfigIa4h8GlFxbA17v22Vx3JUtuZQj9SgOsnbK+aTBzyDyEuw==",
       "license": "Apache-2.0",
       "bin": {
         "baseline-browser-mapping": "dist/cli.cjs"
@@ -3377,11 +4166,21 @@
       }
     },
     "node_modules/better-result": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/better-result/-/better-result-2.8.2.tgz",
-      "integrity": "sha512-YOf0VSj5nUPI27doTtXF+BBnsiRq3qY7avHqfIWnppxTLGyvkLq1QV2RTxkwoZwJ60ywLfZ0raFF4J/G886i7A==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/better-result/-/better-result-2.9.2.tgz",
+      "integrity": "sha512-WIFoBPCdnTOdk9inkE1ZRvCZ4P0CpSkAiLlchC65N7n9DcjZ3NhqkBOlafzpOVnO8ixyi37kicmSJ3ENhPZl7Q==",
+      "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/bignumber.js": {
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz",
+      "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -3396,9 +4195,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
+      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3453,27 +4252,34 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/c12": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/c12/-/c12-3.1.0.tgz",
-      "integrity": "sha512-uWoS8OU1MEIsOv8p/5a82c3H31LsWVR5qiyXVfBNOzfffjUWtPnhAb4BYI2uG2HfGmZmFjCtui5XNWaps+iFuw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/c12/-/c12-3.3.4.tgz",
+      "integrity": "sha512-cM0ApFQSBXuourJejzwv/AuPRvAxordTyParRVcHjjtXirtkzM0uK2L9TTn9s0cXZbG7E55jCivRQzoxYmRAlA==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "chokidar": "^4.0.3",
-        "confbox": "^0.2.2",
-        "defu": "^6.1.4",
-        "dotenv": "^16.6.1",
-        "exsolve": "^1.0.7",
-        "giget": "^2.0.0",
-        "jiti": "^2.4.2",
+        "chokidar": "^5.0.0",
+        "confbox": "^0.2.4",
+        "defu": "^6.1.6",
+        "dotenv": "^17.3.1",
+        "exsolve": "^1.0.8",
+        "giget": "^3.2.0",
+        "jiti": "^2.6.1",
         "ohash": "^2.0.11",
         "pathe": "^2.0.3",
-        "perfect-debounce": "^1.0.0",
-        "pkg-types": "^2.2.0",
-        "rc9": "^2.1.2"
+        "perfect-debounce": "^2.1.0",
+        "pkg-types": "^2.3.0",
+        "rc9": "^3.0.1"
       },
       "peerDependencies": {
-        "magicast": "^0.3.5"
+        "magicast": "*"
       },
       "peerDependenciesMeta": {
         "magicast": {
@@ -3481,18 +4287,6 @@
         }
       }
     },
-    "node_modules/c12/node_modules/dotenv": {
-      "version": "16.6.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
-      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
-      }
-    },
     "node_modules/call-bind": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.9.tgz",
@@ -3564,9 +4358,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001787",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001787.tgz",
-      "integrity": "sha512-mNcrMN9KeI68u7muanUpEejSLghOKlVhRqS/Za2IeyGllJ9I9otGpR9g3nsw7n4W378TE/LyIteA0+/FOZm4Kg==",
+      "version": "1.0.30001793",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz",
+      "integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==",
       "funding": [
         {
           "type": "opencollective",
@@ -3604,6 +4398,7 @@
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.1.tgz",
       "integrity": "sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@kurkle/color": "^0.3.0"
@@ -3613,35 +4408,39 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
+      "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "readdirp": "^4.0.1"
+        "readdirp": "^5.0.0"
       },
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 20.19.0"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/citty": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz",
-      "integrity": "sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==",
-      "license": "MIT",
-      "dependencies": {
-        "consola": "^3.2.3"
-      }
-    },
     "node_modules/client-only": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz",
       "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==",
       "license": "MIT"
     },
+    "node_modules/cloudinary": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/cloudinary/-/cloudinary-2.10.0.tgz",
+      "integrity": "sha512-sY09kYg7wprkndAOjZBAYqFZqwL+SxnEGcAvksOvFA+5upnFn949UjkEkHKNSwkBtW/xRDd0p6NgbSXZcxkI3w==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.23"
+      },
+      "engines": {
+        "node": ">=9"
+      }
+    },
     "node_modules/clsx": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
@@ -3692,17 +4491,9 @@
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.4.tgz",
       "integrity": "sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==",
+      "devOptional": true,
       "license": "MIT"
     },
-    "node_modules/consola": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz",
-      "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==",
-      "license": "MIT",
-      "engines": {
-        "node": "^14.18.0 || >=16.10.0"
-      }
-    },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
@@ -3714,6 +4505,7 @@
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
       "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -3871,6 +4663,15 @@
       "dev": true,
       "license": "BSD-2-Clause"
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/data-view-buffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
@@ -3932,9 +4733,9 @@
       "license": "MIT"
     },
     "node_modules/date-fns": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
-      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.4.0.tgz",
+      "integrity": "sha512-+1UMbeh68lH1SegH83CGWwpb6OHHbpSgr3+s5Eww5M4CAgswBpoWS0AjTOfEJ33HiYKz1hdj/KTFprzXHmq/6w==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -3942,16 +4743,15 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.20",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz",
-      "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==",
+      "version": "1.11.21",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.21.tgz",
+      "integrity": "sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==",
       "license": "MIT"
     },
     "node_modules/debug": {
       "version": "4.4.3",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
       "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -3982,6 +4782,7 @@
       "version": "7.1.5",
       "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.5.tgz",
       "integrity": "sha512-HOJkrhaYsweh+W+e74Yn7YStZOilkoPb6fycpwNLKzSPtruFs48nYis0zy5yJz1+ktUhHxoRDJ27RQAWLIJVJw==",
+      "devOptional": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=16.0.0"
@@ -4027,12 +4828,14 @@
       "version": "6.1.7",
       "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.7.tgz",
       "integrity": "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/denque": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
       "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=0.10"
@@ -4051,6 +4854,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/destr/-/destr-2.0.5.tgz",
       "integrity": "sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/detect-libc": {
@@ -4058,7 +4862,6 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
       "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "license": "Apache-2.0",
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -4101,9 +4904,9 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "17.4.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.1.tgz",
-      "integrity": "sha512-k8DaKGP6r1G30Lx8V4+pCsLzKr8vLmV2paqEj1Y55GdAgJuIqpRp5FfajGF8KtwMxCz9qJc6wUIJnm053d/WCw==",
+      "version": "17.4.2",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",
+      "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -4127,10 +4930,20 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/effect": {
       "version": "3.20.0",
       "resolved": "https://registry.npmjs.org/effect/-/effect-3.20.0.tgz",
       "integrity": "sha512-qMLfDJscrNG8p/aw+IkT9W7fgj50Z4wG5bLBy0Txsxz8iUHjDIkOgO3SV0WZfnQbNG2VJYb0b+rDLMrhM4+Krw==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@standard-schema/spec": "^1.0.0",
@@ -4138,9 +4951,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.334",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.334.tgz",
-      "integrity": "sha512-mgjZAz7Jyx1SRCwEpy9wefDS7GvNPazLthHg8eQMJ76wBdGQQDW33TCrUTvQ4wzpmOrv2zrFoD3oNufMdyMpog==",
+      "version": "1.5.364",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.364.tgz",
+      "integrity": "sha512-G/dYE3+AYhyHwzTwg8UbnXf7zqMERYh7l2jJ3QujhFsH8agSYwtnGAR2aZ7f0AakIKJXd5En/Hre4igIUrdlYw==",
       "dev": true,
       "license": "ISC"
     },
@@ -4155,6 +4968,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/empathic/-/empathic-2.0.0.tgz",
       "integrity": "sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=14"
@@ -4164,6 +4978,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
       "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
@@ -4290,9 +5105,9 @@
       }
     },
     "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz",
+      "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4350,9 +5165,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz",
-      "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz",
+      "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -4363,32 +5178,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.27.7",
-        "@esbuild/android-arm": "0.27.7",
-        "@esbuild/android-arm64": "0.27.7",
-        "@esbuild/android-x64": "0.27.7",
-        "@esbuild/darwin-arm64": "0.27.7",
-        "@esbuild/darwin-x64": "0.27.7",
-        "@esbuild/freebsd-arm64": "0.27.7",
-        "@esbuild/freebsd-x64": "0.27.7",
-        "@esbuild/linux-arm": "0.27.7",
-        "@esbuild/linux-arm64": "0.27.7",
-        "@esbuild/linux-ia32": "0.27.7",
-        "@esbuild/linux-loong64": "0.27.7",
-        "@esbuild/linux-mips64el": "0.27.7",
-        "@esbuild/linux-ppc64": "0.27.7",
-        "@esbuild/linux-riscv64": "0.27.7",
-        "@esbuild/linux-s390x": "0.27.7",
-        "@esbuild/linux-x64": "0.27.7",
-        "@esbuild/netbsd-arm64": "0.27.7",
-        "@esbuild/netbsd-x64": "0.27.7",
-        "@esbuild/openbsd-arm64": "0.27.7",
-        "@esbuild/openbsd-x64": "0.27.7",
-        "@esbuild/openharmony-arm64": "0.27.7",
-        "@esbuild/sunos-x64": "0.27.7",
-        "@esbuild/win32-arm64": "0.27.7",
-        "@esbuild/win32-ia32": "0.27.7",
-        "@esbuild/win32-x64": "0.27.7"
+        "@esbuild/aix-ppc64": "0.28.0",
+        "@esbuild/android-arm": "0.28.0",
+        "@esbuild/android-arm64": "0.28.0",
+        "@esbuild/android-x64": "0.28.0",
+        "@esbuild/darwin-arm64": "0.28.0",
+        "@esbuild/darwin-x64": "0.28.0",
+        "@esbuild/freebsd-arm64": "0.28.0",
+        "@esbuild/freebsd-x64": "0.28.0",
+        "@esbuild/linux-arm": "0.28.0",
+        "@esbuild/linux-arm64": "0.28.0",
+        "@esbuild/linux-ia32": "0.28.0",
+        "@esbuild/linux-loong64": "0.28.0",
+        "@esbuild/linux-mips64el": "0.28.0",
+        "@esbuild/linux-ppc64": "0.28.0",
+        "@esbuild/linux-riscv64": "0.28.0",
+        "@esbuild/linux-s390x": "0.28.0",
+        "@esbuild/linux-x64": "0.28.0",
+        "@esbuild/netbsd-arm64": "0.28.0",
+        "@esbuild/netbsd-x64": "0.28.0",
+        "@esbuild/openbsd-arm64": "0.28.0",
+        "@esbuild/openbsd-x64": "0.28.0",
+        "@esbuild/openharmony-arm64": "0.28.0",
+        "@esbuild/sunos-x64": "0.28.0",
+        "@esbuild/win32-arm64": "0.28.0",
+        "@esbuild/win32-ia32": "0.28.0",
+        "@esbuild/win32-x64": "0.28.0"
       }
     },
     "node_modules/escalade": {
@@ -4572,9 +5387,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
-      "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.13.0.tgz",
+      "integrity": "sha512-bLohSkT6469rRs8czj0tLTD8vaeIS/whvPRJVjDr7IuoTT1k5DYDERlNycjDj/HkOlvQdYurmfZ/g3fG5bgeLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4707,9 +5522,9 @@
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz",
-      "integrity": "sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.1.1.tgz",
+      "integrity": "sha512-f2I7Gw6JbvCexzIInuSbZpfdQ44D7iqdWX01FKLvrPgqxoE7oMj8clOfto8U6vYiz4yd5oKu39rRSVOe1zRu0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4723,7 +5538,7 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 || ^10.0.0"
       }
     },
     "node_modules/eslint-scope": {
@@ -4830,12 +5645,20 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.8.tgz",
       "integrity": "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==",
+      "devOptional": true,
+      "license": "MIT"
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "license": "MIT"
     },
     "node_modules/fast-check": {
       "version": "3.23.2",
       "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-3.23.2.tgz",
       "integrity": "sha512-h5+1OzzfCC3Ef7VbtKdcv7zsstUQwUDlYpUTvjeUsJAssPgLn7QzbboPtL5ro04Mq0rPOsMzl7q5hIbRs2wD1A==",
+      "devOptional": true,
       "funding": [
         {
           "type": "individual",
@@ -4858,6 +5681,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/fast-equals": {
@@ -4920,9 +5744,10 @@
       "license": "Unlicense"
     },
     "node_modules/fast-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
-      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
+      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
+      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -4945,6 +5770,29 @@
         "reusify": "^1.0.4"
       }
     },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
     "node_modules/file-entry-cache": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
@@ -5029,6 +5877,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
       "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "cross-spawn": "^7.0.6",
@@ -5041,6 +5890,18 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "license": "MIT",
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -5097,10 +5958,39 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gaxios": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.4.tgz",
+      "integrity": "sha512-bTIgTsM2bWn3XklZISBTQX7ZSddGW+IO3bMdGaemHZ3tbqExMENHLx6kKZ/KlejgrMtj8q7wBItt51yegqalrA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "extend": "^3.0.2",
+        "https-proxy-agent": "^7.0.1",
+        "node-fetch": "^3.3.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/gcp-metadata": {
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-8.1.2.tgz",
+      "integrity": "sha512-zV/5HKTfCeKWnxG0Dmrw51hEWFGfcF2xiXqcA3+J90WDuP0SvoiSO5ORvcBsifmx/FoIjgQN3oNOGaQ5PhLFkg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "gaxios": "^7.0.0",
+        "google-logging-utils": "^1.0.0",
+        "json-bigint": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/generate-function": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
       "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "is-property": "^1.0.2"
@@ -5155,6 +6045,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/get-port-please/-/get-port-please-3.2.0.tgz",
       "integrity": "sha512-I9QVvBw5U/hw3RmWpYKRumUeaDgxTPd401x364rLmWBJcOQ753eov1eTgzDqRG9bqFIfDc7gfzcQEWrUri3o1A==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/get-proto": {
@@ -5190,9 +6081,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.13.7",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.7.tgz",
-      "integrity": "sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.0.tgz",
+      "integrity": "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5215,18 +6106,11 @@
       }
     },
     "node_modules/giget": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/giget/-/giget-2.0.0.tgz",
-      "integrity": "sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/giget/-/giget-3.2.0.tgz",
+      "integrity": "sha512-GvHTWcykIR/fP8cj8dMpuMMkvaeJfPvYnhq0oW+chSeIr+ldX21ifU2Ms6KBoyKZQZmVaUAAhQ2EZ68KJF8a7A==",
+      "devOptional": true,
       "license": "MIT",
-      "dependencies": {
-        "citty": "^0.1.6",
-        "consola": "^3.4.0",
-        "defu": "^6.1.4",
-        "node-fetch-native": "^1.6.6",
-        "nypm": "^0.6.0",
-        "pathe": "^2.0.3"
-      },
       "bin": {
         "giget": "dist/cli.mjs"
       }
@@ -5285,6 +6169,32 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/google-auth-library": {
+      "version": "10.6.2",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.6.2.tgz",
+      "integrity": "sha512-e27Z6EThmVNNvtYASwQxose/G57rkRuaRbQyxM2bvYLLX/GqWZ5chWq2EBoUchJbCc57eC9ArzO5wMsEmWftCw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "base64-js": "^1.3.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "gaxios": "^7.1.4",
+        "gcp-metadata": "8.1.2",
+        "google-logging-utils": "1.1.3",
+        "jws": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/google-logging-utils": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.3.tgz",
+      "integrity": "sha512-eAmLkjDjAFCVXg7A1unxHsLf961m6y17QFqXqAXGj/gVkKFrEICfStRfwUlGNfeCEjNRa32JEWOUTlYXPyyKvA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -5302,18 +6212,21 @@
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/grammex": {
       "version": "3.1.12",
       "resolved": "https://registry.npmjs.org/grammex/-/grammex-3.1.12.tgz",
       "integrity": "sha512-6ufJOsSA7LcQehIJNCO7HIBykfM7DXQual0Ny780/DEcJIpBlHRvcqEBWGPYd7hrXL2GJ3oJI1MIhaXjWmLQOQ==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/graphmatch": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/graphmatch/-/graphmatch-1.1.1.tgz",
       "integrity": "sha512-5ykVn/EXM1hF0XCaWh05VbYvEiOL2lY1kBxZtaYsyvjp7cmWOU1XsAdfQBwClraEofXDT197lFbXOEVMHpvQOg==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/has-bigints": {
@@ -5398,9 +6311,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
+      "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5428,9 +6341,10 @@
       }
     },
     "node_modules/hono": {
-      "version": "4.12.12",
-      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.12.tgz",
-      "integrity": "sha512-p1JfQMKaceuCbpJKAPKVqyqviZdS0eUxH9v82oWo1kb9xjQ5wA6iP3FNVAPDFlz5/p7d45lO+BpSk1tuSZMF4Q==",
+      "version": "4.12.23",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.23.tgz",
+      "integrity": "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=16.9.0"
@@ -5440,12 +6354,27 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/http-status-codes/-/http-status-codes-2.3.0.tgz",
       "integrity": "sha512-RJ8XvFvpPM/Dmc5SV+dC4y5PCeOhT3x1Hq0NU3rjGeg5a/CqlhZ7uudknPwZFz4aeAXDcbAyaeP7GAo9lvngtA==",
+      "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
       "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -5458,6 +6387,21 @@
         "url": "https://opencollective.com/express"
       }
     },
+    "node_modules/icu-minify": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/icu-minify/-/icu-minify-4.13.0.tgz",
+      "integrity": "sha512-SIFMeUHZJjzS5RvIGvybKvWoHjDm9cGVEs2EpJ8PmywOdJLWyblPm7TdPLLoUtkJtwQD7iGhl2WMptZ+N0on+w==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/amannn"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/icu-messageformat-parser": "^3.4.0"
+      }
+    },
     "node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -5519,6 +6463,16 @@
         "node": ">=12"
       }
     },
+    "node_modules/intl-messageformat": {
+      "version": "11.2.8",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-11.2.8.tgz",
+      "integrity": "sha512-l323RCl3qJDVQ8U9j74ut/hVMdg3VPsOHpVMDvFfz9qiq4dPO5ooVYFNVUzzrpgG39a+RLzcXyJb8VFgIU+tUA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@formatjs/fast-memoize": "3.1.6",
+        "@formatjs/icu-messageformat-parser": "3.5.11"
+      }
+    },
     "node_modules/invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -5623,9 +6577,9 @@
       }
     },
     "node_modules/is-bun-module/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.1.tgz",
+      "integrity": "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -5649,13 +6603,13 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "version": "2.16.2",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz",
+      "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.2"
+        "hasown": "^2.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5703,7 +6657,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -5749,7 +6702,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
@@ -5815,6 +6767,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
       "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/is-regex": {
@@ -5973,6 +6926,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/iterator.prototype": {
@@ -5994,21 +6948,22 @@
       }
     },
     "node_modules/jiti": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
-      "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.7.0.tgz",
+      "integrity": "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==",
+      "devOptional": true,
       "license": "MIT",
       "bin": {
         "jiti": "lib/jiti-cli.mjs"
       }
     },
     "node_modules/js-cookie": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
-      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.7.tgz",
+      "integrity": "sha512-z/wZZgDrkNV1eA0ULjM/F9/50Ya8fbzgKneSpoPsXSGd0KnpdtHfOZWK+GcwLk+EZbS4F9RBhU+K2RgzuDaItw==",
       "license": "MIT",
       "engines": {
-        "node": ">=14"
+        "node": ">=20"
       }
     },
     "node_modules/js-tokens": {
@@ -6043,6 +6998,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/json-bigint": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "license": "MIT",
+      "dependencies": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -6093,6 +7057,27 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/jwa": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
+      "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-equal-constant-time": "^1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jws": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
+      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
+      "license": "MIT",
+      "dependencies": {
+        "jwa": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -6224,6 +7209,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/lru.min/-/lru.min-1.1.4.tgz",
       "integrity": "sha512-DqC6n3QQ77zdFpCMASA1a3Jlb64Hv2N2DciFGkO/4L9+q/IpIAuRlKOvCXabtRW6cQf8usbmM6BE/TOPysCdIA==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "bun": ">=1.0.0",
@@ -6236,9 +7222,9 @@
       }
     },
     "node_modules/lucide-react": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-1.8.0.tgz",
-      "integrity": "sha512-WuvlsjngSk7TnTBJ1hsCy3ql9V9VOdcPkd3PKcSmM34vJD8KG6molxz7m7zbYFgICwsanQWmJ13JlYs4Zp7Arw==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-1.17.0.tgz",
+      "integrity": "sha512-9FA9evdox/JQL5PT57fdA1x/yg8T7knJ98+zjTL3UfKza6pflQUUh3XtaQIHKvnsJw1lmsEyHVlt5jchYxOQ5w==",
       "license": "ISC",
       "peerDependencies": {
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -6378,13 +7364,13 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/mysql2": {
       "version": "3.15.3",
       "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.15.3.tgz",
       "integrity": "sha512-FBrGau0IXmuqg4haEZRBfHNWB5mUARw6hNwPDXXGg0XzVJ50mr/9hb267lvpVMnhZ1FON3qNd4Xfcez1rbFwSg==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "aws-ssl-profiles": "^1.1.1",
@@ -6417,6 +7403,7 @@
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.6.tgz",
       "integrity": "sha512-Tz09sEL2EEuv5fFowm419c1+a/jSMiBjI9gHxVLrVdbUkkNUUfjsVYs9pVZu5oCon/kmRh9TfLEObFtkVxmY0w==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "lru.min": "^1.1.0"
@@ -6426,9 +7413,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "version": "3.3.12",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz",
+      "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==",
       "funding": [
         {
           "type": "github",
@@ -6466,6 +7453,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/next": {
       "version": "16.2.3",
       "resolved": "https://registry.npmjs.org/next/-/next-16.2.3.tgz",
@@ -6534,6 +7530,94 @@
         "react": "^17 || ^18 || >=19.0.0-beta || ^19"
       }
     },
+    "node_modules/next-intl": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/next-intl/-/next-intl-4.13.0.tgz",
+      "integrity": "sha512-OvNq2v5XLx4EkQOsAhVE9g+6zdb83XHusADCXXtIW4LILYnjEVaeINdr1lkVWKSjzwNUiMSlH5N4K0OQTRiv6A==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/amannn"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/intl-localematcher": "^0.8.1",
+        "@parcel/watcher": "^2.4.1",
+        "@swc/core": "^1.15.2",
+        "icu-minify": "^4.13.0",
+        "negotiator": "^1.0.0",
+        "next-intl-swc-plugin-extractor": "^4.13.0",
+        "po-parser": "^2.1.1",
+        "use-intl": "^4.13.0"
+      },
+      "peerDependencies": {
+        "next": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/next-intl-swc-plugin-extractor": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/next-intl-swc-plugin-extractor/-/next-intl-swc-plugin-extractor-4.13.0.tgz",
+      "integrity": "sha512-6S/fJI0KXvLCL8nhBo9P8eGaJPzmwJBTCzX0NaUIj0VyU8U89d//T+vjMLdNIXl5MlLaYH7B9MbAjb8Mvu+tqQ==",
+      "license": "MIT"
+    },
+    "node_modules/next-intl/node_modules/@swc/core": {
+      "version": "1.15.40",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.40.tgz",
+      "integrity": "sha512-2kwzJikRvgtNAG7MwVZY2vEzZjTxKIq5jXOihuSV/8U+Hej8Va22t65aKnJZs3P+NwojZvR8Mf8kyM7O+V8sQg==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/counter": "^0.1.3",
+        "@swc/types": "^0.1.26"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/swc"
+      },
+      "optionalDependencies": {
+        "@swc/core-darwin-arm64": "1.15.40",
+        "@swc/core-darwin-x64": "1.15.40",
+        "@swc/core-linux-arm-gnueabihf": "1.15.40",
+        "@swc/core-linux-arm64-gnu": "1.15.40",
+        "@swc/core-linux-arm64-musl": "1.15.40",
+        "@swc/core-linux-ppc64-gnu": "1.15.40",
+        "@swc/core-linux-s390x-gnu": "1.15.40",
+        "@swc/core-linux-x64-gnu": "1.15.40",
+        "@swc/core-linux-x64-musl": "1.15.40",
+        "@swc/core-win32-arm64-msvc": "1.15.40",
+        "@swc/core-win32-ia32-msvc": "1.15.40",
+        "@swc/core-win32-x64-msvc": "1.15.40"
+      },
+      "peerDependencies": {
+        "@swc/helpers": ">=0.5.17"
+      },
+      "peerDependenciesMeta": {
+        "@swc/helpers": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/next-intl/node_modules/@swc/helpers": {
+      "version": "0.5.23",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.23.tgz",
+      "integrity": "sha512-5lSsMOTXURePglDfvuAQUqkGek9Hg2kksOYay2m0+XR++b2NWYL/4sWyuvVBIs8oKnJaxkdi9whaL/sqN13afw==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.8.0"
+      }
+    },
     "node_modules/next/node_modules/postcss": {
       "version": "8.4.31",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
@@ -6562,6 +7646,32 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "license": "MIT"
+    },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
     "node_modules/node-exports-info": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/node-exports-info/-/node-exports-info-1.6.0.tgz",
@@ -6581,18 +7691,42 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/node-fetch-native": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.7.tgz",
-      "integrity": "sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==",
-      "license": "MIT"
+    "node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "license": "MIT",
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
     },
     "node_modules/node-releases": {
-      "version": "2.0.37",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.37.tgz",
-      "integrity": "sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==",
+      "version": "2.0.46",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.46.tgz",
+      "integrity": "sha512-GYVXHE2KnrzAfsAjl4uP++evGFCrAU1jta4ubEjIG7YWt/64Gqv66a30yKwWczVjA6j3bM4nBwH7Pk1JmDHaxQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/nodemailer": {
+      "version": "8.0.10",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.10.tgz",
+      "integrity": "sha512-BLFuSth7QtHOkBzyqTehWWyub0NTRDuK2Q2SQfnGLsrJnzyU+Yeh4WpV1eZGuARFj1xQJHIdnTuJZLP+b9R1GQ==",
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=6.0.0"
+      }
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -6604,29 +7738,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/nypm": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.5.tgz",
-      "integrity": "sha512-K6AJy1GMVyfyMXRVB88700BJqNUkByijGJM8kEHpLdcAt+vSQAVfkWWHYzuRXHSY6xA2sNc5RjTj0p9rE2izVQ==",
-      "license": "MIT",
-      "dependencies": {
-        "citty": "^0.2.0",
-        "pathe": "^2.0.3",
-        "tinyexec": "^1.0.2"
-      },
-      "bin": {
-        "nypm": "dist/cli.mjs"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/nypm/node_modules/citty": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/citty/-/citty-0.2.2.tgz",
-      "integrity": "sha512-+6vJA3L98yv+IdfKGZHBNiGW5KHn22e/JwID0Strsz8h4S/csAu/OuICwxrg44k5MRiZHWIo8XXuJgQTriRP4w==",
-      "license": "MIT"
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -6763,6 +7874,7 @@
       "version": "2.0.11",
       "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz",
       "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/optionator": {
@@ -6842,6 +7954,28 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-retry/node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -6869,6 +8003,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -6885,23 +8020,25 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
       "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/perfect-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
-      "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-2.1.0.tgz",
+      "integrity": "sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/pg": {
-      "version": "8.20.0",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.20.0.tgz",
-      "integrity": "sha512-ldhMxz2r8fl/6QkXnBD3CR9/xg694oT6DZQ2s6c/RI28OjtSOpxnPrUCGOBJ46RCUxcWdx3p6kw/xnDHjKvaRA==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.21.0.tgz",
+      "integrity": "sha512-AUP1EYJuHraQGsVoCQVIcM7TEJVGtDzxWtGFZd8rds9d+CCXlU5Js1rYgfLNvxy9iJrpHjGrRjoi/3BT9fRyiA==",
       "license": "MIT",
       "dependencies": {
-        "pg-connection-string": "^2.12.0",
-        "pg-pool": "^3.13.0",
-        "pg-protocol": "^1.13.0",
+        "pg-connection-string": "^2.13.0",
+        "pg-pool": "^3.14.0",
+        "pg-protocol": "^1.14.0",
         "pg-types": "2.2.0",
         "pgpass": "1.0.5"
       },
@@ -6909,7 +8046,7 @@
         "node": ">= 16.0.0"
       },
       "optionalDependencies": {
-        "pg-cloudflare": "^1.3.0"
+        "pg-cloudflare": "^1.4.0"
       },
       "peerDependencies": {
         "pg-native": ">=3.0.1"
@@ -6921,16 +8058,16 @@
       }
     },
     "node_modules/pg-cloudflare": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.3.0.tgz",
-      "integrity": "sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.4.0.tgz",
+      "integrity": "sha512-Vo7z/6rrQYxpNRylp4Tlob2elzbh+N/MOQbxFVWCxS7oEx6jF53GTJFxK2WWpKuBRkmiin4Mt+xofFDjx09R0A==",
       "license": "MIT",
       "optional": true
     },
     "node_modules/pg-connection-string": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.12.0.tgz",
-      "integrity": "sha512-U7qg+bpswf3Cs5xLzRqbXbQl85ng0mfSV/J0nnA31MCLgvEaAo7CIhmeyrmJpOr7o+zm0rXK+hNnT5l9RHkCkQ==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.13.0.tgz",
+      "integrity": "sha512-EMnU9E2fSULdsbErBbMaXJvFeD9B4+nPcM3f+4lsiCR0BHLPrLVjv3DbyM2hgQQviKJaTWIRRTjKjWlHg3p2ig==",
       "license": "MIT"
     },
     "node_modules/pg-int8": {
@@ -6943,18 +8080,18 @@
       }
     },
     "node_modules/pg-pool": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.13.0.tgz",
-      "integrity": "sha512-gB+R+Xud1gLFuRD/QgOIgGOBE2KCQPaPwkzBBGC9oG69pHTkhQeIuejVIk3/cnDyX39av2AxomQiyPT13WKHQA==",
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.14.0.tgz",
+      "integrity": "sha512-gKtPkFdQPU3DksooVLi9LsjZxrsBUZIpa+7aVx+LV5pNh0KzP4Zleud2po+ConrxbuXGBJ6Hfer6hdgpIBpBaw==",
       "license": "MIT",
       "peerDependencies": {
         "pg": ">=8.0"
       }
     },
     "node_modules/pg-protocol": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.13.0.tgz",
-      "integrity": "sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.14.0.tgz",
+      "integrity": "sha512-n5taZ1kO3s9ngDTVxsEznOqCyToTgz0FLuPq0B33COy5pPpuWJpY3/2oRBVETuOgzdqRXfWpM9HIhp2LBBT1BA==",
       "license": "MIT"
     },
     "node_modules/pg-types": {
@@ -7031,16 +8168,23 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
-      "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.1.tgz",
+      "integrity": "sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "confbox": "^0.2.2",
-        "exsolve": "^1.0.7",
+        "confbox": "^0.2.4",
+        "exsolve": "^1.0.8",
         "pathe": "^2.0.3"
       }
     },
+    "node_modules/po-parser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/po-parser/-/po-parser-2.1.1.tgz",
+      "integrity": "sha512-ECF4zHLbUItpUgE3OTtLKlPjeBN+fKEczj2zYjDfCGOzicNs0GK3Vg2IoAYwx7LH/XYw43fZQP6xnZ4TkNxSLQ==",
+      "license": "MIT"
+    },
     "node_modules/possible-typed-array-names": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
@@ -7052,9 +8196,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.9",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.9.tgz",
-      "integrity": "sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==",
+      "version": "8.5.15",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
+      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
       "dev": true,
       "funding": [
         {
@@ -7072,7 +8216,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.11",
+        "nanoid": "^3.3.12",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -7099,12 +8243,13 @@
       }
     },
     "node_modules/postcss-import/node_modules/resolve": {
-      "version": "1.22.11",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
-      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+      "version": "1.22.12",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
+      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "es-errors": "^1.3.0",
         "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
@@ -7239,6 +8384,7 @@
       "version": "3.4.7",
       "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.7.tgz",
       "integrity": "sha512-Jtc2612XINuBjIl/QTWsV5UvE8UHuNblcO3vVADSrKsrc6RqGX6lOW1cEo3CM2v0XG4Nat8nI+YM7/f26VxXLw==",
+      "devOptional": true,
       "license": "Unlicense",
       "engines": {
         "node": ">=12"
@@ -7298,15 +8444,16 @@
       }
     },
     "node_modules/prisma": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/prisma/-/prisma-7.7.0.tgz",
-      "integrity": "sha512-HlgwRBt1uEFB9LStHL4HLYDvoi4BNu1rYA0hPG0zCAEyK9SaZBqp7E5Rjpc3Qh8Lex/ye/svoHZ0OWoFNhWxuQ==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/prisma/-/prisma-7.8.0.tgz",
+      "integrity": "sha512-yfN4yrw7HV9kEJhoy1+jgah0jafEIQsf7uWouSsM8MvJtlubsk+kM7AIBWZ8+GJl74Yj3c+nbYqBkMOxtsZ3Lw==",
+      "devOptional": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@prisma/config": "7.7.0",
+        "@prisma/config": "7.8.0",
         "@prisma/dev": "0.24.3",
-        "@prisma/engines": "7.7.0",
+        "@prisma/engines": "7.8.0",
         "@prisma/studio-core": "0.27.3",
         "mysql2": "3.15.3",
         "postgres": "3.4.7"
@@ -7345,6 +8492,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz",
       "integrity": "sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -7356,8 +8504,33 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "devOptional": true,
       "license": "ISC"
     },
+    "node_modules/protobufjs": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.2.tgz",
+      "integrity": "sha512-N9EiLovGEQOJSPF26Ij7qUGvahfEnq0eeYZ02aigIedkmz1qZSwjnP9SBITHJuF/6MYbIW4HDN8zdYjsjqJKXQ==",
+      "hasInstallScript": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.5",
+        "@protobufjs/eventemitter": "^1.1.1",
+        "@protobufjs/fetch": "^1.1.1",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.2",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.1",
+        "@types/node": ">=13.7.0",
+        "long": "^5.3.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -7372,6 +8545,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
       "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "devOptional": true,
       "funding": [
         {
           "type": "individual",
@@ -7406,28 +8580,29 @@
       "license": "MIT"
     },
     "node_modules/rc9": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.2.tgz",
-      "integrity": "sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/rc9/-/rc9-3.0.1.tgz",
+      "integrity": "sha512-gMDyleLWVE+i6Sgtc0QbbY6pEKqYs97NGi6isHQPqYlLemPoO8dxQ3uGi0f4NiP98c+jMW6cG1Kx9dDwfvqARQ==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
-        "defu": "^6.1.4",
-        "destr": "^2.0.3"
+        "defu": "^6.1.6",
+        "destr": "^2.0.5"
       }
     },
     "node_modules/react": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
-      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
+      "version": "19.2.6",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.6.tgz",
+      "integrity": "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-big-calendar": {
-      "version": "1.19.4",
-      "resolved": "https://registry.npmjs.org/react-big-calendar/-/react-big-calendar-1.19.4.tgz",
-      "integrity": "sha512-FrvbDx2LF6JAWFD96LU1jjloppC5OgIvMYUYIPzAw5Aq+ArYFPxAjLqXc4DyxfsQDN0TJTMuS/BIbcSB7Pg0YA==",
+      "version": "1.19.6",
+      "resolved": "https://registry.npmjs.org/react-big-calendar/-/react-big-calendar-1.19.6.tgz",
+      "integrity": "sha512-2vCG/LBuNOOok4Olet4S7M6l11DjCO6RyWwqGRkZcR0cTOWEKVCwpqe5r24NobmVKPQV6nU3/DZGoAkrOypRlw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.20.7",
@@ -7487,21 +8662,21 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
-      "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
+      "version": "19.2.6",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.6.tgz",
+      "integrity": "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==",
       "license": "MIT",
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.3"
+        "react": "^19.2.6"
       }
     },
     "node_modules/react-hook-form": {
-      "version": "7.72.1",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.72.1.tgz",
-      "integrity": "sha512-RhwBoy2ygeVZje+C+bwJ8g0NjTdBmDlJvAUHTxRjTmSUKPYsKfMphkS2sgEMotsY03bP358yEYlnUeZy//D9Ig==",
+      "version": "7.76.1",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.76.1.tgz",
+      "integrity": "sha512-rYM7tPiWlu3nZchkR/ex7piyzui2vFPyaLnXnI/RnblB/L4qfMmyses8llJVtF1NpE9WBBsJlGtcSZzPCXW1qQ==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -7562,9 +8737,9 @@
       }
     },
     "node_modules/react-toastify": {
-      "version": "11.0.5",
-      "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-11.0.5.tgz",
-      "integrity": "sha512-EpqHBGvnSTtHYhCPLxML05NLY2ZX0JURbAdNYa6BUkk+amz4wbKBQvoKQAB0ardvSarUBuY4Q4s1sluAzZwkmA==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-11.1.0.tgz",
+      "integrity": "sha512-e9h23x3phN0wbFeB6yovmWp7lobzV4CaCH0LO8nVP6H7Y+3GbcLpIzMm9dJhcp1RXbpyfvjgpfXqO80QAmn7sg==",
       "license": "MIT",
       "dependencies": {
         "clsx": "^2.1.1"
@@ -7610,12 +8785,13 @@
       }
     },
     "node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
+      "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 14.18.0"
+        "node": ">= 20.19.0"
       },
       "funding": {
         "type": "individual",
@@ -7626,6 +8802,7 @@
       "version": "2.15.4",
       "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.4.tgz",
       "integrity": "sha512-UT/q6fwS3c1dHbXv2uFgYJ9BMFHu3fwnd7AYZaEQhXuYQ4hgsxLvsUXzGdKeZrW5xopzDCvuA2N41WJ88I7zIw==",
+      "deprecated": "1.x and 2.x branches are no longer active. Bump to Recharts v3 to receive latest features and bugfixes. See https://github.com/recharts/recharts/wiki/3.0-migration-guide",
       "license": "MIT",
       "dependencies": {
         "clsx": "^2.0.0",
@@ -7717,6 +8894,7 @@
       "version": "2.33.4",
       "resolved": "https://registry.npmjs.org/remeda/-/remeda-2.33.4.tgz",
       "integrity": "sha512-ygHswjlc/opg2VrtiYvUOPLjxjtdKvjGz1/plDhkG66hjNjFr1xmfrs2ClNFo/E6TyUFiwYNh53bKV26oBoMGQ==",
+      "devOptional": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/remeda"
@@ -7726,20 +8904,21 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/resolve": {
-      "version": "2.0.0-next.6",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.6.tgz",
-      "integrity": "sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA==",
+      "version": "2.0.0-next.7",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.7.tgz",
+      "integrity": "sha512-tqt+NBWwyaMgw3zDsnygx4CByWjQEJHOPMdslYhppaQSJUtL/D4JO9CcBBlhPoI8lz9oJIDXkwXfhF4aWqP8xQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "is-core-module": "^2.16.1",
+        "is-core-module": "^2.16.2",
         "node-exports-info": "^1.6.0",
         "object-keys": "^1.1.1",
         "path-parse": "^1.0.7",
@@ -7779,6 +8958,7 @@
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
       "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -7820,15 +9000,15 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
-      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.4.tgz",
+      "integrity": "sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
+        "call-bind": "^1.0.9",
+        "call-bound": "^1.0.4",
+        "get-intrinsic": "^1.3.0",
         "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
@@ -7839,6 +9019,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/safe-push-apply": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
@@ -7878,6 +9078,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/scheduler": {
@@ -7899,7 +9100,8 @@
     "node_modules/seq-queue": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz",
-      "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="
+      "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==",
+      "devOptional": true
     },
     "node_modules/server-only": {
       "version": "0.0.1",
@@ -8002,9 +9204,9 @@
       }
     },
     "node_modules/sharp/node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.1.tgz",
+      "integrity": "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==",
       "license": "ISC",
       "optional": true,
       "bin": {
@@ -8018,6 +9220,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
@@ -8030,6 +9233,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -8115,6 +9319,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
       "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "devOptional": true,
       "license": "ISC",
       "engines": {
         "node": ">=14"
@@ -8145,6 +9350,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz",
       "integrity": "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==",
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -8525,12 +9731,13 @@
       }
     },
     "node_modules/tailwindcss/node_modules/resolve": {
-      "version": "1.22.11",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
-      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+      "version": "1.22.12",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
+      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "es-errors": "^1.3.0",
         "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
@@ -8574,19 +9781,10 @@
       "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
       "license": "MIT"
     },
-    "node_modules/tinyexec": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.1.1.tgz",
-      "integrity": "sha512-VKS/ZaQhhkKFMANmAOhhXVoIfBXblQxGX1myCQ2faQrfmobMftXeJPcZGp0gS07ocvGJWDLZGyOZDadDBqYIJg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/tinyglobby": {
-      "version": "0.2.16",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
-      "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
+      "version": "0.2.17",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
+      "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8697,14 +9895,13 @@
       "license": "0BSD"
     },
     "node_modules/tsx": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz",
-      "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
+      "version": "4.22.3",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.22.3.tgz",
+      "integrity": "sha512-mdoNxBC/cSQObGGVQ5Bpn5i+yv7j68gk3Nfm3wFjcJg3Z0Mix9jzAFfP12prmm5eVGmDKtp0yyArrs0Q+8gZHg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "esbuild": "~0.27.0",
-        "get-tsconfig": "^4.7.5"
+        "esbuild": "~0.28.0"
       },
       "bin": {
         "tsx": "dist/cli.mjs"
@@ -8787,18 +9984,18 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
-      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.8.tgz",
+      "integrity": "sha512-phPGCwqr2+Qo0fwniCE8e4pKnGu/yFb5nD5Y8bf0EEeiI5GklnACYA9GFy/DrAeRrKHXvHn+1SUsOWgJp6RO+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0",
-        "reflect.getprototypeof": "^1.0.6"
+        "call-bind": "^1.0.9",
+        "for-each": "^0.3.5",
+        "gopd": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "possible-typed-array-names": "^1.1.0",
+        "reflect.getprototypeof": "^1.0.10"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8822,16 +10019,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.58.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.58.1.tgz",
-      "integrity": "sha512-gf6/oHChByg9HJvhMO1iBexJh12AqqTfnuxscMDOVqfJW3htsdRJI/GfPpHTTcyeB8cSTUY2JcZmVgoyPqcrDg==",
+      "version": "8.60.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.60.0.tgz",
+      "integrity": "sha512-9f65qWLZdAW9m1JaxBDUHcqRUfL8bkxxXL7XxEfI+F09q56PkBvIfCjLF3yInsDM/BBmwkqmCQdCZe/RYlIWEw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.58.1",
-        "@typescript-eslint/parser": "8.58.1",
-        "@typescript-eslint/typescript-estree": "8.58.1",
-        "@typescript-eslint/utils": "8.58.1"
+        "@typescript-eslint/eslint-plugin": "8.60.0",
+        "@typescript-eslint/parser": "8.60.0",
+        "@typescript-eslint/typescript-estree": "8.60.0",
+        "@typescript-eslint/utils": "8.60.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -8886,38 +10083,41 @@
       "license": "MIT"
     },
     "node_modules/unrs-resolver": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
-      "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.12.2.tgz",
+      "integrity": "sha512-dmlRxBJJayXjqTwC+JtF1HhJmgf3ftQ3YejFcZrf4+KKtJv0qDsK1pjqaaVjG7wJ5NJ6UVP1OqRMQ71Z4C3rxQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "napi-postinstall": "^0.3.0"
+        "napi-postinstall": "^0.3.4"
       },
       "funding": {
         "url": "https://opencollective.com/unrs-resolver"
       },
       "optionalDependencies": {
-        "@unrs/resolver-binding-android-arm-eabi": "1.11.1",
-        "@unrs/resolver-binding-android-arm64": "1.11.1",
-        "@unrs/resolver-binding-darwin-arm64": "1.11.1",
-        "@unrs/resolver-binding-darwin-x64": "1.11.1",
-        "@unrs/resolver-binding-freebsd-x64": "1.11.1",
-        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
-        "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
-        "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
-        "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
-        "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-x64-musl": "1.11.1",
-        "@unrs/resolver-binding-wasm32-wasi": "1.11.1",
-        "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
-        "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
-        "@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
+        "@unrs/resolver-binding-android-arm-eabi": "1.12.2",
+        "@unrs/resolver-binding-android-arm64": "1.12.2",
+        "@unrs/resolver-binding-darwin-arm64": "1.12.2",
+        "@unrs/resolver-binding-darwin-x64": "1.12.2",
+        "@unrs/resolver-binding-freebsd-x64": "1.12.2",
+        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.12.2",
+        "@unrs/resolver-binding-linux-arm-musleabihf": "1.12.2",
+        "@unrs/resolver-binding-linux-arm64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-arm64-musl": "1.12.2",
+        "@unrs/resolver-binding-linux-loong64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-loong64-musl": "1.12.2",
+        "@unrs/resolver-binding-linux-ppc64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-riscv64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-riscv64-musl": "1.12.2",
+        "@unrs/resolver-binding-linux-s390x-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-x64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-x64-musl": "1.12.2",
+        "@unrs/resolver-binding-openharmony-arm64": "1.12.2",
+        "@unrs/resolver-binding-wasm32-wasi": "1.12.2",
+        "@unrs/resolver-binding-win32-arm64-msvc": "1.12.2",
+        "@unrs/resolver-binding-win32-ia32-msvc": "1.12.2",
+        "@unrs/resolver-binding-win32-x64-msvc": "1.12.2"
       }
     },
     "node_modules/update-browserslist-db": {
@@ -8961,6 +10161,27 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/use-intl": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/use-intl/-/use-intl-4.13.0.tgz",
+      "integrity": "sha512-fAFDrWaASxlhXOipcOyb5VDD+YONqj6+8O8EcG/J7RBoOUF3A8YahRWLN+mBxYMrlMQB8N6Voqk5X+YC+HSL0A==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/amannn"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/fast-memoize": "^3.1.0",
+        "@schummar/icu-type-parser": "1.21.5",
+        "icu-minify": "^4.13.0",
+        "intl-messageformat": "^11.1.0"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -8972,6 +10193,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/valibot/-/valibot-1.2.0.tgz",
       "integrity": "sha512-mm1rxUsmOxzrwnX5arGS+U4T25RdvpPjPN4yR0u9pUBov9+zGVtO84tif1eY4r6zWxVxu3KzIyknJy3rxfRZZg==",
+      "devOptional": true,
       "license": "MIT",
       "peerDependencies": {
         "typescript": ">=5"
@@ -9013,10 +10235,20 @@
         "loose-envify": "^1.0.0"
       }
     },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
@@ -9096,14 +10328,14 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.20",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
-      "integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==",
+      "version": "1.1.21",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.21.tgz",
+      "integrity": "sha512-zbRA8cVm6io/d5W8uIe2hblzN76/Wm3v/yiythQvr+dpBWeqhPSWIDNj4zOyHi4zKbMK6DN34Xsr9jPHJERAEw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
+        "call-bind": "^1.0.9",
         "call-bound": "^1.0.4",
         "for-each": "^0.3.5",
         "get-proto": "^1.0.1",
@@ -9127,6 +10359,27 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ws": {
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz",
+      "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -9160,6 +10413,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/zeptomatch/-/zeptomatch-2.1.0.tgz",
       "integrity": "sha512-KiGErG2J0G82LSpniV0CtIzjlJ10E04j02VOudJsPyPwNZgGnRKQy7I1R7GMyg/QswnE4l7ohSGrQbQbjXPPDA==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "grammex": "^3.1.11",
diff --git a/package.json b/package.json
index 8d62a7f..00fcf11 100644
--- a/package.json
+++ b/package.json
@@ -3,24 +3,29 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev --webpack",
+    "dev": "next dev",
     "build": "next build",
     "start": "next start",
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "postinstall": "prisma generate"
   },
   "dependencies": {
     "@clerk/nextjs": "^7.0.12",
+    "@google/genai": "^2.7.0",
     "@hookform/resolvers": "^3.9.0",
     "@prisma/adapter-pg": "^7.6.0",
-    "@prisma/client": "^7.6.0",
+    "@prisma/client": "^7.8.0",
     "@types/react-big-calendar": "^1.8.9",
+    "cloudinary": "^2.10.0",
     "date-fns": "^4.1.0",
     "dotenv": "^17.4.0",
     "lucide-react": "^1.7.0",
     "moment": "^2.30.1",
     "next": "16.2.3",
     "next-cloudinary": "^6.17.5",
-    "pg": "^8.20.0",
+    "next-intl": "^4.13.0",
+    "nodemailer": "^8.0.10",
+    "pg": "^8.21.0",
     "prisma": "^7.6.0",
     "react": "^19.2.3",
     "react-big-calendar": "^1.13.2",
@@ -33,11 +38,13 @@
   },
   "devDependencies": {
     "@types/node": "^20",
+    "@types/nodemailer": "^8.0.0",
     "@types/react": "19.2.2",
     "@types/react-dom": "19.2.2",
     "eslint": "^9.39.0",
     "eslint-config-next": "16.2.3",
     "postcss": "^8",
+    "prisma": "^7.8.0",
     "tailwindcss": "^3.4.1",
     "tsx": "^4.21.0",
     "typescript": "^5"
diff --git a/prisma/migrations/20260510175534_exam_workflow/migration.sql b/prisma/migrations/20260510175534_exam_workflow/migration.sql
deleted file mode 100644
index 10ca5b2..0000000
--- a/prisma/migrations/20260510175534_exam_workflow/migration.sql
+++ /dev/null
@@ -1,733 +0,0 @@
-/*
-  Warnings:
-
-  - The values [FRIDAY] on the enum `Day` will be removed. If these variants are still used in the database, this will fail.
-  - You are about to drop the column `classId` on the `Announcement` table. All the data in the column will be lost.
-  - You are about to drop the column `lessonId` on the `Attendance` table. All the data in the column will be lost.
-  - You are about to drop the column `classId` on the `Event` table. All the data in the column will be lost.
-  - A unique constraint covering the columns `[schoolId,username]` on the table `Admin` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[studentId,academicYearId,date]` on the table `Attendance` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[teacherId,academicYearId,date]` on the table `Attendance` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,name]` on the table `Class` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,level]` on the table `Grade` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,username]` on the table `Parent` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,email]` on the table `Parent` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,phone]` on the table `Parent` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,username]` on the table `Student` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,email]` on the table `Student` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,phone]` on the table `Student` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,name]` on the table `Subject` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,username]` on the table `Teacher` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,email]` on the table `Teacher` will be added. If there are existing duplicate values, this will fail.
-  - A unique constraint covering the columns `[schoolId,phone]` on the table `Teacher` will be added. If there are existing duplicate values, this will fail.
-  - Added the required column `schoolId` to the `Admin` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `academicYearId` to the `Announcement` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Announcement` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `academicYearId` to the `Assignment` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Assignment` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `academicYearId` to the `Attendance` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Attendance` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Class` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `academicYearId` to the `Event` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Event` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `academicYearId` to the `Exam` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Exam` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Grade` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `academicYearId` to the `Lesson` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Lesson` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Parent` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `academicYearId` to the `Result` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Result` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `birthday` to the `Student` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Student` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `gradeId` to the `Subject` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Subject` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `birthday` to the `Teacher` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `schoolId` to the `Teacher` table without a default value. This is not possible if the table is not empty.
-
-*/
--- CreateEnum
-CREATE TYPE "QuestionType" AS ENUM ('TRUE_FALSE', 'MCQ', 'TEXT', 'FILE');
-
--- CreateEnum
-CREATE TYPE "SubmissionStatus" AS ENUM ('IN_PROGRESS', 'SUBMITTED', 'GRADED');
-
--- CreateEnum
-CREATE TYPE "StudentStatus" AS ENUM ('ACTIVE', 'REPEATED', 'GRADUATED', 'LEFT');
-
--- CreateEnum
-CREATE TYPE "PassFailStatus" AS ENUM ('PASS', 'FAIL');
-
--- AlterEnum
-BEGIN;
-CREATE TYPE "Day_new" AS ENUM ('SATURDAY', 'SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY');
-ALTER TABLE "Lesson" ALTER COLUMN "day" TYPE "Day_new" USING ("day"::text::"Day_new");
-ALTER TYPE "Day" RENAME TO "Day_old";
-ALTER TYPE "Day_new" RENAME TO "Day";
-DROP TYPE "public"."Day_old";
-COMMIT;
-
--- DropForeignKey
-ALTER TABLE "Announcement" DROP CONSTRAINT "Announcement_classId_fkey";
-
--- DropForeignKey
-ALTER TABLE "Attendance" DROP CONSTRAINT "Attendance_lessonId_fkey";
-
--- DropForeignKey
-ALTER TABLE "Attendance" DROP CONSTRAINT "Attendance_studentId_fkey";
-
--- DropForeignKey
-ALTER TABLE "Class" DROP CONSTRAINT "Class_supervisorId_fkey";
-
--- DropForeignKey
-ALTER TABLE "Event" DROP CONSTRAINT "Event_classId_fkey";
-
--- DropForeignKey
-ALTER TABLE "Student" DROP CONSTRAINT "Student_parentId_fkey";
-
--- DropIndex
-DROP INDEX "Admin_username_key";
-
--- DropIndex
-DROP INDEX "Class_name_key";
-
--- DropIndex
-DROP INDEX "Grade_level_key";
-
--- DropIndex
-DROP INDEX "Parent_email_key";
-
--- DropIndex
-DROP INDEX "Parent_phone_key";
-
--- DropIndex
-DROP INDEX "Parent_username_key";
-
--- DropIndex
-DROP INDEX "Student_email_key";
-
--- DropIndex
-DROP INDEX "Student_phone_key";
-
--- DropIndex
-DROP INDEX "Student_username_key";
-
--- DropIndex
-DROP INDEX "Subject_name_key";
-
--- DropIndex
-DROP INDEX "Teacher_email_key";
-
--- DropIndex
-DROP INDEX "Teacher_phone_key";
-
--- DropIndex
-DROP INDEX "Teacher_username_key";
-
--- AlterTable
-ALTER TABLE "Admin" ADD COLUMN     "schoolId" INTEGER NOT NULL;
-
--- AlterTable
-ALTER TABLE "Announcement" DROP COLUMN "classId",
-ADD COLUMN     "academicYearId" INTEGER NOT NULL,
-ADD COLUMN     "schoolId" INTEGER NOT NULL;
-
--- AlterTable
-ALTER TABLE "Assignment" ADD COLUMN     "academicYearId" INTEGER NOT NULL,
-ADD COLUMN     "classId" INTEGER,
-ADD COLUMN     "schoolId" INTEGER NOT NULL,
-ADD COLUMN     "subjectId" INTEGER;
-
--- AlterTable
-ALTER TABLE "Attendance" DROP COLUMN "lessonId",
-ADD COLUMN     "academicYearId" INTEGER NOT NULL,
-ADD COLUMN     "schoolId" INTEGER NOT NULL,
-ADD COLUMN     "teacherId" TEXT,
-ALTER COLUMN "studentId" DROP NOT NULL;
-
--- AlterTable
-ALTER TABLE "Class" ADD COLUMN     "schoolId" INTEGER NOT NULL,
-ALTER COLUMN "supervisorId" DROP NOT NULL;
-
--- AlterTable
-ALTER TABLE "Event" DROP COLUMN "classId",
-ADD COLUMN     "academicYearId" INTEGER NOT NULL,
-ADD COLUMN     "schoolId" INTEGER NOT NULL;
-
--- AlterTable
-ALTER TABLE "Exam" ADD COLUMN     "academicYearId" INTEGER NOT NULL,
-ADD COLUMN     "autoSaveInterval" INTEGER NOT NULL DEFAULT 30,
-ADD COLUMN     "classId" INTEGER,
-ADD COLUMN     "duration" INTEGER,
-ADD COLUMN     "enableAutoSave" BOOLEAN NOT NULL DEFAULT true,
-ADD COLUMN     "enableAutoSubmit" BOOLEAN NOT NULL DEFAULT true,
-ADD COLUMN     "enableNavigation" BOOLEAN NOT NULL DEFAULT true,
-ADD COLUMN     "enableTimer" BOOLEAN NOT NULL DEFAULT true,
-ADD COLUMN     "questionsPerPage" INTEGER NOT NULL DEFAULT 1,
-ADD COLUMN     "schoolId" INTEGER NOT NULL,
-ADD COLUMN     "subjectId" INTEGER;
-
--- AlterTable
-ALTER TABLE "Grade" ADD COLUMN     "schoolId" INTEGER NOT NULL;
-
--- AlterTable
-ALTER TABLE "Lesson" ADD COLUMN     "academicYearId" INTEGER NOT NULL,
-ADD COLUMN     "schoolId" INTEGER NOT NULL;
-
--- AlterTable
-ALTER TABLE "Parent" ADD COLUMN     "schoolId" INTEGER NOT NULL;
-
--- AlterTable
-ALTER TABLE "Result" ADD COLUMN     "academicYearId" INTEGER NOT NULL,
-ADD COLUMN     "schoolId" INTEGER NOT NULL;
-
--- AlterTable
-ALTER TABLE "Student" ADD COLUMN     "birthday" TIMESTAMP(3) NOT NULL,
-ADD COLUMN     "repeatCount" INTEGER NOT NULL DEFAULT 0,
-ADD COLUMN     "schoolId" INTEGER NOT NULL,
-ADD COLUMN     "status" "StudentStatus" NOT NULL DEFAULT 'ACTIVE',
-ALTER COLUMN "parentId" DROP NOT NULL;
-
--- AlterTable
-ALTER TABLE "Subject" ADD COLUMN     "gradeId" INTEGER NOT NULL,
-ADD COLUMN     "schoolId" INTEGER NOT NULL;
-
--- AlterTable
-ALTER TABLE "Teacher" ADD COLUMN     "birthday" TIMESTAMP(3) NOT NULL,
-ADD COLUMN     "schoolId" INTEGER NOT NULL;
-
--- CreateTable
-CREATE TABLE "School" (
-    "id" SERIAL NOT NULL,
-    "name" TEXT NOT NULL,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "School_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "SchoolSettings" (
-    "id" SERIAL NOT NULL,
-    "schoolId" INTEGER NOT NULL,
-    "workDayStart" TIME NOT NULL,
-    "workDayEnd" TIME NOT NULL,
-    "lessonDuration" INTEGER NOT NULL,
-    "lessonsPerDay" INTEGER NOT NULL,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "SchoolSettings_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "AcademicYear" (
-    "id" SERIAL NOT NULL,
-    "schoolId" INTEGER NOT NULL,
-    "name" TEXT NOT NULL,
-    "startDate" DATE NOT NULL,
-    "endDate" DATE NOT NULL,
-    "isCurrent" BOOLEAN NOT NULL DEFAULT false,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "AcademicYear_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "StudentAcademicYear" (
-    "id" SERIAL NOT NULL,
-    "studentId" TEXT NOT NULL,
-    "schoolId" INTEGER NOT NULL,
-    "academicYearId" INTEGER NOT NULL,
-    "gradeId" INTEGER NOT NULL,
-    "classId" INTEGER,
-    "performanceStatus" "PassFailStatus",
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "StudentAcademicYear_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "Message" (
-    "id" SERIAL NOT NULL,
-    "schoolId" INTEGER NOT NULL,
-    "title" TEXT NOT NULL,
-    "description" TEXT NOT NULL,
-    "date" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "academicYearId" INTEGER NOT NULL,
-
-    CONSTRAINT "Message_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "Question" (
-    "id" SERIAL NOT NULL,
-    "schoolId" INTEGER NOT NULL,
-    "examId" INTEGER NOT NULL,
-    "text" TEXT NOT NULL,
-    "type" "QuestionType" NOT NULL,
-    "points" INTEGER NOT NULL DEFAULT 1,
-    "order" INTEGER NOT NULL,
-    "options" JSONB,
-    "correctAnswer" TEXT[],
-    "allowMultiple" BOOLEAN NOT NULL DEFAULT false,
-
-    CONSTRAINT "Question_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "Submission" (
-    "id" SERIAL NOT NULL,
-    "schoolId" INTEGER NOT NULL,
-    "examId" INTEGER NOT NULL,
-    "studentId" TEXT NOT NULL,
-    "status" "SubmissionStatus" NOT NULL DEFAULT 'IN_PROGRESS',
-    "currentPage" INTEGER NOT NULL DEFAULT 1,
-    "startedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "submittedAt" TIMESTAMP(3),
-    "autoSubmitted" BOOLEAN NOT NULL DEFAULT false,
-    "lastSyncedAt" TIMESTAMP(3),
-    "totalScore" DOUBLE PRECISION,
-    "extraTime" INTEGER,
-    "extendedBy" TEXT,
-    "extendedAt" TIMESTAMP(3),
-    "disconnectedAt" TIMESTAMP(3),
-    "reconnectedAt" TIMESTAMP(3),
-    "totalOfflineTime" INTEGER,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "Submission_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "Answer" (
-    "id" SERIAL NOT NULL,
-    "schoolId" INTEGER NOT NULL,
-    "submissionId" INTEGER NOT NULL,
-    "questionId" INTEGER NOT NULL,
-    "textAnswer" TEXT,
-    "fileUrl" TEXT,
-    "isDraft" BOOLEAN NOT NULL DEFAULT true,
-    "savedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "score" DOUBLE PRECISION,
-
-    CONSTRAINT "Answer_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "_TeacherClasses" (
-    "A" INTEGER NOT NULL,
-    "B" TEXT NOT NULL,
-
-    CONSTRAINT "_TeacherClasses_AB_pkey" PRIMARY KEY ("A","B")
-);
-
--- CreateTable
-CREATE TABLE "_ClassToEvent" (
-    "A" INTEGER NOT NULL,
-    "B" INTEGER NOT NULL,
-
-    CONSTRAINT "_ClassToEvent_AB_pkey" PRIMARY KEY ("A","B")
-);
-
--- CreateTable
-CREATE TABLE "_ClassToMessage" (
-    "A" INTEGER NOT NULL,
-    "B" INTEGER NOT NULL,
-
-    CONSTRAINT "_ClassToMessage_AB_pkey" PRIMARY KEY ("A","B")
-);
-
--- CreateTable
-CREATE TABLE "_AnnouncementToClass" (
-    "A" INTEGER NOT NULL,
-    "B" INTEGER NOT NULL,
-
-    CONSTRAINT "_AnnouncementToClass_AB_pkey" PRIMARY KEY ("A","B")
-);
-
--- CreateTable
-CREATE TABLE "_MessageToStudent" (
-    "A" INTEGER NOT NULL,
-    "B" TEXT NOT NULL,
-
-    CONSTRAINT "_MessageToStudent_AB_pkey" PRIMARY KEY ("A","B")
-);
-
--- CreateTable
-CREATE TABLE "_MessageToParent" (
-    "A" INTEGER NOT NULL,
-    "B" TEXT NOT NULL,
-
-    CONSTRAINT "_MessageToParent_AB_pkey" PRIMARY KEY ("A","B")
-);
-
--- CreateTable
-CREATE TABLE "_MessageToTeacher" (
-    "A" INTEGER NOT NULL,
-    "B" TEXT NOT NULL,
-
-    CONSTRAINT "_MessageToTeacher_AB_pkey" PRIMARY KEY ("A","B")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "School_name_key" ON "School"("name");
-
--- CreateIndex
-CREATE UNIQUE INDEX "SchoolSettings_schoolId_key" ON "SchoolSettings"("schoolId");
-
--- CreateIndex
-CREATE INDEX "SchoolSettings_schoolId_idx" ON "SchoolSettings"("schoolId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "AcademicYear_schoolId_name_key" ON "AcademicYear"("schoolId", "name");
-
--- CreateIndex
-CREATE INDEX "StudentAcademicYear_academicYearId_idx" ON "StudentAcademicYear"("academicYearId");
-
--- CreateIndex
-CREATE INDEX "StudentAcademicYear_gradeId_idx" ON "StudentAcademicYear"("gradeId");
-
--- CreateIndex
-CREATE INDEX "StudentAcademicYear_classId_idx" ON "StudentAcademicYear"("classId");
-
--- CreateIndex
-CREATE INDEX "StudentAcademicYear_schoolId_idx" ON "StudentAcademicYear"("schoolId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "StudentAcademicYear_schoolId_studentId_academicYearId_key" ON "StudentAcademicYear"("schoolId", "studentId", "academicYearId");
-
--- CreateIndex
-CREATE INDEX "Message_schoolId_idx" ON "Message"("schoolId");
-
--- CreateIndex
-CREATE INDEX "Question_schoolId_idx" ON "Question"("schoolId");
-
--- CreateIndex
-CREATE INDEX "Question_examId_idx" ON "Question"("examId");
-
--- CreateIndex
-CREATE INDEX "Submission_schoolId_idx" ON "Submission"("schoolId");
-
--- CreateIndex
-CREATE INDEX "Submission_examId_idx" ON "Submission"("examId");
-
--- CreateIndex
-CREATE INDEX "Submission_studentId_idx" ON "Submission"("studentId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Submission_examId_studentId_key" ON "Submission"("examId", "studentId");
-
--- CreateIndex
-CREATE INDEX "Answer_schoolId_idx" ON "Answer"("schoolId");
-
--- CreateIndex
-CREATE INDEX "Answer_submissionId_idx" ON "Answer"("submissionId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Answer_submissionId_questionId_key" ON "Answer"("submissionId", "questionId");
-
--- CreateIndex
-CREATE INDEX "_TeacherClasses_B_index" ON "_TeacherClasses"("B");
-
--- CreateIndex
-CREATE INDEX "_ClassToEvent_B_index" ON "_ClassToEvent"("B");
-
--- CreateIndex
-CREATE INDEX "_ClassToMessage_B_index" ON "_ClassToMessage"("B");
-
--- CreateIndex
-CREATE INDEX "_AnnouncementToClass_B_index" ON "_AnnouncementToClass"("B");
-
--- CreateIndex
-CREATE INDEX "_MessageToStudent_B_index" ON "_MessageToStudent"("B");
-
--- CreateIndex
-CREATE INDEX "_MessageToParent_B_index" ON "_MessageToParent"("B");
-
--- CreateIndex
-CREATE INDEX "_MessageToTeacher_B_index" ON "_MessageToTeacher"("B");
-
--- CreateIndex
-CREATE INDEX "Admin_schoolId_idx" ON "Admin"("schoolId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Admin_schoolId_username_key" ON "Admin"("schoolId", "username");
-
--- CreateIndex
-CREATE INDEX "Announcement_schoolId_idx" ON "Announcement"("schoolId");
-
--- CreateIndex
-CREATE INDEX "Assignment_schoolId_idx" ON "Assignment"("schoolId");
-
--- CreateIndex
-CREATE INDEX "Attendance_academicYearId_idx" ON "Attendance"("academicYearId");
-
--- CreateIndex
-CREATE INDEX "Attendance_date_idx" ON "Attendance"("date");
-
--- CreateIndex
-CREATE INDEX "Attendance_studentId_idx" ON "Attendance"("studentId");
-
--- CreateIndex
-CREATE INDEX "Attendance_teacherId_idx" ON "Attendance"("teacherId");
-
--- CreateIndex
-CREATE INDEX "Attendance_schoolId_idx" ON "Attendance"("schoolId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Attendance_studentId_academicYearId_date_key" ON "Attendance"("studentId", "academicYearId", "date");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Attendance_teacherId_academicYearId_date_key" ON "Attendance"("teacherId", "academicYearId", "date");
-
--- CreateIndex
-CREATE INDEX "Class_schoolId_idx" ON "Class"("schoolId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Class_schoolId_name_key" ON "Class"("schoolId", "name");
-
--- CreateIndex
-CREATE INDEX "Event_schoolId_idx" ON "Event"("schoolId");
-
--- CreateIndex
-CREATE INDEX "Exam_schoolId_idx" ON "Exam"("schoolId");
-
--- CreateIndex
-CREATE INDEX "Grade_schoolId_idx" ON "Grade"("schoolId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Grade_schoolId_level_key" ON "Grade"("schoolId", "level");
-
--- CreateIndex
-CREATE INDEX "Lesson_schoolId_idx" ON "Lesson"("schoolId");
-
--- CreateIndex
-CREATE INDEX "Parent_schoolId_idx" ON "Parent"("schoolId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Parent_schoolId_username_key" ON "Parent"("schoolId", "username");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Parent_schoolId_email_key" ON "Parent"("schoolId", "email");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Parent_schoolId_phone_key" ON "Parent"("schoolId", "phone");
-
--- CreateIndex
-CREATE INDEX "Result_schoolId_idx" ON "Result"("schoolId");
-
--- CreateIndex
-CREATE INDEX "Student_schoolId_idx" ON "Student"("schoolId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Student_schoolId_username_key" ON "Student"("schoolId", "username");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Student_schoolId_email_key" ON "Student"("schoolId", "email");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Student_schoolId_phone_key" ON "Student"("schoolId", "phone");
-
--- CreateIndex
-CREATE INDEX "Subject_schoolId_idx" ON "Subject"("schoolId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Subject_schoolId_name_key" ON "Subject"("schoolId", "name");
-
--- CreateIndex
-CREATE INDEX "Teacher_schoolId_idx" ON "Teacher"("schoolId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Teacher_schoolId_username_key" ON "Teacher"("schoolId", "username");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Teacher_schoolId_email_key" ON "Teacher"("schoolId", "email");
-
--- CreateIndex
-CREATE UNIQUE INDEX "Teacher_schoolId_phone_key" ON "Teacher"("schoolId", "phone");
-
--- AddForeignKey
-ALTER TABLE "Admin" ADD CONSTRAINT "Admin_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "SchoolSettings" ADD CONSTRAINT "SchoolSettings_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "AcademicYear" ADD CONSTRAINT "AcademicYear_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Student" ADD CONSTRAINT "Student_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Student" ADD CONSTRAINT "Student_parentId_fkey" FOREIGN KEY ("parentId") REFERENCES "Parent"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Teacher" ADD CONSTRAINT "Teacher_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Parent" ADD CONSTRAINT "Parent_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Grade" ADD CONSTRAINT "Grade_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Class" ADD CONSTRAINT "Class_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Class" ADD CONSTRAINT "Class_supervisorId_fkey" FOREIGN KEY ("supervisorId") REFERENCES "Teacher"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "StudentAcademicYear" ADD CONSTRAINT "StudentAcademicYear_studentId_fkey" FOREIGN KEY ("studentId") REFERENCES "Student"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "StudentAcademicYear" ADD CONSTRAINT "StudentAcademicYear_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "StudentAcademicYear" ADD CONSTRAINT "StudentAcademicYear_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "StudentAcademicYear" ADD CONSTRAINT "StudentAcademicYear_gradeId_fkey" FOREIGN KEY ("gradeId") REFERENCES "Grade"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "StudentAcademicYear" ADD CONSTRAINT "StudentAcademicYear_classId_fkey" FOREIGN KEY ("classId") REFERENCES "Class"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Subject" ADD CONSTRAINT "Subject_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Subject" ADD CONSTRAINT "Subject_gradeId_fkey" FOREIGN KEY ("gradeId") REFERENCES "Grade"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Lesson" ADD CONSTRAINT "Lesson_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Lesson" ADD CONSTRAINT "Lesson_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Exam" ADD CONSTRAINT "Exam_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Exam" ADD CONSTRAINT "Exam_classId_fkey" FOREIGN KEY ("classId") REFERENCES "Class"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Exam" ADD CONSTRAINT "Exam_subjectId_fkey" FOREIGN KEY ("subjectId") REFERENCES "Subject"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Exam" ADD CONSTRAINT "Exam_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Assignment" ADD CONSTRAINT "Assignment_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Assignment" ADD CONSTRAINT "Assignment_classId_fkey" FOREIGN KEY ("classId") REFERENCES "Class"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Assignment" ADD CONSTRAINT "Assignment_subjectId_fkey" FOREIGN KEY ("subjectId") REFERENCES "Subject"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Assignment" ADD CONSTRAINT "Assignment_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Result" ADD CONSTRAINT "Result_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Result" ADD CONSTRAINT "Result_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Attendance" ADD CONSTRAINT "Attendance_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Attendance" ADD CONSTRAINT "Attendance_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Attendance" ADD CONSTRAINT "Attendance_studentId_fkey" FOREIGN KEY ("studentId") REFERENCES "Student"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Attendance" ADD CONSTRAINT "Attendance_teacherId_fkey" FOREIGN KEY ("teacherId") REFERENCES "Teacher"("id") ON DELETE SET NULL ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Event" ADD CONSTRAINT "Event_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Event" ADD CONSTRAINT "Event_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Announcement" ADD CONSTRAINT "Announcement_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Announcement" ADD CONSTRAINT "Announcement_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Message" ADD CONSTRAINT "Message_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Message" ADD CONSTRAINT "Message_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Question" ADD CONSTRAINT "Question_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Question" ADD CONSTRAINT "Question_examId_fkey" FOREIGN KEY ("examId") REFERENCES "Exam"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Submission" ADD CONSTRAINT "Submission_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Submission" ADD CONSTRAINT "Submission_examId_fkey" FOREIGN KEY ("examId") REFERENCES "Exam"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Submission" ADD CONSTRAINT "Submission_studentId_fkey" FOREIGN KEY ("studentId") REFERENCES "Student"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Answer" ADD CONSTRAINT "Answer_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Answer" ADD CONSTRAINT "Answer_submissionId_fkey" FOREIGN KEY ("submissionId") REFERENCES "Submission"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "Answer" ADD CONSTRAINT "Answer_questionId_fkey" FOREIGN KEY ("questionId") REFERENCES "Question"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_TeacherClasses" ADD CONSTRAINT "_TeacherClasses_A_fkey" FOREIGN KEY ("A") REFERENCES "Class"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_TeacherClasses" ADD CONSTRAINT "_TeacherClasses_B_fkey" FOREIGN KEY ("B") REFERENCES "Teacher"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_ClassToEvent" ADD CONSTRAINT "_ClassToEvent_A_fkey" FOREIGN KEY ("A") REFERENCES "Class"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_ClassToEvent" ADD CONSTRAINT "_ClassToEvent_B_fkey" FOREIGN KEY ("B") REFERENCES "Event"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_ClassToMessage" ADD CONSTRAINT "_ClassToMessage_A_fkey" FOREIGN KEY ("A") REFERENCES "Class"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_ClassToMessage" ADD CONSTRAINT "_ClassToMessage_B_fkey" FOREIGN KEY ("B") REFERENCES "Message"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_AnnouncementToClass" ADD CONSTRAINT "_AnnouncementToClass_A_fkey" FOREIGN KEY ("A") REFERENCES "Announcement"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_AnnouncementToClass" ADD CONSTRAINT "_AnnouncementToClass_B_fkey" FOREIGN KEY ("B") REFERENCES "Class"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_MessageToStudent" ADD CONSTRAINT "_MessageToStudent_A_fkey" FOREIGN KEY ("A") REFERENCES "Message"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_MessageToStudent" ADD CONSTRAINT "_MessageToStudent_B_fkey" FOREIGN KEY ("B") REFERENCES "Student"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_MessageToParent" ADD CONSTRAINT "_MessageToParent_A_fkey" FOREIGN KEY ("A") REFERENCES "Message"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_MessageToParent" ADD CONSTRAINT "_MessageToParent_B_fkey" FOREIGN KEY ("B") REFERENCES "Parent"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_MessageToTeacher" ADD CONSTRAINT "_MessageToTeacher_A_fkey" FOREIGN KEY ("A") REFERENCES "Message"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "_MessageToTeacher" ADD CONSTRAINT "_MessageToTeacher_B_fkey" FOREIGN KEY ("B") REFERENCES "Teacher"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/migrations/20260509100045_init/migration.sql b/prisma/migrations/20260516145158_merge_submissions/migration.sql
similarity index 75%
rename from prisma/migrations/20260509100045_init/migration.sql
rename to prisma/migrations/20260516145158_merge_submissions/migration.sql
index e167685..3709771 100644
--- a/prisma/migrations/20260509100045_init/migration.sql
+++ b/prisma/migrations/20260516145158_merge_submissions/migration.sql
@@ -1,3 +1,9 @@
+-- CreateEnum
+CREATE TYPE "QuestionType" AS ENUM ('TRUE_FALSE', 'MCQ', 'TEXT', 'FILE');
+
+-- CreateEnum
+CREATE TYPE "SubmissionStatus" AS ENUM ('IN_PROGRESS', 'SUBMITTED', 'GRADED');
+
 -- CreateEnum
 CREATE TYPE "UserSex" AS ENUM ('MALE', 'FEMALE');
 
@@ -184,6 +190,13 @@ CREATE TABLE "Exam" (
     "subjectId" INTEGER,
     "lessonId" INTEGER NOT NULL,
     "academicYearId" INTEGER NOT NULL,
+    "enableTimer" BOOLEAN NOT NULL DEFAULT true,
+    "duration" INTEGER,
+    "enableNavigation" BOOLEAN NOT NULL DEFAULT true,
+    "enableAutoSave" BOOLEAN NOT NULL DEFAULT true,
+    "autoSaveInterval" INTEGER NOT NULL DEFAULT 30,
+    "enableAutoSubmit" BOOLEAN NOT NULL DEFAULT true,
+    "questionsPerPage" INTEGER NOT NULL DEFAULT 1,
 
     CONSTRAINT "Exam_pkey" PRIMARY KEY ("id")
 );
@@ -193,8 +206,11 @@ CREATE TABLE "Assignment" (
     "id" SERIAL NOT NULL,
     "schoolId" INTEGER NOT NULL,
     "title" TEXT NOT NULL,
+    "description" TEXT,
     "startDate" TIMESTAMP(3) NOT NULL,
     "endDate" TIMESTAMP(3) NOT NULL,
+    "fileUrl" TEXT,
+    "fileName" TEXT,
     "classId" INTEGER,
     "subjectId" INTEGER,
     "lessonId" INTEGER NOT NULL,
@@ -203,6 +219,40 @@ CREATE TABLE "Assignment" (
     CONSTRAINT "Assignment_pkey" PRIMARY KEY ("id")
 );
 
+-- CreateTable
+CREATE TABLE "AssignmentSubmission" (
+    "id" SERIAL NOT NULL,
+    "fileUrl" TEXT NOT NULL,
+    "fileName" TEXT NOT NULL,
+    "fileType" TEXT NOT NULL,
+    "note" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "assignmentId" INTEGER NOT NULL,
+    "studentId" TEXT NOT NULL,
+    "schoolId" INTEGER NOT NULL,
+    "academicYearId" INTEGER NOT NULL,
+
+    CONSTRAINT "AssignmentSubmission_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "StudyMaterial" (
+    "id" SERIAL NOT NULL,
+    "schoolId" INTEGER NOT NULL,
+    "title" TEXT NOT NULL,
+    "description" TEXT,
+    "fileUrl" TEXT NOT NULL,
+    "fileName" TEXT NOT NULL,
+    "fileType" TEXT NOT NULL,
+    "subjectId" INTEGER NOT NULL,
+    "teacherId" TEXT NOT NULL,
+    "academicYearId" INTEGER NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "StudyMaterial_pkey" PRIMARY KEY ("id")
+);
+
 -- CreateTable
 CREATE TABLE "Result" (
     "id" SERIAL NOT NULL,
@@ -266,6 +316,63 @@ CREATE TABLE "Message" (
     CONSTRAINT "Message_pkey" PRIMARY KEY ("id")
 );
 
+-- CreateTable
+CREATE TABLE "Question" (
+    "id" SERIAL NOT NULL,
+    "schoolId" INTEGER NOT NULL,
+    "examId" INTEGER NOT NULL,
+    "text" TEXT NOT NULL,
+    "type" "QuestionType" NOT NULL,
+    "points" INTEGER NOT NULL DEFAULT 1,
+    "order" INTEGER NOT NULL,
+    "options" JSONB,
+    "correctAnswer" TEXT[],
+    "allowMultiple" BOOLEAN NOT NULL DEFAULT false,
+
+    CONSTRAINT "Question_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Submission" (
+    "id" SERIAL NOT NULL,
+    "schoolId" INTEGER NOT NULL,
+    "examId" INTEGER NOT NULL,
+    "studentId" TEXT NOT NULL,
+    "status" "SubmissionStatus" NOT NULL DEFAULT 'IN_PROGRESS',
+    "currentPage" INTEGER NOT NULL DEFAULT 1,
+    "startedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "submittedAt" TIMESTAMP(3),
+    "autoSubmitted" BOOLEAN NOT NULL DEFAULT false,
+    "lastSyncedAt" TIMESTAMP(3),
+    "totalScore" DOUBLE PRECISION,
+    "extraTime" INTEGER,
+    "extendedBy" TEXT,
+    "extendedAt" TIMESTAMP(3),
+    "disconnectedAt" TIMESTAMP(3),
+    "reconnectedAt" TIMESTAMP(3),
+    "totalOfflineTime" INTEGER,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "academicYearId" INTEGER,
+
+    CONSTRAINT "Submission_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Answer" (
+    "id" SERIAL NOT NULL,
+    "schoolId" INTEGER NOT NULL,
+    "submissionId" INTEGER NOT NULL,
+    "questionId" INTEGER NOT NULL,
+    "textAnswer" TEXT,
+    "fileUrl" TEXT,
+    "isDraft" BOOLEAN NOT NULL DEFAULT true,
+    "savedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "score" DOUBLE PRECISION,
+
+    CONSTRAINT "Answer_pkey" PRIMARY KEY ("id")
+);
+
 -- CreateTable
 CREATE TABLE "_TeacherClasses" (
     "A" INTEGER NOT NULL,
@@ -426,6 +533,27 @@ CREATE INDEX "Exam_schoolId_idx" ON "Exam"("schoolId");
 -- CreateIndex
 CREATE INDEX "Assignment_schoolId_idx" ON "Assignment"("schoolId");
 
+-- CreateIndex
+CREATE INDEX "AssignmentSubmission_schoolId_idx" ON "AssignmentSubmission"("schoolId");
+
+-- CreateIndex
+CREATE INDEX "AssignmentSubmission_assignmentId_idx" ON "AssignmentSubmission"("assignmentId");
+
+-- CreateIndex
+CREATE INDEX "AssignmentSubmission_studentId_idx" ON "AssignmentSubmission"("studentId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "AssignmentSubmission_assignmentId_studentId_key" ON "AssignmentSubmission"("assignmentId", "studentId");
+
+-- CreateIndex
+CREATE INDEX "StudyMaterial_schoolId_idx" ON "StudyMaterial"("schoolId");
+
+-- CreateIndex
+CREATE INDEX "StudyMaterial_subjectId_idx" ON "StudyMaterial"("subjectId");
+
+-- CreateIndex
+CREATE INDEX "StudyMaterial_teacherId_idx" ON "StudyMaterial"("teacherId");
+
 -- CreateIndex
 CREATE INDEX "Result_schoolId_idx" ON "Result"("schoolId");
 
@@ -459,6 +587,33 @@ CREATE INDEX "Announcement_schoolId_idx" ON "Announcement"("schoolId");
 -- CreateIndex
 CREATE INDEX "Message_schoolId_idx" ON "Message"("schoolId");
 
+-- CreateIndex
+CREATE INDEX "Question_schoolId_idx" ON "Question"("schoolId");
+
+-- CreateIndex
+CREATE INDEX "Question_examId_idx" ON "Question"("examId");
+
+-- CreateIndex
+CREATE INDEX "Submission_schoolId_idx" ON "Submission"("schoolId");
+
+-- CreateIndex
+CREATE INDEX "Submission_examId_idx" ON "Submission"("examId");
+
+-- CreateIndex
+CREATE INDEX "Submission_studentId_idx" ON "Submission"("studentId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Submission_examId_studentId_key" ON "Submission"("examId", "studentId");
+
+-- CreateIndex
+CREATE INDEX "Answer_schoolId_idx" ON "Answer"("schoolId");
+
+-- CreateIndex
+CREATE INDEX "Answer_submissionId_idx" ON "Answer"("submissionId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Answer_submissionId_questionId_key" ON "Answer"("submissionId", "questionId");
+
 -- CreateIndex
 CREATE INDEX "_TeacherClasses_B_index" ON "_TeacherClasses"("B");
 
@@ -588,6 +743,30 @@ ALTER TABLE "Assignment" ADD CONSTRAINT "Assignment_lessonId_fkey" FOREIGN KEY (
 -- AddForeignKey
 ALTER TABLE "Assignment" ADD CONSTRAINT "Assignment_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
+-- AddForeignKey
+ALTER TABLE "AssignmentSubmission" ADD CONSTRAINT "AssignmentSubmission_assignmentId_fkey" FOREIGN KEY ("assignmentId") REFERENCES "Assignment"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "AssignmentSubmission" ADD CONSTRAINT "AssignmentSubmission_studentId_fkey" FOREIGN KEY ("studentId") REFERENCES "Student"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "AssignmentSubmission" ADD CONSTRAINT "AssignmentSubmission_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "AssignmentSubmission" ADD CONSTRAINT "AssignmentSubmission_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "StudyMaterial" ADD CONSTRAINT "StudyMaterial_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "StudyMaterial" ADD CONSTRAINT "StudyMaterial_subjectId_fkey" FOREIGN KEY ("subjectId") REFERENCES "Subject"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "StudyMaterial" ADD CONSTRAINT "StudyMaterial_teacherId_fkey" FOREIGN KEY ("teacherId") REFERENCES "Teacher"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "StudyMaterial" ADD CONSTRAINT "StudyMaterial_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
 -- AddForeignKey
 ALTER TABLE "Result" ADD CONSTRAINT "Result_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
@@ -633,6 +812,33 @@ ALTER TABLE "Message" ADD CONSTRAINT "Message_schoolId_fkey" FOREIGN KEY ("schoo
 -- AddForeignKey
 ALTER TABLE "Message" ADD CONSTRAINT "Message_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
+-- AddForeignKey
+ALTER TABLE "Question" ADD CONSTRAINT "Question_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Question" ADD CONSTRAINT "Question_examId_fkey" FOREIGN KEY ("examId") REFERENCES "Exam"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Submission" ADD CONSTRAINT "Submission_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Submission" ADD CONSTRAINT "Submission_examId_fkey" FOREIGN KEY ("examId") REFERENCES "Exam"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Submission" ADD CONSTRAINT "Submission_studentId_fkey" FOREIGN KEY ("studentId") REFERENCES "Student"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Submission" ADD CONSTRAINT "Submission_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Answer" ADD CONSTRAINT "Answer_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Answer" ADD CONSTRAINT "Answer_submissionId_fkey" FOREIGN KEY ("submissionId") REFERENCES "Submission"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Answer" ADD CONSTRAINT "Answer_questionId_fkey" FOREIGN KEY ("questionId") REFERENCES "Question"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
 -- AddForeignKey
 ALTER TABLE "_TeacherClasses" ADD CONSTRAINT "_TeacherClasses_A_fkey" FOREIGN KEY ("A") REFERENCES "Class"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
diff --git a/prisma/migrations/20260522203148_add_allow_late_submission/migration.sql b/prisma/migrations/20260522203148_add_allow_late_submission/migration.sql
new file mode 100644
index 0000000..97d87a5
--- /dev/null
+++ b/prisma/migrations/20260522203148_add_allow_late_submission/migration.sql
@@ -0,0 +1,37 @@
+-- CreateEnum
+CREATE TYPE "SchoolDayExceptionType" AS ENUM ('HOLIDAY', 'OFF_DAY', 'WORKING_OVERRIDE');
+
+-- AlterEnum
+ALTER TYPE "Day" ADD VALUE 'FRIDAY';
+
+-- AlterTable
+ALTER TABLE "Assignment" ADD COLUMN     "allowLateSubmission" BOOLEAN NOT NULL DEFAULT false;
+
+-- AlterTable
+ALTER TABLE "AssignmentSubmission" ADD COLUMN     "teacherFeedback" TEXT;
+
+-- CreateTable
+CREATE TABLE "SchoolDayException" (
+    "id" SERIAL NOT NULL,
+    "schoolId" INTEGER NOT NULL,
+    "date" DATE NOT NULL,
+    "type" "SchoolDayExceptionType" NOT NULL,
+    "name" TEXT,
+    "notes" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "SchoolDayException_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "SchoolDayException_schoolId_idx" ON "SchoolDayException"("schoolId");
+
+-- CreateIndex
+CREATE INDEX "SchoolDayException_date_idx" ON "SchoolDayException"("date");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "SchoolDayException_schoolId_date_key" ON "SchoolDayException"("schoolId", "date");
+
+-- AddForeignKey
+ALTER TABLE "SchoolDayException" ADD CONSTRAINT "SchoolDayException_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/migrations/20260523104852_add_subject_page_settings/migration.sql b/prisma/migrations/20260523104852_add_subject_page_settings/migration.sql
new file mode 100644
index 0000000..a1e7925
--- /dev/null
+++ b/prisma/migrations/20260523104852_add_subject_page_settings/migration.sql
@@ -0,0 +1,36 @@
+-- CreateTable
+CREATE TABLE "SubjectPageSettings" (
+    "id" SERIAL NOT NULL,
+    "schoolId" INTEGER NOT NULL,
+    "subjectId" INTEGER NOT NULL,
+    "teacherId" TEXT NOT NULL,
+    "announcement" TEXT,
+    "description" TEXT,
+    "bannerImage" TEXT,
+    "sectionsOrder" JSONB NOT NULL DEFAULT '["assignments","lessons","materials"]',
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "SubjectPageSettings_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "SubjectPageSettings_schoolId_idx" ON "SubjectPageSettings"("schoolId");
+
+-- CreateIndex
+CREATE INDEX "SubjectPageSettings_subjectId_idx" ON "SubjectPageSettings"("subjectId");
+
+-- CreateIndex
+CREATE INDEX "SubjectPageSettings_teacherId_idx" ON "SubjectPageSettings"("teacherId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "SubjectPageSettings_subjectId_teacherId_key" ON "SubjectPageSettings"("subjectId", "teacherId");
+
+-- AddForeignKey
+ALTER TABLE "SubjectPageSettings" ADD CONSTRAINT "SubjectPageSettings_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "SubjectPageSettings" ADD CONSTRAINT "SubjectPageSettings_subjectId_fkey" FOREIGN KEY ("subjectId") REFERENCES "Subject"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "SubjectPageSettings" ADD CONSTRAINT "SubjectPageSettings_teacherId_fkey" FOREIGN KEY ("teacherId") REFERENCES "Teacher"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/prisma/migrations/20260523124020_add_banner_height/migration.sql b/prisma/migrations/20260523124020_add_banner_height/migration.sql
new file mode 100644
index 0000000..d6f7e0c
--- /dev/null
+++ b/prisma/migrations/20260523124020_add_banner_height/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "SubjectPageSettings" ADD COLUMN     "bannerHeight" TEXT NOT NULL DEFAULT 'md';
diff --git a/prisma/migrations/20260524120000_add_answer_is_overridden/migration.sql b/prisma/migrations/20260524120000_add_answer_is_overridden/migration.sql
new file mode 100644
index 0000000..08cec7a
--- /dev/null
+++ b/prisma/migrations/20260524120000_add_answer_is_overridden/migration.sql
@@ -0,0 +1,2 @@
+-- Keep the existing database column in Prisma's migration history.
+ALTER TABLE "Answer" ADD COLUMN IF NOT EXISTS "isOverridden" BOOLEAN NOT NULL DEFAULT false;
diff --git a/prisma/migrations/20260525120000_add_submission_grade_published/migration.sql b/prisma/migrations/20260525120000_add_submission_grade_published/migration.sql
new file mode 100644
index 0000000..c8639c6
--- /dev/null
+++ b/prisma/migrations/20260525120000_add_submission_grade_published/migration.sql
@@ -0,0 +1 @@
+ALTER TABLE "Submission" ADD COLUMN IF NOT EXISTS "gradePublished" BOOLEAN NOT NULL DEFAULT false;
diff --git a/prisma/migrations/20260525120734_add_notifications/migration.sql b/prisma/migrations/20260525120734_add_notifications/migration.sql
new file mode 100644
index 0000000..669fe9e
--- /dev/null
+++ b/prisma/migrations/20260525120734_add_notifications/migration.sql
@@ -0,0 +1,44 @@
+-- CreateEnum
+CREATE TYPE "SchoolStatus" AS ENUM ('PENDING', 'ACTIVE', 'PAUSED');
+
+-- CreateEnum
+CREATE TYPE "NotificationType" AS ENUM ('NEW_ASSIGNMENT', 'ASSIGNMENT_SUBMITTED', 'ASSIGNMENT_FEEDBACK', 'NEW_EXAM', 'NEW_ANNOUNCEMENT', 'NEW_MESSAGE');
+
+-- AlterTable
+ALTER TABLE "School" ADD COLUMN     "address" TEXT,
+ADD COLUMN     "city" TEXT,
+ADD COLUMN     "contactEmail" TEXT,
+ADD COLUMN     "contactPhone" TEXT,
+ADD COLUMN     "country" TEXT,
+ADD COLUMN     "pauseReason" TEXT,
+ADD COLUMN     "registrationNumber" TEXT,
+ADD COLUMN     "status" "SchoolStatus" NOT NULL DEFAULT 'PENDING',
+ADD COLUMN     "website" TEXT;
+
+-- AlterTable
+ALTER TABLE "SchoolSettings" ADD COLUMN     "workingDays" TEXT[] DEFAULT ARRAY[]::TEXT[];
+
+-- CreateTable
+CREATE TABLE "Notification" (
+    "id" SERIAL NOT NULL,
+    "schoolId" INTEGER NOT NULL,
+    "userId" TEXT NOT NULL,
+    "userRole" TEXT NOT NULL,
+    "type" "NotificationType" NOT NULL,
+    "title" TEXT NOT NULL,
+    "body" TEXT NOT NULL,
+    "link" TEXT,
+    "isRead" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "Notification_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "Notification_userId_isRead_idx" ON "Notification"("userId", "isRead");
+
+-- CreateIndex
+CREATE INDEX "Notification_schoolId_idx" ON "Notification"("schoolId");
+
+-- AddForeignKey
+ALTER TABLE "Notification" ADD CONSTRAINT "Notification_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/migrations/20260526224521_update_notification_types/migration.sql b/prisma/migrations/20260526224521_update_notification_types/migration.sql
new file mode 100644
index 0000000..c6bc173
--- /dev/null
+++ b/prisma/migrations/20260526224521_update_notification_types/migration.sql
@@ -0,0 +1,15 @@
+-- AlterEnum
+-- This migration adds more than one value to an enum.
+-- With PostgreSQL versions 11 and earlier, this is not possible
+-- in a single migration. This can be worked around by creating
+-- multiple migrations, each migration adding only one value to
+-- the enum.
+
+
+ALTER TYPE "NotificationType" ADD VALUE 'ASSIGNMENT_UPDATED';
+ALTER TYPE "NotificationType" ADD VALUE 'GRADE_POSTED';
+ALTER TYPE "NotificationType" ADD VALUE 'GRADE_UPDATED';
+ALTER TYPE "NotificationType" ADD VALUE 'NEW_EVENT';
+ALTER TYPE "NotificationType" ADD VALUE 'SCHEDULE_UPDATED';
+ALTER TYPE "NotificationType" ADD VALUE 'ATTENDANCE_SAVED';
+ALTER TYPE "NotificationType" ADD VALUE 'SUPERVISOR_ASSIGNED';
diff --git a/prisma/migrations/20260530120000_add_file_upload_fields/migration.sql b/prisma/migrations/20260530120000_add_file_upload_fields/migration.sql
new file mode 100644
index 0000000..c9a6186
--- /dev/null
+++ b/prisma/migrations/20260530120000_add_file_upload_fields/migration.sql
@@ -0,0 +1,4 @@
+ALTER TABLE "Answer" ADD COLUMN IF NOT EXISTS "filePublicId"     TEXT;
+ALTER TABLE "Answer" ADD COLUMN IF NOT EXISTS "fileOriginalName" TEXT;
+ALTER TABLE "Answer" ADD COLUMN IF NOT EXISTS "fileMimeType"     TEXT;
+ALTER TABLE "Answer" ADD COLUMN IF NOT EXISTS "fileSizeBytes"    INTEGER;
diff --git a/prisma/migrations/20260531093303_add_school_status/migration.sql b/prisma/migrations/20260531093303_add_school_status/migration.sql
new file mode 100644
index 0000000..b82cc25
--- /dev/null
+++ b/prisma/migrations/20260531093303_add_school_status/migration.sql
@@ -0,0 +1,3 @@
+-- This migration is intentionally empty.
+-- The school status fields were already introduced by
+-- 20260525120734_add_notifications in the merged migration history.
diff --git a/prisma/migrations/20260602110624_add_feedback_system/migration.sql b/prisma/migrations/20260602110624_add_feedback_system/migration.sql
new file mode 100644
index 0000000..c618a0b
--- /dev/null
+++ b/prisma/migrations/20260602110624_add_feedback_system/migration.sql
@@ -0,0 +1,12 @@
+-- CreateTable
+CREATE TABLE "Feedback" (
+    "id" TEXT NOT NULL,
+    "type" TEXT NOT NULL,
+    "message" TEXT NOT NULL,
+    "status" TEXT NOT NULL DEFAULT 'pending',
+    "schoolId" INTEGER NOT NULL,
+    "userId" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "Feedback_pkey" PRIMARY KEY ("id")
+);
diff --git a/prisma/migrations/20260603120000_make_exam_lesson_optional_add_teacher/migration.sql b/prisma/migrations/20260603120000_make_exam_lesson_optional_add_teacher/migration.sql
new file mode 100644
index 0000000..4d9b753
--- /dev/null
+++ b/prisma/migrations/20260603120000_make_exam_lesson_optional_add_teacher/migration.sql
@@ -0,0 +1,24 @@
+-- Make lesson linkage optional for exams and store the responsible teacher directly.
+ALTER TABLE "Exam" ADD COLUMN "teacherId" TEXT;
+
+ALTER TABLE "Exam" DROP CONSTRAINT IF EXISTS "Exam_lessonId_fkey";
+
+ALTER TABLE "Exam" ALTER COLUMN "lessonId" DROP NOT NULL;
+
+ALTER TABLE "Exam"
+ADD CONSTRAINT "Exam_lessonId_fkey"
+FOREIGN KEY ("lessonId") REFERENCES "Lesson"("id")
+ON DELETE SET NULL ON UPDATE CASCADE;
+
+ALTER TABLE "Exam"
+ADD CONSTRAINT "Exam_teacherId_fkey"
+FOREIGN KEY ("teacherId") REFERENCES "Teacher"("id")
+ON DELETE SET NULL ON UPDATE CASCADE;
+
+CREATE INDEX "Exam_teacherId_idx" ON "Exam"("teacherId");
+
+UPDATE "Exam" AS exam
+SET "teacherId" = lesson."teacherId"
+FROM "Lesson" AS lesson
+WHERE exam."lessonId" = lesson."id"
+  AND exam."teacherId" IS NULL;
diff --git a/prisma/migrations/20260603121000_make_assignment_lesson_optional_add_teacher/migration.sql b/prisma/migrations/20260603121000_make_assignment_lesson_optional_add_teacher/migration.sql
new file mode 100644
index 0000000..10cb098
--- /dev/null
+++ b/prisma/migrations/20260603121000_make_assignment_lesson_optional_add_teacher/migration.sql
@@ -0,0 +1,24 @@
+-- Make lesson linkage optional for assignments and store the responsible teacher directly.
+ALTER TABLE "Assignment" ADD COLUMN "teacherId" TEXT;
+
+ALTER TABLE "Assignment" DROP CONSTRAINT IF EXISTS "Assignment_lessonId_fkey";
+
+ALTER TABLE "Assignment" ALTER COLUMN "lessonId" DROP NOT NULL;
+
+ALTER TABLE "Assignment"
+ADD CONSTRAINT "Assignment_lessonId_fkey"
+FOREIGN KEY ("lessonId") REFERENCES "Lesson"("id")
+ON DELETE SET NULL ON UPDATE CASCADE;
+
+ALTER TABLE "Assignment"
+ADD CONSTRAINT "Assignment_teacherId_fkey"
+FOREIGN KEY ("teacherId") REFERENCES "Teacher"("id")
+ON DELETE SET NULL ON UPDATE CASCADE;
+
+CREATE INDEX "Assignment_teacherId_idx" ON "Assignment"("teacherId");
+
+UPDATE "Assignment" AS assignment
+SET "teacherId" = lesson."teacherId"
+FROM "Lesson" AS lesson
+WHERE assignment."lessonId" = lesson."id"
+  AND assignment."teacherId" IS NULL;
diff --git a/prisma/migrations/20260603122000_add_assignment_submission_grading/migration.sql b/prisma/migrations/20260603122000_add_assignment_submission_grading/migration.sql
new file mode 100644
index 0000000..b741022
--- /dev/null
+++ b/prisma/migrations/20260603122000_add_assignment_submission_grading/migration.sql
@@ -0,0 +1,5 @@
+ALTER TABLE "AssignmentSubmission"
+ADD COLUMN "score" DOUBLE PRECISION,
+ADD COLUMN "gradePublished" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN "gradedAt" TIMESTAMP(3),
+ADD COLUMN "gradedBy" TEXT;
diff --git a/prisma/migrations/20260603123000_add_assignment_max_score/migration.sql b/prisma/migrations/20260603123000_add_assignment_max_score/migration.sql
new file mode 100644
index 0000000..55176c4
--- /dev/null
+++ b/prisma/migrations/20260603123000_add_assignment_max_score/migration.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "Assignment"
+ADD COLUMN "maxScore" DOUBLE PRECISION NOT NULL DEFAULT 10;
diff --git a/prisma/migrations/20260604120000_add_ai_evaluations/migration.sql b/prisma/migrations/20260604120000_add_ai_evaluations/migration.sql
new file mode 100644
index 0000000..064c225
--- /dev/null
+++ b/prisma/migrations/20260604120000_add_ai_evaluations/migration.sql
@@ -0,0 +1,44 @@
+CREATE TYPE "AiEvaluationStatus" AS ENUM ('SUGGESTED', 'APPROVED', 'FAILED');
+
+CREATE TABLE "AiEvaluation" (
+  "id" SERIAL NOT NULL,
+  "schoolId" INTEGER NOT NULL,
+  "answerId" INTEGER,
+  "assignmentSubmissionId" INTEGER,
+  "provider" TEXT NOT NULL DEFAULT 'gemini',
+  "model" TEXT NOT NULL,
+  "status" "AiEvaluationStatus" NOT NULL DEFAULT 'SUGGESTED',
+  "score" DOUBLE PRECISION,
+  "maxScore" DOUBLE PRECISION NOT NULL,
+  "feedback" TEXT,
+  "strengths" JSONB NOT NULL DEFAULT '[]',
+  "weaknesses" JSONB NOT NULL DEFAULT '[]',
+  "needsReview" BOOLEAN NOT NULL DEFAULT true,
+  "error" TEXT,
+  "approvedScore" DOUBLE PRECISION,
+  "approvedFeedback" TEXT,
+  "approvedBy" TEXT,
+  "approvedAt" TIMESTAMP(3),
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "updatedAt" TIMESTAMP(3) NOT NULL,
+
+  CONSTRAINT "AiEvaluation_pkey" PRIMARY KEY ("id")
+);
+
+CREATE UNIQUE INDEX "AiEvaluation_answerId_key" ON "AiEvaluation"("answerId");
+CREATE UNIQUE INDEX "AiEvaluation_assignmentSubmissionId_key" ON "AiEvaluation"("assignmentSubmissionId");
+CREATE INDEX "AiEvaluation_schoolId_idx" ON "AiEvaluation"("schoolId");
+CREATE INDEX "AiEvaluation_answerId_idx" ON "AiEvaluation"("answerId");
+CREATE INDEX "AiEvaluation_assignmentSubmissionId_idx" ON "AiEvaluation"("assignmentSubmissionId");
+
+ALTER TABLE "AiEvaluation"
+ADD CONSTRAINT "AiEvaluation_schoolId_fkey"
+FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE "AiEvaluation"
+ADD CONSTRAINT "AiEvaluation_answerId_fkey"
+FOREIGN KEY ("answerId") REFERENCES "Answer"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE "AiEvaluation"
+ADD CONSTRAINT "AiEvaluation_assignmentSubmissionId_fkey"
+FOREIGN KEY ("assignmentSubmissionId") REFERENCES "AssignmentSubmission"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/migrations/20260604123000_add_assignment_rubric/migration.sql b/prisma/migrations/20260604123000_add_assignment_rubric/migration.sql
new file mode 100644
index 0000000..ea15033
--- /dev/null
+++ b/prisma/migrations/20260604123000_add_assignment_rubric/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Assignment" ADD COLUMN "rubric" TEXT;
diff --git a/prisma/migrations/20260604124500_add_exam_instructions/migration.sql b/prisma/migrations/20260604124500_add_exam_instructions/migration.sql
new file mode 100644
index 0000000..8bbd7ab
--- /dev/null
+++ b/prisma/migrations/20260604124500_add_exam_instructions/migration.sql
@@ -0,0 +1 @@
+ALTER TABLE "Exam" ADD COLUMN "instructions" TEXT;
diff --git a/prisma/migrations/20260606190000_add_student_final_results/migration.sql b/prisma/migrations/20260606190000_add_student_final_results/migration.sql
new file mode 100644
index 0000000..149ad53
--- /dev/null
+++ b/prisma/migrations/20260606190000_add_student_final_results/migration.sql
@@ -0,0 +1,22 @@
+CREATE TABLE "StudentFinalResult" (
+    "id" SERIAL NOT NULL,
+    "schoolId" INTEGER NOT NULL,
+    "studentId" TEXT NOT NULL,
+    "academicYearId" INTEGER NOT NULL,
+    "averageScore" DOUBLE PRECISION NOT NULL,
+    "assessmentCount" INTEGER NOT NULL DEFAULT 0,
+    "status" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "StudentFinalResult_pkey" PRIMARY KEY ("id")
+);
+
+CREATE UNIQUE INDEX "StudentFinalResult_schoolId_studentId_academicYearId_key" ON "StudentFinalResult"("schoolId", "studentId", "academicYearId");
+CREATE INDEX "StudentFinalResult_schoolId_idx" ON "StudentFinalResult"("schoolId");
+CREATE INDEX "StudentFinalResult_studentId_idx" ON "StudentFinalResult"("studentId");
+CREATE INDEX "StudentFinalResult_academicYearId_idx" ON "StudentFinalResult"("academicYearId");
+
+ALTER TABLE "StudentFinalResult" ADD CONSTRAINT "StudentFinalResult_schoolId_fkey" FOREIGN KEY ("schoolId") REFERENCES "School"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "StudentFinalResult" ADD CONSTRAINT "StudentFinalResult_studentId_fkey" FOREIGN KEY ("studentId") REFERENCES "Student"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "StudentFinalResult" ADD CONSTRAINT "StudentFinalResult_academicYearId_fkey" FOREIGN KEY ("academicYearId") REFERENCES "AcademicYear"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 6b6647d..a352977 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -8,201 +8,246 @@ datasource db {
   // Docker PostgreSQL — no directUrl needed
 }
 
-
 model School {
-  id Int @id @default(autoincrement())
-  name String @unique
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  academicYears AcademicYear[]
-  admins  Admin[] 
-  students Student[]
-  studentAcademicYears StudentAcademicYear[]
-  teachers Teacher[]
-  parents Parent[]
-  grades Grade[]
-  classes Class[]
-  subjects Subject[]
-  lessons Lesson[]
-  events Event[]
-  announcements Announcement[]
-  messages Message[]
-  attendances Attendance[]
-  exams Exam[]
-  assignments Assignment[]
-  schoolSettings SchoolSettings[]
-  results Result[]
+  id                 Int          @id @default(autoincrement())
+  name               String       @unique
+  contactEmail       String?
+  contactPhone       String?
+  website            String?
+  country            String?
+  city               String?
+  address            String?
+  registrationNumber String?
+  status             SchoolStatus @default(PENDING)
+  pauseReason        String?
+  createdAt          DateTime     @default(now())
+  updatedAt          DateTime     @updatedAt
+
+  academicYears         AcademicYear[]
+  admins                Admin[]
+  students              Student[]
+  studentAcademicYears  StudentAcademicYear[]
+  teachers              Teacher[]
+  parents               Parent[]
+  grades                Grade[]
+  classes               Class[]
+  subjects              Subject[]
+  lessons               Lesson[]
+  events                Event[]
+  announcements         Announcement[]
+  messages              Message[]
+  attendances           Attendance[]
+  exams                 Exam[]
+  assignments           Assignment[]
+  assignmentSubmissions AssignmentSubmission[]
+  studyMaterials        StudyMaterial[]
+  schoolSettings        SchoolSettings[]
+  schoolDayExceptions   SchoolDayException[]
+  results               Result[]
+  studentFinalResults   StudentFinalResult[]
+  aiEvaluations         AiEvaluation[]
 
   // Exam workflow relations
   questions   Question[]
   submissions Submission[]
   answers     Answer[]
-}
 
+  subjectPageSettings SubjectPageSettings[]
+  notifications       Notification[]
+}
 
-model Admin{
-  id String @id
+model Admin {
+  id       String @id
   username String
   schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  @@unique([schoolId, username])
+  school   School @relation(fields: [schoolId], references: [id])
 
+  @@unique([schoolId, username])
   @@index([schoolId])
 }
 
-
 model SchoolSettings {
-  id Int @id @default(autoincrement())
-  schoolId Int @unique
-  school School @relation(fields: [schoolId], references: [id])
+  id       Int    @id @default(autoincrement())
+  schoolId Int    @unique
+  school   School @relation(fields: [schoolId], references: [id])
 
   workDayStart DateTime @db.Time
-  workDayEnd DateTime @db.Time
+  workDayEnd   DateTime @db.Time
 
   lessonDuration Int
-  lessonsPerDay Int
+  lessonsPerDay  Int
+  workingDays    String[] @default([])
 
   updatedAt DateTime @updatedAt
 
   @@index([schoolId])
 }
 
+model SchoolDayException {
+  id        Int                    @id @default(autoincrement())
+  schoolId  Int
+  school    School                 @relation(fields: [schoolId], references: [id], onDelete: Cascade)
+  date      DateTime               @db.Date
+  type      SchoolDayExceptionType
+  name      String?
+  notes     String?
+  createdAt DateTime               @default(now())
+  updatedAt DateTime               @updatedAt
+
+  @@unique([schoolId, date])
+  @@index([schoolId])
+  @@index([date])
+}
+
 model AcademicYear {
-  id Int @id @default(autoincrement())
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  name String 
+  id        Int      @id @default(autoincrement())
+  schoolId  Int
+  school    School   @relation(fields: [schoolId], references: [id])
+  name      String
   startDate DateTime @db.Date
-  endDate DateTime @db.Date
-  isCurrent Boolean @default(false)
+  endDate   DateTime @db.Date
+  isCurrent Boolean  @default(false)
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  lessons Lesson[]
-  exams Exam[]
-  assignments Assignment[]
-  results Result[]
-  attendances Attendance[]
-  events Event[]
-  announcements Announcement[]
-  messages Message[]
-  studentAcademicYears StudentAcademicYear[]
+  lessons               Lesson[]
+  exams                 Exam[]
+  assignments           Assignment[]
+  studyMaterials        StudyMaterial[]
+  results               Result[]
+  studentFinalResults   StudentFinalResult[]
+  attendances           Attendance[]
+  events                Event[]
+  announcements         Announcement[]
+  messages              Message[]
+  studentAcademicYears  StudentAcademicYear[]
+  submissions           Submission[] // exam submissions
+  assignmentSubmissions AssignmentSubmission[] // assignment submissions
 
- @@unique([schoolId, name])
+  @@unique([schoolId, name])
 }
 
-model Student{  
-  id String @id
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  username String
+model Student {
+  id                    String                 @id
+  schoolId              Int
+  school                School                 @relation(fields: [schoolId], references: [id])
+  username              String
+  name                  String
+  email                 String?
+  phone                 String?
+  address               String
+  img                   String?
+  bloodType             String
+  sex                   UserSex
+  status                StudentStatus          @default(ACTIVE)
+  repeatCount           Int                    @default(0)
+  createdAt             DateTime               @default(now())
+  parentId              String?
+  parent                Parent?                @relation(fields: [parentId], references: [id])
+  classId               Int
+  class                 Class                  @relation(fields: [classId], references: [id])
+  gradeId               Int
+  grade                 Grade                  @relation(fields: [gradeId], references: [id])
+  attendances           Attendance[]
+  results               Result[]
+  finalResults          StudentFinalResult[]
+  messages              Message[]
+  academicYears         StudentAcademicYear[]
+  birthday              DateTime
+  submissions           Submission[] // exam submissions
+  assignmentSubmissions AssignmentSubmission[] // assignment submissions
+
   @@unique([schoolId, username])
-  name String
-  email String?
   @@unique([schoolId, email])
-  phone String?
   @@unique([schoolId, phone])
-  address String
-  img String?
-  bloodType String
-  sex UserSex
-  status StudentStatus @default(ACTIVE)
-  repeatCount Int @default(0)
-  createdAt DateTime @default(now())
-  parentId String?
-  parent Parent? @relation(fields:[parentId], references: [id])
-  classId Int
-  class Class @relation(fields:[classId], references: [id])
-  gradeId Int
-  grade Grade @relation(fields:[gradeId], references: [id])
-  attendances Attendance[]
-  results Result[]
-  messages Message[]
-  academicYears StudentAcademicYear[]
-  birthday DateTime
-  submissions Submission[]
-
   @@index([schoolId])
 }
-model Teacher{  
-  id String @id
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  username String
+
+model Teacher {
+  id                  String                @id
+  schoolId            Int
+  school              School                @relation(fields: [schoolId], references: [id])
+  username            String
+  name                String
+  email               String?
+  phone               String?
+  address             String
+  img                 String?
+  bloodType           String
+  sex                 UserSex
+  createdAt           DateTime              @default(now())
+  subjects            Subject[]
+  lessons             Lesson[]
+  classes             Class[]               @relation("TeacherClasses")
+  supervisedClasses   Class[]               @relation("ClassSupervisor")
+  attendances         Attendance[]
+  messages            Message[]
+  studyMaterials      StudyMaterial[]
+  birthday            DateTime
+  exams               Exam[]
+  assignments         Assignment[]
+  subjectPageSettings SubjectPageSettings[]
+
   @@unique([schoolId, username])
-  name String
-  email String?
   @@unique([schoolId, email])
-  phone String?
   @@unique([schoolId, phone])
-  address String
-  img String?
-  bloodType String
-  sex UserSex
-  createdAt DateTime @default(now())
-  subjects Subject[]
-  lessons Lesson[]
-  classes Class[] @relation("TeacherClasses")
-  supervisedClasses Class[] @relation("ClassSupervisor")
-  attendances Attendance[]
-  messages Message[]
-  birthday DateTime
-
   @@index([schoolId])
 }
-model Parent{  
-  id String @id
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  username String
+
+model Parent {
+  id        String    @id
+  schoolId  Int
+  school    School    @relation(fields: [schoolId], references: [id])
+  username  String
+  name      String
+  email     String?
+  phone     String
+  address   String
+  createdAt DateTime  @default(now())
+  students  Student[]
+  messages  Message[]
+
   @@unique([schoolId, username])
-  name String
-  email String?
   @@unique([schoolId, email])
-  phone String
   @@unique([schoolId, phone])
-  address String
-  createdAt DateTime @default(now())
-  students Student[]
-  messages Message[]
-
   @@index([schoolId])
 }
-model Grade{
-  id Int @id @default(autoincrement())
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  level Int
-  @@unique([schoolId, level])
-  students Student[]
-  classes Class[]
-  subjects Subject[]
+
+model Grade {
+  id                   Int                   @id @default(autoincrement())
+  schoolId             Int
+  school               School                @relation(fields: [schoolId], references: [id])
+  level                Int
+  students             Student[]
+  classes              Class[]
+  subjects             Subject[]
   studentAcademicYears StudentAcademicYear[]
 
+  @@unique([schoolId, level])
   @@index([schoolId])
 }
-model Class{
-  id Int @id @default(autoincrement())
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  name String
-  @@unique([schoolId, name])
-  capacity Int
-  supervisorId String?
-  supervisor Teacher? @relation("ClassSupervisor", fields: [supervisorId], references: [id])
-  teachers Teacher[] @relation("TeacherClasses")
-  lessons Lesson[]
-  students Student[]
-  gradeId Int
-  grade Grade @relation(fields: [gradeId], references: [id])
-  events Event[]
-  announcements Announcement[]
-  messages Message[]
-  exams Exam[]
-  assignments Assignment[]
+
+model Class {
+  id                   Int                   @id @default(autoincrement())
+  schoolId             Int
+  school               School                @relation(fields: [schoolId], references: [id])
+  name                 String
+  capacity             Int
+  supervisorId         String?
+  supervisor           Teacher?              @relation("ClassSupervisor", fields: [supervisorId], references: [id])
+  teachers             Teacher[]             @relation("TeacherClasses")
+  lessons              Lesson[]
+  students             Student[]
+  gradeId              Int
+  grade                Grade                 @relation(fields: [gradeId], references: [id])
+  events               Event[]
+  announcements        Announcement[]
+  messages             Message[]
+  exams                Exam[]
+  assignments          Assignment[]
   studentAcademicYears StudentAcademicYear[]
 
+  @@unique([schoolId, name])
   @@index([schoolId])
 }
 
@@ -210,19 +255,19 @@ model StudentAcademicYear {
   id Int @id @default(autoincrement())
 
   studentId String
-  student Student @relation(fields: [studentId], references: [id])
+  student   Student @relation(fields: [studentId], references: [id])
 
   schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
+  school   School @relation(fields: [schoolId], references: [id])
 
   academicYearId Int
-  academicYear AcademicYear @relation(fields: [academicYearId], references: [id])
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
 
   gradeId Int
-  grade Grade @relation(fields: [gradeId], references: [id])
+  grade   Grade @relation(fields: [gradeId], references: [id])
 
   classId Int?
-  class Class? @relation(fields: [classId], references: [id])
+  class   Class? @relation(fields: [classId], references: [id])
 
   performanceStatus PassFailStatus?
 
@@ -235,135 +280,245 @@ model StudentAcademicYear {
   @@index([classId])
   @@index([schoolId])
 }
-model Subject{
-  id Int @id @default(autoincrement())
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  name String
-  @@unique([schoolId, name])
-  gradeId Int
-  grade Grade @relation(fields: [gradeId], references: [id])
-  teachers Teacher[]
-  lessons Lesson[]
-  exams Exam[]
-  assignments Assignment[]
 
+model Subject {
+  id             Int                   @id @default(autoincrement())
+  schoolId       Int
+  school         School                @relation(fields: [schoolId], references: [id])
+  name           String
+  gradeId        Int
+  grade          Grade                 @relation(fields: [gradeId], references: [id])
+  teachers       Teacher[]
+  lessons        Lesson[]
+  exams          Exam[]
+  assignments    Assignment[]
+  studyMaterials StudyMaterial[]
+  pageSettings   SubjectPageSettings[]
+
+  @@unique([schoolId, name])
   @@index([schoolId])
 }
-model Lesson{
-  id Int @id @default(autoincrement())
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  name String
-  day Day
-  startTime DateTime
-  endTime DateTime
-  subjectId Int
-  subject Subject @relation(fields: [subjectId], references: [id])
-  classId Int
-  class Class @relation(fields: [classId], references: [id])
-  teacherId String
-  teacher Teacher @relation(fields: [teacherId], references: [id])
+
+model Lesson {
+  id             Int          @id @default(autoincrement())
+  schoolId       Int
+  school         School       @relation(fields: [schoolId], references: [id])
+  name           String
+  day            Day
+  startTime      DateTime
+  endTime        DateTime
+  subjectId      Int
+  subject        Subject      @relation(fields: [subjectId], references: [id])
+  classId        Int
+  class          Class        @relation(fields: [classId], references: [id])
+  teacherId      String
+  teacher        Teacher      @relation(fields: [teacherId], references: [id])
   academicYearId Int
-  academicYear AcademicYear @relation(fields: [academicYearId], references: [id])
-  exams Exam[]
-  assignments Assignment[]
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
+  exams          Exam[]
+  assignments    Assignment[]
 
   @@index([schoolId])
 }
-model Exam{
-  id Int @id @default(autoincrement())
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  title String
-  startTime DateTime
-  endTime DateTime
 
-  classId Int?
-  class Class? @relation(fields: [classId], references: [id])
+model Exam {
+  id        Int      @id @default(autoincrement())
+  schoolId  Int
+    school    School   @relation(fields: [schoolId], references: [id])
+    title     String
+    instructions String?
+    startTime DateTime
+    endTime   DateTime
+
+  classId   Int?
+  class     Class?   @relation(fields: [classId], references: [id])
   subjectId Int?
-  subject Subject? @relation(fields: [subjectId], references: [id])
+  subject   Subject? @relation(fields: [subjectId], references: [id])
+
+  teacherId String?
+  teacher   Teacher? @relation(fields: [teacherId], references: [id])
 
-  lessonId Int
-  lesson Lesson @relation(fields: [lessonId], references: [id])
+  lessonId Int?
+  lesson   Lesson? @relation(fields: [lessonId], references: [id])
 
   academicYearId Int
-  academicYear AcademicYear @relation(fields: [academicYearId], references: [id])
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
 
   results Result[]
 
-  // Feature toggles — all per-exam configurable
+  // Feature toggles
   enableTimer      Boolean @default(true)
-  duration         Int?                    // minutes — required if enableTimer = true
-  enableNavigation Boolean @default(true)  // allow prev page navigation
-  enableAutoSave   Boolean @default(true)  // auto-save answers
-  autoSaveInterval Int     @default(30)    // seconds between auto-saves
-  enableAutoSubmit Boolean @default(true)  // cron auto-submit backstop
-  questionsPerPage Int     @default(1)     // server-side pagination size
+  duration         Int?
+  enableNavigation Boolean @default(true)
+  enableAutoSave   Boolean @default(true)
+  autoSaveInterval Int     @default(30)
+  enableAutoSubmit Boolean @default(true)
+  questionsPerPage Int     @default(1)
 
   // Exam workflow relations
   questions   Question[]
   submissions Submission[]
 
   @@index([schoolId])
+  @@index([teacherId])
 }
-model Assignment{
-  id Int @id @default(autoincrement())
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  title String
-  startDate DateTime
-  endDate DateTime
 
-  classId Int?
-  class Class? @relation(fields: [classId], references: [id])
+model Assignment {
+  id                  Int      @id @default(autoincrement())
+  schoolId            Int
+  school              School   @relation(fields: [schoolId], references: [id])
+  title               String
+  description         String?
+  rubric              String?
+  startDate           DateTime
+  endDate             DateTime
+  fileUrl             String?
+  fileName            String?
+  maxScore            Float    @default(10)
+  allowLateSubmission Boolean  @default(false) // ✅ أضف هذا السطر
+
+  classId   Int?
+  class     Class?   @relation(fields: [classId], references: [id])
   subjectId Int?
-  subject Subject? @relation(fields: [subjectId], references: [id])
+  subject   Subject? @relation(fields: [subjectId], references: [id])
 
-  lessonId Int
-  lesson Lesson @relation(fields: [lessonId], references: [id])
+  teacherId String?
+  teacher   Teacher? @relation(fields: [teacherId], references: [id])
+
+  lessonId Int?
+  lesson   Lesson? @relation(fields: [lessonId], references: [id])
 
   academicYearId Int
-  academicYear AcademicYear @relation(fields: [academicYearId], references: [id])
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
 
-  results Result[]
+  results               Result[]
+  assignmentSubmissions AssignmentSubmission[]
 
   @@index([schoolId])
+  @@index([teacherId])
 }
-model Result{
-  id Int @id @default(autoincrement())
+
+// Assignment file submission (from stash)
+model AssignmentSubmission {
+  id              Int     @id @default(autoincrement())
+  fileUrl         String
+  fileName        String
+  fileType        String
+  note            String?
+  teacherFeedback String?
+  score           Float?
+  gradePublished  Boolean   @default(false)
+  gradedAt        DateTime?
+  gradedBy        String?
+  aiEvaluation    AiEvaluation?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  assignmentId Int
+  assignment   Assignment @relation(fields: [assignmentId], references: [id], onDelete: Cascade)
+
+  studentId String
+  student   Student @relation(fields: [studentId], references: [id], onDelete: Cascade)
+
   schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  score Int
+  school   School @relation(fields: [schoolId], references: [id])
 
-  examId Int?
-  exam Exam? @relation(fields: [examId], references: [id])
+  academicYearId Int
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
+
+  @@unique([assignmentId, studentId])
+  @@index([schoolId])
+  @@index([assignmentId])
+  @@index([studentId])
+}
+
+model StudyMaterial {
+  id       Int    @id @default(autoincrement())
+  schoolId Int
+  school   School @relation(fields: [schoolId], references: [id])
+
+  title       String
+  description String?
+  fileUrl     String
+  fileName    String
+  fileType    String
+
+  subjectId Int
+  subject   Subject @relation(fields: [subjectId], references: [id])
+
+  teacherId String
+  teacher   Teacher @relation(fields: [teacherId], references: [id])
+
+  academicYearId Int
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
+
+  createdAt DateTime @default(now())
+
+  @@index([schoolId])
+  @@index([subjectId])
+  @@index([teacherId])
+}
+
+model Result {
+  id       Int    @id @default(autoincrement())
+  schoolId Int
+  school   School @relation(fields: [schoolId], references: [id])
+  score    Int
+
+  examId       Int?
+  exam         Exam?       @relation(fields: [examId], references: [id])
   assignmentId Int?
-  assignment Assignment? @relation(fields: [assignmentId], references: [id])
+  assignment   Assignment? @relation(fields: [assignmentId], references: [id])
 
   studentId String
-  student Student @relation(fields: [studentId], references: [id])
+  student   Student @relation(fields: [studentId], references: [id])
 
   academicYearId Int
-  academicYear AcademicYear @relation(fields: [academicYearId], references: [id])
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
 
   @@index([schoolId])
 }
-model Attendance{
-  id Int @id @default(autoincrement())
+
+model StudentFinalResult {
+  id       Int    @id @default(autoincrement())
+  schoolId Int
+  school   School @relation(fields: [schoolId], references: [id])
+
+  studentId String
+  student   Student @relation(fields: [studentId], references: [id])
+
+  academicYearId Int
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
+
+  averageScore    Float
+  assessmentCount Int    @default(0)
+  status          String?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@unique([schoolId, studentId, academicYearId])
+  @@index([schoolId])
+  @@index([studentId])
+  @@index([academicYearId])
+}
+
+model Attendance {
+  id       Int      @id @default(autoincrement())
   schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  date DateTime
-  present Boolean
+  school   School   @relation(fields: [schoolId], references: [id])
+  date     DateTime
+  present  Boolean
 
   academicYearId Int
-  academicYear AcademicYear @relation(fields: [academicYearId], references: [id])
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
 
   studentId String?
-  student Student? @relation(fields: [studentId], references: [id])
+  student   Student? @relation(fields: [studentId], references: [id])
 
   teacherId String?
-  teacher Teacher? @relation(fields: [teacherId], references: [id])
+  teacher   Teacher? @relation(fields: [teacherId], references: [id])
 
   @@unique([studentId, academicYearId, date])
   @@unique([teacherId, academicYearId, date])
@@ -373,51 +528,89 @@ model Attendance{
   @@index([teacherId])
   @@index([schoolId])
 }
-model Event{
-  id Int @id @default(autoincrement())
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  title String
-  description String
-  startDate DateTime
-  endDate DateTime
+
+model Event {
+  id             Int          @id @default(autoincrement())
+  schoolId       Int
+  school         School       @relation(fields: [schoolId], references: [id])
+  title          String
+  description    String
+  startDate      DateTime
+  endDate        DateTime
   academicYearId Int
-  academicYear AcademicYear @relation(fields: [academicYearId], references: [id])
-  classes Class[]
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
+  classes        Class[]
 
   @@index([schoolId])
 }
-model Announcement{
-  id Int @id @default(autoincrement())
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  title String
-  description String
-  date DateTime
+
+model Announcement {
+  id             Int          @id @default(autoincrement())
+  schoolId       Int
+  school         School       @relation(fields: [schoolId], references: [id])
+  title          String
+  description    String
+  date           DateTime
   academicYearId Int
-  academicYear AcademicYear @relation(fields: [academicYearId], references: [id])
-  classes Class[]
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
+  classes        Class[]
 
   @@index([schoolId])
 }
 
 model Message {
-  id Int @id @default(autoincrement())
-  schoolId Int
-  school School @relation(fields: [schoolId], references: [id])
-  title String
-  description String
-  date DateTime @default(now())
+  id             Int          @id @default(autoincrement())
+  schoolId       Int
+  school         School       @relation(fields: [schoolId], references: [id])
+  title          String
+  description    String
+  date           DateTime     @default(now())
   academicYearId Int
-  academicYear AcademicYear @relation(fields: [academicYearId], references: [id])
-  students Student[]
-  parents Parent[]
-  teachers Teacher[]
-  classes Class[]
+  academicYear   AcademicYear @relation(fields: [academicYearId], references: [id])
+  students       Student[]
+  parents        Parent[]
+  teachers       Teacher[]
+  classes        Class[]
 
   @@index([schoolId])
 }
 
+// ===== SUBJECT PAGE SETTINGS =====
+
+model SubjectPageSettings {
+  id       Int    @id @default(autoincrement())
+  schoolId Int
+  school   School @relation(fields: [schoolId], references: [id])
+
+  subjectId Int
+  subject   Subject @relation(fields: [subjectId], references: [id], onDelete: Cascade)
+
+  teacherId String
+  teacher   Teacher @relation(fields: [teacherId], references: [id])
+
+  // Welcome announcement shown at top of page for students
+  announcement String?
+
+  // Short course description
+  description String?
+
+  // Banner image (Cloudinary URL)
+  bannerImage String?
+
+  // Banner height: sm | md | lg
+  bannerHeight String @default("md")
+
+  // Order of sections: JSON array e.g. ["assignments","lessons","materials"]
+  sectionsOrder Json @default("[\"assignments\",\"lessons\",\"materials\"]")
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@unique([subjectId, teacherId])
+  @@index([schoolId])
+  @@index([subjectId])
+  @@index([teacherId])
+}
 
 // ===== EXAM WORKFLOW MODELS =====
 
@@ -431,9 +624,10 @@ model Question {
   type          QuestionType
   points        Int          @default(1)
   order         Int
-  options       Json?        // MCQ only: string[]
-  correctAnswer String[]     // T/F and MCQ — array supports multiple correct answers
+  options       Json?
+  correctAnswer String[]
   allowMultiple Boolean      @default(false)
+  textAnswer    String?      // Optional model answer for TEXT questions
   answers       Answer[]
 
   @@index([schoolId])
@@ -453,44 +647,103 @@ model Submission {
   startedAt        DateTime         @default(now())
   submittedAt      DateTime?
   autoSubmitted    Boolean          @default(false)
-  lastSyncedAt     DateTime?        // Anti-cheat: updated on every saveAnswer
+  lastSyncedAt     DateTime?
   totalScore       Float?
-  extraTime        Int?             // Additional minutes granted by teacher
-  extendedBy       String?          // Teacher Clerk ID who granted extension
+  gradePublished   Boolean          @default(false)
+  extraTime        Int?
+  extendedBy       String?
   extendedAt       DateTime?
-  disconnectedAt   DateTime?        // Logged on reconnection for audit
+  disconnectedAt   DateTime?
   reconnectedAt    DateTime?
-  totalOfflineTime Int?             // Seconds offline — computed server-side
+  totalOfflineTime Int?
   createdAt        DateTime         @default(now())
   updatedAt        DateTime         @updatedAt
   answers          Answer[]
+  academicYear     AcademicYear?    @relation(fields: [academicYearId], references: [id])
+  academicYearId   Int?
 
-  @@unique([examId, studentId])   // One submission per student per exam
+  @@unique([examId, studentId])
   @@index([schoolId])
   @@index([examId])
   @@index([studentId])
 }
 
 model Answer {
-  id           Int        @id @default(autoincrement())
-  schoolId     Int
-  school       School     @relation(fields: [schoolId], references: [id])
-  submissionId Int
-  submission   Submission @relation(fields: [submissionId], references: [id], onDelete: Cascade)
-  questionId   Int
-  question     Question   @relation(fields: [questionId], references: [id])
-  textAnswer   String?    // T/F, MCQ (comma-separated for multi-select), TEXT
-  fileUrl      String?    // FILE — relative path or URL
-  isDraft      Boolean    @default(true)   // false after submitExam finalizes it
-  savedAt      DateTime   @default(now())  // ALWAYS set by server — never accepted from client
-  score        Float?     // null until graded
+  id               Int        @id @default(autoincrement())
+  schoolId         Int
+  school           School     @relation(fields: [schoolId], references: [id])
+  submissionId     Int
+  submission       Submission @relation(fields: [submissionId], references: [id], onDelete: Cascade)
+  questionId       Int
+  question         Question   @relation(fields: [questionId], references: [id])
+  textAnswer       String?    // T/F, MCQ (comma-separated for multi-select), TEXT
+  fileUrl          String?    // FILE — Cloudinary secure_url
+  isDraft          Boolean    @default(true)   // false after submitExam finalizes it
+  savedAt          DateTime   @default(now())  // ALWAYS set by server — never accepted from client
+  score            Float?     // null until graded
+  isOverridden     Boolean    @default(false)
+  filePublicId     String?    // Cloudinary public_id for deletion
+  fileOriginalName String?    // Student's original filename
+  fileMimeType     String?    // MIME type from Cloudinary
+  fileSizeBytes    Int?       // File size in bytes
+  aiEvaluation     AiEvaluation?
 
   @@unique([submissionId, questionId])
   @@index([schoolId])
   @@index([submissionId])
 }
 
-// ===== EXAM WORKFLOW ENUMS =====
+model AiEvaluation {
+  id Int @id @default(autoincrement())
+
+  schoolId Int
+  school   School @relation(fields: [schoolId], references: [id])
+
+  answerId Int?    @unique
+  answer   Answer? @relation(fields: [answerId], references: [id], onDelete: Cascade)
+
+  assignmentSubmissionId Int?                  @unique
+  assignmentSubmission   AssignmentSubmission? @relation(fields: [assignmentSubmissionId], references: [id], onDelete: Cascade)
+
+  provider String @default("gemini")
+  model    String
+  status   AiEvaluationStatus @default(SUGGESTED)
+
+  score       Float?
+  maxScore    Float
+  feedback    String?
+  strengths   Json   @default("[]")
+  weaknesses  Json   @default("[]")
+  needsReview Boolean @default(true)
+  error       String?
+
+  approvedScore    Float?
+  approvedFeedback String?
+  approvedBy       String?
+  approvedAt       DateTime?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([schoolId])
+  @@index([answerId])
+  @@index([assignmentSubmissionId])
+}
+
+model Feedback {
+  id        String   @id @default(cuid())
+
+  type      String
+  message   String
+  status    String   @default("pending")
+
+  schoolId  Int
+  userId    String?
+
+  createdAt DateTime @default(now())
+}
+
+// ===== ENUMS =====
 
 enum QuestionType {
   TRUE_FALSE
@@ -505,18 +758,25 @@ enum SubmissionStatus {
   GRADED
 }
 
+enum AiEvaluationStatus {
+  SUGGESTED
+  APPROVED
+  FAILED
+}
+
 enum UserSex {
   MALE
   FEMALE
 }
 
-enum Day{
+enum Day {
   SATURDAY
   SUNDAY
   MONDAY
   TUESDAY
   WEDNESDAY
   THURSDAY
+  FRIDAY
 }
 
 enum StudentStatus {
@@ -530,3 +790,51 @@ enum PassFailStatus {
   PASS
   FAIL
 }
+
+enum SchoolStatus {
+  PENDING
+  ACTIVE
+  PAUSED
+}
+
+enum SchoolDayExceptionType {
+  HOLIDAY
+  OFF_DAY
+  WORKING_OVERRIDE
+}
+
+model Notification {
+  id       Int    @id @default(autoincrement())
+  schoolId Int
+  school   School @relation(fields: [schoolId], references: [id], onDelete: Cascade)
+
+  userId   String
+  userRole String
+
+  type  NotificationType
+  title String
+  body  String
+  link  String?
+
+  isRead    Boolean  @default(false)
+  createdAt DateTime @default(now())
+
+  @@index([userId, isRead])
+  @@index([schoolId])
+}
+
+enum NotificationType {
+  NEW_ASSIGNMENT
+  ASSIGNMENT_UPDATED
+  ASSIGNMENT_SUBMITTED
+  ASSIGNMENT_FEEDBACK
+  NEW_EXAM
+  GRADE_POSTED
+  GRADE_UPDATED
+  NEW_ANNOUNCEMENT
+  NEW_EVENT
+  SCHEDULE_UPDATED
+  ATTENDANCE_SAVED
+  SUPERVISOR_ASSIGNED
+  NEW_MESSAGE
+}
diff --git a/prisma/seed.ts b/prisma/seed.ts
index cab1681..9be77c9 100644
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -1,5 +1,10 @@
 import "dotenv/config";
-import { Day, PrismaClient } from "@prisma/client";
+import {
+  PrismaClient,
+  SchoolStatus,
+  StudentStatus,
+  UserSex,
+} from "@prisma/client";
 import { PrismaPg } from "@prisma/adapter-pg";
 
 const adapter = new PrismaPg({
@@ -13,26 +18,48 @@ const normalizeDay = (date: Date) => {
   return new Date(`${iso}T00:00:00.000Z`);
 };
 
+const safeDeleteMany = async (run: () => Promise<unknown>) => {
+  try {
+    await run();
+  } catch (error) {
+    if (
+      typeof error === "object" &&
+      error !== null &&
+      "code" in error &&
+      (error as { code?: string }).code === "P2021"
+    ) {
+      return;
+    }
+    throw error;
+  }
+};
+
 const clearDatabase = async () => {
-  await prisma.result.deleteMany();
-  await prisma.attendance.deleteMany();
-  await prisma.message.deleteMany();
-  await prisma.event.deleteMany();
-  await prisma.announcement.deleteMany();
-  await prisma.assignment.deleteMany();
-  await prisma.exam.deleteMany();
-  await prisma.lesson.deleteMany();
-  await prisma.studentAcademicYear.deleteMany();
-  await prisma.student.deleteMany();
-  await prisma.parent.deleteMany();
-  await prisma.subject.deleteMany();
-  await prisma.class.deleteMany();
-  await prisma.teacher.deleteMany();
-  await prisma.grade.deleteMany();
-  await prisma.admin.deleteMany();
-  await prisma.academicYear.deleteMany();
-  await prisma.schoolSettings.deleteMany();
-  await prisma.school.deleteMany();
+  await prisma.answer.deleteMany();
+  await prisma.submission.deleteMany();
+  await prisma.question.deleteMany();
+  await safeDeleteMany(() => prisma.answer.deleteMany());
+  await safeDeleteMany(() => prisma.submission.deleteMany());
+  await safeDeleteMany(() => prisma.question.deleteMany());
+  await safeDeleteMany(() => prisma.result.deleteMany());
+  await safeDeleteMany(() => prisma.attendance.deleteMany());
+  await safeDeleteMany(() => prisma.message.deleteMany());
+  await safeDeleteMany(() => prisma.event.deleteMany());
+  await safeDeleteMany(() => prisma.announcement.deleteMany());
+  await safeDeleteMany(() => prisma.assignment.deleteMany());
+  await safeDeleteMany(() => prisma.exam.deleteMany());
+  await safeDeleteMany(() => prisma.lesson.deleteMany());
+  await safeDeleteMany(() => prisma.studentAcademicYear.deleteMany());
+  await safeDeleteMany(() => prisma.student.deleteMany());
+  await safeDeleteMany(() => prisma.parent.deleteMany());
+  await safeDeleteMany(() => prisma.subject.deleteMany());
+  await safeDeleteMany(() => prisma.class.deleteMany());
+  await safeDeleteMany(() => prisma.teacher.deleteMany());
+  await safeDeleteMany(() => prisma.grade.deleteMany());
+  await safeDeleteMany(() => prisma.admin.deleteMany());
+  await safeDeleteMany(() => prisma.academicYear.deleteMany());
+  await safeDeleteMany(() => prisma.schoolSettings.deleteMany());
+  await safeDeleteMany(() => prisma.school.deleteMany());
 };
 
 const seedSchool = async ({
@@ -50,6 +77,8 @@ const seedSchool = async ({
   studentName,
   className,
   subjectName,
+  schoolStatus,
+  pauseReason,
 }: {
   schoolName: string;
   adminId: string;
@@ -65,9 +94,18 @@ const seedSchool = async ({
   studentName: string;
   className: string;
   subjectName: string;
+  schoolStatus: SchoolStatus;
+  pauseReason?: string | null;
 }) => {
   const school = await prisma.school.create({
-    data: { name: schoolName },
+    data: {
+      name: schoolName,
+      status: schoolStatus,
+      pauseReason:
+        schoolStatus === SchoolStatus.PAUSED
+          ? (pauseReason ?? "Paused by super admin for review.")
+          : null,
+    },
   });
 
   await prisma.schoolSettings.create({
@@ -77,6 +115,14 @@ const seedSchool = async ({
       workDayEnd: new Date("1970-01-01T14:00:00.000Z"),
       lessonDuration: 45,
       lessonsPerDay: 6,
+      workingDays: [
+        "SATURDAY",
+        "SUNDAY",
+        "MONDAY",
+        "TUESDAY",
+        "WEDNESDAY",
+        "THURSDAY",
+      ],
     },
   });
 
@@ -149,19 +195,19 @@ const seedSchool = async ({
     },
   });
 
-  const lesson = await prisma.lesson.create({
-    data: {
-      name: "Lesson 1",
-      day: Day.MONDAY,
-      startTime: new Date("1970-01-01T08:00:00.000Z"),
-      endTime: new Date("1970-01-01T08:45:00.000Z"),
-      schoolId: school.id,
-      subjectId: subject.id,
-      classId: classA.id,
-      teacherId: teacher.id,
-      academicYearId: currentYear.id,
-    },
-  });
+  // const lesson = await prisma.lesson.create({
+  //   data: {
+  //     name: "Lesson 1",
+  //     day: Day.MONDAY,
+  //     startTime: new Date("1970-01-01T08:00:00.000Z"),
+  //     endTime: new Date("1970-01-01T08:45:00.000Z"),
+  //     schoolId: school.id,
+  //     subjectId: subject.id,
+  //     classId: classA.id,
+  //     teacherId: teacher.id,
+  //     academicYearId: currentYear.id,
+  //   },
+  // });
 
   const parent = await prisma.parent.create({
     data: {
@@ -184,13 +230,16 @@ const seedSchool = async ({
       phone: `${school.id}33333333`,
       address: `${schoolName} City`,
       bloodType: "A+",
-      sex: "MALE",
+
+      sex: UserSex.MALE,
       birthday: new Date("2010-01-01"),
+
       schoolId: school.id,
       parentId: parent.id,
       classId: classA.id,
       gradeId: grade1.id,
-      status: "ACTIVE",
+
+      status: StudentStatus.ACTIVE,
     },
   });
 
@@ -216,51 +265,51 @@ const seedSchool = async ({
     },
   });
 
-  const exam = await prisma.exam.create({
-    data: {
-      title: `${subjectName} Midterm`,
-      startTime: new Date("2026-01-15T08:00:00.000Z"),
-      endTime: new Date("2026-01-15T09:00:00.000Z"),
-      schoolId: school.id,
-      classId: classA.id,
-      subjectId: subject.id,
-      lessonId: lesson.id,
-      academicYearId: currentYear.id,
-    },
-  });
-
-  const assignment = await prisma.assignment.create({
-    data: {
-      title: `${subjectName} Homework 1`,
-      startDate: new Date("2026-01-10T08:00:00.000Z"),
-      endDate: new Date("2026-01-20T23:59:00.000Z"),
-      schoolId: school.id,
-      classId: classA.id,
-      subjectId: subject.id,
-      lessonId: lesson.id,
-      academicYearId: currentYear.id,
-    },
-  });
-
-  await prisma.result.create({
-    data: {
-      score: 88,
-      schoolId: school.id,
-      examId: exam.id,
-      studentId: student.id,
-      academicYearId: currentYear.id,
-    },
-  });
-
-  await prisma.result.create({
-    data: {
-      score: 92,
-      schoolId: school.id,
-      assignmentId: assignment.id,
-      studentId: student.id,
-      academicYearId: currentYear.id,
-    },
-  });
+  // const exam = await prisma.exam.create({
+  //   data: {
+  //     title: `${subjectName} Midterm`,
+  //     startTime: new Date("2026-01-15T08:00:00.000Z"),
+  //     endTime: new Date("2026-01-15T09:00:00.000Z"),
+  //     schoolId: school.id,
+  //     classId: classA.id,
+  //     subjectId: subject.id,
+  //     lessonId: lesson.id,
+  //     academicYearId: currentYear.id,
+  //   },
+  // });
+
+  // const assignment = await prisma.assignment.create({
+  //   data: {
+  //     title: `${subjectName} Homework 1`,
+  //     startDate: new Date("2026-01-10T08:00:00.000Z"),
+  //     endDate: new Date("2026-01-20T23:59:00.000Z"),
+  //     schoolId: school.id,
+  //     classId: classA.id,
+  //     subjectId: subject.id,
+  //     lessonId: lesson.id,
+  //     academicYearId: currentYear.id,
+  //   },
+  // });
+
+  // await prisma.result.create({
+  //   data: {
+  //     score: 88,
+  //     schoolId: school.id,
+  //     examId: exam.id,
+  //     studentId: student.id,
+  //     academicYearId: currentYear.id,
+  //   },
+  // });
+
+  // await prisma.result.create({
+  //   data: {
+  //     score: 92,
+  //     schoolId: school.id,
+  //     assignmentId: assignment.id,
+  //     studentId: student.id,
+  //     academicYearId: currentYear.id,
+  //   },
+  // });
 
   const today = normalizeDay(new Date());
 
@@ -340,6 +389,7 @@ async function main() {
     studentName: "Student Alpha",
     className: "1A",
     subjectName: "Mathematics",
+    schoolStatus: SchoolStatus.ACTIVE,
   });
 
   await seedSchool({
@@ -357,9 +407,31 @@ async function main() {
     studentName: "Student Beta",
     className: "1B",
     subjectName: "Science",
+    schoolStatus: SchoolStatus.PENDING,
+  });
+
+  await seedSchool({
+    schoolName: "Gamma School",
+    adminId: "admin_gamma",
+    adminUsername: "admin_gamma",
+    teacherId: "teacher_gamma",
+    teacherUsername: "teacher_gamma",
+    teacherName: "Teacher Gamma",
+    parentId: "parent_gamma",
+    parentUsername: "parent_gamma",
+    parentName: "Parent Gamma",
+    studentId: "student_gamma",
+    studentUsername: "student_gamma",
+    studentName: "Student Gamma",
+    className: "1C",
+    subjectName: "English",
+    schoolStatus: SchoolStatus.PAUSED,
+    pauseReason: "Pending compliance document update.",
   });
 
-  console.log("Seed completed successfully for 2 schools.");
+  console.log(
+    "Seed completed successfully for 3 schools (ACTIVE, PENDING, PAUSED).",
+  );
 }
 
 main()
diff --git a/public/blood.png b/public/blood.png
deleted file mode 100644
index e1f3382..0000000
Binary files a/public/blood.png and /dev/null differ
diff --git a/public/calendar.png b/public/calendar.png
deleted file mode 100644
index c808804..0000000
Binary files a/public/calendar.png and /dev/null differ
diff --git a/public/date.png b/public/date.png
deleted file mode 100644
index 4a8c6a1..0000000
Binary files a/public/date.png and /dev/null differ
diff --git a/public/finance.png b/public/finance.png
deleted file mode 100644
index 042c6ea..0000000
Binary files a/public/finance.png and /dev/null differ
diff --git a/public/googlee7f4264b8dc368a1.html b/public/googlee7f4264b8dc368a1.html
new file mode 100644
index 0000000..5aace7c
--- /dev/null
+++ b/public/googlee7f4264b8dc368a1.html
@@ -0,0 +1 @@
+google-site-verification: googlee7f4264b8dc368a1.html
\ No newline at end of file
diff --git a/public/logo-purple.png b/public/logo-purple.png
new file mode 100644
index 0000000..6493dd5
Binary files /dev/null and b/public/logo-purple.png differ
diff --git a/public/logo-white.png b/public/logo-white.png
new file mode 100644
index 0000000..4f24bba
Binary files /dev/null and b/public/logo-white.png differ
diff --git a/public/mail.png b/public/mail.png
deleted file mode 100644
index 3b8f857..0000000
Binary files a/public/mail.png and /dev/null differ
diff --git a/public/maleFemale.png b/public/maleFemale.png
deleted file mode 100644
index fbf1b5b..0000000
Binary files a/public/maleFemale.png and /dev/null differ
diff --git a/public/phone.png b/public/phone.png
deleted file mode 100644
index f2d4135..0000000
Binary files a/public/phone.png and /dev/null differ
diff --git a/public/singleAttendance.png b/public/singleAttendance.png
deleted file mode 100644
index cf7db9b..0000000
Binary files a/public/singleAttendance.png and /dev/null differ
diff --git a/public/singleBranch.png b/public/singleBranch.png
deleted file mode 100644
index b9d8431..0000000
Binary files a/public/singleBranch.png and /dev/null differ
diff --git a/public/singleClass.png b/public/singleClass.png
deleted file mode 100644
index e9aea85..0000000
Binary files a/public/singleClass.png and /dev/null differ
diff --git a/public/singleLesson.png b/public/singleLesson.png
deleted file mode 100644
index 0d3de8a..0000000
Binary files a/public/singleLesson.png and /dev/null differ
diff --git a/src/app/(dashboard)/admin/feedbacks/page.tsx b/src/app/(dashboard)/admin/feedbacks/page.tsx
new file mode 100644
index 0000000..5bbb207
--- /dev/null
+++ b/src/app/(dashboard)/admin/feedbacks/page.tsx
@@ -0,0 +1,233 @@
+import Link from "next/link";
+import Pagination from "@/components/Pagination";
+import prisma from "@/lib/prisma";
+import { getAuthUser } from "@/lib/auth";
+import { updateFeedbackStatus } from "@/lib/actions/feedback";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import { ITEM_PER_PAGE } from "@/lib/settings";
+import { getTranslations } from "next-intl/server";
+
+const statusOrder: Record<string, number> = {
+  pending: 1,
+  reviewed: 2,
+  resolved: 3,
+};
+
+const getStatusClass = (status: string) => {
+  switch (status) {
+    case "reviewed":
+      return "bg-blue-100 text-blue-700";
+    case "resolved":
+      return "bg-green-100 text-green-700";
+    default:
+      return "bg-yellow-100 text-yellow-700";
+  }
+};
+
+const filters = [
+  { labelKey: "all", href: "/admin/feedbacks" },
+  { labelKey: "pending", href: "/admin/feedbacks?status=pending" },
+  { labelKey: "reviewed", href: "/admin/feedbacks?status=reviewed" },
+  { labelKey: "resolved", href: "/admin/feedbacks?status=resolved" },
+  { labelKey: "suggestions", href: "/admin/feedbacks?type=suggestion" },
+  { labelKey: "complaints", href: "/admin/feedbacks?type=complaint" },
+];
+
+const FeedbacksPage = async ({
+  searchParams,
+}: {
+  searchParams: PageSearchParams;
+}) => {
+  const t = await getTranslations("pages");
+  const filtersT = await getTranslations("filters");
+  const feedbackT = await getTranslations("feedbackPage");
+  const user = await getAuthUser();
+
+  if (!user) {
+    return <div>{feedbackT("unauthorized")}</div>;
+  }
+
+  const params = await searchParams;
+
+  const status = getQueryParam(params.status);
+  const type = getQueryParam(params.type);
+  const currentPage = getQueryParam(params.page);
+  const p = currentPage ? parseInt(currentPage) : 1;
+
+  const where = {
+    schoolId: user.schoolId,
+    ...(status ? { status } : {}),
+    ...(type ? { type } : {}),
+  };
+
+  const [feedbacks, count, pendingCount] = await prisma.$transaction([
+    prisma.feedback.findMany({
+      where,
+      orderBy: {
+        createdAt: "desc",
+      },
+      take: ITEM_PER_PAGE,
+      skip: (p - 1) * ITEM_PER_PAGE,
+    }),
+    prisma.feedback.count({ where }),
+    prisma.feedback.count({
+      where: {
+        schoolId: user.schoolId,
+        status: "pending",
+      },
+    }),
+  ]);
+
+  const sortedFeedbacks = [...feedbacks].sort((a, b) => {
+    const statusDiff =
+      (statusOrder[a.status] ?? 99) - (statusOrder[b.status] ?? 99);
+
+    if (statusDiff !== 0) return statusDiff;
+
+    return new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime();
+  });
+
+  return (
+    <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
+      <div className="flex md:flex-row flex-col md:justify-between md:items-center gap-4 mb-6">
+        <div>
+          <h1 className="font-semibold text-lg">{t("feedbacks")}</h1>
+        </div>
+
+        <div className="flex items-center gap-3">
+          <span className="bg-yellow-100 px-4 py-2 rounded-full font-medium text-yellow-700 text-sm">
+            {feedbackT("pendingCount", { count: pendingCount })}
+          </span>
+
+          <span className="text-gray-500 text-sm">
+            {feedbackT("shownCount", { count })}
+          </span>
+        </div>
+      </div>
+
+      <div className="flex flex-wrap gap-2 mb-6">
+        {filters.map((filter) => {
+          const isActive =
+            (!status && !type && filter.labelKey === "all") ||
+            filter.href.includes(`status=${status}`) ||
+            filter.href.includes(`type=${type}`);
+
+          return (
+            <Link
+              key={filter.labelKey}
+              href={filter.href}
+              className={`rounded-md px-4 py-2 text-sm font-medium transition ${
+                isActive
+                  ? "bg-[#7C3AED] text-white"
+                  : "bg-gray-100 text-gray-600 hover:bg-gray-200"
+              }`}
+            >
+              {filtersT(filter.labelKey)}
+            </Link>
+          );
+        })}
+      </div>
+
+      <div className="space-y-4">
+        {sortedFeedbacks.length === 0 ? (
+          <div className="p-10 border border-gray-300 border-dashed rounded-xl text-center">
+            <p className="text-gray-500">{feedbackT("noFeedbacks")}</p>
+          </div>
+        ) : (
+          sortedFeedbacks.map((feedback) => {
+            const isResolved = feedback.status === "resolved";
+
+            return (
+              <div
+                key={feedback.id}
+                className={`rounded-2xl flex flex-col border p-5 shadow-sm transition ${
+                  isResolved
+                    ? "border-green-100 bg-green-50/40 opacity-80"
+                    : "border-gray-200 bg-white hover:shadow-md"
+                }`}
+              >
+                <div className="flex md:flex-row flex-col md:justify-between md:items-start gap-3">
+                  <div>
+                    <div className="flex items-center gap-2 mb-2">
+                      <span className="font-semibold text-gray-900">
+                        {feedbackT(`types.${feedback.type}`)}
+                      </span>
+
+                      <span
+                        className={`rounded-full px-3 py-1 text-xs font-medium ${getStatusClass(
+                          feedback.status,
+                        )}`}
+                      >
+                    {filtersT(feedback.status)}
+                      </span>
+                    </div>
+
+                    <p className="text-gray-600 leading-6">
+                      {feedback.message}
+                    </p>
+                  </div>
+
+                  <span className="text-gray-400 text-sm whitespace-nowrap">
+                    {new Date(feedback.createdAt).toLocaleDateString()}
+                  </span>
+                </div>
+
+                {isResolved ? (
+                  <p className="mt-5 text-green-700 text-sm">
+                    {feedbackT("resolvedLocked")}
+                  </p>
+                ) : (
+                  <div className="flex flex-wrap gap-2 mt-5 ms-auto">
+                    {feedback.status !== "reviewed" && (
+                      <form action={updateFeedbackStatus}>
+                        <input type="hidden" name="id" value={feedback.id} />
+                        <input type="hidden" name="status" value="reviewed" />
+
+                        <button
+                          type="submit"
+                          className="bg-blue-100 hover:bg-blue-200 px-4 py-2 rounded-md font-medium text-blue-700 text-sm transition"
+                        >
+                          {feedbackT("markReviewed")}
+                        </button>
+                      </form>
+                    )}
+
+                    <form action={updateFeedbackStatus}>
+                      <input type="hidden" name="id" value={feedback.id} />
+                      <input type="hidden" name="status" value="resolved" />
+
+                      <button
+                        type="submit"
+                        className="bg-green-100 hover:bg-green-200 px-4 py-2 rounded-md font-medium text-green-700 text-sm transition"
+                      >
+                        {feedbackT("markResolved")}
+                      </button>
+                    </form>
+
+                    {feedback.status !== "pending" && (
+                      <form action={updateFeedbackStatus}>
+                        <input type="hidden" name="id" value={feedback.id} />
+                        <input type="hidden" name="status" value="pending" />
+
+                        <button
+                          type="submit"
+                          className="bg-yellow-100 hover:bg-yellow-200 px-4 py-2 rounded-md font-medium text-yellow-700 text-sm transition"
+                        >
+                          {feedbackT("markPending")}
+                        </button>
+                      </form>
+                    )}
+                  </div>
+                )}
+              </div>
+            );
+          })
+        )}
+      </div>
+
+      <Pagination page={p} count={count} />
+    </div>
+  );
+};
+
+export default FeedbacksPage;
diff --git a/src/app/(dashboard)/admin/layout.tsx b/src/app/(dashboard)/admin/layout.tsx
index 2bfff7b..187e9a9 100644
--- a/src/app/(dashboard)/admin/layout.tsx
+++ b/src/app/(dashboard)/admin/layout.tsx
@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation";
-import { getAuthUser, requireRole } from "@/lib/auth";
+import { enforceAdminSchoolAccess, getAuthUser, requireRole } from "@/lib/auth";
 
 export default async function AdminLayout({
   children,
@@ -13,6 +13,7 @@ export default async function AdminLayout({
   }
 
   requireRole(user, ["admin"]);
+  await enforceAdminSchoolAccess(user);
 
   return <>{children}</>;
 }
diff --git a/src/app/(dashboard)/admin/loading.tsx b/src/app/(dashboard)/admin/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/admin/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/admin/page.tsx b/src/app/(dashboard)/admin/page.tsx
index 9ed5a2d..2cbf39c 100644
--- a/src/app/(dashboard)/admin/page.tsx
+++ b/src/app/(dashboard)/admin/page.tsx
@@ -1,42 +1,63 @@
 import Announcements from "@/components/Announcements";
 import AttendanceChartContainer from "@/components/AttendanceChartContainer";
-import CountChartContainer from "@/components/CountChartContainer";
 import EventCalendarContainer from "@/components/EventCalendarContainer";
-import FinanceChartLoader from "@/components/FinanceChartLoader";
 import UserCard from "@/components/UserCard";
+import { getCurrentAcademicYearOrNull } from "@/lib/academicYears";
+import { requireAuth } from "@/lib/auth";
+import prisma from "@/lib/prisma";
+import { UserRole } from "@/lib/utils";
+type SchoolDashboardRole = Exclude<UserRole, "superAdmin">;
 
-const AdminPage = ({
+const AdminPage = async ({
   searchParams,
 }: {
   searchParams: Promise<{ [key: string]: string }>;
 }) => {
+  const user = await requireAuth();
+  const roleTypes: SchoolDashboardRole[] = ["admin", "teacher", "student", "parent"];
+  const schoolId = user.schoolId;
+  const [currentYear, counts] = await Promise.all([
+    getCurrentAcademicYearOrNull(schoolId),
+    Promise.all([
+      prisma.admin.count({ where: { schoolId } }),
+      prisma.teacher.count({ where: { schoolId } }),
+      prisma.student.count({ where: { schoolId } }),
+      prisma.parent.count({ where: { schoolId } }),
+    ]),
+  ]);
+  const countByRole: Record<SchoolDashboardRole, number> = {
+    admin: counts[0],
+    teacher: counts[1],
+    student: counts[2],
+    parent: counts[3],
+  };
+  const currentYearName = currentYear?.name ?? null;
+
   return (
-    <div className="flex md:flex-row flex-col gap-4 p-4">
+    <div className="flex lg:flex-row flex-col gap-4 p-4">
       {/* LEFT */}
       <div className="flex flex-col gap-8 w-full lg:w-2/3">
         {/* USER CARDS */}
-        <div className="flex flex-wrap justify-between gap-4">
-          <UserCard type="admin" />
-          <UserCard type="teacher" />
-          <UserCard type="student" />
-          <UserCard type="parent" />
+        <div className="gap-4 grid grid-cols-2 md:grid-cols-4">
+          {roleTypes.map((type) => (
+            <UserCard
+              key={type}
+              type={type}
+              count={countByRole[type]}
+              currentYearName={currentYearName}
+            />
+          ))}
         </div>
         {/* MIDDLE CHARTS */}
         <div className="flex lg:flex-row flex-col gap-4">
-          {/* COUNT CHART */}
-          <div className="w-full lg:w-1/3 h-[450px]">
-            {/* <CountChartContainer /> */}
-          </div>
           {/* ATTENDANCE CHART */}
-          <div className="w-full lg:w-2/3 h-[450px]">
+          <div className="w-full h-[450px]">
             <AttendanceChartContainer />
           </div>
         </div>
-        {/* BOTTOM CHART */}
-        <div className="w-full h-[500px]">{/* <FinanceChartLoader /> */}</div>
       </div>
       {/* RIGHT */}
-      <div className="flex flex-col gap-8 w-full lg:w-1/3">
+      <div className="flex flex-col justify-between w-full lg:w-1/3">
         <EventCalendarContainer searchParams={searchParams} />
         <Announcements />
       </div>
diff --git a/src/app/(dashboard)/archive/page.tsx b/src/app/(dashboard)/archive/page.tsx
new file mode 100644
index 0000000..5899767
--- /dev/null
+++ b/src/app/(dashboard)/archive/page.tsx
@@ -0,0 +1,355 @@
+import ArchiveFilters from "@/components/ArchiveFilters";
+import ExportButton from "@/components/ExportButton";
+import { requireAuth } from "@/lib/auth";
+import prisma from "@/lib/prisma";
+import { getTranslations } from "next-intl/server";
+
+type ArchiveRow = {
+  id: string | number;
+  name: string;
+  username?: string | null;
+  email?: string | null;
+  phone?: string | null;
+  status?: string | null;
+  finalGrade?: string | null;
+};
+
+type StoredFinalResult = {
+  studentId: string;
+  averageScore: number;
+};
+
+const ArchivePage = async ({
+  searchParams,
+}: {
+  searchParams: Promise<{
+    type?: string;
+    academicYearId?: string;
+  }>;
+}) => {
+  const t = await getTranslations("pages");
+  const archiveT = await getTranslations("archivePage");
+  const th = await getTranslations("tableHeaders");
+  const params = await searchParams;
+  const user = await requireAuth();
+
+  const admin = await prisma.admin.findUnique({
+    where: { id: user.userId },
+  });
+
+  if (!admin) return null;
+
+  const academicYears = await prisma.academicYear.findMany({
+    where: {
+      schoolId: admin.schoolId,
+    },
+    orderBy: { startDate: "desc" },
+  });
+
+  const selectedType = params.type || "students";
+  const selectedYear =
+    params.academicYearId || academicYears[0]?.id.toString() || "";
+
+  let rows: ArchiveRow[] = [];
+
+  if (selectedType === "students") {
+    const students = await prisma.student.findMany({
+      where: {
+        schoolId: admin.schoolId,
+        academicYears: {
+          some: {
+            academicYearId: Number(selectedYear),
+          },
+        },
+      },
+      select: {
+        id: true,
+        name: true,
+        username: true,
+        email: true,
+        phone: true,
+        status: true,
+      },
+    });
+
+    const studentIds = students.map((student) => student.id);
+    const finalResults: StoredFinalResult[] = studentIds.length
+      ? await (
+          prisma as unknown as {
+            studentFinalResult: {
+              findMany: (args: {
+                where: {
+                  schoolId: number;
+                  academicYearId: number;
+                  studentId: { in: string[] };
+                };
+                select: {
+                  studentId: boolean;
+                  averageScore: boolean;
+                };
+              }) => Promise<StoredFinalResult[]>;
+            };
+          }
+        ).studentFinalResult.findMany({
+          where: {
+            schoolId: admin.schoolId,
+            academicYearId: Number(selectedYear),
+            studentId: { in: studentIds },
+          },
+          select: {
+            studentId: true,
+            averageScore: true,
+          },
+        })
+      : [];
+    const finalGradeByStudent = new Map(
+      finalResults.map((result) => [
+        result.studentId,
+        `${result.averageScore.toFixed(2)}%`,
+      ]),
+    );
+
+    rows = students.map((student) => ({
+      ...student,
+      finalGrade: finalGradeByStudent.get(student.id) ?? "-",
+    }));
+  }
+
+  if (selectedType === "teachers") {
+    rows = await prisma.teacher.findMany({
+      where: {
+        schoolId: admin.schoolId,
+      },
+      select: {
+        id: true,
+        name: true,
+        username: true,
+        email: true,
+        phone: true,
+      },
+    });
+  }
+
+  if (selectedType === "parents") {
+    rows = await prisma.parent.findMany({
+      where: {
+        schoolId: admin.schoolId,
+      },
+      select: {
+        id: true,
+        name: true,
+        username: true,
+        email: true,
+        phone: true,
+      },
+    });
+  }
+
+  if (selectedType === "subjects") {
+    rows = await prisma.subject.findMany({
+      where: {
+        schoolId: admin.schoolId,
+      },
+      select: {
+        id: true,
+        name: true,
+      },
+    });
+  }
+
+  if (selectedType === "classes") {
+    rows = await prisma.class.findMany({
+      where: {
+        schoolId: admin.schoolId,
+      },
+      select: {
+        id: true,
+        name: true,
+      },
+    });
+  }
+
+  if (selectedType === "exams") {
+    rows = await prisma.exam
+      .findMany({
+        where: {
+          lesson: {
+            subject: {
+              schoolId: admin.schoolId,
+            },
+          },
+        },
+        select: {
+          id: true,
+          title: true,
+        },
+      })
+      .then((items) =>
+        items.map((item) => ({
+          id: item.id,
+          name: item.title,
+        })),
+      );
+  }
+
+  if (selectedType === "assignments") {
+    rows = await prisma.assignment
+      .findMany({
+        where: {
+          lesson: {
+            subject: {
+              schoolId: admin.schoolId,
+            },
+          },
+        },
+        select: {
+          id: true,
+          title: true,
+        },
+      })
+      .then((items) =>
+        items.map((item) => ({
+          id: item.id,
+          name: item.title,
+        })),
+      );
+  }
+
+  if (selectedType === "results") {
+    rows = await prisma.result
+      .findMany({
+        where: {
+          student: {
+            schoolId: admin.schoolId,
+          },
+        },
+        select: {
+          id: true,
+          score: true,
+          student: {
+            select: {
+              name: true,
+            },
+          },
+        },
+      })
+      .then((items) =>
+        items.map((item) => ({
+          id: item.id,
+          name: item.student.name,
+          status: String(item.score),
+        })),
+      );
+  }
+
+  if (selectedType === "attendance") {
+    rows = await prisma.attendance
+      .findMany({
+        where: {
+          student: {
+            schoolId: admin.schoolId,
+          },
+        },
+        select: {
+          id: true,
+          present: true,
+          student: {
+            select: {
+              name: true,
+            },
+          },
+        },
+      })
+      .then((items) =>
+        items.map((item) => ({
+          id: item.id,
+          name: item.student?.name || archiveT("unknownStudent"),
+          status: item.present ? archiveT("present") : archiveT("absent"),
+        })),
+      );
+  }
+
+  return (
+    <div className="flex flex-col gap-6 p-4 md:p-6">
+      <div>
+        <div className="flex lg:flex-row flex-col lg:justify-between lg:items-center gap-4">
+          <div>
+            <h1 className="font-bold text-gray-800 text-2xl">{t("archive")}</h1>
+          </div>
+        </div>
+      </div>
+
+      <ArchiveFilters
+        academicYears={academicYears.map((year) => ({
+          id: year.id.toString(),
+          name: year.name,
+        }))}
+        selectedType={selectedType}
+        selectedYear={selectedYear}
+      />
+
+      <div className="bg-white shadow-sm p-6 border border-gray-100 rounded-2xl">
+        <div className="flex justify-between items-center mb-6">
+          <h2 className="mb-4 font-semibold text-gray-800 text-lg">
+            {archiveT("previewData")}
+          </h2>
+          <ExportButton
+            href={`/api/export/archive?type=${selectedType}&academicYearId=${selectedYear}`}
+          />
+        </div>
+
+        <div className="overflow-x-auto">
+          <table className="w-full text-sm">
+            <thead>
+              <tr className="border-b text-gray-500 text-start">
+                <th className="px-4 py-3">{th("name")}</th>
+                <th className="px-4 py-3">{th("username")}</th>
+                <th className="px-4 py-3">{th("email")}</th>
+                <th className="px-4 py-3">{th("phone")}</th>
+                {selectedType === "students" && (
+                  <th className="px-4 py-3">{th("finalGrade")}</th>
+                )}
+                <th className="px-4 py-3">{th("statusValue")}</th>
+              </tr>
+            </thead>
+
+            <tbody>
+              {rows.slice(0, 5).map((row) => (
+                <tr key={row.id} className="border-b last:border-b-0">
+                  <td className="px-4 py-3 font-medium">{row.name}</td>
+                  <td className="px-4 py-3">{row.username || "-"}</td>
+                  <td className="px-4 py-3">{row.email || "-"}</td>
+                  <td className="px-4 py-3">{row.phone || "-"}</td>
+                  {selectedType === "students" && (
+                    <td className="px-4 py-3">{row.finalGrade || "-"}</td>
+                  )}
+                  <td className="px-4 py-3">{row.status || "-"}</td>
+                </tr>
+              ))}
+
+              {rows.length === 0 && (
+                <tr>
+                  <td
+                    colSpan={selectedType === "students" ? 6 : 5}
+                    className="py-8 text-gray-400 text-center"
+                  >
+                    {archiveT("noData")}
+                  </td>
+                </tr>
+              )}
+            </tbody>
+          </table>
+          {rows.length > 5 && (
+            <div className="flex justify-center mt-6">
+              <button className="bg-academixPurple hover:bg-academixPurpleDark px-5 py-2 rounded-xl font-medium text-white text-sm transition">
+                {archiveT("showMore")}
+              </button>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ArchivePage;
diff --git a/src/app/(dashboard)/error.tsx b/src/app/(dashboard)/error.tsx
new file mode 100644
index 0000000..fdded98
--- /dev/null
+++ b/src/app/(dashboard)/error.tsx
@@ -0,0 +1,40 @@
+"use client";
+
+import { useEffect, useTransition } from "react";
+import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+import ErrorState from "@/components/states/ErrorState";
+
+export default function DashboardError({
+  error,
+  reset,
+}: {
+  error: Error;
+  reset: () => void;
+}) {
+  const t = useTranslations("states");
+  const router = useRouter();
+  const [isPending, startTransition] = useTransition();
+
+  useEffect(() => {
+    console.error(error);
+  }, [error]);
+
+  const handleRetry = () => {
+    startTransition(() => {
+      router.refresh();
+      reset();
+    });
+  };
+
+  return (
+    <div className="flex flex-1 justify-center items-center bg-white m-4 mt-0 p-4 rounded-md">
+      <ErrorState
+        title={t("pageErrorTitle")}
+        description={t("pageErrorDescription")}
+        onRetry={handleRetry}
+        retryLabel={isPending ? t("retrying") : t("tryAgain")}
+      />
+    </div>
+  );
+}
diff --git a/src/app/(dashboard)/feedback/page.tsx b/src/app/(dashboard)/feedback/page.tsx
new file mode 100644
index 0000000..800c742
--- /dev/null
+++ b/src/app/(dashboard)/feedback/page.tsx
@@ -0,0 +1,130 @@
+import FeedbackModal from "@/components/FeedbackModal";
+import Pagination from "@/components/Pagination";
+import { getAuthUser } from "@/lib/auth";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+import { ITEM_PER_PAGE } from "@/lib/settings";
+import { getTranslations } from "next-intl/server";
+
+const getStatusClass = (status: string) => {
+  switch (status) {
+    case "reviewed":
+      return "bg-blue-100 text-blue-700";
+    case "resolved":
+      return "bg-green-100 text-green-700";
+    default:
+      return "bg-yellow-100 text-yellow-700";
+  }
+};
+
+const getTypeLabel = (type: string, t: (key: string) => string) => {
+  switch (type) {
+    case "complaint":
+      return t("types.complaint");
+    default:
+      return t("types.suggestion");
+  }
+};
+
+export default async function FeedbackPage({
+  searchParams,
+}: {
+  searchParams: PageSearchParams;
+}) {
+  const feedbackT = await getTranslations("feedbackPage");
+  const user = await getAuthUser();
+
+  if (!user) {
+    return <div>{feedbackT("unexpectedError")}</div>;
+  }
+
+  const resolvedSearchParams = await searchParams;
+  const currentPage = getQueryParam(resolvedSearchParams.page);
+  const p = currentPage ? parseInt(currentPage) : 1;
+
+  const where = {
+    schoolId: user.schoolId,
+    userId: user.userId,
+  };
+
+  const [feedbacks, count] = await prisma.$transaction([
+    prisma.feedback.findMany({
+      where,
+      orderBy: {
+        createdAt: "desc",
+      },
+      take: ITEM_PER_PAGE,
+      skip: (p - 1) * ITEM_PER_PAGE,
+    }),
+    prisma.feedback.count({ where }),
+  ]);
+
+  return (
+    <div className="bg-white p-4 rounded-md flex-1 m-4 mt-0">
+      <div className="mb-6 flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+        <div>
+          <h1 className="text-lg font-semibold">
+            {feedbackT("historyTitle")}
+          </h1>
+
+          <p className="text-sm text-gray-500">
+            {feedbackT("historyDescription")}
+          </p>
+        </div>
+
+        <div className="flex items-center gap-3">
+          <span className="text-sm text-gray-500">
+            {feedbackT("submittedCount", { count })}
+          </span>
+
+          <FeedbackModal />
+        </div>
+      </div>
+
+      <div className="space-y-4">
+        {feedbacks.length === 0 ? (
+          <div className="rounded-xl border border-dashed border-gray-300 p-10 text-center">
+            <p className="text-gray-500 text-sm">
+              {feedbackT("emptyHistory")}
+            </p>
+          </div>
+        ) : (
+          feedbacks.map((feedback) => (
+            <div
+              key={feedback.id}
+              className="rounded-2xl border border-gray-200 bg-white p-5 shadow-sm"
+            >
+              <div className="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
+                <div>
+                  <div className="mb-2 flex items-center gap-2">
+                    <span className="font-semibold text-gray-900">
+                      {getTypeLabel(feedback.type, feedbackT)}
+                    </span>
+
+                    <span
+                      className={`rounded-full px-3 py-1 text-xs font-medium ${getStatusClass(
+                        feedback.status
+                      )}`}
+                    >
+                      {feedbackT(`statuses.${feedback.status}`)}
+                    </span>
+                  </div>
+
+                  <p className="text-gray-600 leading-6">
+                    {feedback.message}
+                  </p>
+                </div>
+
+                <span className="whitespace-nowrap text-sm text-gray-400">
+                  {new Date(feedback.createdAt).toLocaleDateString()}
+                </span>
+              </div>
+            </div>
+          ))
+        )}
+      </div>
+
+      <Pagination page={p} count={count} />
+    </div>
+  );
+}
diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsx
index bca3191..442f8b1 100644
--- a/src/app/(dashboard)/layout.tsx
+++ b/src/app/(dashboard)/layout.tsx
@@ -1,7 +1,4 @@
-import Menu from "@/components/Menu";
-import Navbar from "@/components/Navbar";
-import Image from "next/image";
-import Link from "next/link";
+import DashboardShell from "@/components/DashboardShell";
 import { getAuthUser } from "@/lib/auth";
 import { getSchoolName } from "@/lib/school";
 
@@ -17,30 +14,8 @@ export default async function DashboardLayout({
     : null;
 
   return (
-    <div className="flex h-screen overflow-hidden">
-      {/* LEFT */}
-      <div className="p-4 w-[14%] md:w-[8%] lg:w-[16%] xl:w-[14%] overflow-auto">
-        <Link
-          href="/"
-          className="flex justify-center lg:justify-start items-center gap-2"
-        >
-          <Image
-            src="/icon.png"
-            alt="logo"
-            className="w-[32px] h-[32px]"
-            width={32}
-            height={32}
-          />
-          <span className="hidden lg:block font-bold">ACADEMIX</span>
-        </Link>
-        <Menu authUser={authUser} />
-      </div>
-
-      {/* RIGHT */}
-      <div className="flex flex-col bg-[#F7F8FA] w-[86%] md:w-[92%] lg:w-[84%] xl:w-[86%]">
-        <Navbar authUser={authUser} schoolName={schoolName} />
-        <div className="overflow-auto">{children}</div>
-      </div>
-    </div>
+    <DashboardShell authUser={authUser} schoolName={schoolName}>
+      {children}
+    </DashboardShell>
   );
 }
diff --git a/src/app/(dashboard)/list/announcements/loading.tsx b/src/app/(dashboard)/list/announcements/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/announcements/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/announcements/page.tsx b/src/app/(dashboard)/list/announcements/page.tsx
index 4a44bb5..86a2cdc 100644
--- a/src/app/(dashboard)/list/announcements/page.tsx
+++ b/src/app/(dashboard)/list/announcements/page.tsx
@@ -1,9 +1,12 @@
 import FilterSortActions from "@/components/FilterSortActions";
 import FormContainer from "@/components/FormContainer";
+import ClassFilter from "@/components/ClassFilter";
+import GradeFilter from "@/components/GradeFilter";
 import NoCurrentAcademicYearMessage from "@/components/NoCurrentAcademicYearMessage";
 import Pagination from "@/components/Pagination";
 import Table from "@/components/Table";
 import TableSearch from "@/components/TableSearch";
+import { getTranslations } from "next-intl/server";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
 import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
 import prisma from "@/lib/prisma";
@@ -16,22 +19,22 @@ type AnnouncementList = Announcement & {
   classes: Pick<Class, "id" | "name">[];
 };
 
-const getColumns = (role: UserRole | null) => [
+const getColumns = (role: UserRole | null, th: (key: string) => string) => [
   {
-    header: "Title",
+    header: th("title"),
     accessor: "title",
   },
   {
-    header: "Class",
+    header: th("class"),
     accessor: "class",
   },
   {
-    header: "Date",
+    header: th("date"),
     accessor: "date",
     className: "hidden md:table-cell",
   },
   {
-    header: role === "admin" ? "Actions" : "",
+    header: role === "admin" ? th("actions") : "",
     accessor: "action",
   },
 ];
@@ -40,6 +43,7 @@ const renderRow = (
   item: AnnouncementList,
   role: UserRole | null,
   totalClassesCount: number,
+  allClassesLabel: string,
 ) => (
   <tr
     key={item.id}
@@ -48,7 +52,7 @@ const renderRow = (
     <td className="flex items-center gap-4 p-4">{item.title}</td>
     <td>
       {item.classes.length === totalClassesCount && totalClassesCount > 0
-        ? "All Classes"
+        ? allClassesLabel
         : item.classes.map((cls) => cls.name).join(", ") || "-"}
     </td>
     <td className="hidden md:table-cell">
@@ -72,6 +76,10 @@ const AnnouncementListPage = async ({
 }: {
   searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const filtersT = await getTranslations("filters");
+  const emptyT = await getTranslations("emptyStates");
   const { role, userId, schoolId } = await enforceRouteAccess(
     "/list/announcements",
   );
@@ -98,6 +106,24 @@ const AnnouncementListPage = async ({
             });
             break;
           }
+          case "classId": {
+            const classId = Number.parseInt(value, 10);
+            if (!Number.isNaN(classId)) {
+              conditions.push({
+                classes: { some: { id: classId } },
+              });
+            }
+            break;
+          }
+          case "gradeId": {
+            const gradeId = Number.parseInt(value, 10);
+            if (!Number.isNaN(gradeId)) {
+              conditions.push({
+                classes: { some: { gradeId } },
+              });
+            }
+            break;
+          }
           default:
             break;
         }
@@ -127,31 +153,49 @@ const AnnouncementListPage = async ({
     query.AND = conditions;
   }
 
-  const [data, count, totalClassesCount] = await prisma.$transaction([
+  const sortParam = getQueryParam(queryParams.sort);
+  const orderBy: Prisma.AnnouncementOrderByWithRelationInput =
+    sortParam === "asc" ? { date: "asc" } : { date: "desc" };
+
+  const [data, count, totalClassesCount, classes, grades] = await prisma.$transaction([
     prisma.announcement.findMany({
       where: query,
       include: {
         classes: { select: { id: true, name: true } },
       },
-      orderBy: { date: "desc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
     prisma.announcement.count({ where: query }),
     prisma.class.count({ where: { schoolId } }),
+    prisma.class.findMany({
+      where: { schoolId },
+      select: { id: true, name: true, gradeId: true },
+      orderBy: { name: "asc" },
+    }),
+    prisma.grade.findMany({
+      where: { schoolId },
+      select: { id: true, level: true },
+      orderBy: { level: "asc" },
+    }),
   ]);
 
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
       {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">
-          All Announcements
-        </h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allAnnouncements")}</h1>
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
           <TableSearch />
-          <div className="flex items-center self-end gap-4">
-            <FilterSortActions />
+          {role === "admin" && (
+            <>
+              <GradeFilter grades={grades} />
+              <ClassFilter classes={classes} />
+            </>
+          )}
+          <div className="flex items-center self-end gap-2">
+            <FilterSortActions sortKey="sort" />
             {role === "admin" && (
               <FormContainer table="announcement" type="create" />
             )}
@@ -160,9 +204,13 @@ const AnnouncementListPage = async ({
       </div>
       {/* LIST */}
       <Table
-        columns={getColumns(role)}
-        renderRow={(item) => renderRow(item, role, totalClassesCount)}
+        columns={getColumns(role, th)}
+        renderRow={(item) =>
+          renderRow(item, role, totalClassesCount, filtersT("allClasses"))
+        }
         data={data}
+        emptyTitle={emptyT("announcements")}
+        emptyDescription={emptyT("filterDescription")}
       />
       {/* PAGINATION */}
       <Pagination page={p} count={count} />
diff --git a/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/AssignmentSubmissionAiEvaluation.tsx b/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/AssignmentSubmissionAiEvaluation.tsx
new file mode 100644
index 0000000..bf55e75
--- /dev/null
+++ b/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/AssignmentSubmissionAiEvaluation.tsx
@@ -0,0 +1,52 @@
+"use client";
+
+import { evaluateAssignmentSubmissionWithAi } from "@/lib/actions/aiEvaluation.actions";
+import { Loader2, Sparkles } from "lucide-react";
+import { useTranslations } from "next-intl";
+import { useRouter } from "next/navigation";
+import { useTransition } from "react";
+import { toast } from "react-toastify";
+
+type Props = {
+  submissionId: number;
+  disabled?: boolean;
+};
+
+export default function AssignmentSubmissionAiEvaluation({
+  submissionId,
+  disabled,
+}: Props) {
+  const t = useTranslations("aiEvaluation");
+  const router = useRouter();
+  const [isPending, startTransition] = useTransition();
+
+  const handleEvaluate = () => {
+    startTransition(async () => {
+      const result = await evaluateAssignmentSubmissionWithAi(submissionId);
+
+      if (result.success) {
+        toast.success(result.message);
+        router.refresh();
+      } else {
+        toast.error(result.message);
+      }
+    });
+  };
+
+  return (
+    <button
+      type="button"
+      onClick={handleEvaluate}
+      disabled={disabled || isPending}
+      title={disabled ? t("pdfSubmissionsOnly") : t("evaluate")}
+      className="inline-flex items-center gap-2 rounded-md bg-academixPurpleDark px-3 py-1.5 text-xs font-medium text-white transition hover:brightness-90 disabled:cursor-not-allowed disabled:opacity-60"
+    >
+      {isPending ? (
+        <Loader2 className="h-3.5 w-3.5 animate-spin" />
+      ) : (
+        <Sparkles className="h-3.5 w-3.5" />
+      )}
+      {t("evaluate")}
+    </button>
+  );
+}
diff --git a/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/AssignmentSubmissionBulkActions.tsx b/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/AssignmentSubmissionBulkActions.tsx
new file mode 100644
index 0000000..a40e4bd
--- /dev/null
+++ b/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/AssignmentSubmissionBulkActions.tsx
@@ -0,0 +1,119 @@
+"use client";
+
+import { adjustAssignmentSubmissionScores } from "@/lib/actions/submission.actions";
+import { Loader2, Minus, Plus } from "lucide-react";
+import { useTranslations } from "next-intl";
+import { useRouter } from "next/navigation";
+import { useState, useTransition } from "react";
+import { toast } from "react-toastify";
+
+type BulkAction = "increase" | "decrease";
+
+type Props = {
+  assignmentId: number;
+  maxScore: number;
+  classId?: number | null;
+  search?: string | null;
+  disabled?: boolean;
+};
+
+export default function AssignmentSubmissionBulkActions({
+  assignmentId,
+  maxScore,
+  classId,
+  search,
+  disabled,
+}: Props) {
+  const t = useTranslations("assignmentSubmissions");
+  const router = useRouter();
+  const [amount, setAmount] = useState("1");
+  const [pendingAction, setPendingAction] = useState<BulkAction | null>(null);
+  const [isPending, startTransition] = useTransition();
+
+  const filters = {
+    classId: classId ?? null,
+    search: search ?? null,
+  };
+
+  const runAction = (action: BulkAction) => {
+    const parsedAmount = Number(amount);
+
+    if (!Number.isFinite(parsedAmount) || parsedAmount <= 0) {
+      toast.error(t("validation.positiveAmount"));
+      return;
+    }
+
+    if (parsedAmount > maxScore) {
+      toast.error(t("validation.maxAmount", { maxScore }));
+      return;
+    }
+
+    setPendingAction(action);
+    startTransition(async () => {
+      try {
+        const result = await adjustAssignmentSubmissionScores(
+          assignmentId,
+          action === "increase" ? parsedAmount : -parsedAmount,
+          filters,
+        );
+
+        if (result.success) {
+          toast.success(result.message);
+          router.refresh();
+        } else {
+          toast.error(result.message);
+        }
+      } finally {
+        setPendingAction(null);
+      }
+    });
+  };
+
+  return (
+    <div className="flex flex-wrap items-center gap-2">
+      <div className="flex items-center gap-2 px-2 py-1 border border-gray-200 rounded-md">
+        <input
+          type="number"
+          min={0.5}
+          max={maxScore}
+          step={0.5}
+          value={amount}
+          onChange={(event) => setAmount(event.target.value)}
+          className="bg-transparent outline-none w-20 h-8 text-sm"
+          aria-label={t("fields.scoreAdjustmentAmount")}
+        />
+        <span className="text-gray-400 text-xs">{t("fields.marks")}</span>
+      </div>
+
+      <div className="flex items-center gap-2">
+        <button
+          type="button"
+          onClick={() => runAction("increase")}
+          disabled={disabled || isPending}
+          className="inline-flex items-center gap-2 bg-green-600 hover:bg-green-700 disabled:opacity-50 px-3 py-3 rounded-md font-semibold text-white text-xs transition disabled:cursor-not-allowed"
+        >
+          {pendingAction === "increase" ? (
+            <Loader2 className="w-3.5 h-3.5 animate-spin" />
+          ) : (
+            <Plus className="w-3.5 h-3.5" />
+          )}
+          {t("actions.increaseAll")}
+        </button>
+
+        <button
+          type="button"
+          onClick={() => runAction("decrease")}
+          disabled={disabled || isPending}
+          className="inline-flex items-center gap-2 bg-amber-500 hover:bg-amber-600 disabled:opacity-50 px-3 py-3 rounded-md font-semibold text-white text-xs transition disabled:cursor-not-allowed"
+        >
+          {pendingAction === "decrease" ? (
+            <Loader2 className="w-3.5 h-3.5 animate-spin" />
+          ) : (
+            <Minus className="w-3.5 h-3.5" />
+          )}
+          {t("actions.decreaseAll")}
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/AssignmentSubmissionScoreForm.tsx b/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/AssignmentSubmissionScoreForm.tsx
new file mode 100644
index 0000000..383c8d1
--- /dev/null
+++ b/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/AssignmentSubmissionScoreForm.tsx
@@ -0,0 +1,70 @@
+"use client";
+
+import { gradeAssignmentSubmission } from "@/lib/actions/submission.actions";
+import { Loader2, Save } from "lucide-react";
+import { useRouter } from "next/navigation";
+import { useEffect, useState, useTransition } from "react";
+import { toast } from "react-toastify";
+
+type Props = {
+  submissionId: number;
+  maxScore: number;
+  currentScore: number | null;
+};
+
+export default function AssignmentSubmissionScoreForm({
+  submissionId,
+  maxScore,
+  currentScore,
+}: Props) {
+  const router = useRouter();
+  const [score, setScore] = useState(currentScore?.toString() ?? "0");
+  const [isPending, startTransition] = useTransition();
+
+  useEffect(() => {
+    setScore(currentScore?.toString() ?? "0");
+  }, [currentScore]);
+
+  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    const nextScore = Number(score);
+
+    startTransition(async () => {
+      const result = await gradeAssignmentSubmission(submissionId, nextScore);
+
+      if (result.success) {
+        toast.success(result.message);
+        router.refresh();
+      } else {
+        toast.error(result.message);
+      }
+    });
+  };
+
+  return (
+    <form onSubmit={handleSubmit} className="flex items-center gap-2">
+      <input
+        type="number"
+        min={0}
+        max={maxScore}
+        step={0.5}
+        value={score}
+        onChange={(event) => setScore(event.target.value)}
+        placeholder={`0-${maxScore}`}
+        className="h-9 w-20 rounded-md border border-gray-200 px-2 text-sm outline-none focus:border-academixPurpleDark focus:bg-academixPurpleLight"
+      />
+      <button
+        type="submit"
+        disabled={isPending}
+        className="inline-flex h-9 w-9 items-center justify-center rounded-md bg-academixPurpleDark text-white transition hover:brightness-90 disabled:opacity-60"
+        title="Save score"
+      >
+        {isPending ? (
+          <Loader2 className="h-4 w-4 animate-spin" />
+        ) : (
+          <Save className="h-4 w-4" />
+        )}
+      </button>
+    </form>
+  );
+}
diff --git a/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/PublishAssignmentGradesButton.tsx b/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/PublishAssignmentGradesButton.tsx
new file mode 100644
index 0000000..17187db
--- /dev/null
+++ b/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/PublishAssignmentGradesButton.tsx
@@ -0,0 +1,55 @@
+"use client";
+
+import { publishAssignmentGrades } from "@/lib/actions/submission.actions";
+import { CheckCircle, Loader2 } from "lucide-react";
+import { useTranslations } from "next-intl";
+import { useRouter } from "next/navigation";
+import { useState, useTransition } from "react";
+import { toast } from "react-toastify";
+
+type Props = {
+  assignmentId: number;
+  disabled?: boolean;
+  allPublished?: boolean;
+};
+
+export default function PublishAssignmentGradesButton({
+  assignmentId,
+  disabled,
+  allPublished,
+}: Props) {
+  const t = useTranslations("assignmentSubmissions.actions");
+  const router = useRouter();
+  const [synced, setSynced] = useState(false);
+  const [isPending, startTransition] = useTransition();
+
+  const handlePublish = () => {
+    startTransition(async () => {
+      const result = await publishAssignmentGrades(assignmentId);
+
+      if (result.success) {
+        setSynced(true);
+        toast.success(result.message);
+        router.refresh();
+      } else {
+        toast.error(result.message);
+      }
+    });
+  };
+
+  return (
+    <button
+      type="button"
+      onClick={handlePublish}
+      disabled={disabled || allPublished || synced || isPending}
+      className="inline-flex items-center gap-2 rounded-md bg-green-600 px-4 py-2 text-sm font-semibold text-white transition hover:bg-green-700 disabled:cursor-not-allowed disabled:opacity-50"
+    >
+      {isPending ? (
+        <Loader2 className="h-4 w-4 animate-spin" />
+      ) : (
+        <CheckCircle className="h-4 w-4" />
+      )}
+      {allPublished || synced ? t("gradesPublished") : t("publishGrades")}
+    </button>
+  );
+}
diff --git a/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/page.tsx b/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/page.tsx
new file mode 100644
index 0000000..4c16d30
--- /dev/null
+++ b/src/app/(dashboard)/list/assignments/[assignmentId]/submissions/page.tsx
@@ -0,0 +1,394 @@
+import Table from "@/components/Table";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { getQueryParam, PageSearchParams } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+import type { AiEvaluation } from "@prisma/client";
+import { Download, Eye } from "lucide-react";
+import Link from "next/link";
+import { redirect } from "next/navigation";
+import { getTranslations } from "next-intl/server";
+import AssignmentSubmissionAiEvaluation from "./AssignmentSubmissionAiEvaluation";
+import AssignmentSubmissionBulkActions from "./AssignmentSubmissionBulkActions";
+import AssignmentSubmissionScoreForm from "./AssignmentSubmissionScoreForm";
+import PublishAssignmentGradesButton from "./PublishAssignmentGradesButton";
+
+type Props = {
+  params: Promise<{ assignmentId: string }>;
+  searchParams: PageSearchParams;
+};
+
+type SubmissionRow = {
+  id: number;
+  fileUrl: string;
+  fileName: string;
+  note: string | null;
+  teacherFeedback: string | null;
+  score: number | null;
+  gradePublished: boolean;
+  updatedAt: Date;
+  createdAt: Date;
+  aiEvaluation: AiEvaluation | null;
+  student: {
+    name: string;
+    username: string;
+    img: string | null;
+  };
+  assignment: {
+    class: { name: string } | null;
+  };
+};
+
+const getColumns = (th: (key: string) => string) => [
+  { header: th("student"), accessor: "student", className: "min-w-[190px] p-4" },
+  { header: th("class"), accessor: "class", className: "min-w-[120px] p-4" },
+  { header: th("file"), accessor: "file", className: "hidden md:table-cell min-w-[180px] p-4" },
+  { header: th("status"), accessor: "status", className: "min-w-[120px] p-4" },
+  { header: th("score"), accessor: "score", className: "min-w-[140px] p-4" },
+  { header: th("submitted"), accessor: "submitted", className: "hidden md:table-cell p-4" },
+  { header: th("actions"), accessor: "actions", className: "min-w-[130px] p-4" },
+];
+
+const formatDateTime = (date: Date) =>
+  new Intl.DateTimeFormat("en-US", {
+    dateStyle: "short",
+    timeStyle: "short",
+  }).format(date);
+
+const browserPreviewExtensions = new Set([
+  "pdf",
+  "jpg",
+  "jpeg",
+  "png",
+  "gif",
+  "webp",
+  "txt",
+]);
+
+const getFileExtension = (fileName: string) =>
+  fileName.split(".").pop()?.toLowerCase() ?? "";
+
+const getPreviewHref = (submission: SubmissionRow) => {
+  const extension = getFileExtension(submission.fileName);
+
+  return browserPreviewExtensions.has(extension)
+    ? `/api/preview/${submission.id}?type=submission`
+    : null;
+};
+
+const getStatusBadge = (submission: SubmissionRow, t: (key: string) => string) => {
+  if (submission.gradePublished) {
+    return (
+      <span className="rounded-md bg-academixPurpleLight px-2 py-1 text-xs font-medium text-academixPurpleDark">
+        {t("status.published")}
+      </span>
+    );
+  }
+
+  if (submission.score !== null) {
+    return (
+      <span className="rounded-md bg-amber-100 px-2 py-1 text-xs font-medium text-amber-700">
+        {t("status.draftGrade")}
+      </span>
+    );
+  }
+
+  return (
+    <span className="rounded-md bg-blue-50 px-2 py-1 text-xs font-medium text-blue-700">
+      {t("status.submitted")}
+    </span>
+  );
+};
+
+const renderRow = (
+  item: SubmissionRow,
+  maxScore: number,
+  t: (key: string) => string,
+) => {
+  const isPdfSubmission = getFileExtension(item.fileName) === "pdf";
+
+  return (
+    <tr
+      key={item.id}
+      className="border-b border-gray-200 text-sm even:bg-slate-50 hover:bg-academixPurpleLight"
+    >
+      <td className="min-w-[190px] p-4">
+        <div className="flex items-center gap-3">
+          {item.student.img ? (
+            <img
+              src={item.student.img}
+              alt={item.student.name}
+              className="h-8 w-8 rounded-full object-cover"
+            />
+          ) : (
+            <div className="flex h-8 w-8 items-center justify-center rounded-full bg-academixPurpleLight text-xs font-semibold text-academixPurpleDark">
+              {item.student.name[0] ?? "S"}
+            </div>
+          )}
+          <div className="flex flex-col">
+            <span className="font-medium text-gray-800">{item.student.name}</span>
+            <span className="text-xs text-gray-400">{item.student.username}</span>
+          </div>
+        </div>
+      </td>
+      <td className="min-w-[120px] p-4">{item.assignment.class?.name ?? "-"}</td>
+      <td className="hidden max-w-[180px] truncate p-4 text-gray-500 md:table-cell">
+        {item.fileName}
+      </td>
+      <td className="min-w-[120px] p-4">{getStatusBadge(item, t)}</td>
+      <td className="min-w-[140px] p-4">
+        <AssignmentSubmissionScoreForm
+          submissionId={item.id}
+          currentScore={item.score}
+          maxScore={maxScore}
+        />
+      </td>
+      <td className="hidden p-4 text-gray-500 md:table-cell">
+        {formatDateTime(item.updatedAt)}
+      </td>
+      <td className="min-w-[320px] p-4">
+        <div className="flex flex-wrap items-center gap-2">
+          {getPreviewHref(item) ? (
+            <a
+              href={getPreviewHref(item) ?? undefined}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="inline-flex items-center gap-2 rounded-md bg-gray-50 px-3 py-1.5 text-xs font-medium text-gray-700 transition hover:bg-gray-100"
+            >
+              <Eye className="h-3.5 w-3.5" />
+              {t("actions.view")}
+            </a>
+          ) : (
+            <span className="inline-flex items-center rounded-md bg-gray-50 px-3 py-1.5 text-xs font-medium text-gray-400">
+              {t("empty.previewUnavailable")}
+            </span>
+          )}
+          <a
+            href={`/api/download/${item.id}?type=submission`}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="inline-flex items-center gap-2 rounded-md bg-academixPurpleLight px-3 py-1.5 text-xs font-medium text-academixPurpleDark transition hover:brightness-95"
+          >
+            <Download className="h-3.5 w-3.5" />
+            {t("actions.download")}
+          </a>
+          <AssignmentSubmissionAiEvaluation
+            submissionId={item.id}
+            disabled={!isPdfSubmission}
+          />
+        </div>
+      </td>
+    </tr>
+  );
+};
+
+const AssignmentSubmissionsPage = async ({ params, searchParams }: Props) => {
+  const th = await getTranslations("tableHeaders");
+  const filtersT = await getTranslations("filters");
+  const actionsT = await getTranslations("actions");
+  const assignmentSubmissionsT = await getTranslations("assignmentSubmissions");
+  const { role, userId, schoolId } = await enforceRouteAccess("/list/assignments");
+  const { assignmentId: assignmentIdRaw } = await params;
+  const resolvedSearchParams = await searchParams;
+
+  if (role !== "admin" && role !== "teacher") redirect("/list/assignments");
+
+  const assignmentId = Number.parseInt(assignmentIdRaw, 10);
+  if (Number.isNaN(assignmentId)) redirect("/list/assignments");
+
+  const classIdRaw = getQueryParam(resolvedSearchParams.classId);
+  const search = getQueryParam(resolvedSearchParams.search)?.trim() ?? "";
+  const parsedClassId = classIdRaw ? Number.parseInt(classIdRaw, 10) : null;
+  const selectedClassId =
+    parsedClassId && !Number.isNaN(parsedClassId) ? parsedClassId : null;
+
+  const assignment = await prisma.assignment.findFirst({
+    where: {
+      id: assignmentId,
+      schoolId,
+      ...(role === "teacher"
+        ? { OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }] }
+        : {}),
+    },
+    include: {
+      subject: { select: { name: true } },
+      class: { select: { id: true, name: true } },
+    },
+  });
+
+  if (!assignment) redirect("/list/assignments");
+
+  const groupAssignments = await prisma.assignment.findMany({
+    where: {
+      title: assignment.title,
+      startDate: assignment.startDate,
+      endDate: assignment.endDate,
+      subjectId: assignment.subjectId,
+      schoolId,
+      academicYearId: assignment.academicYearId,
+      ...(role === "teacher"
+        ? { OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }] }
+        : {}),
+    },
+    include: {
+      class: { select: { id: true, name: true } },
+    },
+    orderBy: { class: { name: "asc" } },
+  });
+
+  const assignmentIds = groupAssignments.map((item) => item.id);
+  const classOptions = groupAssignments
+    .map((item) => item.class)
+    .filter((item): item is { id: number; name: string } => Boolean(item));
+
+  const submissions = await prisma.assignmentSubmission.findMany({
+    where: {
+      assignmentId: { in: assignmentIds },
+      schoolId,
+      ...(selectedClassId ? { assignment: { classId: selectedClassId } } : {}),
+      ...(search
+        ? {
+            student: {
+              OR: [
+                { name: { contains: search, mode: "insensitive" } },
+                { username: { contains: search, mode: "insensitive" } },
+              ],
+            },
+          }
+        : {}),
+    },
+    include: {
+      student: { select: { name: true, username: true, img: true } },
+      assignment: { select: { class: { select: { name: true } } } },
+      aiEvaluation: true,
+    },
+    orderBy: { updatedAt: "desc" },
+  });
+
+  const submitted = submissions.length;
+  const graded = submissions.filter((submission) => submission.score !== null).length;
+  const published = submissions.filter((submission) => submission.gradePublished).length;
+  const draftGrades = submissions.filter(
+    (submission) => submission.score !== null && !submission.gradePublished,
+  ).length;
+  const allPublished = graded > 0 && published === graded;
+
+  return (
+    <div className="m-4 mt-0 flex-1 rounded-md bg-white p-4">
+      <div className="mb-6 flex flex-wrap items-start justify-between gap-4">
+        <div>
+          <div className="mb-1 flex items-center gap-2 text-sm text-gray-400">
+            <Link href="/list/assignments" className="hover:text-gray-600">
+              {assignmentSubmissionsT("breadcrumb")}
+            </Link>
+            <span>/</span>
+            <span className="text-gray-700">{assignment.title}</span>
+          </div>
+          <h1 className="text-lg font-semibold">
+            {assignmentSubmissionsT("title")}
+          </h1>
+          <p className="mt-1 text-sm text-gray-400">
+            {assignment.subject?.name ?? assignmentSubmissionsT("subjectFallback")} -{" "}
+            {assignmentSubmissionsT("marks", { count: assignment.maxScore })}
+          </p>
+        </div>
+        <PublishAssignmentGradesButton
+          assignmentId={assignmentId}
+          disabled={graded === 0 || draftGrades === 0}
+          allPublished={allPublished}
+        />
+      </div>
+
+      <div className="mb-6 grid grid-cols-2 gap-4 md:grid-cols-4">
+        <div className="rounded-md bg-gray-50 p-4">
+          <span className="text-xs text-gray-400">
+            {assignmentSubmissionsT("stats.visibleSubmissions")}
+          </span>
+          <p className="text-xl font-bold">{submitted}</p>
+        </div>
+        <div className="rounded-md bg-green-50 p-4">
+          <span className="text-xs text-green-500">
+            {assignmentSubmissionsT("stats.graded")}
+          </span>
+          <p className="text-xl font-bold text-green-700">{graded}</p>
+        </div>
+        <div className="rounded-md bg-amber-50 p-4">
+          <span className="text-xs text-amber-500">
+            {assignmentSubmissionsT("stats.draftGrades")}
+          </span>
+          <p className="text-xl font-bold text-amber-700">{draftGrades}</p>
+        </div>
+        <div className="rounded-md bg-academixPurpleLight p-4">
+          <span className="text-xs text-academixPurpleDark">
+            {assignmentSubmissionsT("stats.published")}
+          </span>
+          <p className="text-xl font-bold text-academixPurpleDark">{published}</p>
+        </div>
+      </div>
+
+      <div className="mb-4 flex flex-col gap-3 xl:flex-row xl:items-center xl:justify-between">
+        <form className="flex w-full flex-col gap-2 sm:flex-row sm:flex-wrap xl:w-auto">
+          <select
+            name="classId"
+            defaultValue={selectedClassId ?? ""}
+            className="h-10 w-full rounded-md border border-gray-200 px-3 text-sm outline-none focus:border-academixPurpleDark sm:w-auto"
+          >
+            <option value="">{filtersT("allClasses")}</option>
+            {classOptions.map((classItem) => (
+              <option key={classItem.id} value={classItem.id}>
+                {classItem.name}
+              </option>
+            ))}
+          </select>
+          <input
+            name="search"
+            defaultValue={search}
+            placeholder={filtersT("searchStudent")}
+            className="h-10 w-full rounded-md border border-gray-200 px-3 text-sm outline-none focus:border-academixPurpleDark sm:w-[220px]"
+          />
+          <button
+            type="submit"
+            className="h-10 rounded-md bg-academixPurpleDark px-4 text-sm font-medium text-white transition hover:brightness-90"
+          >
+            {actionsT("apply")}
+          </button>
+          {(selectedClassId || search) && (
+            <Link
+              href={`/list/assignments/${assignmentId}/submissions`}
+              className="h-10 rounded-md border border-gray-200 px-4 py-2 text-sm font-medium text-gray-600 transition hover:bg-gray-50"
+            >
+              {actionsT("clear")}
+            </Link>
+          )}
+        </form>
+
+        <AssignmentSubmissionBulkActions
+          assignmentId={assignmentId}
+          maxScore={assignment.maxScore}
+          classId={selectedClassId}
+          search={search}
+          disabled={submitted === 0}
+        />
+      </div>
+
+      <div className="w-full overflow-x-auto">
+        <div className="min-w-[980px]">
+          <Table
+            columns={getColumns(th)}
+            renderRow={(item) =>
+              renderRow(
+                item as SubmissionRow,
+                assignment.maxScore,
+                assignmentSubmissionsT,
+              )
+            }
+            data={submissions}
+            emptyTitle={assignmentSubmissionsT("empty.title")}
+            emptyDescription={assignmentSubmissionsT("empty.description")}
+          />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AssignmentSubmissionsPage;
diff --git a/src/app/(dashboard)/list/assignments/loading.tsx b/src/app/(dashboard)/list/assignments/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/assignments/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/assignments/page.tsx b/src/app/(dashboard)/list/assignments/page.tsx
index 0585104..4e63f1e 100644
--- a/src/app/(dashboard)/list/assignments/page.tsx
+++ b/src/app/(dashboard)/list/assignments/page.tsx
@@ -1,208 +1,230 @@
+// src/app/(dashboard)/list/assignments/page.tsx
+import ExportButton from "@/components/ExportButton";
 import FilterSortActions from "@/components/FilterSortActions";
 import FormContainer from "@/components/FormContainer";
+import ClassFilter from "@/components/ClassFilter";
+import GradeFilter from "@/components/GradeFilter";
 import NoCurrentAcademicYearMessage from "@/components/NoCurrentAcademicYearMessage";
 import Pagination from "@/components/Pagination";
 import Table from "@/components/Table";
 import TableSearch from "@/components/TableSearch";
+import { getTranslations } from "next-intl/server";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
-import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import { buildAssignmentQuery } from "@/lib/query-builders/assignment-query";
 import prisma from "@/lib/prisma";
 import { ITEM_PER_PAGE } from "@/lib/settings";
-import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
-import { Assignment, Class, Prisma, Subject, Teacher } from "@prisma/client";
 import { UserRole } from "@/lib/utils";
+import { Assignment, Class, Subject, Teacher } from "@prisma/client";
+import type { PageSearchParams } from "@/lib/pageParams";
+import { Download, Users } from "lucide-react";
+import Link from "next/link";
+import AssignmentSubmit from "@/components/AssignmentSubmit";
 
 type AssignmentList = Assignment & {
   subject: Pick<Subject, "name"> | null;
   class: Pick<Class, "name"> | null;
-  lesson: {
-    teacher: Pick<Teacher, "name">;
-  };
+  teacher: Pick<Teacher, "name"> | null;
+  lesson: { teacher: Pick<Teacher, "name"> } | null;
+  assignmentSubmissions?: { // تم التغيير من submissions إلى assignmentSubmissions
+    id: number;
+    fileUrl: string;
+    fileName: string;
+    createdAt: Date;
+    note: string | null;
+    teacherFeedback: string | null;
+    score: number | null;
+    gradePublished: boolean;
+  }[];
+  _count?: { assignmentSubmissions: number };
 };
 
-const getColumns = (role: UserRole | null) => {
+const formatDateTime = (date: Date) =>
+  new Intl.DateTimeFormat("en-US", {
+    dateStyle: "medium",
+    timeStyle: "short",
+  }).format(date);
+
+const getColumns = (role: UserRole | null, th: (key: string) => string) => {
   const columns: { header: string; accessor: string; className?: string }[] = [
-    {
-      header: "Title",
-      accessor: "title",
-    },
-    {
-      header: "Subject",
-      accessor: "name",
-    },
+    { header: th("title"), accessor: "title" },
+    { header: th("subject"), accessor: "subject" },
   ];
 
   if (role !== "student") {
-    columns.push({
-      header: "Class",
-      accessor: "class",
-    });
+    columns.push({ header: th("class"), accessor: "class" });
   }
 
   if (role !== "teacher") {
-    columns.push({
-      header: "Teacher",
-      accessor: "teacher",
-      className: "hidden md:table-cell",
-    });
+    columns.push({ header: th("teacher"), accessor: "teacher", className: "hidden md:table-cell" });
   }
 
-  columns.push({
-    header: "Start Date",
-    accessor: "startDate",
-    className: "hidden md:table-cell",
-  });
+  if (role === "student") {
+    columns.push({ header: th("submission"), accessor: "submission" });
+    columns.push({ header: th("score"), accessor: "score" });
+  }
 
   columns.push({
-    header: "End Date",
+    header: th("endDate"),
     accessor: "endDate",
-    className: "hidden md:table-cell",
+    className: "hidden md:table-cell min-w-[180px] w-[180px]",
   });
 
   columns.push({
-    header: role === "admin" || role === "teacher" ? "Actions" : "",
+    header: role === "admin" || role === "teacher" ? th("actions") : "",
     accessor: "action",
   });
 
   return columns;
 };
 
-const renderRow = (item: AssignmentList, role: UserRole | null) => (
-  <tr
-    key={item.id}
-    className="hover:bg-academixPurpleLight even:bg-slate-50 border-gray-200 border-b text-sm"
-  >
-    <td className="p-4">{item.title}</td>
-    <td className="flex items-center gap-4 p-4">{item.subject?.name}</td>
-    {role !== "student" && <td>{item.class?.name}</td>}
-    {role !== "teacher" && (
-      <td className="hidden md:table-cell">{item.lesson.teacher.name}</td>
-    )}
-    <td className="hidden md:table-cell">
-      {new Intl.DateTimeFormat("en-US", {
-        dateStyle: "short",
-        timeStyle: "short",
-      }).format(item.startDate)}
-    </td>
-    <td className="hidden md:table-cell">
-      {new Intl.DateTimeFormat("en-US", {
-        dateStyle: "short",
-        timeStyle: "short",
-      }).format(item.endDate)}
-    </td>
-    <td>
-      <div className="flex items-center gap-2">
-        {(role === "admin" || role === "teacher") && (
-          <>
-            <FormContainer table="assignment" type="update" data={item} />
-            <FormContainer table="assignment" type="delete" id={item.id} />
-          </>
-        )}
-      </div>
-    </td>
-  </tr>
-);
+const renderRow = (
+  item: AssignmentList,
+  role: UserRole | null,
+  assignmentsT: (key: string) => string,
+) => {
+  // ✅ استخدام assignmentSubmissions بدلاً من submissions
+  const mySubmission = item.assignmentSubmissions?.[0] ?? null;
+  const canManage = role === "teacher" || role === "admin";
+
+  return (
+    <tr
+      key={item.id}
+      className="hover:bg-academixPurpleLight even:bg-slate-50 border-gray-200 border-b text-sm"
+    >
+      <td className="p-4">{item.title}</td>
+      <td className="flex items-center gap-4 p-4">{item.subject?.name ?? "-"}</td>
+      {role !== "student" && <td>{item.class?.name ?? "-"}</td>}
+      {role !== "teacher" && (
+        <td className="hidden md:table-cell">
+          {item.teacher?.name ?? item.lesson?.teacher.name ?? "-"}
+        </td>
+      )}
+      {role === "student" && (
+        <td>
+          {mySubmission ? (
+            <span
+              className={`inline-flex items-center rounded-md px-2 py-1 text-xs font-medium ${
+                mySubmission.gradePublished
+                  ? "bg-academixPurpleLight text-academixPurpleDark"
+                  : mySubmission.teacherFeedback
+                    ? "bg-blue-50 text-blue-700"
+                    : "bg-green-50 text-green-700"
+              }`}
+            >
+              {mySubmission.gradePublished
+                ? assignmentsT("status.gradePublished")
+                : mySubmission.teacherFeedback
+                  ? assignmentsT("status.feedbackReady")
+                  : assignmentsT("status.submitted")}
+            </span>
+          ) : (
+            <span className="inline-flex items-center rounded-md bg-gray-50 px-2 py-1 text-xs font-medium text-gray-500">
+              {assignmentsT("status.notSubmitted")}
+            </span>
+          )}
+        </td>
+      )}
+      {role === "student" && (
+        <td>
+          {mySubmission?.gradePublished && mySubmission.score !== null
+            ? `${mySubmission.score}/${item.maxScore}`
+            : "-"}
+        </td>
+      )}
+      <td className="hidden md:table-cell w-[180px] min-w-[180px]">
+        {formatDateTime(item.endDate)}
+      </td>
+      <td>
+        <div className="flex items-center gap-2 flex-wrap">
+          {/* زر Download للطالب فقط (إن وجد ملف) */}
+          {role === "student" && item.fileUrl && (
+            <a
+              href={`/api/download/${item.id}?type=assignment`}
+              className="flex items-center gap-1.5 px-2.5 py-1.5 rounded-lg bg-purple-50 text-purple-700 hover:bg-purple-100 transition-colors text-xs font-medium"
+            >
+              <Download className="w-3.5 h-3.5" />
+              {assignmentsT("actions.download")}
+            </a>
+          )}
+          {role === "student" && (
+            <AssignmentSubmit
+              key={mySubmission?.id ?? 'no-submission'}
+              assignmentId={item.id}
+              assignmentTitle={item.title}
+              maxScore={item.maxScore}
+              endDate={item.endDate}
+              allowLateSubmission={item.allowLateSubmission} // ✅
+              existingSubmission={mySubmission ? {
+                id: mySubmission.id,
+                fileUrl: mySubmission.fileUrl,
+                fileName: mySubmission.fileName,
+                createdAt: mySubmission.createdAt,
+                note: mySubmission.note,
+                teacherFeedback: mySubmission.teacherFeedback,
+                score: mySubmission.score,
+                gradePublished: mySubmission.gradePublished,
+              } : null}
+            />
+          )}
+          {canManage && (
+            <Link
+              href={`/list/assignments/${item.id}/submissions`}
+              className="flex items-center gap-1.5 px-2.5 py-1.5 rounded-lg bg-academixPurpleLight text-academixPurpleDark hover:brightness-95 transition-colors text-xs font-medium"
+            >
+              <Users className="w-3.5 h-3.5" />
+              {assignmentsT("actions.submissions")}
+            </Link>
+          )}
+          {(role === "admin" || role === "teacher") && (
+            <>
+              <FormContainer table="assignment" type="update" data={item} />
+              <FormContainer table="assignment" type="delete" id={item.id} />
+            </>
+          )}
+        </div>
+      </td>
+    </tr>
+  );
+};
+
 const AssignmentListPage = async ({
   searchParams,
 }: {
   searchParams: PageSearchParams;
 }) => {
-  const { role, userId, schoolId } =
-    await enforceRouteAccess("/list/assignments");
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const assignmentsT = await getTranslations("assignmentsPage");
+  const { role, userId, schoolId } = await enforceRouteAccess("/list/assignments");
+
   const resolvedSearchParams = await searchParams;
-  const { page, ...queryParams } = resolvedSearchParams;
-  const currentPage = getQueryParam(page);
-  const p = currentPage ? parseInt(currentPage) : 1;
 
-  const academicYearId = await getCurrentAcademicYearIdOrNull(schoolId);
+  const {
+    academicYearId,
+    query,
+    orderBy,
+    page: p,
+  } = await buildAssignmentQuery({
+    searchParams,
+    schoolId,
+    role,
+    userId,
+  });
 
-  if (!academicYearId) {
+  if (!academicYearId || !query) {
     return <NoCurrentAcademicYearMessage />;
   }
 
-  const query: Prisma.AssignmentWhereInput = {
-    schoolId,
-    academicYearId,
-  };
-  query.lesson = query.lesson || {};
-
-  const conditions: Prisma.AssignmentWhereInput[] = [];
-
-  if (queryParams) {
-    for (const [key, rawValue] of Object.entries(queryParams)) {
-      const value = getQueryParam(rawValue);
-
-      if (value !== undefined) {
-        switch (key) {
-          case "classId":
-            conditions.push({
-              lesson: {
-                classId: parseInt(value),
-              },
-            });
-            break;
-
-          case "teacherId":
-            conditions.push({
-              lesson: {
-                teacherId: value,
-              },
-            });
-            break;
-
-          case "search":
-            conditions.push({
-              lesson: {
-                subject: {
-                  name: { contains: value, mode: "insensitive" },
-                },
-              },
-            });
-            break;
-        }
+  const exportQuery = new URLSearchParams(
+    Object.entries(resolvedSearchParams).flatMap(([key, value]) => {
+      if (Array.isArray(value)) {
+        return value.map((item) => [key, item]);
       }
-    }
-  }
-
-  switch (role) {
-    case "admin":
-      break;
-
-    case "teacher":
-      conditions.push({
-        lesson: {
-          teacherId: userId,
-        },
-      });
-      break;
-
-    case "student":
-      conditions.push({
-        lesson: {
-          class: {
-            students: {
-              some: { id: userId },
-            },
-          },
-        },
-      });
-      break;
+      return value ? [[key, value]] : [];
+    }),
+  );
 
-    case "parent":
-      conditions.push({
-        lesson: {
-          class: {
-            students: {
-              some: { parentId: userId },
-            },
-          },
-        },
-      });
-      break;
-  }
-  if (conditions.length > 0) {
-    query.AND = conditions;
-  }
+  const includeSubmissionsCount = role === "teacher" || role === "admin";
 
   const [data, count] = await prisma.$transaction([
     prisma.assignment.findMany({
@@ -210,44 +232,71 @@ const AssignmentListPage = async ({
       include: {
         subject: { select: { name: true } },
         class: { select: { name: true } },
-        lesson: {
-          select: {
-            teacher: { select: { name: true } },
-          },
-        },
+        lesson: { select: { teacher: { select: { name: true } } } },
+        teacher: { select: { name: true } },
+        assignmentSubmissions: role === "student" && userId
+          ? { where: { studentId: userId }, select: { id: true, fileUrl: true, fileName: true, createdAt: true, note: true, teacherFeedback: true, score: true, gradePublished: true } }
+          : false,
+        _count: includeSubmissionsCount ? { select: { assignmentSubmissions: true } } : false,
       },
-      orderBy: { startDate: "desc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
-    prisma.assignment.count({
-      where: query,
-    }),
+    prisma.assignment.count({ where: query }),
   ]);
+  const [classes, grades] =
+    role === "admin"
+      ? await prisma.$transaction([
+          prisma.class.findMany({
+            where: { schoolId },
+            select: { id: true, name: true, gradeId: true },
+            orderBy: { name: "asc" },
+          }),
+          prisma.grade.findMany({
+            where: { schoolId },
+            select: { id: true, level: true },
+            orderBy: { level: "asc" },
+          }),
+        ])
+      : [[], []];
+
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
-      {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">
-          All Assignments
-        </h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allAssignments")}</h1>
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
           <TableSearch />
-          <div className="flex items-center self-end gap-4">
-            <FilterSortActions />
+          {role === "admin" && (
+            <>
+              <GradeFilter grades={grades} />
+              <ClassFilter classes={classes} />
+            </>
+          )}
+          <div className="flex items-center self-end gap-2">
+            <FilterSortActions sortKey="sort" />
             {(role === "admin" || role === "teacher") && (
-              <FormContainer table="assignment" type="create" />
+              <>
+                {role === "admin" && (
+                  <ExportButton
+                    href={`/api/admin/assignments/export?${exportQuery.toString()}`}
+                  />
+                )}
+                <FormContainer table="assignment" type="create" />
+              </>
             )}
           </div>
         </div>
       </div>
-      {/* LIST */}
+
       <Table
-        columns={getColumns(role)}
-        renderRow={(item) => renderRow(item, role)}
+        columns={getColumns(role, th)}
+        renderRow={(item) => renderRow(item, role, assignmentsT)}
         data={data}
+        emptyTitle={assignmentsT("empty.title")}
+        emptyDescription={assignmentsT("empty.description")}
       />
-      {/* PAGINATION */}
+
       <Pagination page={p} count={count} />
     </div>
   );
diff --git a/src/app/(dashboard)/list/attendance/loading.tsx b/src/app/(dashboard)/list/attendance/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/attendance/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/attendance/page.tsx b/src/app/(dashboard)/list/attendance/page.tsx
index 5f4052a..40bd4dc 100644
--- a/src/app/(dashboard)/list/attendance/page.tsx
+++ b/src/app/(dashboard)/list/attendance/page.tsx
@@ -4,21 +4,42 @@ import { getAttendanceData } from "@/lib/attendance";
 
 import AttendanceClient from "@/components/AttendanceClient";
 import AttendanceClassSelect from "@/components/AttendanceClassSelect";
+import GradeFilter from "@/components/GradeFilter";
 import Pagination from "@/components/Pagination";
 import NoCurrentAcademicYearMessage from "@/components/NoCurrentAcademicYearMessage";
+import EmptyState from "@/components/states/EmptyState";
 import { ITEM_PER_PAGE } from "@/lib/settings";
 import { getAttendanceParams } from "@/lib/attendanceParams";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { getTranslations } from "next-intl/server";
+import { getQueryParam } from "@/lib/pageParams";
+import { getCurrentAcademicYearOrNull } from "@/lib/academicYears";
+
+const isDateWithinRange = (date: string, startDate: string, endDate: string) =>
+  date >= startDate && date <= endDate;
 
 const AttendancePage = async ({
   searchParams,
 }: {
   searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const attendanceT = await getTranslations("attendance");
+  const th = await getTranslations("tableHeaders");
+  const filtersT = await getTranslations("filters");
   const { role, userId, schoolId } =
     await enforceRouteAccess("/list/attendance");
+  const currentAcademicYear = await getCurrentAcademicYearOrNull(schoolId);
+
+  if (!currentAcademicYear) {
+    return <NoCurrentAcademicYearMessage />;
+  }
 
   const resolved = await searchParams;
+  const gradeIdParam = getQueryParam(resolved.gradeId);
+  const gradeId = gradeIdParam ? Number.parseInt(gradeIdParam, 10) : undefined;
+  const selectedGradeId =
+    gradeId && !Number.isNaN(gradeId) && gradeId > 0 ? gradeId : undefined;
 
   // PARAMS
   const {
@@ -32,12 +53,22 @@ const AttendancePage = async ({
 
   const scope: "students" | "teachers" =
     rawScope === "teachers" ? "teachers" : "students";
+  const isSelectedDateInAcademicYear = isDateWithinRange(
+    selectedDate,
+    currentAcademicYear.startDate,
+    currentAcademicYear.endDate,
+  );
 
   // CLASSES
   const classes =
     role === "admin"
       ? await prisma.class.findMany({
-          where: { schoolId: schoolId },
+          where: {
+            schoolId: schoolId,
+            ...(scope === "students" && selectedGradeId
+              ? { gradeId: selectedGradeId }
+              : {}),
+          },
           select: { id: true, name: true },
           orderBy: { name: "asc" },
         })
@@ -48,15 +79,25 @@ const AttendancePage = async ({
           },
           select: { id: true, name: true },
         });
+  const grades =
+    role === "admin"
+      ? await prisma.grade.findMany({
+          where: { schoolId },
+          select: { id: true, level: true },
+          orderBy: { level: "asc" },
+        })
+      : [];
 
   // Teacher with no classes
   if (role === "teacher" && classes.length === 0) {
     return (
       <div className="flex-1 bg-white m-4 p-6 rounded-md">
-        <h1 className="mb-2 font-semibold text-lg">Attendance</h1>
-        <div className="text-gray-500 text-sm">
-          You are not assigned to supervise any class yet.
-        </div>
+        <h1 className="mb-2 font-semibold text-lg">{t("attendance")}</h1>
+        <EmptyState
+          title={attendanceT("noClassesAssigned")}
+          description={attendanceT("noClassesAssignedDescription")}
+          className="py-6"
+        />
       </div>
     );
   }
@@ -67,14 +108,17 @@ const AttendancePage = async ({
     classId && validClassIds.has(classId) ? classId : classes[0]?.id;
 
   // DATA
-  const { data, hasAttendance, noCurrentYear } = await getAttendanceData({
-    role,
-    userId,
-    schoolId: schoolId,
-    scope,
-    classId: effectiveClassId,
-    day,
-  });
+  const { data, hasAttendance, noCurrentYear } = isSelectedDateInAcademicYear
+    ? await getAttendanceData({
+        role,
+        userId,
+        schoolId: schoolId,
+        scope,
+        classId: effectiveClassId,
+        gradeId: selectedGradeId,
+        day,
+      })
+    : { data: [], hasAttendance: false, noCurrentYear: false };
 
   if (noCurrentYear) {
     return <NoCurrentAcademicYearMessage />;
@@ -87,14 +131,16 @@ const AttendancePage = async ({
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
       {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">Attendance</h1>
+      <div className="flex justify-between items-center mb-4">
+        <h1 className="font-semibold text-lg">{t("attendance")}</h1>
 
-        <form className="flex items-center gap-2">
+        <form className="hidden sm:flex items-center gap-2">
           <input
             type="date"
             name="date"
             defaultValue={selectedDate}
+            min={currentAcademicYear.startDate}
+            max={currentAcademicYear.endDate}
             className="p-2 border rounded-md text-sm"
           />
 
@@ -102,46 +148,57 @@ const AttendancePage = async ({
           {effectiveClassId && (
             <input type="hidden" name="classId" value={effectiveClassId} />
           )}
+          {selectedGradeId && (
+            <input type="hidden" name="gradeId" value={selectedGradeId} />
+          )}
 
-          <button className="bg-gray-100 px-3 py-2 rounded-md text-sm">
-            Filter
+          <button className="bg-academixPurple px-3 py-2 rounded-md text-sm">
+            {attendanceT("filter")}
           </button>
         </form>
       </div>
 
-      {/* ADMIN TABS */}
-      {role === "admin" && (
-        <div className="flex gap-4 mb-4">
-          <a
-            href={`/list/attendance?scope=students&classId=${effectiveClassId}`}
-            className={`px-3 py-1 rounded ${
-              scope === "students" ? "bg-blue-500 text-white" : "bg-gray-100"
-            }`}
-          >
-            Students
-          </a>
-
-          <a
-            href={`/list/attendance?scope=teachers`}
-            className={`px-3 py-1 rounded ${
-              scope === "teachers" ? "bg-blue-500 text-white" : "bg-gray-100"
-            }`}
-          >
-            Teachers
-          </a>
-        </div>
-      )}
+      <div className="flex flex-wrap justify-between items-center">
+        {/* ADMIN TABS */}
+        {role === "admin" && (
+          <div className="flex gap-2 mb-2">
+            <a
+              href={`/list/attendance?scope=students&classId=${effectiveClassId}`}
+              className={`px-3 py-1 rounded-md ${
+                scope === "students"
+                  ? "bg-academixPurpleDark text-white"
+                  : "bg-gray-100"
+              }`}
+            >
+              {filtersT("students")}
+            </a>
 
-      {/* CLASS SELECT (ADMIN) */}
-      {role === "admin" && scope === "students" && (
-        <div className="mb-4">
-          <AttendanceClassSelect
-            classes={classes}
-            value={effectiveClassId}
-            selectedDate={selectedDate}
-          />
-        </div>
-      )}
+            <a
+              href={`/list/attendance?scope=teachers`}
+              className={`px-3 py-1 rounded-md ${
+                scope === "teachers"
+                  ? "bg-academixPurpleDark text-white"
+                  : "bg-gray-100"
+              }`}
+            >
+              {filtersT("teachers")}
+            </a>
+          </div>
+        )}
+
+        {/* CLASS SELECT (ADMIN) */}
+        {role === "admin" && scope === "students" && (
+          <div className="mb-4 flex flex-wrap items-center gap-2">
+            <GradeFilter grades={grades} />
+            <span className="me-2">{th("class")}:</span>
+            <AttendanceClassSelect
+              classes={classes}
+              value={effectiveClassId}
+              selectedDate={selectedDate}
+            />
+          </div>
+        )}
+      </div>
 
       {/* TEACHER CLASS TABS */}
       {role === "teacher" && (
@@ -152,7 +209,7 @@ const AttendancePage = async ({
               href={`/list/attendance?classId=${cls.id}`}
               className={`px-3 py-1 rounded ${
                 effectiveClassId === cls.id
-                  ? "bg-blue-500 text-white"
+                  ? "bg-academixPurpleDark text-white"
                   : "bg-gray-100"
               }`}
             >
@@ -162,6 +219,15 @@ const AttendancePage = async ({
         </div>
       )}
 
+      {!isSelectedDateInAcademicYear && (
+        <div className="mb-4 rounded-md border border-amber-200 bg-amber-50 px-4 py-3 text-sm text-amber-800">
+          {attendanceT("dateOutsideAcademicYear", {
+            start: currentAcademicYear.startDate,
+            end: currentAcademicYear.endDate,
+          })}
+        </div>
+      )}
+
       {/* TABLE */}
       <AttendanceClient
         data={paginatedData}
diff --git a/src/app/(dashboard)/list/classes/loading.tsx b/src/app/(dashboard)/list/classes/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/classes/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/classes/page.tsx b/src/app/(dashboard)/list/classes/page.tsx
index f5b6166..02a8995 100644
--- a/src/app/(dashboard)/list/classes/page.tsx
+++ b/src/app/(dashboard)/list/classes/page.tsx
@@ -1,44 +1,45 @@
+import ExportButton from "@/components/ExportButton";
 import FilterSortActions from "@/components/FilterSortActions";
 import FormContainer from "@/components/FormContainer";
+import GradeFilter from "@/components/GradeFilter";
 import Pagination from "@/components/Pagination";
 import Table from "@/components/Table";
 import TableSearch from "@/components/TableSearch";
+import { getTranslations } from "next-intl/server";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
-import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import { buildClassQuery } from "@/lib/query-builders/class-query";
 import prisma from "@/lib/prisma";
 import { ITEM_PER_PAGE } from "@/lib/settings";
 import { UserRole } from "@/lib/utils";
-import { Class, Prisma, Teacher } from "@prisma/client";
+import { Class, Teacher } from "@prisma/client";
+import type { PageSearchParams } from "@/lib/pageParams";
 
 type ClassList = Class & {
   supervisor: Teacher | null;
   grade: {
     level: number;
-  };
+  } | null;
 };
 
-const getColumns = (role: UserRole | null) => [
+const getColumns = (role: UserRole | null, th: (key: string) => string) => [
+  { header: th("className"), accessor: "name" },
   {
-    header: "Class Name",
-    accessor: "name",
-  },
-  {
-    header: "Capacity",
+    header: th("capacity"),
     accessor: "capacity",
     className: "hidden md:table-cell",
   },
   {
-    header: "Grade",
+    header: th("grade"),
     accessor: "grade",
     className: "hidden md:table-cell",
   },
   {
-    header: "Supervisor",
+    header: th("supervisor"),
     accessor: "supervisor",
     className: "hidden md:table-cell",
   },
   {
-    header: role === "admin" ? "Actions" : "",
+    header: role === "admin" ? th("actions") : "",
     accessor: "action",
   },
 ];
@@ -49,11 +50,15 @@ const renderRow = (item: ClassList, role: UserRole | null) => (
     className="hover:bg-academixPurpleLight even:bg-slate-50 border-gray-200 border-b text-sm"
   >
     <td className="flex items-center gap-4 p-4">{item.name}</td>
+
     <td className="hidden md:table-cell">{item.capacity}</td>
-    <td className="hidden md:table-cell">{item.grade?.level}</td>
+
+    <td className="hidden md:table-cell">{item.grade?.level ?? "-"}</td>
+
     <td className="hidden md:table-cell">
       {item.supervisor?.name ?? "No supervisor"}
     </td>
+
     <td>
       <div className="flex items-center gap-2">
         {role === "admin" && (
@@ -66,48 +71,39 @@ const renderRow = (item: ClassList, role: UserRole | null) => (
     </td>
   </tr>
 );
+
 const ClassListPage = async ({
   searchParams,
 }: {
   searchParams: PageSearchParams;
 }) => {
-  const { role, schoolId } = await enforceRouteAccess("/list/classes");
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const emptyT = await getTranslations("emptyStates");
+  const { role, userId, schoolId } = await enforceRouteAccess("/list/classes");
 
   const resolvedSearchParams = await searchParams;
-  const { page, ...queryParams } = resolvedSearchParams;
-  const currentPage = getQueryParam(page);
-  const p = currentPage ? parseInt(currentPage) : 1;
 
-  const query: Prisma.ClassWhereInput = {
+  const {
+    query,
+    orderBy,
+    page: p,
+  } = await buildClassQuery({
+    searchParams,
     schoolId,
-  };
-  const conditions: Prisma.ClassWhereInput[] = [];
-
-  if (queryParams) {
-    for (const [key, rawValue] of Object.entries(queryParams)) {
-      const value = getQueryParam(rawValue);
-
-      if (value !== undefined) {
-        switch (key) {
-          case "supervisorId":
-            conditions.push({
-              supervisorId: value,
-            });
-            break;
-
-          case "search":
-            conditions.push({
-              name: { contains: value, mode: "insensitive" },
-            });
-            break;
-        }
+    role,
+    userId,
+  });
+
+  const exportQuery = new URLSearchParams(
+    Object.entries(resolvedSearchParams).flatMap(([key, value]) => {
+      if (Array.isArray(value)) {
+        return value.map((item) => [key, item]);
       }
-    }
-  }
 
-  if (conditions.length > 0) {
-    query.AND = conditions;
-  }
+      return value ? [[key, value]] : [];
+    }),
+  );
 
   const [data, count] = await prisma.$transaction([
     prisma.class.findMany({
@@ -120,7 +116,7 @@ const ClassListPage = async ({
           },
         },
       },
-      orderBy: { name: "asc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
@@ -128,26 +124,48 @@ const ClassListPage = async ({
       where: query,
     }),
   ]);
+  const grades =
+    role === "admin"
+      ? await prisma.grade.findMany({
+          where: { schoolId },
+          select: { id: true, level: true },
+          orderBy: { level: "asc" },
+        })
+      : [];
+
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
-      {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">All Classes</h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allClasses")}</h1>
+
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
           <TableSearch />
-          <div className="flex items-center self-end gap-4">
-            <FilterSortActions />
-            {role === "admin" && <FormContainer table="class" type="create" />}
+          {role === "admin" && <GradeFilter grades={grades} />}
+
+          <div className="flex items-center self-end gap-2">
+            <FilterSortActions sortKey="sort" />
+
+            {role === "admin" && (
+              <>
+                <ExportButton
+                  href={`/api/admin/classes/export?${exportQuery.toString()}`}
+                />
+
+                <FormContainer table="class" type="create" />
+              </>
+            )}
           </div>
         </div>
       </div>
-      {/* LIST */}
+
       <Table
-        columns={getColumns(role)}
+        columns={getColumns(role, th)}
         renderRow={(item) => renderRow(item, role)}
         data={data}
+        emptyTitle={emptyT("classes")}
+        emptyDescription={emptyT("filterDescription")}
       />
-      {/* PAGINATION */}
+
       <Pagination page={p} count={count} />
     </div>
   );
diff --git a/src/app/(dashboard)/list/events/loading.tsx b/src/app/(dashboard)/list/events/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/events/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/events/page.tsx b/src/app/(dashboard)/list/events/page.tsx
index 16936ad..77097e0 100644
--- a/src/app/(dashboard)/list/events/page.tsx
+++ b/src/app/(dashboard)/list/events/page.tsx
@@ -1,9 +1,12 @@
 import FilterSortActions from "@/components/FilterSortActions";
 import FormContainer from "@/components/FormContainer";
+import ClassFilter from "@/components/ClassFilter";
+import GradeFilter from "@/components/GradeFilter";
 import NoCurrentAcademicYearMessage from "@/components/NoCurrentAcademicYearMessage";
 import Pagination from "@/components/Pagination";
 import Table from "@/components/Table";
 import TableSearch from "@/components/TableSearch";
+import { getTranslations } from "next-intl/server";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
 import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
 import prisma from "@/lib/prisma";
@@ -14,32 +17,32 @@ import { UserRole } from "@/lib/utils";
 
 type EventList = Event & { classes: Pick<Class, "id" | "name">[] };
 
-const getColumns = (role: UserRole | null) => [
+const getColumns = (role: UserRole | null, th: (key: string) => string) => [
   {
-    header: "Title",
+    header: th("title"),
     accessor: "title",
   },
   {
-    header: "Class",
+    header: th("class"),
     accessor: "class",
   },
   {
-    header: "Date",
+    header: th("date"),
     accessor: "date",
     className: "hidden md:table-cell",
   },
   {
-    header: "Start Time",
+    header: th("startTime"),
     accessor: "startTime",
     className: "hidden md:table-cell",
   },
   {
-    header: "End Time",
+    header: th("endTime"),
     accessor: "endTime",
     className: "hidden md:table-cell",
   },
   {
-    header: role === "admin" ? "Actions" : "",
+    header: role === "admin" ? th("actions") : "",
     accessor: "action",
   },
 ];
@@ -48,6 +51,7 @@ const renderRow = (
   item: EventList,
   role: UserRole | null,
   totalClassesCount: number,
+  allClassesLabel: string,
 ) => (
   <tr
     key={item.id}
@@ -56,7 +60,7 @@ const renderRow = (
     <td className="flex items-center gap-4 p-4">{item.title}</td>
     <td>
       {item.classes.length === totalClassesCount && totalClassesCount > 0
-        ? "All Classes"
+        ? allClassesLabel
         : item.classes.map((cls) => cls.name).join(", ") || "-"}
     </td>
     <td className="hidden md:table-cell">
@@ -94,6 +98,10 @@ const EventListPage = async ({
 }: {
   searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const filtersT = await getTranslations("filters");
+  const emptyT = await getTranslations("emptyStates");
   const { role, userId, schoolId } = await enforceRouteAccess("/list/events");
   const resolvedSearchParams = await searchParams;
   const { page, ...queryParams } = resolvedSearchParams;
@@ -118,6 +126,24 @@ const EventListPage = async ({
             });
             break;
           }
+          case "classId": {
+            const classId = Number.parseInt(value, 10);
+            if (!Number.isNaN(classId)) {
+              conditions.push({
+                classes: { some: { id: classId } },
+              });
+            }
+            break;
+          }
+          case "gradeId": {
+            const gradeId = Number.parseInt(value, 10);
+            if (!Number.isNaN(gradeId)) {
+              conditions.push({
+                classes: { some: { gradeId } },
+              });
+            }
+            break;
+          }
           default:
             break;
         }
@@ -150,13 +176,17 @@ const EventListPage = async ({
     query.AND = conditions;
   }
 
-  const [data, count, totalClassesCount] = await prisma.$transaction([
+  const sortParam = getQueryParam(queryParams.sort);
+  const orderBy: Prisma.EventOrderByWithRelationInput =
+    sortParam === "asc" ? { startDate: "asc" } : { startDate: "desc" };
+
+  const [data, count, totalClassesCount, classes, grades] = await prisma.$transaction([
     prisma.event.findMany({
       where: query,
       include: {
         classes: { select: { id: true, name: true } },
       },
-      orderBy: { startDate: "desc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
@@ -164,26 +194,46 @@ const EventListPage = async ({
       where: query,
     }),
     prisma.class.count({ where: { schoolId } }),
+    prisma.class.findMany({
+      where: { schoolId },
+      select: { id: true, name: true, gradeId: true },
+      orderBy: { name: "asc" },
+    }),
+    prisma.grade.findMany({
+      where: { schoolId },
+      select: { id: true, level: true },
+      orderBy: { level: "asc" },
+    }),
   ]);
 
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
       {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">All Events</h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allEvents")}</h1>
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
           <TableSearch />
-          <div className="flex items-center self-end gap-4">
-            <FilterSortActions />
+          {role === "admin" && (
+            <>
+              <GradeFilter grades={grades} />
+              <ClassFilter classes={classes} />
+            </>
+          )}
+          <div className="flex items-center self-end gap-2">
+            <FilterSortActions sortKey="sort" />
             {role === "admin" && <FormContainer table="event" type="create" />}
           </div>
         </div>
       </div>
       {/* LIST */}
       <Table
-        columns={getColumns(role)}
-        renderRow={(item) => renderRow(item, role, totalClassesCount)}
+        columns={getColumns(role, th)}
+        renderRow={(item) =>
+          renderRow(item, role, totalClassesCount, filtersT("allClasses"))
+        }
         data={data}
+        emptyTitle={emptyT("events")}
+        emptyDescription={emptyT("filterDescription")}
       />
       {/* PAGINATION */}
       <Pagination page={p} count={count} />
diff --git a/src/app/(dashboard)/list/exams/[examId]/submissions/ExtendTimeButton.tsx b/src/app/(dashboard)/list/exams/[examId]/submissions/ExtendTimeButton.tsx
new file mode 100644
index 0000000..8fd0372
--- /dev/null
+++ b/src/app/(dashboard)/list/exams/[examId]/submissions/ExtendTimeButton.tsx
@@ -0,0 +1,139 @@
+"use client";
+
+import { useState, useTransition } from "react";
+import { extendTime } from "@/lib/actions/examWorkflow.actions";
+import { toast } from "react-toastify";
+import { useRouter } from "next/navigation";
+import { Clock, X, Loader2 } from "lucide-react";
+
+const QUICK_OPTIONS = [5, 10, 15, 30];
+
+export default function ExtendTimeButton({
+  submissionId,
+  studentName,
+}: {
+  submissionId: number;
+  studentName: string;
+}) {
+  const [open, setOpen] = useState(false);
+  const [minutes, setMinutes] = useState(5);
+  const [isPending, startTransition] = useTransition();
+  const router = useRouter();
+
+  const handleExtend = () => {
+    if (minutes < 1) {
+      toast.error("Please enter at least 1 minute.");
+      return;
+    }
+
+    startTransition(async () => {
+      const res = await extendTime(
+        { success: true, error: false },
+        { submissionId, extraMinutes: minutes }
+      );
+
+      if (res.error) {
+        toast.error(
+          ("message" in res ? res.message : null) ?? "Failed to extend time."
+        );
+      } else {
+        toast.success(`Added ${minutes} minute(s) for ${studentName}.`);
+        setOpen(false);
+        router.refresh();
+      }
+    });
+  };
+
+  return (
+    <>
+      <button
+        onClick={() => setOpen(true)}
+        title="Extend time"
+        className="flex h-7 w-7 items-center justify-center rounded-md border border-yellow-300 bg-yellow-50 text-yellow-600 transition hover:bg-yellow-100"
+      >
+        <Clock className="h-3.5 w-3.5" />
+      </button>
+
+      {open && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 p-4">
+          <div className="w-full max-w-sm rounded-lg bg-white shadow-xl">
+            {/* Header */}
+            <div className="flex items-start justify-between border-b border-gray-100 p-4">
+              <div className="flex items-center gap-3">
+                <div className="flex h-9 w-9 items-center justify-center rounded-md bg-yellow-100 text-yellow-600">
+                  <Clock className="h-4 w-4" />
+                </div>
+                <div>
+                  <p className="text-xs font-medium uppercase text-gray-400">
+                    Extend Time
+                  </p>
+                  <h2 className="text-sm font-semibold text-gray-900">
+                    {studentName}
+                  </h2>
+                </div>
+              </div>
+              <button
+                onClick={() => setOpen(false)}
+                disabled={isPending}
+                className="rounded-md p-1 text-gray-400 transition hover:bg-gray-100 hover:text-gray-700"
+              >
+                <X className="h-4 w-4" />
+              </button>
+            </div>
+
+            {/* Body */}
+            <div className="space-y-4 p-4">
+              <div className="flex flex-wrap gap-2">
+                {QUICK_OPTIONS.map((opt) => (
+                  <button
+                    key={opt}
+                    onClick={() => setMinutes(opt)}
+                    className={`rounded-md border px-3 py-1.5 text-sm font-medium transition ${
+                      minutes === opt
+                        ? "border-academixPurpleDark bg-academixPurpleDark text-white"
+                        : "border-gray-200 bg-white text-gray-600 hover:bg-gray-50"
+                    }`}
+                  >
+                    {opt} min
+                  </button>
+                ))}
+              </div>
+
+              <div className="flex items-center gap-2">
+                <label className="text-sm text-gray-500">Custom:</label>
+                <input
+                  type="number"
+                  min={1}
+                  max={120}
+                  value={minutes}
+                  onChange={(e) => setMinutes(parseInt(e.target.value) || 1)}
+                  className="h-9 w-20 rounded-md border border-gray-200 px-2 text-center text-sm outline-none focus:border-academixPurpleDark"
+                />
+                <span className="text-sm text-gray-400">minutes</span>
+              </div>
+            </div>
+
+            {/* Footer */}
+            <div className="flex justify-end gap-2 border-t border-gray-100 p-4">
+              <button
+                onClick={() => setOpen(false)}
+                disabled={isPending}
+                className="rounded-md border border-gray-200 px-4 py-2 text-sm font-medium text-gray-600 transition hover:bg-gray-50"
+              >
+                Cancel
+              </button>
+              <button
+                onClick={handleExtend}
+                disabled={isPending}
+                className="inline-flex items-center gap-2 rounded-md bg-academixPurpleDark px-4 py-2 text-sm font-medium text-white transition hover:brightness-90 disabled:opacity-60"
+              >
+                {isPending && <Loader2 className="h-4 w-4 animate-spin" />}
+                {isPending ? "Extending..." : `Add ${minutes} min`}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/src/app/(dashboard)/list/exams/[examId]/submissions/PublishGradesButton.tsx b/src/app/(dashboard)/list/exams/[examId]/submissions/PublishGradesButton.tsx
new file mode 100644
index 0000000..023d474
--- /dev/null
+++ b/src/app/(dashboard)/list/exams/[examId]/submissions/PublishGradesButton.tsx
@@ -0,0 +1,70 @@
+"use client";
+
+import { publishExamGrades } from "@/lib/actions/examWorkflow.actions";
+import { CheckCircle, Loader2 } from "lucide-react";
+import { useTranslations } from "next-intl";
+import { useRouter } from "next/navigation";
+import { useState, useTransition } from "react";
+import { toast } from "react-toastify";
+
+type PublishGradesButtonProps = {
+  examId: number;
+  disabled?: boolean;
+  allPublished?: boolean;
+  allGraded?: boolean;
+  alreadyPublished?: boolean;
+};
+
+const PublishGradesButton = ({
+  examId,
+  disabled,
+  allPublished,
+  allGraded,
+  alreadyPublished,
+}: PublishGradesButtonProps) => {
+  const t = useTranslations("examSubmissions");
+  const router = useRouter();
+  const [isPending, startTransition] = useTransition();
+  const [synced, setSynced] = useState(false);
+  const published = allPublished ?? alreadyPublished ?? false;
+  const hasPublishableGrades = allGraded ?? !disabled;
+  const isDisabled = disabled ?? (!hasPublishableGrades || published);
+
+  const handlePublish = () => {
+    startTransition(async () => {
+      const result = await publishExamGrades(examId);
+
+      if (result.success) {
+        setSynced(true);
+        toast.success(
+          published
+            ? t("toast.publishedSynced")
+            : t("toast.gradesPublished")
+        );
+        router.refresh();
+      } else {
+        toast.error(result.message ?? t("toast.publishFailed"));
+      }
+    });
+  };
+
+  return (
+    <button
+      type="button"
+      onClick={handlePublish}
+      disabled={isDisabled || isPending || synced}
+      className="inline-flex items-center gap-2 rounded-md bg-green-600 px-4 py-2 text-sm font-semibold text-white transition hover:bg-green-700 disabled:cursor-not-allowed disabled:opacity-50"
+    >
+      {isPending ? (
+        <Loader2 className="h-4 w-4 animate-spin" />
+      ) : (
+        <CheckCircle className="h-4 w-4" />
+      )}
+      {synced || published
+        ? t("actions.gradesPublished")
+        : t("actions.publishGrades")}
+    </button>
+  );
+};
+
+export default PublishGradesButton;
diff --git a/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/GradeAnswerAiEvaluation.tsx b/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/GradeAnswerAiEvaluation.tsx
new file mode 100644
index 0000000..fe621d8
--- /dev/null
+++ b/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/GradeAnswerAiEvaluation.tsx
@@ -0,0 +1,29 @@
+"use client";
+
+import AiEvaluationCard, {
+  AiEvaluationCardData,
+} from "@/components/AiEvaluationCard";
+import { evaluateExamAnswerWithAi } from "@/lib/actions/aiEvaluation.actions";
+
+type Props = {
+  answerId: number;
+  maxScore: number;
+  evaluation: AiEvaluationCardData | null;
+  disabledMessage?: string;
+};
+
+export default function GradeAnswerAiEvaluation({
+  answerId,
+  maxScore,
+  evaluation,
+  disabledMessage,
+}: Props) {
+  return (
+    <AiEvaluationCard
+      maxScore={maxScore}
+      evaluation={evaluation}
+      disabledMessage={disabledMessage}
+      onEvaluate={() => evaluateExamAnswerWithAi(answerId)}
+    />
+  );
+}
diff --git a/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/GradeClient.tsx b/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/GradeClient.tsx
index 9339054..a716ee4 100644
--- a/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/GradeClient.tsx
+++ b/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/GradeClient.tsx
@@ -1,14 +1,19 @@
 "use client";
 
-import { gradeAnswer } from "@/lib/actions";
+import { gradeAnswer, approveAndFinalizeGrading } from "@/lib/actions";
 import { useRouter } from "next/navigation";
-import { useState, useTransition } from "react";
+import { useEffect, useState, useTransition } from "react";
 import { toast } from "react-toastify";
-import { CheckCircle, ExternalLink } from "lucide-react";
-import type { Answer, Question, Submission, Student } from "@prisma/client";
+import { CheckCircle, Eye, Loader2, AlertCircle, Download, FileText } from "lucide-react";
+import type { AiEvaluation, Answer, Question, Submission, Student } from "@prisma/client";
 import { parseAnswerList } from "@/lib/examAnswerUtils";
+import { useTranslations } from "next-intl";
+import GradeAnswerAiEvaluation from "./GradeAnswerAiEvaluation";
 
-type AnswerWithQuestion = Answer & { question: Question };
+type AnswerWithQuestion = Answer & {
+  question: Question;
+  aiEvaluation: AiEvaluation | null;
+};
 
 type GradeClientProps = {
   submission: Submission & { student: Pick<Student, "name" | "username"> };
@@ -34,9 +39,11 @@ const QuestionTypeBadge = ({ type }: { type: string }) => {
 const AnswerDisplay = ({
   value,
   multi = false,
+  noAnswerLabel,
 }: {
   value: string | string[] | null | undefined;
   multi?: boolean;
+  noAnswerLabel: string;
 }) => {
   if (!multi) {
     if (Array.isArray(value)) {
@@ -45,11 +52,11 @@ const AnswerDisplay = ({
         .filter((item) => item.length > 0)
         .join(", ");
 
-      return text ? <span>{text}</span> : <span className="text-gray-400 italic">No answer provided</span>;
+      return text ? <span>{text}</span> : <span className="text-gray-400 italic">{noAnswerLabel}</span>;
     }
 
     if (!value || !value.trim()) {
-      return <span className="text-gray-400 italic">No answer provided</span>;
+      return <span className="text-gray-400 italic">{noAnswerLabel}</span>;
     }
 
     return <span>{value}</span>;
@@ -60,7 +67,7 @@ const AnswerDisplay = ({
     : parseAnswerList(value);
 
   if (items.length === 0) {
-    return <span className="text-gray-400 italic">No answer provided</span>;
+    return <span className="text-gray-400 italic">{noAnswerLabel}</span>;
   }
 
   if (items.length === 1) {
@@ -81,12 +88,26 @@ const AnswerDisplay = ({
   );
 };
 
+const previewableFileExtensions = new Set([
+  "pdf",
+  "jpg",
+  "jpeg",
+  "png",
+  "gif",
+  "webp",
+  "txt",
+]);
+
+const getFileExtension = (fileName?: string | null) =>
+  fileName?.split(".").pop()?.toLowerCase() ?? "";
+
 const GradeClient = ({
   submission,
   answers,
   examTitle,
   examId,
 }: GradeClientProps) => {
+  const t = useTranslations("examSubmissions");
   const router = useRouter();
   const [isPending, startTransition] = useTransition();
   const [scores, setScores] = useState<Record<number, string>>(() => {
@@ -99,16 +120,83 @@ const GradeClient = ({
     return map;
   });
 
+  const [savingStatus, setSavingStatus] = useState<
+    Record<number, "idle" | "saving" | "saved" | "error">
+  >({});
+  const [isFinalizing, setIsFinalizing] = useState(false);
+
+  useEffect(() => {
+    setScores((prev) => {
+      const next = { ...prev };
+      for (const answer of answers) {
+        if (answer.score !== null && answer.score !== undefined) {
+          next[answer.id] = String(answer.score);
+        }
+      }
+      return next;
+    });
+  }, [answers]);
+
+  const handleAutoSave = async (answerId: number, maxPoints: number) => {
+    const scoreStr = scores[answerId];
+    if (scoreStr === undefined || scoreStr === "") {
+      return;
+    }
+
+    const score = parseFloat(scoreStr);
+    if (isNaN(score) || score < 0) {
+      toast.error(t("toast.scorePositive"));
+      setSavingStatus((prev) => ({ ...prev, [answerId]: "error" }));
+      return;
+    }
+
+    if (score > maxPoints) {
+      toast.error(t("toast.scoreMax", { maxPoints }));
+      setSavingStatus((prev) => ({ ...prev, [answerId]: "error" }));
+      return;
+    }
+
+    const originalAnswer = answers.find((a) => a.id === answerId);
+    if (originalAnswer && originalAnswer.score === score) {
+      return; // No change, skip calling server action
+    }
+
+    setSavingStatus((prev) => ({ ...prev, [answerId]: "saving" }));
+
+    try {
+      const result = await gradeAnswer(
+        { success: false, error: false },
+        { answerId, score }
+      );
+      if (result.success) {
+        setSavingStatus((prev) => ({ ...prev, [answerId]: "saved" }));
+        router.refresh();
+      } else {
+        toast.error(result.message ?? t("toast.somethingWrong"));
+        setSavingStatus((prev) => ({ ...prev, [answerId]: "error" }));
+      }
+    } catch (err) {
+      toast.error(t("toast.autoSaveFailed"));
+      setSavingStatus((prev) => ({ ...prev, [answerId]: "error" }));
+    }
+  };
+
   const handleGrade = (answerId: number) => {
     const scoreStr = scores[answerId];
     if (scoreStr === undefined || scoreStr === "") {
-      toast.error("Please enter a score.");
+      toast.error(t("toast.scoreRequired"));
       return;
     }
 
     const score = parseFloat(scoreStr);
     if (isNaN(score) || score < 0) {
-      toast.error("Score must be a positive number.");
+      toast.error(t("toast.scorePositive"));
+      return;
+    }
+
+    const answer = answers.find((a) => a.id === answerId);
+    if (answer && score > answer.question.points) {
+      toast.error(t("toast.scoreMax", { maxPoints: answer.question.points }));
       return;
     }
 
@@ -118,14 +206,33 @@ const GradeClient = ({
         { answerId, score }
       );
       if (result.success) {
-        toast.success("Score saved!");
+        toast.success(t("toast.scoreSaved"));
         router.refresh();
       } else {
-        toast.error(result.message ?? "Something went wrong.");
+        toast.error(result.message ?? t("toast.somethingWrong"));
       }
     });
   };
 
+  const handleFinalize = async () => {
+    setIsFinalizing(true);
+    try {
+      const result = await approveAndFinalizeGrading(submission.id);
+      if (result.success) {
+        toast.success(t("toast.finalized"));
+        router.push(`/list/exams/${examId}/submissions`);
+      } else if ("warning" in result && result.warning) {
+        toast.warning(result.warning, { autoClose: 6000 });
+      } else {
+        toast.error("message" in result ? result.message : t("toast.somethingWrong"));
+      }
+    } catch (err) {
+      toast.error(t("toast.finalizeError"));
+    } finally {
+      setIsFinalizing(false);
+    }
+  };
+
   const totalMax = answers.reduce((sum, a) => sum + a.question.points, 0);
   const gradedAnswers = answers.filter(
     (a) => a.score !== null && a.score !== undefined
@@ -149,7 +256,7 @@ const GradeClient = ({
             {examTitle}
           </span>
           <span>/</span>
-          <span className="text-gray-700">Grade Submission</span>
+          <span className="text-gray-700">{t("gradeTitle")}</span>
         </div>
 
         <div className="flex items-start justify-between">
@@ -164,12 +271,15 @@ const GradeClient = ({
               {currentTotal} / {totalMax}
             </div>
             <div className="text-xs text-gray-400">
-              {gradedAnswers.length} of {answers.length} graded
+              {t("gradedCount", {
+                graded: gradedAnswers.length,
+                total: answers.length,
+              })}
             </div>
             {allGraded && (
               <div className="flex items-center gap-1 text-green-600 text-xs font-medium">
                 <CheckCircle className="w-3 h-3" />
-                All graded
+                {t("status.allGraded")}
               </div>
             )}
           </div>
@@ -188,6 +298,15 @@ const GradeClient = ({
               answer.question.type === "MCQ" && answer.question.allowMultiple;
             const isGraded =
               answer.score !== null && answer.score !== undefined;
+            const isPdfFileAnswer =
+              answer.question.type === "FILE" &&
+              getFileExtension((answer as any).fileOriginalName) === "pdf";
+            const canAiEvaluate =
+              answer.question.type === "TEXT" || isPdfFileAnswer;
+            const aiDisabledMessage =
+              answer.question.type === "FILE" && !isPdfFileAnswer
+                ? t("ai.pdfOnly")
+                : undefined;
 
             return (
               <div
@@ -205,7 +324,7 @@ const GradeClient = ({
                       <QuestionTypeBadge type={answer.question.type} />
                       {isAutoGraded && (
                         <span className="text-xs text-gray-400 italic">
-                          Auto-graded
+                          {t("status.autoGraded")}
                         </span>
                       )}
                     </div>
@@ -220,24 +339,73 @@ const GradeClient = ({
 
                 {/* Student Answer */}
                 <div className="bg-white border border-gray-100 rounded-md p-3">
-                  <p className="text-xs text-gray-400 mb-1">Student Answer:</p>
+                  <p className="text-xs text-gray-400 mb-1">
+                    {t("answers.studentAnswer")}
+                  </p>
 
                   {/* FILE */}
-                  {answer.question.type === "FILE" && answer.fileUrl ? (
-                    <a
-                      href={answer.fileUrl}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="flex items-center gap-2 text-sm text-academixPurpleDark hover:underline"
-                    >
-                      View uploaded file
-                      <ExternalLink className="w-3 h-3" />
-                    </a>
+                  {answer.question.type === "FILE" ? (
+                    answer.fileUrl && (answer as any).filePublicId ? (
+                      <div className="space-y-2">
+                        <div className="flex items-center gap-2">
+                          <FileText className="w-4 h-4 text-gray-500 shrink-0" />
+                          <div>
+                            <p className="text-sm font-medium text-gray-700">
+                              {(answer as any).fileOriginalName ?? t("answers.uploadedFile")}
+                            </p>
+                            <p className="text-xs text-gray-400">
+                              {(answer as any).fileSizeBytes
+                                ? `${((answer as any).fileSizeBytes / (1024 * 1024)).toFixed(2)} MB`
+                                : ""}
+                              {(answer as any).fileSizeBytes && (answer as any).fileMimeType ? " · " : ""}
+                              {(answer as any).fileMimeType?.split("/")?.[1]?.toUpperCase() ?? t("answers.file")}
+                              {(answer as any).fileSizeBytes || (answer as any).fileMimeType ? " · " : ""}
+                              {t("answers.uploaded")} {answer.savedAt
+                                ? new Intl.DateTimeFormat("en-US", { dateStyle: "short", timeStyle: "short" }).format(answer.savedAt)
+                                : ""}
+                            </p>
+                          </div>
+                        </div>
+                        <div className="flex flex-wrap items-center gap-2">
+                          {previewableFileExtensions.has(
+                            getFileExtension((answer as any).fileOriginalName),
+                          ) ? (
+                            <a
+                              href={`/api/exam-files/${answer.id}/preview`}
+                              target="_blank"
+                              rel="noopener noreferrer"
+                              className="inline-flex items-center gap-2 rounded-md bg-gray-50 px-3 py-1.5 text-sm font-medium text-gray-700 transition hover:bg-gray-100"
+                            >
+                              <Eye className="w-3.5 h-3.5" />
+                              {t("actions.view")}
+                            </a>
+                          ) : (
+                            <span className="inline-flex items-center rounded-md bg-gray-50 px-3 py-1.5 text-sm font-medium text-gray-400">
+                              {t("answers.previewUnavailable")}
+                            </span>
+                          )}
+                          <a
+                            href={`/api/exam-files/${answer.id}`}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="inline-flex items-center gap-2 rounded-md bg-academixPurpleLight px-3 py-1.5 text-sm font-medium text-academixPurpleDark transition hover:brightness-95"
+                          >
+                            <Download className="w-3.5 h-3.5" />
+                            {t("actions.downloadFile")}
+                          </a>
+                        </div>
+                      </div>
+                    ) : (
+                      <span className="text-gray-400 italic text-sm">
+                        {t("answers.noFile")}
+                      </span>
+                    )
                   ) : (
                     <div className="text-sm text-gray-700 whitespace-pre-wrap">
                       <AnswerDisplay
                         value={answer.textAnswer}
                         multi={usesMultiAnswer}
+                        noAnswerLabel={t("answers.noAnswer")}
                       />
                     </div>
                   )}
@@ -246,20 +414,46 @@ const GradeClient = ({
                 {/* Correct Answer - for T/F and MCQ */}
                 {isAutoGraded && (
                   <div className="bg-green-50 border border-green-100 rounded-md p-3">
-                    <p className="text-xs text-gray-400 mb-1">Correct Answer:</p>
+                    <p className="text-xs text-gray-400 mb-1">
+                      {t("answers.correctAnswer")}
+                    </p>
                     <div className="text-sm text-green-700 font-medium">
                       <AnswerDisplay
                         value={answer.question.correctAnswer}
                         multi={usesMultiAnswer}
+                        noAnswerLabel={t("answers.noAnswer")}
                       />
                     </div>
                   </div>
                 )}
 
+                {/* Correct Answer - for TEXT */}
+                {answer.question.type === "TEXT" && answer.question.textAnswer && (
+                  <div className="bg-blue-50 border border-blue-100 rounded-md p-3">
+                    <p className="text-xs text-gray-400 mb-1">
+                      {t("answers.correctAnswer")}
+                    </p>
+                    <div className="text-sm text-blue-700 whitespace-pre-wrap">
+                      {answer.question.textAnswer}
+                    </div>
+                  </div>
+                )}
+
+                {canAiEvaluate || aiDisabledMessage ? (
+                  <GradeAnswerAiEvaluation
+                    answerId={answer.id}
+                    maxScore={answer.question.points}
+                    evaluation={answer.aiEvaluation}
+                    disabledMessage={aiDisabledMessage}
+                  />
+                ) : null}
+
                 {/* Score Input */}
                 <div className="flex items-center gap-3">
                   <div className="flex items-center gap-2">
-                    <label className="text-sm text-gray-600">Score:</label>
+                    <label className="text-sm text-gray-600">
+                      {t("answers.score")}
+                    </label>
                     <input
                       type="number"
                       min={0}
@@ -272,30 +466,45 @@ const GradeClient = ({
                           [answer.id]: e.target.value,
                         }))
                       }
-                      disabled={isAutoGraded || isPending}
-                      className={`w-20 p-1.5 rounded-md ring-[1.5px] ring-gray-300 text-sm text-center
-                        focus:outline-none focus:ring-academixPurpleDark
-                        ${isAutoGraded ? "bg-gray-50 text-gray-400 cursor-not-allowed" : ""}`}
+                      onBlur={() => handleAutoSave(answer.id, answer.question.points)}
+                      onKeyDown={(e) => {
+                        if (e.key === "Enter") {
+                          e.currentTarget.blur();
+                        }
+                      }}
+                      disabled={isPending || savingStatus[answer.id] === "saving"}
+                      className="w-20 p-1.5 rounded-md ring-[1.5px] ring-gray-300 text-sm text-center
+                        focus:outline-none focus:ring-academixPurpleDark"
                     />
                     <span className="text-sm text-gray-400">
                       / {answer.question.points}
                     </span>
                   </div>
 
-                  {/* Save button - for TEXT and FILE only */}
-                  {!isAutoGraded && (
-                    <button
-                      onClick={() => handleGrade(answer.id)}
-                      disabled={isPending}
-                      className="px-3 py-1.5 bg-academixPurpleDark text-white text-xs
-                        rounded-md hover:opacity-90 disabled:opacity-50 transition"
-                    >
-                      {isPending ? "Saving..." : "Save"}
-                    </button>
+                  {/* Localized Status Indicator */}
+                  {savingStatus[answer.id] === "saving" && (
+                    <span className="flex items-center gap-1 text-xs text-blue-500 animate-pulse font-medium">
+                      <Loader2 className="w-3.5 h-3.5 animate-spin" />
+                      {t("status.saving")}
+                    </span>
+                  )}
+                  {savingStatus[answer.id] === "saved" && (
+                    <span className="flex items-center gap-1 text-xs text-green-600 font-medium">
+                      <CheckCircle className="w-3.5 h-3.5" />
+                      {t("status.saved")}
+                    </span>
                   )}
+                  {savingStatus[answer.id] === "error" && (
+                    <span className="flex items-center gap-1 text-xs text-red-500 font-medium">
+                      <AlertCircle className="w-3.5 h-3.5" />
+                      {t("status.error")}
+                    </span>
+                  )}
+
+
 
                   {/* Graded indicator */}
-                  {isGraded && (
+                  {isGraded && !savingStatus[answer.id] && (
                     <CheckCircle className="w-4 h-4 text-green-500" />
                   )}
                 </div>
@@ -304,16 +513,43 @@ const GradeClient = ({
           })}
       </div>
 
-      {/* Back button */}
-      <div className="mt-6">
+      {/* Action buttons */}
+      <div className="mt-6 flex items-center gap-3 justify-between border-t pt-6">
         <button
           onClick={() =>
             router.push(`/list/exams/${examId}/submissions`)
           }
-          className="px-4 py-2 border border-gray-200 rounded-md text-sm
-            hover:bg-gray-50 transition"
+          className="px-4 py-2 border border-gray-200 rounded-md text-sm text-gray-700
+            hover:bg-gray-50 transition font-medium"
+        >
+          {t("actions.backToSubmissions")}
+        </button>
+
+        <button
+          onClick={handleFinalize}
+          disabled={isFinalizing}
+          className={`px-5 py-2 rounded-md text-sm font-semibold transition flex items-center gap-2 text-white
+            ${submission.status === "GRADED"
+              ? "bg-green-600 hover:bg-green-700"
+              : "bg-academixPurpleDark hover:opacity-90"}
+            disabled:opacity-50`}
         >
-          ← Back to Submissions
+          {isFinalizing ? (
+            <>
+              <Loader2 className="w-4 h-4 animate-spin" />
+              {t("actions.finalizing")}
+            </>
+          ) : submission.status === "GRADED" ? (
+            <>
+              <CheckCircle className="w-4 h-4" />
+              {t("actions.finalizedReapprove")}
+            </>
+          ) : (
+            <>
+              <CheckCircle className="w-4 h-4" />
+              {t("actions.approveFinalize")}
+            </>
+          )}
         </button>
       </div>
     </div>
diff --git a/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/loading.tsx b/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/page.tsx b/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/page.tsx
index 60fa4d5..ead90d3 100644
--- a/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/page.tsx
+++ b/src/app/(dashboard)/list/exams/[examId]/submissions/[submissionId]/page.tsx
@@ -20,29 +20,58 @@ const GradeSubmissionPage = async ({
   if (isNaN(examId) || isNaN(submissionId)) redirect("/list/exams");
 
   // Check that the teacher owns the exam
-  const exam = await prisma.exam.findFirst({
+  const urlExam = await prisma.exam.findFirst({
     where: {
       id: examId,
       schoolId,
       ...(role === "teacher"
-        ? { lesson: { teacherId: userId } }
+        ? { OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }] }
         : {}),
     },
-    select: { id: true, title: true },
+    select: {
+      id: true,
+      title: true,
+      startTime: true,
+      endTime: true,
+      subjectId: true,
+      academicYearId: true,
+    },
   });
 
-  if (!exam) redirect("/list/exams");
+  if (!urlExam) redirect("/list/exams");
+
+  // Find all exams in the same group
+  const groupExams = await prisma.exam.findMany({
+    where: {
+      title: urlExam.title,
+      startTime: urlExam.startTime,
+      endTime: urlExam.endTime,
+      subjectId: urlExam.subjectId,
+      schoolId,
+      academicYearId: urlExam.academicYearId,
+      ...(role === "teacher"
+        ? { OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }] }
+        : {}),
+    },
+    select: { id: true },
+  });
+  const allowedExamIds = groupExams.map((e) => e.id);
 
   await syncAutoGrades(submissionId);
 
   // Load the submission with its answers
   const submission = await prisma.submission.findFirst({
-    where: { id: submissionId, examId, schoolId },
+    where: {
+      id: submissionId,
+      examId: { in: allowedExamIds },
+      schoolId,
+    },
     include: {
       student: { select: { name: true, username: true } },
       answers: {
         include: {
           question: true,
+          aiEvaluation: true,
         },
       },
     },
@@ -58,7 +87,7 @@ const GradeSubmissionPage = async ({
     <GradeClient
       submission={submission}
       answers={submission.answers}
-      examTitle={exam.title}
+      examTitle={urlExam.title}
       examId={examId}
     />
   );
diff --git a/src/app/(dashboard)/list/exams/[examId]/submissions/loading.tsx b/src/app/(dashboard)/list/exams/[examId]/submissions/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/exams/[examId]/submissions/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/exams/[examId]/submissions/page.tsx b/src/app/(dashboard)/list/exams/[examId]/submissions/page.tsx
index 15597a5..be24233 100644
--- a/src/app/(dashboard)/list/exams/[examId]/submissions/page.tsx
+++ b/src/app/(dashboard)/list/exams/[examId]/submissions/page.tsx
@@ -1,129 +1,190 @@
 import Table from "@/components/Table";
+import { autoSubmitExpiredSubmissions } from "@/lib/actions/examWorkflow.actions";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { getQueryParam, PageSearchParams } from "@/lib/pageParams";
 import prisma from "@/lib/prisma";
-import { Submission, Student, SubmissionStatus } from "@prisma/client";
+import { Class, Submission, Student, SubmissionStatus } from "@prisma/client";
 import Link from "next/link";
 import { redirect } from "next/navigation";
+import { getTranslations } from "next-intl/server";
+import PublishGradesButton from "./PublishGradesButton";
+
+import ExtendTimeButton from "./ExtendTimeButton";
 
 type SubmissionRow = Submission & {
   student: Pick<Student, "name" | "username">;
+  exam: { class: Pick<Class, "name"> | null };
 };
 
-const getStatusBadge = (status: SubmissionStatus) => {
+const getStatusBadge = (status: SubmissionStatus, t: (key: string) => string) => {
   switch (status) {
     case "IN_PROGRESS":
       return (
-        <span className="bg-yellow-100 text-yellow-700 px-2 py-1 rounded-md text-xs font-medium">
-          In Progress
+        <span className="rounded-md bg-yellow-100 px-2 py-1 text-xs font-medium text-yellow-700">
+          {t("status.inProgress")}
         </span>
       );
     case "SUBMITTED":
       return (
-        <span className="bg-blue-100 text-blue-700 px-2 py-1 rounded-md text-xs font-medium">
-          Submitted
+        <span className="rounded-md bg-blue-100 px-2 py-1 text-xs font-medium text-blue-700">
+          {t("status.submitted")}
         </span>
       );
     case "GRADED":
       return (
-        <span className="bg-green-100 text-green-700 px-2 py-1 rounded-md text-xs font-medium">
-          Graded
+        <span className="rounded-md bg-green-100 px-2 py-1 text-xs font-medium text-green-700">
+          {t("status.graded")}
         </span>
       );
   }
 };
 
-const columns = [
-  { header: "Student", accessor: "student" },
-  { header: "Status", accessor: "status" },
-  { header: "Score", accessor: "score", className: "hidden md:table-cell" },
-  { header: "Submitted At", accessor: "submittedAt", className: "hidden md:table-cell" },
-  { header: "Actions", accessor: "action" },
+const getColumns = (th: (key: string) => string) => [
+  { header: th("student"), accessor: "student", className: "min-w-[190px] p-4" },
+  { header: th("class"), accessor: "class", className: "min-w-[120px] p-4" },
+  { header: th("status"), accessor: "status", className: "min-w-[120px] p-4" },
+  { header: th("score"), accessor: "score", className: "min-w-[140px] p-4" },
+  {
+    header: th("submittedAt"),
+    accessor: "submittedAt",
+    className: "hidden md:table-cell p-4",
+  },
+  { header: th("actions"), accessor: "action", className: "min-w-[110px] p-4" },
 ];
 
-const renderRow = (item: SubmissionRow, examId: number) => (
+const formatDateTime = (date: Date) =>
+  new Intl.DateTimeFormat("en-US", {
+    dateStyle: "short",
+    timeStyle: "short",
+  }).format(date);
+
+const renderRow = (
+  item: SubmissionRow,
+  examId: number,
+  maxScore: number,
+  t: (key: string) => string,
+) => (
   <tr
     key={item.id}
-    className="hover:bg-academixPurpleLight even:bg-slate-50 border-gray-200 border-b text-sm"
+    className="border-b border-gray-200 text-sm even:bg-slate-50 hover:bg-academixPurpleLight"
   >
-    {/* Student */}
-    <td className="p-4">
+    <td className="min-w-[190px] p-4">
       <div className="flex flex-col">
         <span className="font-medium">{item.student.name}</span>
-        <span className="text-gray-400 text-xs">{item.student.username}</span>
+        <span className="text-xs text-gray-400">{item.student.username}</span>
       </div>
     </td>
-
-    {/* Status */}
-    <td className="p-4">{getStatusBadge(item.status)}</td>
-
-    {/* Score */}
-    <td className="hidden md:table-cell p-4">
+    <td className="min-w-[120px] p-4">{item.exam.class?.name ?? "-"}</td>
+    <td className="min-w-[120px] p-4">{getStatusBadge(item.status, t)}</td>
+    <td className="min-w-[140px] p-4 text-start">
       {item.totalScore !== null && item.totalScore !== undefined
-        ? item.totalScore
-        : "—"}
+        ? `${item.totalScore}/${maxScore}`
+        : "-"}
     </td>
-
-    {/* Submitted At */}
-    <td className="hidden md:table-cell p-4">
-      {item.submittedAt
-        ? new Intl.DateTimeFormat("en-US", {
-            dateStyle: "short",
-            timeStyle: "short",
-          }).format(item.submittedAt)
-        : "—"}
+    <td className="hidden p-4 text-start text-gray-500 md:table-cell">
+      {item.submittedAt ? formatDateTime(item.submittedAt) : "-"}
     </td>
-
-    {/* Actions */}
-    <td className="p-4">
+    <td className="min-w-[110px] p-4">
       {(item.status === "SUBMITTED" || item.status === "GRADED") && (
         <Link
           href={`/list/exams/${examId}/submissions/${item.id}`}
-          className="px-3 py-1.5 bg-academixPurpleDark text-white text-xs
-            rounded-md hover:opacity-90 transition"
+          className="rounded-md bg-academixPurpleDark px-3 py-1.5 text-xs text-white transition hover:opacity-90"
         >
-          {item.status === "GRADED" ? "View" : "Grade"}
+          {item.status === "GRADED" ? t("actions.view") : t("actions.grade")}
         </Link>
       )}
+      {item.status === "IN_PROGRESS" && (
+        <ExtendTimeButton submissionId={item.id} studentName={item.student.name} />
+      )}
     </td>
   </tr>
 );
 
 const ExamSubmissionsPage = async ({
   params,
+  searchParams,
 }: {
   params: Promise<{ examId: string }>;
+  searchParams: PageSearchParams;
 }) => {
-  const { role, userId, schoolId } = await enforceRouteAccess(
-    "/list/exams"
-  );
+  const th = await getTranslations("tableHeaders");
+  const filtersT = await getTranslations("filters");
+  const actionsT = await getTranslations("actions");
+  const examSubmissionsT = await getTranslations("examSubmissions");
+  const { role, userId, schoolId } = await enforceRouteAccess("/list/exams");
   const { examId: examIdStr } = await params;
+  const resolvedSearchParams = await searchParams;
 
   if (role !== "admin" && role !== "teacher") redirect("/list/exams");
 
   const examId = parseInt(examIdStr);
   if (isNaN(examId)) redirect("/list/exams");
 
-  // Check that the teacher owns the exam
+  const classIdRaw = getQueryParam(resolvedSearchParams.classId);
+  const search = getQueryParam(resolvedSearchParams.search)?.trim() ?? "";
+  const parsedClassId = classIdRaw ? Number.parseInt(classIdRaw, 10) : null;
+  const selectedClassId =
+    parsedClassId && !Number.isNaN(parsedClassId) ? parsedClassId : null;
+
   const exam = await prisma.exam.findFirst({
     where: {
       id: examId,
       schoolId,
       ...(role === "teacher"
-        ? { lesson: { teacherId: userId } }
+        ? { OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }] }
         : {}),
     },
     include: {
       subject: { select: { name: true } },
-      class: { select: { name: true } },
+      questions: { select: { points: true } },
     },
   });
 
   if (!exam) redirect("/list/exams");
+  const maxScore = exam.questions.reduce((sum, q) => sum + q.points, 0);
+
+  await autoSubmitExpiredSubmissions(examId).catch(() => {});
+
+  const groupExams = await prisma.exam.findMany({
+    where: {
+      title: exam.title,
+      startTime: exam.startTime,
+      endTime: exam.endTime,
+      subjectId: exam.subjectId,
+      schoolId,
+      academicYearId: exam.academicYearId,
+      ...(role === "teacher"
+        ? { OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }] }
+        : {}),
+    },
+    include: { class: { select: { id: true, name: true } } },
+    orderBy: { class: { name: "asc" } },
+  });
+
+  const examIds = groupExams.map((e) => e.id);
+  const classOptions = groupExams
+    .map((item) => item.class)
+    .filter((item): item is { id: number; name: string } => Boolean(item));
 
   const submissions = await prisma.submission.findMany({
-    where: { examId, schoolId },
+    where: {
+      examId: { in: examIds },
+      schoolId,
+      ...(selectedClassId ? { exam: { classId: selectedClassId } } : {}),
+      ...(search
+        ? {
+            student: {
+              OR: [
+                { name: { contains: search, mode: "insensitive" } },
+                { username: { contains: search, mode: "insensitive" } },
+              ],
+            },
+          }
+        : {}),
+    },
     include: {
       student: { select: { name: true, username: true } },
+      exam: { select: { class: { select: { name: true } } } },
     },
     orderBy: { submittedAt: "desc" },
   });
@@ -131,57 +192,124 @@ const ExamSubmissionsPage = async ({
   const submitted = submissions.filter((s) => s.status !== "IN_PROGRESS").length;
   const graded = submissions.filter((s) => s.status === "GRADED").length;
   const inProgress = submissions.filter((s) => s.status === "IN_PROGRESS").length;
+  const published = submissions.filter((s) => s.gradePublished).length;
+  const draftGrades = submissions.filter(
+    (s) => s.status === "GRADED" && !s.gradePublished,
+  ).length;
+  const hasGradedSubmissions = graded > 0;
+  const allGradedPublished =
+    hasGradedSubmissions &&
+    submissions
+      .filter((s) => s.status === "GRADED")
+      .every((s) => s.gradePublished);
 
   return (
-    <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
-
-      {/* Header */}
-      <div className="flex items-center justify-between mb-6">
+    <div className="m-4 mt-0 flex-1 rounded-md bg-white p-4">
+      <div className="mb-6 flex flex-wrap items-start justify-between gap-4">
         <div>
-          <div className="flex items-center gap-2 text-gray-400 text-sm mb-1">
+          <div className="mb-1 flex items-center gap-2 text-sm text-gray-400">
             <Link href="/list/exams" className="hover:text-gray-600">
-              Exams
+              {examSubmissionsT("breadcrumb")}
             </Link>
             <span>/</span>
             <span className="text-gray-700">{exam.title}</span>
           </div>
-          <h1 className="font-semibold text-lg">Submissions</h1>
+          <h1 className="text-lg font-semibold">{examSubmissionsT("title")}</h1>
+          <p className="mt-1 text-sm text-gray-400">
+            {exam.subject?.name ?? examSubmissionsT("subjectFallback")} -{" "}
+            {examSubmissionsT("marks", { count: maxScore })}
+          </p>
         </div>
+        <PublishGradesButton
+          examId={examId}
+          disabled={!hasGradedSubmissions || allGradedPublished}
+          allPublished={allGradedPublished}
+        />
       </div>
 
-      {/* Stats */}
-      <div className="grid grid-cols-2 md:grid-cols-4 gap-4 mb-6">
-        <div className="bg-gray-50 rounded-md p-4 flex flex-col gap-1">
-          <span className="text-gray-400 text-xs">Total</span>
-          <span className="font-bold text-xl">{submissions.length}</span>
+      <div className="mb-6 grid grid-cols-2 gap-4 md:grid-cols-5">
+        <div className="flex flex-col gap-1 rounded-md bg-gray-50 p-4">
+          <span className="text-xs text-gray-400">
+            {examSubmissionsT("stats.visible")}
+          </span>
+          <span className="text-xl font-bold">{submissions.length}</span>
         </div>
-        <div className="bg-blue-50 rounded-md p-4 flex flex-col gap-1">
-          <span className="text-blue-400 text-xs">Submitted</span>
-          <span className="font-bold text-xl text-blue-700">{submitted}</span>
+        <div className="flex flex-col gap-1 rounded-md bg-blue-50 p-4">
+          <span className="text-xs text-blue-400">
+            {examSubmissionsT("stats.submitted")}
+          </span>
+          <span className="text-xl font-bold text-blue-700">{submitted}</span>
         </div>
-        <div className="bg-green-50 rounded-md p-4 flex flex-col gap-1">
-          <span className="text-green-400 text-xs">Graded</span>
-          <span className="font-bold text-xl text-green-700">{graded}</span>
+        <div className="flex flex-col gap-1 rounded-md bg-green-50 p-4">
+          <span className="text-xs text-green-400">
+            {examSubmissionsT("stats.graded")}
+          </span>
+          <span className="text-xl font-bold text-green-700">{graded}</span>
         </div>
-        <div className="bg-yellow-50 rounded-md p-4 flex flex-col gap-1">
-          <span className="text-yellow-400 text-xs">In Progress</span>
-          <span className="font-bold text-xl text-yellow-700">{inProgress}</span>
+        <div className="flex flex-col gap-1 rounded-md bg-yellow-50 p-4">
+          <span className="text-xs text-yellow-400">
+            {examSubmissionsT("stats.inProgress")}
+          </span>
+          <span className="text-xl font-bold text-yellow-700">{inProgress}</span>
         </div>
+        <div className="flex flex-col gap-1 rounded-md bg-emerald-50 p-4">
+          <span className="text-xs text-emerald-500">
+            {examSubmissionsT("stats.published")}
+          </span>
+          <span className="text-xl font-bold text-emerald-700">{published}</span>
+        </div>
+      </div>
+
+      <div className="mb-4 flex flex-col gap-3 xl:flex-row xl:items-center xl:justify-between">
+        <form className="flex w-full flex-col gap-2 sm:flex-row sm:flex-wrap xl:w-auto">
+          <select
+            name="classId"
+            defaultValue={selectedClassId ?? ""}
+            className="h-10 w-full rounded-md border border-gray-200 px-3 text-sm outline-none focus:border-academixPurpleDark sm:w-auto"
+          >
+            <option value="">{filtersT("allClasses")}</option>
+            {classOptions.map((classItem) => (
+              <option key={classItem.id} value={classItem.id}>
+                {classItem.name}
+              </option>
+            ))}
+          </select>
+          <input
+            name="search"
+            defaultValue={search}
+            placeholder={filtersT("searchStudent")}
+            className="h-10 w-full rounded-md border border-gray-200 px-3 text-sm outline-none focus:border-academixPurpleDark sm:w-[220px]"
+          />
+          <button
+            type="submit"
+            className="h-10 rounded-md bg-academixPurpleDark px-4 text-sm font-medium text-white transition hover:brightness-90"
+          >
+            {actionsT("apply")}
+          </button>
+          {(selectedClassId || search) && (
+            <Link
+              href={`/list/exams/${examId}/submissions`}
+              className="h-10 rounded-md border border-gray-200 px-4 py-2 text-sm font-medium text-gray-600 transition hover:bg-gray-50"
+            >
+              {actionsT("clear")}
+            </Link>
+          )}
+        </form>
       </div>
 
-      {/* Table */}
-      {submissions.length === 0 ? (
-        <div className="flex flex-col items-center justify-center py-16 text-gray-400">
-          <p className="text-lg font-medium">No submissions yet</p>
-          <p className="text-sm">Students haven&apos;t submitted this exam yet.</p>
+      <div className="w-full overflow-x-auto">
+        <div className="min-w-[760px]">
+          <Table
+            columns={getColumns(th)}
+            renderRow={(item) =>
+              renderRow(item as SubmissionRow, examId, maxScore, examSubmissionsT)
+            }
+            data={submissions}
+            emptyTitle={examSubmissionsT("empty.title")}
+            emptyDescription={examSubmissionsT("empty.description")}
+          />
         </div>
-      ) : (
-        <Table
-          columns={columns}
-          renderRow={(item) => renderRow(item as SubmissionRow, examId)}
-          data={submissions}
-        />
-      )}
+      </div>
     </div>
   );
 };
diff --git a/src/app/(dashboard)/list/exams/[examId]/take/loading.tsx b/src/app/(dashboard)/list/exams/[examId]/take/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/exams/[examId]/take/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/exams/create-workflow/page.tsx b/src/app/(dashboard)/list/exams/create-workflow/page.tsx
index cbd2a7c..a379f2a 100644
--- a/src/app/(dashboard)/list/exams/create-workflow/page.tsx
+++ b/src/app/(dashboard)/list/exams/create-workflow/page.tsx
@@ -4,16 +4,21 @@ import ExamWorkflowForm from "@/components/forms/ExamWorkflowForm";
 import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
 import NoCurrentAcademicYearMessage from "@/components/NoCurrentAcademicYearMessage";
 import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import { isFileConfig } from "@/lib/formValidationSchemas";
 
 export default async function CreateExamWorkflowPage({
   searchParams,
 }: {
   searchParams: PageSearchParams;
 }) {
-  const { role, userId, schoolId } = await enforceRouteAccess("/list/exams", ["admin", "teacher"]);
+  const { role, userId, schoolId } = await enforceRouteAccess("/list/exams");
   const resolvedSearchParams = await searchParams;
   const examIdParam = getQueryParam(resolvedSearchParams.examId);
+  const subjectIdParam = getQueryParam(resolvedSearchParams.subjectId);
   const examId = examIdParam ? Number.parseInt(examIdParam, 10) : NaN;
+  const preselectedSubjectId = subjectIdParam
+    ? Number.parseInt(subjectIdParam, 10)
+    : NaN;
 
   const academicYearId = await getCurrentAcademicYearIdOrNull(schoolId);
   if (!academicYearId) {
@@ -23,9 +28,16 @@ export default async function CreateExamWorkflowPage({
   const subjects = await prisma.subject.findMany({
     where: {
       schoolId,
-      ...(role === "teacher" ? { teachers: { some: { id: userId } } } : {}),
+      ...(role === "teacher"
+        ? {
+            OR: [
+              { teachers: { some: { id: userId } } },
+              { lessons: { some: { teacherId: userId, academicYearId } } },
+            ],
+          }
+        : {}),
     },
-    select: { id: true, name: true },
+    select: { id: true, name: true, gradeId: true },
   });
 
   const exam = Number.isNaN(examId)
@@ -35,7 +47,9 @@ export default async function CreateExamWorkflowPage({
           id: examId,
           schoolId,
           academicYearId,
-          ...(role === "teacher" ? { lesson: { teacherId: userId } } : {}),
+          ...(role === "teacher"
+            ? { OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }] }
+            : {}),
         },
         include: {
           questions: {
@@ -53,7 +67,9 @@ export default async function CreateExamWorkflowPage({
           subjectId: exam.subjectId,
           academicYearId,
           schoolId,
-          ...(role === "teacher" ? { lesson: { teacherId: userId } } : {}),
+          ...(role === "teacher"
+            ? { OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }] }
+            : {}),
         },
         select: { classId: true },
       })
@@ -70,6 +86,8 @@ export default async function CreateExamWorkflowPage({
   const initialData = exam
     ? {
         title: exam.title,
+        instructions: exam.instructions ?? "",
+        teacherId: exam.teacherId ?? "",
         startTime: exam.startTime,
         endTime: exam.endTime,
         subjectId: exam.subjectId ?? undefined,
@@ -87,28 +105,95 @@ export default async function CreateExamWorkflowPage({
           points: question.points,
           order: question.order,
           allowMultiple: question.allowMultiple,
-          options: Array.isArray(question.options) ? (question.options as string[]) : [],
+          options: question.type === "FILE"
+            ? []
+            : Array.isArray(question.options)
+            ? (question.options as string[])
+            : [],
+          fileConfig:
+            question.type === "FILE" && isFileConfig(question.options)
+              ? question.options
+              : undefined,
           correctAnswer: question.correctAnswer ?? [],
+          textAnswer: question.textAnswer ?? "",
         })),
       }
-    : undefined;
+    : Number.isNaN(preselectedSubjectId) ||
+        !subjects.some((subject) => subject.id === preselectedSubjectId)
+      ? undefined
+      : { subjectId: preselectedSubjectId };
+
+  const subjectGradeIds = Array.from(
+    new Set(subjects.map((subject) => subject.gradeId)),
+  );
 
   const classes = await prisma.class.findMany({
     where: {
       schoolId,
-      ...(role === "teacher" ? { teachers: { some: { id: userId } } } : {}),
+      ...(role === "teacher"
+        ? {
+            OR: [
+              { gradeId: { in: subjectGradeIds } },
+              { teachers: { some: { id: userId } } },
+              { lessons: { some: { teacherId: userId, academicYearId } } },
+            ],
+          }
+        : {}),
+    },
+    select: { id: true, name: true, gradeId: true },
+  });
+
+  const teachers =
+    role === "admin"
+      ? await prisma.teacher.findMany({
+          where: { schoolId },
+          select: { id: true, name: true },
+          orderBy: { name: "asc" },
+        })
+      : [];
+
+  const lessonPairs = await prisma.lesson.findMany({
+    where: {
+      schoolId,
+      academicYearId,
+      ...(role === "teacher" ? { teacherId: userId } : {}),
     },
-    select: { id: true, name: true },
+    select: { subjectId: true, classId: true },
   });
 
+  const subjectClassPairsMap = new Map<
+    string,
+    { subjectId: number; classId: number }
+  >();
+
+  for (const subject of subjects) {
+    for (const classItem of classes) {
+      if (classItem.gradeId === subject.gradeId) {
+        subjectClassPairsMap.set(`${subject.id}:${classItem.id}`, {
+          subjectId: subject.id,
+          classId: classItem.id,
+        });
+      }
+    }
+  }
+
+  for (const pair of lessonPairs) {
+    subjectClassPairsMap.set(`${pair.subjectId}:${pair.classId}`, pair);
+  }
+
+  const subjectClassPairs = Array.from(subjectClassPairsMap.values());
+
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-6 rounded-md">
-      <h1 className="text-2xl font-bold text-gray-900 mb-6">
-        {exam ? "Update Exam Workflow" : "Create New Exam Workflow"}
+      <h1 className="mb-6 font-bold text-gray-900 text-2xl">
+        {exam ? "Update Exam" : "Create New Exam"}
       </h1>
       <ExamWorkflowForm
         subjects={subjects}
         classes={classes}
+        teachers={teachers}
+        canSelectTeacher={role === "admin"}
+        teacherLessons={subjectClassPairs}
         mode={exam ? "update" : "create"}
         examId={exam?.id}
         initialData={initialData}
diff --git a/src/app/(dashboard)/list/exams/loading.tsx b/src/app/(dashboard)/list/exams/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/exams/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/exams/page.tsx b/src/app/(dashboard)/list/exams/page.tsx
index 4ace280..66a0f6b 100644
--- a/src/app/(dashboard)/list/exams/page.tsx
+++ b/src/app/(dashboard)/list/exams/page.tsx
@@ -1,16 +1,21 @@
+import ExportButton from "@/components/ExportButton";
 import FilterSortActions from "@/components/FilterSortActions";
 import FormContainer from "@/components/FormContainer";
+import ClassFilter from "@/components/ClassFilter";
+import GradeFilter from "@/components/GradeFilter";
 import NoCurrentAcademicYearMessage from "@/components/NoCurrentAcademicYearMessage";
 import Pagination from "@/components/Pagination";
 import Table from "@/components/Table";
 import TableSearch from "@/components/TableSearch";
+import { getTranslations } from "next-intl/server";
+import TakeExamConfirmation from "@/components/exam/TakeExamConfirmation";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
-import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import { buildExamQuery } from "@/lib/query-builders/exam-query";
 import prisma from "@/lib/prisma";
 import { ITEM_PER_PAGE } from "@/lib/settings";
-import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
-import { Class, Exam, Prisma, Subject, Teacher } from "@prisma/client";
+import { Class, Exam, Subject, Teacher } from "@prisma/client";
 import { UserRole } from "@/lib/utils";
+import type { PageSearchParams } from "@/lib/pageParams";
 import Link from "next/link";
 import { Pencil } from "lucide-react";
 
@@ -18,223 +23,313 @@ type ExamList = Exam & {
   displayClasses?: string;
   subject: Pick<Subject, "name"> | null;
   class: Pick<Class, "name"> | null;
+  teacher: Pick<Teacher, "name"> | null;
   lesson: {
     teacher: Pick<Teacher, "name">;
-  };
+  } | null;
+  studentSubmission?: {
+    status: string;
+    gradePublished: boolean;
+    totalScore: number | null;
+    startedAt: Date;
+    extraTime: number | null;
+  } | null;
+  questions?: { points: number }[];
 };
 
-const getColumns = (role: UserRole | null) => {
-  const columns: { header: string; accessor: string; className?: string }[] = [
+const formatDateTime = (date: Date) =>
+  new Intl.DateTimeFormat("en-US", {
+    dateStyle: "medium",
+    timeStyle: "short",
+  }).format(date);
+
+const getColumns = (role: UserRole | null, th: (key: string) => string) => {
+  const columns: {
+    header: string;
+    accessor: string;
+    className?: string;
+  }[] = [
     {
-      header: "Title",
+      header: th("title"),
       accessor: "title",
     },
     {
-      header: "Subject",
-      accessor: "name",
+      header: th("subject"),
+      accessor: "subject",
     },
   ];
 
   if (role !== "student") {
     columns.push({
-      header: "Class",
+      header: th("class"),
       accessor: "class",
     });
   }
 
   if (role !== "teacher") {
     columns.push({
-      header: "Teacher",
+      header: th("teacher"),
       accessor: "teacher",
       className: "hidden md:table-cell",
     });
   }
 
-  columns.push({
-    header: "Start Time",
-    accessor: "startTime",
-    className: "hidden md:table-cell",
-  });
+  columns.push(
+    {
+      header: th("startTime"),
+      accessor: "startTime",
+      className: "hidden md:table-cell min-w-[180px] w-[180px]",
+    },
+    {
+      header: th("endTime"),
+      accessor: "endTime",
+      className: "hidden md:table-cell min-w-[180px] w-[180px]",
+    },
+  );
 
-  columns.push({
-    header: "End Time",
-    accessor: "endTime",
-    className: "hidden md:table-cell",
-  });
+  if (role === "student") {
+    columns.push({
+      header: th("status"),
+      accessor: "myStatus",
+    });
+    columns.push({
+      header: th("score"),
+      accessor: "myScore",
+    });
+  }
 
   columns.push({
-    header: role === "admin" || role === "teacher" ? "Actions" : "",
+    header: role === "admin" || role === "teacher" ? th("actions") : "",
     accessor: "action",
   });
 
   return columns;
 };
 
-const renderRow = (item: ExamList, role: UserRole | null) => (
-  <tr
-    key={item.id}
-    className="hover:bg-academixPurpleLight even:bg-slate-50 border-gray-200 border-b text-sm"
-  >
-    <td className="p-4">{item.title}</td>
-    <td className="flex items-center gap-4 p-4">{item.subject?.name}</td>
-    {role !== "student" && <td>{item.displayClasses ?? item.class?.name}</td>}
-    {role !== "teacher" && (
-      <td className="hidden md:table-cell">{item.lesson.teacher.name}</td>
-    )}
-    <td className="hidden md:table-cell">
-      {new Intl.DateTimeFormat("en-US", {
-        dateStyle: "short",
-        timeStyle: "short",
-      }).format(item.startTime)}
-    </td>
-    <td className="hidden md:table-cell">
-      {new Intl.DateTimeFormat("en-US", {
-        dateStyle: "short",
-        timeStyle: "short",
-      }).format(item.endTime)}
-    </td>
-    <td>
-      <div className="flex items-center gap-2">
-        {(role === "admin" || role === "teacher") && (
-          <div className="flex items-center gap-2">
+const renderRow = (item: ExamList, role: UserRole | null) => {
+  const sub = item.studentSubmission;
+  const isTimerExpired =
+    sub &&
+    sub.status === "IN_PROGRESS" &&
+    Date.now() >
+      new Date(sub.startedAt).getTime() +
+        ((item.duration ?? 0) + (sub.extraTime ?? 0)) * 60000;
+  const hasExamEnded = Date.now() > new Date(item.endTime).getTime();
+  const maxScore = item.questions?.reduce((sum, q) => sum + q.points, 0) ?? 0;
+
+  return (
+    <tr
+      key={item.id}
+      className="hover:bg-academixPurpleLight even:bg-slate-50 border-gray-200 border-b text-sm"
+    >
+      <td className="p-4">{item.title}</td>
+
+      <td className="flex items-center gap-4 p-4">
+        {item.subject?.name ?? "-"}
+      </td>
+
+      {role !== "student" && (
+        <td>{item.displayClasses ?? item.class?.name ?? "-"}</td>
+      )}
+
+      {role !== "teacher" && (
+        <td className="hidden md:table-cell">
+          {item.teacher?.name ?? item.lesson?.teacher.name ?? "-"}
+        </td>
+      )}
+
+      <td className="hidden md:table-cell w-[180px] min-w-[180px]">
+        {formatDateTime(item.startTime)}
+      </td>
+
+      <td className="hidden md:table-cell w-[180px] min-w-[180px]">
+        {formatDateTime(item.endTime)}
+      </td>
+
+      {role === "student" && (
+        <td className="py-4 pr-4 text-left">
+          {(() => {
+            if (!sub) {
+              if (hasExamEnded) {
+                return (
+                  <span className="bg-gray-100 px-2 py-1 rounded-md font-medium text-gray-500 text-xs whitespace-nowrap">
+                    Ended
+                  </span>
+                );
+              }
+              return (
+                <span className="bg-gray-100 px-2 py-1 rounded-md font-medium text-gray-500 text-xs whitespace-nowrap">
+                  Not Started
+                </span>
+              );
+            }
+            if (
+              sub.status === "IN_PROGRESS" &&
+              (isTimerExpired || hasExamEnded)
+            ) {
+              return (
+                <span className="bg-red-100 px-2 py-1 rounded-md font-medium text-red-700 text-xs whitespace-nowrap">
+                  Ended
+                </span>
+              );
+            }
+            if (sub.status === "IN_PROGRESS")
+              return (
+                <span className="bg-yellow-100 px-2 py-1 rounded-md font-medium text-yellow-700 text-xs">
+                  In Progress
+                </span>
+              );
+            if (sub.status === "SUBMITTED")
+              return (
+                <span className="bg-blue-100 px-2 py-1 rounded-md font-medium text-blue-700 text-xs">
+                  Submitted
+                </span>
+              );
+            if (sub.status === "GRADED" && !sub.gradePublished)
+              return (
+                <span className="bg-orange-100 px-2 py-1 rounded-md font-medium text-orange-700 text-xs">
+                  Graded
+                </span>
+              );
+            if (sub.status === "GRADED" && sub.gradePublished)
+              return (
+                <span className="bg-green-100 px-2 py-1 rounded-md font-medium text-green-700 text-xs">
+                  Published
+                </span>
+              );
+          })()}
+        </td>
+      )}
+
+      {role === "student" && (
+        <td className="py-4 pr-4 font-semibold text-academixPurpleDark text-left">
+          {item.studentSubmission?.gradePublished &&
+          item.studentSubmission.totalScore !== null ? (
+            `${item.studentSubmission.totalScore}/${maxScore}`
+          ) : (
+            <span className="font-normal text-gray-300">—</span>
+          )}
+        </td>
+      )}
+
+      <td>
+        <div className="flex items-center gap-2">
+          {(role === "admin" || role === "teacher") && (
+            <div className="flex items-center gap-2">
+              <Link
+                href={`/list/exams/create-workflow?examId=${item.id}`}
+                className="flex justify-center items-center bg-academixPurpleDark p-2 rounded-md text-white hover:scale-[1.05] transition"
+                aria-label="Edit exam workflow"
+              >
+                <Pencil className="w-4 h-4" />
+              </Link>
+              <FormContainer table="exam" type="delete" id={item.id} />
+            </div>
+          )}
+          {(role === "admin" || role === "teacher") && (
             <Link
-              href={`/list/exams/create-workflow?examId=${item.id}`}
-              className="p-2 flex items-center justify-center text-academixPurpleDark hover:bg-gray-100 rounded-md transition bg-academixSky"
-              aria-label="Edit exam workflow"
+              href={`/list/exams/${item.id}/submissions`}
+              className="bg-academixYellow hover:opacity-90 px-3 py-2 rounded-md text-xs hover:scale-[1.05] transition"
             >
-              <Pencil className="w-4 h-4" />
+              Submissions
             </Link>
-            <FormContainer table="exam" type="delete" id={item.id} />
-          </div>
-        )}
-        {(role === "admin" || role === "teacher") && (
-          <Link
-            href={`/list/exams/${item.id}/submissions`}
-            className="px-3 py-1 bg-academixYellow text-xs rounded-md hover:opacity-90"
-          >
-            Submissions
-          </Link>
-        )}
-        {role === "student" && (
-          <Link href={`/list/exams/${item.id}/take`}>
-            <button className="bg-academixPurpleDark text-white px-3 py-1 rounded-md text-xs font-semibold hover:bg-academixPurple transition-colors">
-              Take Exam
-            </button>
-          </Link>
-        )}
-      </div>
-    </td>
-  </tr>
-);
+          )}
+          {role === "student" && !item.studentSubmission && !hasExamEnded && (
+            <TakeExamConfirmation
+              examId={item.id}
+              title={item.title}
+              instructions={item.instructions}
+            />
+          )}
+          {role === "student" &&
+            item.studentSubmission?.status === "IN_PROGRESS" &&
+            !isTimerExpired &&
+            !hasExamEnded && (
+              <Link href={`/list/exams/${item.id}/take`}>
+                <button className="bg-yellow-500 hover:opacity-90 px-3 py-2 rounded-md font-semibold text-white text-xs transition">
+                  Continue
+                </button>
+              </Link>
+            )}
+        </div>
+      </td>
+    </tr>
+  );
+};
+
 const ExamListPage = async ({
   searchParams,
 }: {
   searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const examT = await getTranslations("examList");
   const { role, userId, schoolId } = await enforceRouteAccess("/list/exams");
+
   const resolvedSearchParams = await searchParams;
-  const { page, ...queryParams } = resolvedSearchParams;
-  const currentPage = getQueryParam(page);
-  const p = currentPage ? parseInt(currentPage) : 1;
-  const academicYearId = await getCurrentAcademicYearIdOrNull(schoolId);
 
-  if (!academicYearId) {
+  const {
+    academicYearId,
+    query,
+    orderBy,
+    page: p,
+  } = await buildExamQuery({
+    searchParams,
+    schoolId,
+    role,
+    userId,
+  });
+
+  if (!academicYearId || !query) {
     return <NoCurrentAcademicYearMessage />;
   }
 
-  const query: Prisma.ExamWhereInput = { schoolId, academicYearId };
-  const conditions: Prisma.ExamWhereInput[] = [];
-
-  if (queryParams) {
-    for (const [key, rawValue] of Object.entries(queryParams)) {
-      const value = getQueryParam(rawValue);
-
-      if (value !== undefined) {
-        switch (key) {
-          case "classId":
-            conditions.push({
-              lesson: {
-                classId: parseInt(value),
-              },
-            });
-            break;
-
-          case "teacherId":
-            conditions.push({
-              lesson: {
-                teacherId: value,
-              },
-            });
-            break;
-
-          case "search":
-            conditions.push({
-              lesson: {
-                subject: {
-                  name: { contains: value, mode: "insensitive" },
-                },
-              },
-            });
-            break;
-        }
+  const exportQuery = new URLSearchParams(
+    Object.entries(resolvedSearchParams).flatMap(([key, value]) => {
+      if (Array.isArray(value)) {
+        return value.map((item) => [key, item]);
       }
-    }
-  }
-  // ROLE CONDITIONS
-  switch (role) {
-    case "admin":
-      break;
 
-    case "teacher":
-      conditions.push({
-        lesson: {
-          teacherId: userId,
-        },
-      });
-      break;
+      return value ? [[key, value]] : [];
+    }),
+  );
 
-    case "student":
-      conditions.push({
-        lesson: {
-          class: {
-            students: {
-              some: { id: userId },
-            },
+  const [data, count] = await prisma.$transaction([
+    prisma.exam.findMany({
+      where: query,
+      include: {
+        subject: {
+          select: {
+            name: true,
+          },
+        },
+        class: {
+          select: {
+            name: true,
           },
         },
-      });
-      break;
-
-    case "parent":
-      conditions.push({
         lesson: {
-          class: {
-            students: {
-              some: { parentId: userId },
+          select: {
+            teacher: {
+              select: {
+                name: true,
+              },
             },
           },
         },
-      });
-      break;
-  }
-
-  if (conditions.length > 0) {
-    query.AND = conditions;
-  }
-
-  const [data, count] = await prisma.$transaction([
-    prisma.exam.findMany({
-      where: query,
-      include: {
-        subject: { select: { name: true } },
-        class: { select: { name: true } },
-        lesson: {
+        teacher: {
+          select: {
+            name: true,
+          },
+        },
+        questions: {
           select: {
-            teacher: { select: { name: true } },
+            points: true,
           },
         },
       },
-      orderBy: { startTime: "desc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
@@ -242,76 +337,149 @@ const ExamListPage = async ({
       where: query,
     }),
   ]);
+  const [classes, grades] =
+    role === "admin"
+      ? await prisma.$transaction([
+          prisma.class.findMany({
+            where: { schoolId },
+            select: { id: true, name: true, gradeId: true },
+            orderBy: { name: "asc" },
+          }),
+          prisma.grade.findMany({
+            where: { schoolId },
+            select: { id: true, level: true },
+            orderBy: { level: "asc" },
+          }),
+        ])
+      : [[], []];
+
+  const classGroups = new Map<string, Set<string>>();
+  const uniqueExamsMap = new Map<string, (typeof data)[0]>();
 
-  const dataWithClassDisplay: ExamList[] =
-    role === "admin" || role === "teacher"
-      ? (() => {
-        const classGroups = new Map<string, Set<string>>();
-
-        for (const exam of data) {
-          const groupKey = [
-            exam.title,
-            exam.startTime.toISOString(),
-            exam.endTime.toISOString(),
-            exam.subject?.name,
-          ].join("|");
-
-          if (!classGroups.has(groupKey)) {
-            classGroups.set(groupKey, new Set<string>());
-          }
-
-          if (exam.class?.name) {
-            classGroups.get(groupKey)!.add(exam.class.name);
-          }
-        }
-
-        return data.map((exam) => {
-          const groupKey = [
-            exam.title,
-            exam.startTime.toISOString(),
-            exam.endTime.toISOString(),
-            exam.subject?.name,
-          ].join("|");
-
-          const groupedClasses = classGroups.get(groupKey);
-          return {
-            ...exam,
-            displayClasses:
-              groupedClasses && groupedClasses.size > 1
-                ? Array.from(groupedClasses).sort().join(", ")
-                : exam.class?.name,
-          };
-        });
-      })()
-      : data;
+  for (const exam of data) {
+    const groupKey = [
+      exam.title,
+      exam.startTime.toISOString(),
+      exam.endTime.toISOString(),
+      exam.subject?.name,
+    ].join("|");
+
+    if (!classGroups.has(groupKey)) {
+      classGroups.set(groupKey, new Set<string>());
+    }
+
+    if (exam.class?.name) {
+      classGroups.get(groupKey)!.add(exam.class.name);
+    }
+
+    if (!uniqueExamsMap.has(groupKey)) {
+      uniqueExamsMap.set(groupKey, exam);
+    }
+  }
+
+  // For student role: fetch their submission status for each displayed exam
+  let studentSubmissionsMap = new Map<
+    number,
+    {
+      status: string;
+      gradePublished: boolean;
+      totalScore: number | null;
+      startedAt: Date;
+      extraTime: number | null;
+    }
+  >();
+  if (role === "student") {
+    const examIds = data.map((e) => e.id);
+    const studentSubmissions = await prisma.submission.findMany({
+      where: { studentId: userId, examId: { in: examIds }, schoolId },
+      select: {
+        examId: true,
+        status: true,
+        gradePublished: true,
+        totalScore: true,
+        startedAt: true,
+        extraTime: true,
+      },
+    });
+    for (const sub of studentSubmissions) {
+      studentSubmissionsMap.set(sub.examId, {
+        status: sub.status,
+        gradePublished: sub.gradePublished,
+        totalScore: sub.totalScore ?? null,
+        startedAt: sub.startedAt,
+        extraTime: sub.extraTime,
+      });
+    }
+  }
+
+  const dataWithClassDisplay: ExamList[] = Array.from(
+    uniqueExamsMap.values(),
+  ).map((exam) => {
+    const groupKey = [
+      exam.title,
+      exam.startTime.toISOString(),
+      exam.endTime.toISOString(),
+      exam.subject?.name,
+    ].join("|");
+
+    const groupedClasses = classGroups.get(groupKey);
+    return {
+      ...exam,
+      displayClasses:
+        groupedClasses && groupedClasses.size > 1
+          ? Array.from(groupedClasses).sort().join(", ")
+          : exam.class?.name,
+      studentSubmission:
+        role === "student"
+          ? (studentSubmissionsMap.get(exam.id) ?? null)
+          : undefined,
+    };
+  });
 
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
-      {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">All Exams</h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allExams")}</h1>
+
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
           <TableSearch />
-          <div className="flex items-center self-end gap-4">
-            <FilterSortActions />
+          {role === "admin" && (
+            <>
+              <GradeFilter grades={grades} />
+              <ClassFilter classes={classes} />
+            </>
+          )}
+
+          <div className="flex items-center self-end gap-2">
+            <FilterSortActions sortKey="sort" />
+
             {(role === "admin" || role === "teacher") && (
-              <Link
-                href="/list/exams/create-workflow"
-                className="px-4 py-2 bg-academixPurpleDark text-white rounded-md text-sm font-medium hover:opacity-90 transition-colors"
-              >
-                Add Exam
-              </Link>
+              <>
+                {role === "admin" && (
+                  <ExportButton
+                    href={`/api/admin/exams/export?${exportQuery.toString()}`}
+                  />
+                )}
+                <Link
+                  href="/list/exams/create-workflow"
+                  className="bg-academixPurpleDark hover:opacity-90 px-4 py-2 rounded-md font-medium text-white text-sm transition-colors"
+                >
+                  {examT("addExam")}
+                </Link>
+              </>
             )}
           </div>
         </div>
       </div>
-      {/* LIST */}
+
       <Table
-        columns={getColumns(role)}
+        columns={getColumns(role, th)}
         renderRow={(item) => renderRow(item, role)}
         data={dataWithClassDisplay}
+        emptyTitle={examT("noExams")}
+        emptyDescription={examT("emptyDescription")}
       />
-      {/* PAGINATION */}
+
       <Pagination page={p} count={count} />
     </div>
   );
diff --git a/src/app/(dashboard)/list/final-results/page.tsx b/src/app/(dashboard)/list/final-results/page.tsx
new file mode 100644
index 0000000..326ad63
--- /dev/null
+++ b/src/app/(dashboard)/list/final-results/page.tsx
@@ -0,0 +1,407 @@
+import AcademicYearFilter from "@/components/AcademicYearFilter";
+import ClassFilter from "@/components/ClassFilter";
+import FinalGradeEditButton from "@/components/FinalGradeEditButton";
+import GradeFilter from "@/components/GradeFilter";
+import NoCurrentAcademicYearMessage from "@/components/NoCurrentAcademicYearMessage";
+import Pagination from "@/components/Pagination";
+import EmptyState from "@/components/states/EmptyState";
+import Table from "@/components/Table";
+import TableSearch from "@/components/TableSearch";
+import {
+  getAcademicYears,
+  getCurrentAcademicYearIdOrNull,
+} from "@/lib/academicYears";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import {
+  calculateFinalResultSummary,
+  type AssessmentScore,
+  type FinalResultStatus,
+} from "@/lib/finalResults";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+import { ITEM_PER_PAGE } from "@/lib/settings";
+import { Prisma } from "@prisma/client";
+import { getTranslations } from "next-intl/server";
+
+type FinalResultRow = {
+  id: string;
+  name: string;
+  className: string;
+  averageScore: number | null;
+  assessmentCount: number;
+  status: FinalResultStatus;
+  storedAverageScore: number | null;
+};
+
+type StoredFinalResult = {
+  studentId: string;
+  averageScore: number;
+  assessmentCount: number;
+  status: string | null;
+};
+
+const formatValue = (value: number | null, suffix = "") =>
+  value === null ? "-" : `${value.toFixed(2)}${suffix}`;
+
+const columns = (th: (key: string) => string, canEdit: boolean) => {
+  const baseColumns = [
+    { header: th("student"), accessor: "student" },
+    {
+      header: th("class"),
+      accessor: "class",
+      className: "hidden md:table-cell",
+    },
+    { header: th("assessmentCount"), accessor: "assessmentCount" },
+    { header: th("averageScore"), accessor: "averageScore" },
+    { header: th("status"), accessor: "status" },
+  ];
+
+  if (canEdit) {
+    baseColumns.push({ header: th("actions"), accessor: "actions" });
+  }
+
+  return baseColumns;
+};
+
+const statusClassName: Record<FinalResultStatus, string> = {
+  PASS: "bg-emerald-50 text-emerald-700",
+  FAIL: "bg-red-50 text-red-700",
+  NO_RESULTS: "bg-gray-100 text-gray-500",
+  NOT_UPDATED: "bg-amber-50 text-amber-700",
+};
+
+const AverageBadge = ({ value }: { value: number | null }) => (
+  <span className="inline-flex items-center bg-academixSkyLight px-2 py-1 rounded-md font-semibold text-academixPurpleDark">
+    {formatValue(value, "%")}
+  </span>
+);
+
+const StatusBadge = ({
+  status,
+  statusT,
+}: {
+  status: FinalResultStatus;
+  statusT: (key: FinalResultStatus) => string;
+}) => (
+  <span
+    className={`inline-flex items-center rounded-md px-2 py-1 font-medium ${statusClassName[status]}`}
+  >
+    {statusT(status)}
+  </span>
+);
+
+const renderRow = (
+  item: FinalResultRow,
+  statusT: (key: FinalResultStatus) => string,
+  academicYearId: number,
+  canEdit: boolean,
+) => (
+  <tr
+    key={item.id}
+    className="hover:bg-academixPurpleLight even:bg-slate-50 border-gray-200 border-b text-sm"
+  >
+    <td className="p-4 font-medium text-gray-900">{item.name}</td>
+    <td className="hidden md:table-cell">{item.className}</td>
+    <td>{item.assessmentCount}</td>
+    <td>
+      <AverageBadge value={item.averageScore} />
+    </td>
+    <td>
+      <StatusBadge status={item.status} statusT={statusT} />
+    </td>
+    {canEdit && (
+      <td>
+        <FinalGradeEditButton
+          studentId={item.id}
+          studentName={item.name}
+          academicYearId={academicYearId}
+          averageScore={item.storedAverageScore ?? item.averageScore}
+        />
+      </td>
+    )}
+  </tr>
+);
+
+export default async function FinalResultsPage({
+  searchParams,
+}: {
+  searchParams: PageSearchParams;
+}) {
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const emptyT = await getTranslations("emptyStates");
+  const statusT = await getTranslations("finalResultStatus");
+  const { role, userId, schoolId } = await enforceRouteAccess(
+    "/list/final-results",
+  );
+  const resolvedSearchParams = await searchParams;
+  const pageParam = getQueryParam(resolvedSearchParams.page);
+  const search = getQueryParam(resolvedSearchParams.search);
+  const classIdParam = getQueryParam(resolvedSearchParams.classId);
+  const gradeIdParam = getQueryParam(resolvedSearchParams.gradeId);
+  const academicYearParam = getQueryParam(resolvedSearchParams.academicYearId);
+  const page = pageParam ? Number.parseInt(pageParam, 10) : 1;
+  const currentPage = Number.isNaN(page) || page < 1 ? 1 : page;
+  const classId = classIdParam ? Number.parseInt(classIdParam, 10) : null;
+  const gradeId = gradeIdParam ? Number.parseInt(gradeIdParam, 10) : null;
+  const currentAcademicYearId = await getCurrentAcademicYearIdOrNull(schoolId);
+
+  if (!currentAcademicYearId) return <NoCurrentAcademicYearMessage />;
+
+  const academicYears =
+    role === "student" || role === "parent"
+      ? await getAcademicYears(schoolId)
+      : [];
+  const selectedAcademicYearId = academicYearParam
+    ? Number.parseInt(academicYearParam, 10)
+    : currentAcademicYearId;
+  const academicYearId =
+    Number.isNaN(selectedAcademicYearId) || selectedAcademicYearId < 1
+      ? currentAcademicYearId
+      : selectedAcademicYearId;
+
+  const conditions: Prisma.StudentWhereInput[] = [];
+  if (search) {
+    conditions.push({
+      OR: [
+        { name: { contains: search, mode: "insensitive" } },
+        { username: { contains: search, mode: "insensitive" } },
+        { email: { contains: search, mode: "insensitive" } },
+      ],
+    });
+  }
+  if (classId && !Number.isNaN(classId)) conditions.push({ classId });
+  if (gradeId && !Number.isNaN(gradeId)) {
+    conditions.push({ class: { gradeId } });
+  }
+
+  if (role === "teacher") {
+    conditions.push({
+      class: {
+        supervisorId: userId,
+      },
+    });
+  } else if (role === "student") {
+    conditions.push({ id: userId });
+  } else if (role === "parent") {
+    conditions.push({ parentId: userId });
+  } else if (role !== "admin") {
+    conditions.push({ id: "__forbidden__" });
+  }
+
+  const studentWhere: Prisma.StudentWhereInput = {
+    schoolId,
+    ...(conditions.length ? { AND: conditions } : {}),
+  };
+  const classWhere: Prisma.ClassWhereInput = { schoolId };
+  if (role === "teacher") {
+    classWhere.supervisorId = userId;
+  }
+
+  const [students, count, classes, grades] = await prisma.$transaction([
+    prisma.student.findMany({
+      where: studentWhere,
+      select: { id: true, name: true, class: { select: { name: true } } },
+      orderBy: { name: "asc" },
+      take: ITEM_PER_PAGE,
+      skip: (currentPage - 1) * ITEM_PER_PAGE,
+    }),
+    prisma.student.count({ where: studentWhere }),
+    prisma.class.findMany({
+      where: classWhere,
+      select: { id: true, name: true, gradeId: true },
+      orderBy: { name: "asc" },
+    }),
+    prisma.grade.findMany({
+      where: { schoolId },
+      select: { id: true, level: true },
+      orderBy: { level: "asc" },
+    }),
+  ]);
+
+  const studentIds = students.map((student) => student.id);
+  const results = studentIds.length
+    ? await prisma.result.findMany({
+        where: { schoolId, academicYearId, studentId: { in: studentIds } },
+        select: {
+          studentId: true,
+          score: true,
+          assignment: { select: { maxScore: true } },
+          exam: { select: { questions: { select: { points: true } } } },
+        },
+      })
+    : [];
+  const storedFinalResults: StoredFinalResult[] = studentIds.length
+    ? await (
+        prisma as unknown as {
+          studentFinalResult: {
+            findMany: (args: {
+              where: {
+                schoolId: number;
+                academicYearId: number;
+                studentId: { in: string[] };
+              };
+              select: {
+                studentId: boolean;
+                averageScore: boolean;
+                assessmentCount: boolean;
+                status: boolean;
+              };
+            }) => Promise<StoredFinalResult[]>;
+          };
+        }
+      ).studentFinalResult.findMany({
+        where: { schoolId, academicYearId, studentId: { in: studentIds } },
+        select: {
+          studentId: true,
+          averageScore: true,
+          assessmentCount: true,
+          status: true,
+        },
+      })
+    : [];
+  const scoresByStudent = new Map<string, AssessmentScore[]>();
+  const storedStatusByStudent = new Map<string, FinalResultStatus>(
+    storedFinalResults.map((result) => [
+      result.studentId,
+      result.status === "PASS" || result.status === "FAIL"
+        ? result.status
+        : "NOT_UPDATED",
+    ]),
+  );
+  const storedFinalResultByStudent = new Map(
+    storedFinalResults.map((result) => [result.studentId, result]),
+  );
+
+  for (const result of results) {
+    const maxScore =
+      result.assignment?.maxScore ??
+      result.exam?.questions.reduce(
+        (sum, question) => sum + question.points,
+        0,
+      ) ??
+      null;
+    const scores = scoresByStudent.get(result.studentId) ?? [];
+    scores.push({ score: result.score, maxScore });
+    scoresByStudent.set(result.studentId, scores);
+  }
+
+  const data: FinalResultRow[] = students.map((student) => {
+    const summary = calculateFinalResultSummary(
+      scoresByStudent.get(student.id) ?? [],
+    );
+    const storedFinalResult = storedFinalResultByStudent.get(student.id);
+    const hasStoredFinalResult = !!storedFinalResult;
+    const averageScore =
+      storedFinalResult?.averageScore ?? summary.averageScore;
+    const assessmentCount =
+      storedFinalResult?.assessmentCount ?? summary.assessmentCount;
+
+    return {
+      id: student.id,
+      name: student.name,
+      className: student.class.name,
+      averageScore,
+      assessmentCount,
+      storedAverageScore: storedFinalResult?.averageScore ?? null,
+      status:
+        !hasStoredFinalResult && summary.assessmentCount === 0
+          ? "NO_RESULTS"
+          : (storedStatusByStudent.get(student.id) ?? "NOT_UPDATED"),
+    };
+  });
+  const canEdit = role === "admin" || role === "teacher";
+
+  return (
+    <div className="flex-1 bg-white m-2 sm:m-4 mt-0 sm:mt-0 p-3 sm:p-4 rounded-md">
+      <div className="flex md:flex-row flex-col md:flex-wrap justify-between md:items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("finalAverages")}</h1>
+        <div className="flex sm:flex-row flex-col sm:flex-wrap sm:items-center gap-2 w-fit md:w-auto">
+          <TableSearch />
+          {(role === "student" || role === "parent") && (
+            <AcademicYearFilter
+              academicYears={academicYears}
+              currentAcademicYearId={currentAcademicYearId}
+            />
+          )}
+          {role === "admin" && (
+            <>
+              <GradeFilter grades={grades} />
+              <ClassFilter classes={classes} />
+            </>
+          )}
+        </div>
+      </div>
+
+      <div className="md:hidden space-y-3 mt-4">
+        {data.length === 0 ? (
+          <div className="flex justify-center items-center min-h-[300px]">
+            <EmptyState
+              title={emptyT("finalAverages")}
+              description={emptyT("filterDescription")}
+              className="py-0"
+            />
+          </div>
+        ) : (
+          data.map((item) => (
+            <div
+              key={item.id}
+              className="bg-white shadow-sm p-3 border border-gray-100 rounded-md"
+            >
+              <div className="flex justify-between items-start gap-3">
+                <div className="min-w-0">
+                  <p className="font-medium text-gray-900 text-sm truncate">
+                    {item.name}
+                  </p>
+                  <p className="mt-1 text-gray-500 text-xs">
+                    {th("class")}: {item.className}
+                  </p>
+                </div>
+                <StatusBadge status={item.status} statusT={statusT} />
+              </div>
+
+              <div className="gap-2 grid grid-cols-2 mt-3 text-xs">
+                <div className="bg-slate-50 p-2 rounded-md">
+                  <p className="text-gray-500">{th("assessmentCount")}</p>
+                  <p className="mt-1 font-semibold text-gray-900">
+                    {item.assessmentCount}
+                  </p>
+                </div>
+                <div className="bg-slate-50 p-2 rounded-md">
+                  <p className="text-gray-500">{th("averageScore")}</p>
+                  <div className="mt-1">
+                    <AverageBadge value={item.averageScore} />
+                  </div>
+                </div>
+              </div>
+
+              {canEdit && (
+                <div className="mt-3">
+                  <FinalGradeEditButton
+                    studentId={item.id}
+                    studentName={item.name}
+                    academicYearId={academicYearId}
+                    averageScore={item.storedAverageScore ?? item.averageScore}
+                  />
+                </div>
+              )}
+            </div>
+          ))
+        )}
+      </div>
+
+      <div className="hidden md:block">
+        <Table
+          columns={columns(th, canEdit)}
+          renderRow={(item) =>
+            renderRow(item, statusT, academicYearId, canEdit)
+          }
+          data={data}
+          emptyTitle={emptyT("finalAverages")}
+          emptyDescription={emptyT("filterDescription")}
+        />
+      </div>
+      <Pagination page={currentPage} count={count} />
+    </div>
+  );
+}
diff --git a/src/app/(dashboard)/list/grades/loading.tsx b/src/app/(dashboard)/list/grades/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/grades/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/grades/page.tsx b/src/app/(dashboard)/list/grades/page.tsx
new file mode 100644
index 0000000..788f709
--- /dev/null
+++ b/src/app/(dashboard)/list/grades/page.tsx
@@ -0,0 +1,139 @@
+import FormContainer from "@/components/FormContainer";
+import Pagination from "@/components/Pagination";
+import Table from "@/components/Table";
+import TableSearch from "@/components/TableSearch";
+import { getTranslations } from "next-intl/server";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { ITEM_PER_PAGE } from "@/lib/settings";
+import { UserRole } from "@/lib/utils";
+import prisma from "@/lib/prisma";
+import { Grade } from "@prisma/client";
+import type { PageSearchParams } from "@/lib/pageParams";
+import { Prisma } from "@prisma/client";
+
+type GradeList = Grade & {
+  classes: Array<{ id: number; name: string }>;
+};
+
+const getColumns = (role: UserRole | null, th: (key: string) => string) => [
+  {
+    header: th("gradeLevel"),
+    accessor: "level",
+  },
+  {
+    header: th("classes"),
+    accessor: "classes",
+    className: "hidden md:table-cell",
+  },
+  {
+    header: role === "admin" ? th("actions") : "",
+    accessor: "action",
+  },
+];
+
+const renderRow = (item: GradeList, role: UserRole | null) => (
+  <tr
+    key={item.id}
+    className="hover:bg-academixPurpleLight even:bg-slate-50 border-gray-200 border-b text-sm"
+  >
+    <td className="p-4">Grade {item.level}</td>
+
+    <td className="hidden md:table-cell">
+      {item.classes.length > 0
+        ? item.classes.map((classItem) => classItem.name).join(", ")
+        : "-"}
+    </td>
+
+    <td>
+      <div className="flex items-center gap-2">
+        {role === "admin" && (
+          <FormContainer table="grade" type="delete" id={item.id} data={item} />
+        )}
+      </div>
+    </td>
+  </tr>
+);
+
+const GradeListPage = async ({
+  searchParams,
+}: {
+  searchParams: PageSearchParams;
+}) => {
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const emptyT = await getTranslations("emptyStates");
+  const { role, schoolId } = await enforceRouteAccess("/list/grades");
+
+  const resolvedSearchParams = await searchParams;
+  const p = Number(resolvedSearchParams?.page) || 1;
+  const q =
+    typeof resolvedSearchParams?.search === "string"
+      ? resolvedSearchParams.search.trim()
+      : "";
+
+  const numericSearch = Number(q);
+  const query: Prisma.GradeWhereInput = {
+    schoolId,
+    ...(q
+      ? {
+          OR: [
+            ...(Number.isNaN(numericSearch) ? [] : [{ level: numericSearch }]),
+            {
+              classes: {
+                some: {
+                  name: {
+                    contains: q,
+                    mode: "insensitive",
+                  },
+                },
+              },
+            },
+          ],
+        }
+      : {}),
+  };
+
+  const [data, count] = await prisma.$transaction([
+    prisma.grade.findMany({
+      where: query,
+      include: {
+        classes: {
+          select: { id: true, name: true },
+          orderBy: { name: "asc" },
+        },
+      },
+      orderBy: { level: "asc" },
+      take: ITEM_PER_PAGE,
+      skip: (p - 1) * ITEM_PER_PAGE,
+    }),
+    prisma.grade.count({ where: query }),
+  ]);
+
+  return (
+    <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allGrades")}</h1>
+
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
+          <TableSearch />
+
+          <div className="flex items-center self-end gap-2">
+            {role === "admin" && <FormContainer table="grade" type="create" />}
+          </div>
+        </div>
+      </div>
+
+      <Table
+        columns={getColumns(role, th)}
+        renderRow={(item) => renderRow(item, role)}
+        data={data}
+        emptyTitle={emptyT("grades")}
+        emptyDescription={emptyT("searchDescription")}
+      />
+
+      <Pagination page={p} count={count} />
+    </div>
+  );
+};
+
+export default GradeListPage;
diff --git a/src/app/(dashboard)/list/layout.tsx b/src/app/(dashboard)/list/layout.tsx
index fb2fe73..a35b763 100644
--- a/src/app/(dashboard)/list/layout.tsx
+++ b/src/app/(dashboard)/list/layout.tsx
@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation";
-import { getAuthUser } from "@/lib/auth";
+import { enforceAdminSchoolAccess, getAuthUser } from "@/lib/auth";
 
 export default async function ListLayout({
   children,
@@ -12,5 +12,7 @@ export default async function ListLayout({
     redirect("/sign-in");
   }
 
-  return <>{children}</>;
+  await enforceAdminSchoolAccess(user);
+
+  return <div className="h-full overflow-auto">{children}</div>;
 }
diff --git a/src/app/(dashboard)/list/lessons/loading.tsx b/src/app/(dashboard)/list/lessons/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/lessons/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/lessons/page.tsx b/src/app/(dashboard)/list/lessons/page.tsx
index 4360356..ca981ca 100644
--- a/src/app/(dashboard)/list/lessons/page.tsx
+++ b/src/app/(dashboard)/list/lessons/page.tsx
@@ -1,10 +1,13 @@
 import BigCalendarContainer from "@/components/BigCalendarContainer";
+import EmptyState from "@/components/states/EmptyState";
+import ExportButton from "@/components/ExportButton";
 import FormContainer from "@/components/FormContainer";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
 import { computeClassSelection } from "@/lib/lessons/classSelection";
 import { getAccessibleClasses } from "@/lib/lessons/getClasses";
 import { parseLessonParams } from "@/lib/lessons/lessonParams";
 import { type PageSearchParams } from "@/lib/pageParams";
+import { getTranslations } from "next-intl/server";
 import Link from "next/link";
 
 const LessonListPage = async ({
@@ -13,6 +16,8 @@ const LessonListPage = async ({
   searchParams: PageSearchParams;
 }) => {
   const user = await enforceRouteAccess("/list/lessons");
+  const t = await getTranslations("lessonsPage");
+  const filtersT = await getTranslations("filters");
   const resolvedSearchParams = await searchParams;
 
   const role = user.role;
@@ -33,7 +38,6 @@ const LessonListPage = async ({
       selectedGrade: grade,
     });
 
-  //  preserve params
   const baseParams: Record<string, string> = {};
 
   for (const [key, value] of Object.entries(resolvedSearchParams)) {
@@ -58,31 +62,44 @@ const LessonListPage = async ({
     params.set("classId", classId.toString());
     return `/list/lessons?${params.toString()}`;
   };
+
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
-      <div className="flex md:flex-row flex-col justify-between md:items-center gap-4">
-        <h1 className="font-semibold text-xl">Lessons Calendar</h1>
-        {role === "admin" && selectedClass && (
-          <div className="self-end md:self-auto">
-            <FormContainer
-              table="lesson"
-              type="update"
-              data={{ classId: selectedClass.id }}
+      <div className="flex justify-between md:items-center gap-4">
+        <h1 className="font-semibold text-xl">{t("title")}</h1>
+
+        <div className="flex items-center gap-2">
+          {role === "admin" && selectedClass && (
+            <ExportButton
+              href={`/api/admin/lessons/export?classId=${selectedClass.id}`}
             />
-          </div>
-        )}
+          )}
+
+          {role === "admin" && selectedClass && (
+            <div className="self-end md:self-auto">
+              <FormContainer
+                table="lesson"
+                type="update"
+                data={{ classId: selectedClass.id }}
+              />
+            </div>
+          )}
+        </div>
       </div>
 
       {classes.length === 0 ? (
-        <div className="mt-6 text-gray-500 text-sm">
-          No classes with lessons are available for this view.
-        </div>
+        <EmptyState
+          title={t("empty.noClassesTitle")}
+          description={t("empty.noClassesDescription")}
+          className="mt-6"
+        />
       ) : (
         <>
           <div className="flex flex-wrap items-center gap-2 mt-6">
-            <span className="mr-1 font-medium text-gray-600 text-xs">
-              Grade:
+            <span className="me-1 font-medium text-gray-600 text-xs">
+              {t("grade")}
             </span>
+
             {availableGrades.map((gradeLevel) => (
               <Link
                 key={gradeLevel}
@@ -93,17 +110,19 @@ const LessonListPage = async ({
                     : "bg-white text-gray-700 border-gray-300 hover:bg-gray-50"
                 }`}
               >
-                {`Grade ${gradeLevel}`}
+                {filtersT("gradeLevel", { level: gradeLevel })}
               </Link>
             ))}
           </div>
 
           <div className="flex flex-wrap items-center gap-2 mt-6">
-            <span className="mr-1 font-medium text-gray-600 text-xs">
-              Classes:
+            <span className="me-1 font-medium text-gray-600 text-xs">
+              {t("classes")}
             </span>
+
             {filteredClasses.map((item) => {
               const isActive = selectedClass?.id === item.id;
+
               return (
                 <Link
                   key={item.id}
@@ -122,15 +141,23 @@ const LessonListPage = async ({
 
           {selectedClass ? (
             <div className="mt-4">
-              <h2 className="mb-3 font-medium text-gray-700 text-sm">
-                {`Schedule for Grade ${selectedClass.grade.level} - ${selectedClass.name}`}
-              </h2>
+              <div className="flex justify-between items-center mb-3">
+                <h2 className="font-medium text-gray-700 text-sm">
+                  {t("scheduleFor", {
+                    grade: selectedClass.grade.level,
+                    className: selectedClass.name,
+                  })}
+                </h2>
+              </div>
+
               <BigCalendarContainer type="classId" id={selectedClass.id} />
             </div>
           ) : (
-            <div className="mt-4 text-gray-500 text-sm">
-              No classes found for the selected grade.
-            </div>
+            <EmptyState
+              title={t("empty.noClassesTitle")}
+              description={t("empty.noClassesForGrade")}
+              className="mt-4"
+            />
           )}
         </>
       )}
diff --git a/src/app/(dashboard)/list/messages/loading.tsx b/src/app/(dashboard)/list/messages/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/messages/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/messages/page.tsx b/src/app/(dashboard)/list/messages/page.tsx
index 497ab80..edbfdf7 100644
--- a/src/app/(dashboard)/list/messages/page.tsx
+++ b/src/app/(dashboard)/list/messages/page.tsx
@@ -17,31 +17,32 @@ import {
   MessageList,
 } from "@/lib/message";
 import { UserRole } from "@/lib/utils";
+import { getTranslations } from "next-intl/server";
 
 const isLimitedMessageRole = (role: UserRole | null) =>
   role === "student" || role === "parent" || role === "teacher";
 
-const getColumns = (role: UserRole | null) => {
+const getColumns = (role: UserRole | null, th: (key: string) => string) => {
   if (isLimitedMessageRole(role)) {
     return [
       {
-        header: "Title",
+        header: th("title"),
         accessor: "title",
       },
       {
-        header: "Content",
+        header: th("content"),
         accessor: "description",
       },
       {
-        header: "Date",
+        header: th("date"),
         accessor: "date",
       },
       {
-        header: "Time",
+        header: th("time"),
         accessor: "time",
       },
       {
-        header: "Actions",
+        header: th("actions"),
         accessor: "action",
       },
     ];
@@ -49,33 +50,33 @@ const getColumns = (role: UserRole | null) => {
 
   return [
     {
-      header: "Title",
+      header: th("title"),
       accessor: "title",
     },
     {
-      header: "Content",
+      header: th("content"),
       accessor: "description",
     },
     {
-      header: "Sent To",
+      header: th("sentTo"),
       accessor: "recipients",
     },
     {
-      header: "Class",
+      header: th("class"),
       accessor: "class",
     },
     {
-      header: "Date",
+      header: th("date"),
       accessor: "date",
       className: "hidden md:table-cell",
     },
     {
-      header: "Time",
+      header: th("time"),
       accessor: "time",
       className: "hidden md:table-cell",
     },
     {
-      header: role === "admin" ? "Actions" : "",
+      header: role === "admin" ? th("actions") : "",
       accessor: "action",
     },
   ];
@@ -85,6 +86,7 @@ const renderRow = (
   item: MessageList,
   role: UserRole | null,
   totalClassesCount: number,
+  allClassesLabel: string,
 ) => {
   if (isLimitedMessageRole(role)) {
     return (
@@ -121,7 +123,7 @@ const renderRow = (
       <td>{getRecipientsPreview(item)}</td>
       <td>
         {item.classes.length === totalClassesCount && totalClassesCount > 0
-          ? "All Classes"
+          ? allClassesLabel
           : item.classes.map((cls) => cls.name).join(", ") || "-"}
       </td>
       <td className="hidden md:table-cell">
@@ -154,6 +156,10 @@ const MessageListPage = async ({
 }: {
   searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const filtersT = await getTranslations("filters");
+  const emptyT = await getTranslations("emptyStates");
   const { role, userId, schoolId } = await enforceRouteAccess("/list/messages");
   const resolvedSearchParams = await searchParams;
   const { page, ...queryParams } = resolvedSearchParams;
@@ -238,6 +244,9 @@ const MessageListPage = async ({
   }
 
   const where = query;
+  const sortParam = getQueryParam(queryParams.sort);
+  const orderBy: Prisma.MessageOrderByWithRelationInput =
+    sortParam === "asc" ? { date: "asc" } : { date: "desc" };
 
   const [data, count, totalClassesCount] = await prisma.$transaction([
     prisma.message.findMany({
@@ -248,7 +257,7 @@ const MessageListPage = async ({
         parents: { select: { id: true, name: true } },
         teachers: { select: { id: true, name: true } },
       },
-      orderBy: { date: "desc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
@@ -259,12 +268,12 @@ const MessageListPage = async ({
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
       {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">All Messages</h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allMessages")}</h1>
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
           <TableSearch />
-          <div className="flex items-center self-end gap-4">
-            <FilterSortActions />
+          <div className="flex items-center self-end gap-2">
+            <FilterSortActions sortKey="sort" />
             {role === "admin" && (
               <FormContainer table="message" type="create" />
             )}
@@ -273,9 +282,13 @@ const MessageListPage = async ({
       </div>
       {/* LIST */}
       <Table
-        columns={getColumns(role)}
-        renderRow={(item) => renderRow(item, role, totalClassesCount)}
+        columns={getColumns(role, th)}
+        renderRow={(item) =>
+          renderRow(item, role, totalClassesCount, filtersT("allClasses"))
+        }
         data={data}
+        emptyTitle={emptyT("messages")}
+        emptyDescription={emptyT("filterDescription")}
       />
       {/* PAGINATION */}
       <Pagination page={p} count={count} />
diff --git a/src/app/(dashboard)/list/notifications/NotificationsClient.tsx b/src/app/(dashboard)/list/notifications/NotificationsClient.tsx
new file mode 100644
index 0000000..aaa7c50
--- /dev/null
+++ b/src/app/(dashboard)/list/notifications/NotificationsClient.tsx
@@ -0,0 +1,321 @@
+"use client";
+
+import { useState, useTransition } from "react";
+import { useRouter, usePathname, useSearchParams } from "next/navigation";
+import {
+  Bell, ClipboardList, MessageSquare, Megaphone,
+  BookOpen, Mail, CheckCheck, Search, Filter,
+  Clock, CheckCircle, ArrowUpDown, Trash2,
+  BarChart3, Calendar, Users,
+} from "lucide-react";
+import Pagination from "@/components/Pagination";
+import { useTranslations } from "next-intl";
+
+type NotificationType =
+  | "NEW_ASSIGNMENT"
+  | "ASSIGNMENT_UPDATED"
+  | "ASSIGNMENT_SUBMITTED"
+  | "ASSIGNMENT_FEEDBACK"
+  | "NEW_EXAM"
+  | "GRADE_POSTED"
+  | "GRADE_UPDATED"
+  | "NEW_ANNOUNCEMENT"
+  | "NEW_EVENT"
+  | "SCHEDULE_UPDATED"
+  | "ATTENDANCE_SAVED"
+  | "SUPERVISOR_ASSIGNED"
+  | "NEW_MESSAGE";
+
+type Notification = {
+  id: number;
+  type: NotificationType;
+  title: string;
+  body: string;
+  link: string | null;
+  isRead: boolean;
+  createdAt: string;
+};
+
+type TypeOption = { value: string; labelKey: string };
+
+type Props = {
+  notifications: Notification[];
+  count: number;
+  page: number;
+  unreadCount: number;
+  typeOptions: TypeOption[];
+  currentSearch: string;
+  currentType: string;
+  currentSort: string;
+};
+
+const TYPE_ICON: Record<NotificationType, { icon: React.ElementType; color: string; bg: string }> = {
+  NEW_ASSIGNMENT:       { icon: ClipboardList, color: "text-orange-600", bg: "bg-orange-100" },
+  ASSIGNMENT_UPDATED:   { icon: ClipboardList, color: "text-amber-600",  bg: "bg-amber-100"  },
+  ASSIGNMENT_SUBMITTED: { icon: ClipboardList, color: "text-green-600",  bg: "bg-green-100"  },
+  ASSIGNMENT_FEEDBACK:  { icon: MessageSquare, color: "text-indigo-600", bg: "bg-indigo-100" },
+  NEW_EXAM:             { icon: BookOpen,      color: "text-red-600",    bg: "bg-red-100"    },
+  GRADE_POSTED:         { icon: BarChart3,     color: "text-green-600",  bg: "bg-green-100"  },
+  GRADE_UPDATED:        { icon: BarChart3,     color: "text-amber-600",  bg: "bg-amber-100"  },
+  NEW_ANNOUNCEMENT:     { icon: Megaphone,     color: "text-purple-600", bg: "bg-purple-100" },
+  NEW_EVENT:            { icon: Calendar,      color: "text-blue-600",   bg: "bg-blue-100"   },
+  SCHEDULE_UPDATED:     { icon: Calendar,      color: "text-teal-600",   bg: "bg-teal-100"   },
+  ATTENDANCE_SAVED:     { icon: CheckCheck,    color: "text-gray-600",   bg: "bg-gray-100"   },
+  SUPERVISOR_ASSIGNED:  { icon: Users,         color: "text-violet-600", bg: "bg-violet-100" },
+  NEW_MESSAGE:          { icon: Mail,          color: "text-blue-600",   bg: "bg-blue-100"   },
+};
+
+function timeAgo(dateStr: string): string {
+  const diff = Date.now() - new Date(dateStr).getTime();
+  const mins  = Math.floor(diff / 60000);
+  const hours = Math.floor(diff / 3600000);
+  const days  = Math.floor(diff / 86400000);
+  if (days  >= 1) return `${days}d ago`;
+  if (hours >= 1) return `${hours}h ago`;
+  if (mins  >= 1) return `${mins}m ago`;
+  return "Just now";
+}
+
+export default function NotificationsClient({
+  notifications: initialNotifs,
+  count,
+  page,
+  unreadCount: initialUnread,
+  typeOptions,
+  currentSearch,
+  currentType,
+  currentSort,
+}: Props) {
+  const t = useTranslations("pages");
+  const commonT = useTranslations("common");
+  const filtersT = useTranslations("filters");
+  const actionsT = useTranslations("actions");
+  const emptyT = useTranslations("emptyStates");
+  const router       = useRouter();
+  const pathname     = usePathname();
+  const searchParams = useSearchParams();
+  const [isPending, startTransition] = useTransition();
+
+  const [notifications, setNotifs]     = useState(initialNotifs);
+  const [unreadCount,   setUnreadCount] = useState(initialUnread);
+  const [search,        setSearch]      = useState(currentSearch);
+
+  function navigate(updates: Record<string, string>) {
+    const params = new URLSearchParams(searchParams.toString());
+    Object.entries(updates).forEach(([k, v]) => {
+      if (v) params.set(k, v); else params.delete(k);
+    });
+    params.delete("page");
+    startTransition(() => router.push(`${pathname}?${params}`));
+  }
+
+  async function markRead(id: number) {
+    setNotifs((prev) => prev.map((n) => n.id === id ? { ...n, isRead: true } : n));
+    setUnreadCount((c) => Math.max(0, c - 1));
+    await fetch("/api/notifications", {
+      method: "PATCH",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ id }),
+    });
+  }
+
+  async function markAllRead() {
+    setNotifs((prev) => prev.map((n) => ({ ...n, isRead: true })));
+    setUnreadCount(0);
+    await fetch("/api/notifications", {
+      method: "PATCH",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ markAllRead: true }),
+    });
+  }
+
+  async function deleteOne(id: number) {
+    setNotifs((prev) => prev.filter((n) => n.id !== id));
+    setUnreadCount((c) => {
+      const wasUnread = notifications.find((n) => n.id === id && !n.isRead);
+      return wasUnread ? Math.max(0, c - 1) : c;
+    });
+    await fetch("/api/notifications", {
+      method: "DELETE",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ id }),
+    });
+  }
+
+  async function deleteAll() {
+    setNotifs([]);
+    setUnreadCount(0);
+    await fetch("/api/notifications", {
+      method: "DELETE",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ deleteAll: true }),
+    });
+  }
+
+  return (
+    <div className="space-y-4">
+      {/* ── Header — نفس هيكلية باقي الصفحات ── */}
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allNotifications")}</h1>
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
+          {/* Search */}
+          <div className="flex items-center gap-2 border border-gray-200 rounded-lg px-3 py-2 flex-1 md:flex-none md:min-w-[200px]">
+            <Search className="w-4 h-4 text-gray-400 flex-shrink-0" />
+            <input
+              type="text"
+              placeholder={commonT("search")}
+              value={search}
+              onChange={(e) => setSearch(e.target.value)}
+              onKeyDown={(e) => e.key === "Enter" && navigate({ search })}
+              className="text-sm outline-none w-full text-gray-700 placeholder-gray-400 bg-transparent"
+            />
+          </div>
+
+          <div className="flex items-center self-end gap-2">
+            {/* Type filter */}
+            <div className="flex items-center gap-2 border border-gray-200 rounded-lg px-3 py-2">
+              <Filter className="w-4 h-4 text-gray-400 flex-shrink-0" />
+              <select
+                value={currentType}
+                onChange={(e) => navigate({ type: e.target.value })}
+                className="text-sm outline-none text-gray-700 bg-transparent max-w-[130px]"
+              >
+                {typeOptions.map((opt) => (
+                  <option key={opt.value} value={opt.value}>
+                    {filtersT(opt.labelKey)}
+                  </option>
+                ))}
+              </select>
+            </div>
+
+            {/* Sort */}
+            <button
+              type="button"
+              onClick={() => navigate({ sort: currentSort === "desc" ? "asc" : "desc" })}
+              className="flex items-center gap-1.5 px-3 py-2 border border-gray-200 rounded-lg
+                         text-sm text-gray-600 hover:bg-gray-50 transition-colors"
+            >
+              <ArrowUpDown className="w-4 h-4 text-gray-400" />
+              <span className="hidden sm:inline">
+                {currentSort === "desc" ? filtersT("newest") : filtersT("oldest")}
+              </span>
+            </button>
+
+            {/* Mark all read */}
+            {unreadCount > 0 && (
+              <button
+                type="button"
+                onClick={markAllRead}
+                className="flex items-center gap-1.5 px-3 py-1.5 bg-purple-50 hover:bg-purple-100
+                           text-purple-700 rounded-lg text-xs font-medium transition-colors"
+              >
+                <CheckCheck className="w-3.5 h-3.5" />
+                <span className="hidden sm:inline">{actionsT("markAllRead")}</span>
+              </button>
+            )}
+
+            {/* Delete all */}
+            {notifications.length > 0 && (
+              <button
+                type="button"
+                onClick={deleteAll}
+                className="flex items-center gap-1.5 px-3 py-1.5 bg-red-50 hover:bg-red-100
+                           text-red-600 rounded-lg text-xs font-medium transition-colors"
+              >
+                <Trash2 className="w-3.5 h-3.5" />
+                <span className="hidden sm:inline">{actionsT("deleteAll")}</span>
+              </button>
+            )}
+          </div>
+        </div>
+      </div>
+
+      {/* ── List ── */}
+      {isPending ? (
+        <div className="flex items-center justify-center py-16">
+          <div className="w-6 h-6 border-2 border-purple-500 border-t-transparent rounded-full animate-spin" />
+        </div>
+      ) : notifications.length === 0 ? (
+        <div className="flex flex-col items-center justify-center py-16 text-center">
+          <Bell className="w-12 h-12 text-gray-200 mb-3" />
+          <p className="text-gray-500 font-medium text-sm">
+            {emptyT("notifications")}
+          </p>
+          <p className="text-gray-400 text-xs mt-1">
+            {emptyT("filterDescription")}
+          </p>
+        </div>
+      ) : (
+        <ul className="divide-y divide-gray-100">
+          {notifications.map((n) => {
+            const { icon: Icon, color, bg } = TYPE_ICON[n.type] ?? TYPE_ICON.NEW_MESSAGE;
+            const row = (
+              <li
+                key={n.id}
+                className={`flex items-start gap-3 py-3 transition-colors
+                            ${n.isRead ? "hover:bg-gray-50" : "bg-purple-50 hover:bg-purple-100"}`}
+              >
+                {/* Icon */}
+                <div className={`flex-shrink-0 p-2 rounded-xl ${bg} mt-0.5`}>
+                  <Icon className={`w-4 h-4 ${color}`} />
+                </div>
+
+                {/* Content */}
+                <div className="flex-1 min-w-0">
+                  <div className="flex items-start justify-between gap-2">
+                    <p className={`text-sm font-medium truncate ${n.isRead ? "text-gray-700" : "text-gray-900"}`}>
+                      {n.title}
+                    </p>
+                    <div className="flex items-center gap-1 flex-shrink-0">
+                      <span className="text-xs text-gray-400 hidden sm:flex items-center gap-1">
+                        <Clock className="w-3 h-3" />
+                        {timeAgo(n.createdAt)}
+                      </span>
+                      {!n.isRead && (
+                        <button
+                          type="button"
+                          onClick={() => markRead(n.id)}
+                          className="p-1 rounded text-gray-400 hover:text-green-600 transition-colors"
+                          title="Mark as read"
+                        >
+                          <CheckCircle className="w-3.5 h-3.5" />
+                        </button>
+                      )}
+                      <button
+                        type="button"
+                        onClick={(e) => { e.preventDefault(); deleteOne(n.id); }}
+                        className="p-1 rounded text-gray-400 hover:text-red-500 transition-colors"
+                        title="Delete"
+                      >
+                        <Trash2 className="w-3.5 h-3.5" />
+                      </button>
+                    </div>
+                  </div>
+                  <p className="text-xs text-gray-500 mt-0.5 line-clamp-2">{n.body}</p>
+                  <span className="text-xs text-gray-400 sm:hidden mt-0.5 flex items-center gap-1">
+                    <Clock className="w-3 h-3" />
+                    {timeAgo(n.createdAt)}
+                  </span>
+                </div>
+
+                {/* Unread dot */}
+                {!n.isRead && (
+                  <div className="flex-shrink-0 w-2 h-2 rounded-full bg-purple-500 mt-2" />
+                )}
+              </li>
+            );
+
+            return n.link ? (
+              <a key={n.id} href={n.link} onClick={() => markRead(n.id)} className="block">
+                {row}
+              </a>
+            ) : <div key={n.id}>{row}</div>;
+          })}
+        </ul>
+      )}
+
+      {/* Pagination */}
+      {count > 0 && <Pagination page={page} count={count} />}
+    </div>
+  );
+}
diff --git a/src/app/(dashboard)/list/notifications/page.tsx b/src/app/(dashboard)/list/notifications/page.tsx
new file mode 100644
index 0000000..16858d4
--- /dev/null
+++ b/src/app/(dashboard)/list/notifications/page.tsx
@@ -0,0 +1,75 @@
+// src/app/(dashboard)/list/notifications/page.tsx
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+import { ITEM_PER_PAGE } from "@/lib/settings";
+import { Prisma } from "@prisma/client";
+import NotificationsClient from "./NotificationsClient";
+
+const TYPE_OPTIONS = [
+  { value: "",                    labelKey: "allTypes"          },
+  { value: "NEW_ASSIGNMENT",      labelKey: "assignments"       },
+  { value: "ASSIGNMENT_UPDATED",  labelKey: "assignmentUpdates" },
+  { value: "ASSIGNMENT_FEEDBACK", labelKey: "feedback"          },
+  { value: "NEW_EXAM",            labelKey: "exams"             },
+  { value: "GRADE_POSTED",        labelKey: "grades"            },
+  { value: "GRADE_UPDATED",       labelKey: "gradeUpdates"      },
+  { value: "NEW_ANNOUNCEMENT",    labelKey: "announcements"     },
+  { value: "NEW_EVENT",           labelKey: "events"            },
+  { value: "SCHEDULE_UPDATED",    labelKey: "schedule"          },
+  { value: "ATTENDANCE_SAVED",    labelKey: "attendance"        },
+  { value: "SUPERVISOR_ASSIGNED", labelKey: "supervisor"        },
+  { value: "NEW_MESSAGE",         labelKey: "messages"          },
+];
+
+export default async function NotificationsPage({
+  searchParams,
+}: {
+  searchParams: PageSearchParams;
+}) {
+  const { userId } = await enforceRouteAccess("/list/notifications");
+  const resolved = await searchParams;
+
+  const p      = parseInt(getQueryParam(resolved.page)   ?? "1");
+  const search = getQueryParam(resolved.search) ?? "";
+  const type   = getQueryParam(resolved.type)   ?? "";
+  const sort   = getQueryParam(resolved.sort)   ?? "desc";
+
+  const where: Prisma.NotificationWhereInput = {
+    userId,
+    ...(type   ? { type: type as any } : {}),
+    ...(search ? { OR: [
+      { title: { contains: search, mode: "insensitive" } },
+      { body:  { contains: search, mode: "insensitive" } },
+    ]} : {}),
+  };
+
+  const [notifications, count, unreadCount] = await prisma.$transaction([
+    prisma.notification.findMany({
+      where,
+      orderBy: { createdAt: sort === "asc" ? "asc" : "desc" },
+      take: ITEM_PER_PAGE,
+      skip: (p - 1) * ITEM_PER_PAGE,
+    }),
+    prisma.notification.count({ where }),
+    prisma.notification.count({ where: { userId, isRead: false } }),
+  ]);
+
+  return (
+    <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
+      <NotificationsClient
+        notifications={notifications.map(n => ({
+          ...n,
+          createdAt: n.createdAt.toISOString(),
+        }))}
+        count={count}
+        page={p}
+        unreadCount={unreadCount}
+        typeOptions={TYPE_OPTIONS}
+        currentSearch={search}
+        currentType={type}
+        currentSort={sort}
+      />
+    </div>
+  );
+}
diff --git a/src/app/(dashboard)/list/parents/loading.tsx b/src/app/(dashboard)/list/parents/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/parents/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/parents/page.tsx b/src/app/(dashboard)/list/parents/page.tsx
index 6c4131d..4b3aaf6 100644
--- a/src/app/(dashboard)/list/parents/page.tsx
+++ b/src/app/(dashboard)/list/parents/page.tsx
@@ -1,39 +1,41 @@
+import ExportButton from "@/components/ExportButton";
 import FilterSortActions from "@/components/FilterSortActions";
 import FormContainer from "@/components/FormContainer";
+import ClassFilter from "@/components/ClassFilter";
+import GradeFilter from "@/components/GradeFilter";
 import Pagination from "@/components/Pagination";
 import Table from "@/components/Table";
 import TableSearch from "@/components/TableSearch";
+import { getTranslations } from "next-intl/server";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
-import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import { buildParentQuery } from "@/lib/query-builders/parent-query";
 import prisma from "@/lib/prisma";
 import { ITEM_PER_PAGE } from "@/lib/settings";
 import { UserRole } from "@/lib/utils";
-import { Parent, Prisma, Student } from "@prisma/client";
+import { Parent, Student } from "@prisma/client";
+import type { PageSearchParams } from "@/lib/pageParams";
 
 type ParentList = Parent & { students: Student[] };
 
-const getColumns = (role: UserRole | null) => [
+const getColumns = (role: UserRole | null, th: (key: string) => string) => [
+  { header: th("info"), accessor: "info" },
   {
-    header: "Info",
-    accessor: "info",
-  },
-  {
-    header: "Student Names",
+    header: th("studentNames"),
     accessor: "students",
     className: "hidden md:table-cell",
   },
   {
-    header: "Phone",
+    header: th("phone"),
     accessor: "phone",
     className: "hidden lg:table-cell",
   },
   {
-    header: "Address",
+    header: th("address"),
     accessor: "address",
     className: "hidden lg:table-cell",
   },
   {
-    header: role === "admin" ? "Actions" : "",
+    header: role === "admin" ? th("actions") : "",
     accessor: "action",
   },
 ];
@@ -46,14 +48,17 @@ const renderRow = (item: ParentList, role: UserRole | null) => (
     <td className="flex items-center gap-4 p-4">
       <div className="flex flex-col">
         <h3 className="font-semibold">{item.name}</h3>
-        <p className="text-gray-500 text-xs">{item?.email}</p>
+        <p className="text-gray-500 text-xs">{item.email}</p>
       </div>
     </td>
+
     <td className="hidden md:table-cell">
-      {item.students.map((s) => s.name).join(",")}
+      {item.students.map((s) => s.name).join(", ")}
     </td>
+
     <td className="hidden md:table-cell">{item.phone}</td>
     <td className="hidden md:table-cell">{item.address}</td>
+
     <td>
       <div className="flex items-center gap-2">
         {role === "admin" && (
@@ -66,55 +71,39 @@ const renderRow = (item: ParentList, role: UserRole | null) => (
     </td>
   </tr>
 );
+
 const ParentListPage = async ({
   searchParams,
 }: {
   searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const emptyT = await getTranslations("emptyStates");
   const { role, userId, schoolId } = await enforceRouteAccess("/list/parents");
+
+  const {
+    query,
+    orderBy,
+    page: p,
+  } = await buildParentQuery({
+    searchParams,
+    schoolId,
+    role,
+    userId,
+  });
+
   const resolvedSearchParams = await searchParams;
-  const { page, ...queryParams } = resolvedSearchParams;
-  const currentPage = getQueryParam(page);
-  const p = currentPage ? parseInt(currentPage) : 1;
-
-  const query: Prisma.ParentWhereInput = { schoolId };
-  const conditions: Prisma.ParentWhereInput[] = [];
-
-  if (queryParams) {
-    for (const [key, rawValue] of Object.entries(queryParams)) {
-      const value = getQueryParam(rawValue);
-
-      if (value !== undefined) {
-        switch (key) {
-          case "search":
-            conditions.push({
-              name: { contains: value, mode: "insensitive" },
-            });
-            break;
-        }
+
+  const exportQuery = new URLSearchParams(
+    Object.entries(resolvedSearchParams).flatMap(([key, value]) => {
+      if (Array.isArray(value)) {
+        return value.map((item) => [key, item]);
       }
-    }
-  }
-
-  if (role === "teacher") {
-    conditions.push({
-      students: {
-        some: {
-          class: {
-            lessons: {
-              some: {
-                teacherId: userId,
-              },
-            },
-          },
-        },
-      },
-    });
-  }
 
-  if (conditions.length > 0) {
-    query.AND = conditions;
-  }
+      return value ? [[key, value]] : [];
+    }),
+  );
 
   const [data, count] = await prisma.$transaction([
     prisma.parent.findMany({
@@ -122,7 +111,7 @@ const ParentListPage = async ({
       include: {
         students: true,
       },
-      orderBy: { name: "asc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
@@ -130,26 +119,60 @@ const ParentListPage = async ({
       where: query,
     }),
   ]);
+  const [classes, grades] =
+    role === "admin"
+      ? await prisma.$transaction([
+          prisma.class.findMany({
+            where: { schoolId },
+            select: { id: true, name: true, gradeId: true },
+            orderBy: { name: "asc" },
+          }),
+          prisma.grade.findMany({
+            where: { schoolId },
+            select: { id: true, level: true },
+            orderBy: { level: "asc" },
+          }),
+        ])
+      : [[], []];
+
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
-      {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">All Parents</h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allParents")}</h1>
+
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
           <TableSearch />
-          <div className="flex items-center self-end gap-4">
-            <FilterSortActions />
-            {role === "admin" && <FormContainer table="parent" type="create" />}
+          {role === "admin" && (
+            <>
+              <GradeFilter grades={grades} />
+              <ClassFilter classes={classes} />
+            </>
+          )}
+
+          <div className="flex items-center self-end gap-2">
+            <FilterSortActions sortKey="sort" />
+
+            {role === "admin" && (
+              <>
+                <ExportButton
+                  href={`/api/admin/parents/export?${exportQuery.toString()}`}
+                />
+
+                <FormContainer table="parent" type="create" />
+              </>
+            )}
           </div>
         </div>
       </div>
-      {/* LIST */}
+
       <Table
-        columns={getColumns(role)}
+        columns={getColumns(role, th)}
         renderRow={(item) => renderRow(item, role)}
         data={data}
+        emptyTitle={emptyT("parents")}
+        emptyDescription={emptyT("filterDescription")}
       />
-      {/* PAGINATION */}
+
       <Pagination page={p} count={count} />
     </div>
   );
diff --git a/src/app/(dashboard)/list/results/loading.tsx b/src/app/(dashboard)/list/results/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/results/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/results/page.tsx b/src/app/(dashboard)/list/results/page.tsx
index e50f307..b175b37 100644
--- a/src/app/(dashboard)/list/results/page.tsx
+++ b/src/app/(dashboard)/list/results/page.tsx
@@ -1,80 +1,55 @@
+import ExportButton from "@/components/ExportButton";
 import FilterSortActions from "@/components/FilterSortActions";
 import FormContainer from "@/components/FormContainer";
+import ClassFilter from "@/components/ClassFilter";
+import GradeFilter from "@/components/GradeFilter";
 import NoCurrentAcademicYearMessage from "@/components/NoCurrentAcademicYearMessage";
 import Pagination from "@/components/Pagination";
 import Table from "@/components/Table";
 import TableSearch from "@/components/TableSearch";
+import { getTranslations } from "next-intl/server";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
-import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import { buildResultQuery } from "@/lib/query-builders/result-query";
 import prisma from "@/lib/prisma";
 import { ITEM_PER_PAGE } from "@/lib/settings";
-import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
-import { Prisma } from "@prisma/client";
 import { UserRole } from "@/lib/utils";
-
-type ResultList = {
-  id: number;
-  title: string;
-  subjectName: string;
-  studentId: string;
-  studentName: string;
-  teacherName: string;
-  score: number;
-  className: string;
-  startTime: Date;
-  examId: number | null;
-  assignmentId: number | null;
+import { Assignment, Exam, Result, Student } from "@prisma/client";
+import Image from "next/image";
+import type { PageSearchParams } from "@/lib/pageParams";
+
+type ResultList = Result & {
+  student: Pick<Student, "name">;
+  exam: Pick<Exam, "title"> | null;
+  assignment: Pick<Assignment, "title"> | null;
 };
 
-const getColumns = (role: UserRole | null) => {
+const getColumns = (role: UserRole | null, th: (key: string) => string) => {
   const columns = [
     {
-      header: "Title",
-      accessor: "name",
-    },
-    ...(role !== "student"
-      ? [
-          {
-            header: "Student",
-            accessor: "student",
-          },
-        ]
-      : []),
-    {
-      header: "Subject",
-      accessor: "subject",
-      className: "hidden md:table-cell",
+      header: th("assessment"),
+      accessor: "assessment",
     },
     {
-      header: "Score",
+      header: th("score"),
       accessor: "score",
       className: "hidden md:table-cell",
     },
-    ...(role !== "teacher"
-      ? [
-          {
-            header: "Teacher",
-            accessor: "teacher",
-            className: "hidden md:table-cell",
-          },
-        ]
-      : []),
-    {
-      header: "Class",
-      accessor: "class",
-      className: "hidden md:table-cell",
-    },
-    {
-      header: "Date",
-      accessor: "date",
-      className: "hidden md:table-cell",
-    },
-    {
-      header: role === "admin" || role === "teacher" ? "Actions" : "",
-      accessor: "action",
-    },
   ];
 
+  if (role !== "student") {
+    columns.unshift({
+      header: th("student"),
+      accessor: "student",
+    });
+  }
+
+  if (role === "admin" || role === "teacher") {
+      columns.push({
+      header: th("actions"),
+      accessor: "action",
+    });
+  }
+
   return columns;
 };
 
@@ -83,140 +58,95 @@ const renderRow = (item: ResultList, role: UserRole | null) => (
     key={item.id}
     className="hover:bg-academixPurpleLight even:bg-slate-50 border-gray-200 border-b text-sm"
   >
-    <td className="flex items-center gap-4 p-4">{item.title}</td>
-    {role !== "student" && <td>{item.studentName}</td>}
-    <td className="hidden md:table-cell">{item.subjectName}</td>
-    <td className="hidden md:table-cell">{item.score}</td>
-    {role !== "teacher" && (
-      <td className="hidden md:table-cell">{item.teacherName}</td>
+    {role !== "student" && (
+      <td className="flex items-center gap-4 p-4">
+        <Image
+          src="/avatar.png"
+          alt=""
+          width={40}
+          height={40}
+          className="hidden md:block rounded-full w-10 h-10 object-cover"
+        />
+        {item.student.name}
+      </td>
     )}
-    <td className="hidden md:table-cell">{item.className}</td>
-    <td className="hidden md:table-cell">
-      {new Intl.DateTimeFormat("en-US").format(item.startTime)}
-    </td>
-    <td>
-      <div className="flex items-center gap-2">
-        {(role === "admin" || role === "teacher") && (
-          <>
-            <FormContainer table="result" type="update" data={item} />
-            <FormContainer table="result" type="delete" id={item.id} />
-          </>
-        )}
-      </div>
+
+    <td className={role === "student" ? "p-4" : ""}>
+      {item.exam?.title || item.assignment?.title || "-"}
     </td>
+
+    <td className="hidden md:table-cell">{item.score}</td>
+
+    {(role === "admin" || role === "teacher") && (
+      <td>
+        <div className="flex items-center gap-2">
+          <FormContainer table="result" type="update" data={item} />
+          <FormContainer table="result" type="delete" id={item.id} />
+        </div>
+      </td>
+    )}
   </tr>
 );
+
 const ResultListPage = async ({
   searchParams,
 }: {
   searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const emptyT = await getTranslations("emptyStates");
   const { role, userId, schoolId } = await enforceRouteAccess("/list/results");
+
   const resolvedSearchParams = await searchParams;
-  const { page, ...queryParams } = resolvedSearchParams;
-  const currentPage = getQueryParam(page);
-  const p = currentPage ? parseInt(currentPage) : 1;
-  const academicYearId = await getCurrentAcademicYearIdOrNull(schoolId);
 
-  if (!academicYearId) {
+  const {
+    academicYearId,
+    query,
+    orderBy,
+    page: p,
+  } = await buildResultQuery({
+    searchParams,
+    schoolId,
+    role,
+    userId,
+  });
+
+  if (!academicYearId || !query) {
     return <NoCurrentAcademicYearMessage />;
   }
 
-  const query: Prisma.ResultWhereInput = { schoolId, academicYearId };
-  const conditions: Prisma.ResultWhereInput[] = [];
-  if (queryParams) {
-    for (const [key, rawValue] of Object.entries(queryParams)) {
-      const value = getQueryParam(rawValue);
-
-      if (value !== undefined) {
-        switch (key) {
-          case "studentId":
-            conditions.push({
-              studentId: value,
-            });
-            break;
-
-          case "search":
-            conditions.push({
-              OR: [
-                {
-                  student: {
-                    name: { contains: value, mode: "insensitive" },
-                  },
-                },
-                {
-                  exam: {
-                    title: { contains: value, mode: "insensitive" },
-                  },
-                },
-              ],
-            });
-            break;
-        }
+  const exportQuery = new URLSearchParams(
+    Object.entries(resolvedSearchParams).flatMap(([key, value]) => {
+      if (Array.isArray(value)) {
+        return value.map((item) => [key, item]);
       }
-    }
-  }
-
-  switch (role) {
-    case "admin":
-      break;
 
-    case "teacher":
-      conditions.push({
-        OR: [
-          { exam: { lesson: { teacherId: userId } } },
-          { assignment: { lesson: { teacherId: userId } } },
-        ],
-      });
-      break;
-
-    case "student":
-      conditions.push({
-        studentId: userId,
-      });
-      break;
-
-    case "parent":
-      conditions.push({
-        student: {
-          parentId: userId,
-        },
-      });
-      break;
-  }
+      return value ? [[key, value]] : [];
+    }),
+  );
 
-  if (conditions.length > 0) {
-    query.AND = conditions;
-  }
-  const [dataRes, count] = await prisma.$transaction([
+  const [data, count] = await prisma.$transaction([
     prisma.result.findMany({
       where: query,
       include: {
-        student: { select: { name: true } },
+        student: {
+          select: {
+            name: true,
+          },
+        },
         exam: {
-          include: {
-            lesson: {
-              select: {
-                subject: { select: { name: true } },
-                teacher: { select: { name: true } },
-                class: { select: { name: true } },
-              },
-            },
+          select: {
+            title: true,
           },
         },
         assignment: {
-          include: {
-            lesson: {
-              select: {
-                subject: { select: { name: true } },
-                teacher: { select: { name: true } },
-                class: { select: { name: true } },
-              },
-            },
+          select: {
+            title: true,
           },
         },
       },
-      orderBy: { id: "desc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
@@ -224,52 +154,62 @@ const ResultListPage = async ({
       where: query,
     }),
   ]);
-
-  const data = dataRes.flatMap((item) => {
-    const assesment = item.exam || item.assignment;
-
-    if (!assesment) return [];
-
-    const isExam = "startTime" in assesment;
-    return [
-      {
-        id: item.id,
-        title: assesment.title,
-        subjectName: assesment.lesson.subject.name,
-        studentId: item.studentId,
-        studentName: item.student.name,
-        teacherName: assesment.lesson.teacher.name,
-        score: item.score,
-        className: assesment.lesson.class.name,
-        startTime: isExam ? assesment.startTime : assesment.startDate,
-        examId: item.examId,
-        assignmentId: item.assignmentId,
-      },
-    ];
-  });
+  const [classes, grades] =
+    role === "admin"
+      ? await prisma.$transaction([
+          prisma.class.findMany({
+            where: { schoolId },
+            select: { id: true, name: true, gradeId: true },
+            orderBy: { name: "asc" },
+          }),
+          prisma.grade.findMany({
+            where: { schoolId },
+            select: { id: true, level: true },
+            orderBy: { level: "asc" },
+          }),
+        ])
+      : [[], []];
 
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
-      {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">All Results</h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allResults")}</h1>
+
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
           <TableSearch />
-          <div className="flex items-center self-end gap-4">
-            <FilterSortActions />
+          {role === "admin" && (
+            <>
+              <GradeFilter grades={grades} />
+              <ClassFilter classes={classes} />
+            </>
+          )}
+
+          <div className="flex items-center self-end gap-2">
+            <FilterSortActions sortKey="sort" />
+
             {(role === "admin" || role === "teacher") && (
-              <FormContainer table="result" type="create" />
+              <>
+                {role === "admin" && (
+                  <ExportButton
+                    href={`/api/admin/results/export?${exportQuery.toString()}`}
+                  />
+                )}
+
+                <FormContainer table="result" type="create" />
+              </>
             )}
           </div>
         </div>
       </div>
-      {/* LIST */}
+
       <Table
-        columns={getColumns(role)}
+        columns={getColumns(role, th)}
         renderRow={(item) => renderRow(item, role)}
         data={data}
+        emptyTitle={emptyT("results")}
+        emptyDescription={emptyT("filterDescription")}
       />
-      {/* PAGINATION */}
+
       <Pagination page={p} count={count} />
     </div>
   );
diff --git a/src/app/(dashboard)/list/students/[id]/page.tsx b/src/app/(dashboard)/list/students/[id]/page.tsx
index 6eddc9a..3c6bb94 100644
--- a/src/app/(dashboard)/list/students/[id]/page.tsx
+++ b/src/app/(dashboard)/list/students/[id]/page.tsx
@@ -1,15 +1,25 @@
-import Announcements from "@/components/Announcements";
+import Announcements from "@/components/Announcements";
 import BigCalendarContainer from "@/components/BigCalendarContainer";
 import FormContainer from "@/components/FormContainer";
 import UserActionButtons from "@/components/UserActionButtons";
-import Performance from "@/components/Performance";
-import StudentAttendanceCard from "@/components/StudentAttendanceCard";
+import AttendanceCard from "@/components/AttendanceCard";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
 import prisma from "@/lib/prisma";
 import { Prisma } from "@prisma/client";
+import {
+  BookOpen,
+  Calendar,
+  CalendarCheck2,
+  Droplet,
+  GraduationCap,
+  Mail,
+  Phone,
+  School,
+} from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
 import { notFound } from "next/navigation";
+import { getTranslations } from "next-intl/server";
 import { Suspense } from "react";
 
 const SingleStudentPage = async ({
@@ -17,6 +27,8 @@ const SingleStudentPage = async ({
 }: {
   params: Promise<{ id: string }>;
 }) => {
+  const t = await getTranslations("profilePages");
+  const statesT = await getTranslations("states");
   const { id } = await params;
 
   const { role, userId, schoolId } = await enforceRouteAccess(`/list/students`);
@@ -78,7 +90,7 @@ const SingleStudentPage = async ({
         <div className="flex flex-wrap md:flex-nowrap gap-4">
           {/* USER INFO CARD */}
           <div className="relative flex sm:flex-row flex-col md:justify-between gap-4 bg-academixSky px-4 py-6 rounded-md w-full md:w-2/3">
-            <div className="top-5 right-5 absolute flex items-center gap-2">
+            <div className="top-5 absolute flex items-center gap-2 end-5">
               {role === "admin" && (
                 <FormContainer table="student" type="update" data={student} />
               )}
@@ -101,28 +113,25 @@ const SingleStudentPage = async ({
             <div className="flex flex-col gap-8">
               <div>
                 <h1 className="font-semibold text-xl">{student.name}</h1>
-                <p className="text-gray-500 text-sm">
-                  Lorem ipsum, dolor sit amet consectetur adipisicing elit.
-                </p>
               </div>
 
               <div className="flex flex-wrap justify-between items-center gap-2 font-medium text-xs">
                 <div className="flex items-center gap-2 w-full md:w-1/3 lg:w-full 2xl:w-1/3">
-                  <Image src="/blood.png" alt="" width={14} height={14} />
+                  <Droplet className="w-4 h-4 text-gray-600" />
                   <span>{student.bloodType}</span>
                 </div>
                 <div className="flex items-center gap-2 w-full md:w-1/3 lg:w-full 2xl:w-1/3">
-                  <Image src="/date.png" alt="" width={14} height={14} />
+                  <Calendar className="w-4 h-4 text-gray-600" />
                   <span>
                     {new Intl.DateTimeFormat("en-US").format(student.birthday)}
                   </span>
                 </div>
                 <div className="flex items-center gap-2 w-full md:w-1/3 lg:w-full 2xl:w-1/3">
-                  <Image src="/mail.png" alt="" width={14} height={14} />
+                  <Mail className="w-4 h-4 text-gray-600" />
                   <span>{student.email || "-"}</span>
                 </div>
                 <div className="flex items-center gap-2 w-full md:w-1/3 lg:w-full 2xl:w-1/3">
-                  <Image src="/phone.png" alt="" width={14} height={14} />
+                  <Phone className="w-4 h-4 text-gray-600" />
                   <span>{student.phone || "-"}</span>
                 </div>
               </div>
@@ -134,112 +143,90 @@ const SingleStudentPage = async ({
 
             <div className="flex flex-col gap-4 bg-white p-4 rounded-md w-full">
               <div className="flex items-center gap-4">
-                <Image
-                  src="/singleAttendance.png"
-                  alt=""
-                  width={24}
-                  height={24}
-                  className="w-6 h-6"
-                />
-                <Suspense fallback="Loading...">
-                  <StudentAttendanceCard id={id} />
+                <CalendarCheck2 className="w-6 h-6 text-academixPurpleDark" />
+                <Suspense fallback={statesT("loading")}>
+                  <AttendanceCard id={id} scope="student" />
                 </Suspense>
               </div>
-              <span className="text-gray-400 text-sm">Attendance</span>
+              <span className="text-gray-400 text-sm">
+                {t("cards.attendance")}
+              </span>
             </div>
             {/* CARD */}
             <div className="flex flex-col gap-4 bg-white p-4 rounded-md w-full">
               <div className="flex items-center gap-4">
-                <Image
-                  src="/singleBranch.png"
-                  alt=""
-                  width={24}
-                  height={24}
-                  className="w-6 h-6"
-                />{" "}
+                <GraduationCap className="w-6 h-6 text-academixPurpleDark" />
                 <h1 className="font-semibold text-xl">
                   {student.class?.name.charAt(0)}
                 </h1>
               </div>
-              <span className="text-gray-400 text-sm">Grade</span>
+              <span className="text-gray-400 text-sm">{t("cards.grade")}</span>
             </div>
             {/* CARD */}
             <div className="flex flex-col gap-4 bg-white p-4 rounded-md w-full">
               <div className="flex items-center gap-4">
-                <Image
-                  src="/singleLesson.png"
-                  alt=""
-                  width={24}
-                  height={24}
-                  className="w-6 h-6"
-                />
+                <BookOpen className="w-6 h-6 text-academixPurpleDark" />
                 <h1 className="font-semibold text-xl">
                   {student.class._count.lessons}
                 </h1>
               </div>
-              <span className="text-gray-400 text-sm">Lessons</span>
+              <span className="text-gray-400 text-sm">
+                {t("cards.lessons")}
+              </span>
             </div>
             {/* CARD */}
             <div className="flex flex-col gap-4 bg-white p-4 rounded-md w-full">
               <div className="flex items-center gap-4">
-                {" "}
-                <Image
-                  src="/singleClass.png"
-                  alt=""
-                  width={24}
-                  height={24}
-                  className="w-6 h-6"
-                />
+                <School className="w-6 h-6 text-academixPurpleDark" />
                 <h1 className="font-semibold text-xl">{student.class?.name}</h1>
               </div>
-              <span className="text-gray-400 text-sm">Class</span>
+              <span className="text-gray-400 text-sm">{t("cards.class")}</span>
             </div>
           </div>
         </div>
         {/* BOTTOM */}
         <div className="bg-white mt-4 p-4 rounded-md h-[800px]">
-          <h1>Student&apos;s Schedule</h1>
+          <h1>{t("student.schedule")}</h1>
           <BigCalendarContainer type="classId" id={student.class.id} />
         </div>
       </div>
       {/* RIGHT */}
       <div className="flex flex-col gap-4 w-full xl:w-1/4">
         <div className="bg-white p-4 rounded-md">
-          <h1 className="font-semibold text-xl">Shortcuts</h1>
-          <div className="flex flex-wrap gap-4 mt-4 text-gray-500 text-xs">
+          <h1 className="font-semibold text-xl">{t("shortcuts.title")}</h1>
+          <div className="flex flex-col gap-2 mt-4 text-gray-500 text-xs">
             <Link
-              className="bg-academixSkyLight p-3 rounded-md"
+              className="bg-academixSkyLight p-3 rounded-md hover:font-bold hover:scale-[1.05] transition-all"
               href={`/list/lessons?classId=${student.class.id}`}
             >
-              Student&apos;s Lessons
+              {t("student.lessons")}
             </Link>
             <Link
-              className="bg-academixPurpleLight p-3 rounded-md"
+              className="bg-academixPurpleLight p-3 rounded-md hover:font-bold hover:scale-[1.05] transition-all"
               href={`/list/teachers?classId=${student.class.id}`}
             >
-              Student&apos;s Teachers
+              {t("student.teachers")}
             </Link>
             <Link
-              className="bg-pink-50 p-3 rounded-md"
+              className="bg-pink-50 p-3 rounded-md hover:font-bold hover:scale-[1.05] transition-all"
               href={`/list/exams?classId=${student.class.id}`}
             >
-              Student&apos;s Exams
+              {t("student.exams")}
             </Link>
             <Link
-              className="bg-academixSkyLight p-3 rounded-md"
+              className="bg-academixSkyLight p-3 rounded-md hover:font-bold hover:scale-[1.05] transition-all"
               href={`/list/assignments?classId=${student.class.id}`}
             >
-              Student&apos;s Assignments
+              {t("student.assignments")}
             </Link>
             <Link
-              className="bg-academixYellowLight p-3 rounded-md"
+              className="bg-academixYellowLight p-3 rounded-md hover:font-bold hover:scale-[1.05] transition-all"
               href={`/list/results?studentId=${id}`}
             >
-              Student&apos;s Results
+              {t("student.results")}
             </Link>
           </div>
         </div>
-        <Performance />
         <Announcements />
       </div>
     </div>
diff --git a/src/app/(dashboard)/list/students/loading.tsx b/src/app/(dashboard)/list/students/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/students/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/students/page.tsx b/src/app/(dashboard)/list/students/page.tsx
index ae8f256..e97b355 100644
--- a/src/app/(dashboard)/list/students/page.tsx
+++ b/src/app/(dashboard)/list/students/page.tsx
@@ -1,53 +1,52 @@
+import ExportButton from "@/components/ExportButton";
+import FilterSortActions from "@/components/FilterSortActions";
 import FormContainer from "@/components/FormContainer";
 import PromoteStudentsButton from "@/components/PromoteStudentsButton";
 import Pagination from "@/components/Pagination";
 import Table from "@/components/Table";
 import TableSearch from "@/components/TableSearch";
-import StudentsFilters from "@/components/StudentsFilters";
-import {
-  getAcademicYears,
-  getCurrentAcademicYearOrNull,
-} from "@/lib/academicYears";
+import { getTranslations } from "next-intl/server";
+import { getCurrentAcademicYearOrNull } from "@/lib/academicYears";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
-import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import { buildStudentQuery } from "@/lib/query-builders/student-query";
 import prisma from "@/lib/prisma";
 import { ITEM_PER_PAGE } from "@/lib/settings";
-import { Class, Prisma, Student, StudentStatus } from "@prisma/client";
+import { Class, Student } from "@prisma/client";
 import { Eye } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
 import NoCurrentAcademicYearMessage from "@/components/NoCurrentAcademicYearMessage";
 import { UserRole } from "@/lib/utils";
+import type { PageSearchParams } from "@/lib/pageParams";
+import GradeFilter from "@/components/GradeFilter";
+import ClassFilter from "@/components/ClassFilter";
 
 type StudentList = Student & { class: Class };
 
-const getColumns = (role: UserRole | null) => [
+const getColumns = (role: UserRole | null, th: (key: string) => string) => [
+  { header: th("info"), accessor: "info" },
   {
-    header: "Info",
-    accessor: "info",
-  },
-  {
-    header: "Student ID",
+    header: th("studentId"),
     accessor: "studentId",
     className: "hidden md:table-cell",
   },
   {
-    header: "Grade",
+    header: th("grade"),
     accessor: "grade",
     className: "hidden md:table-cell",
   },
   {
-    header: "Phone",
+    header: th("phone"),
     accessor: "phone",
     className: "hidden lg:table-cell",
   },
   {
-    header: "Address",
+    header: th("address"),
     accessor: "address",
     className: "hidden lg:table-cell",
   },
   {
-    header: role === "admin" ? "Actions" : "",
+    header: role === "admin" ? th("actions") : "",
     accessor: "action",
   },
 ];
@@ -70,17 +69,21 @@ const renderRow = (item: StudentList, role: UserRole | null) => (
         <p className="text-gray-500 text-xs">{item.class.name}</p>
       </div>
     </td>
+
     <td className="hidden md:table-cell">{item.username}</td>
     <td className="hidden md:table-cell">{item.class.name[0]}</td>
     <td className="hidden md:table-cell">{item.phone}</td>
     <td className="hidden md:table-cell">{item.address}</td>
+
     <td>
       <div className="flex items-center gap-2">
         <Link href={`/list/students/${item.id}`}>
-          <button className="flex justify-center items-center bg-academixSky rounded-full w-7 h-7">
+          <button className="flex justify-center items-center bg-academixPurpleDark p-2 rounded-md w-8 h-8 text-white hover:scale-[1.05] transition">
+            {" "}
             <Eye className="w-4 h-4" />
           </button>
         </Link>
+
         {role === "admin" && (
           <FormContainer table="student" type="delete" id={item.id} />
         )}
@@ -88,110 +91,91 @@ const renderRow = (item: StudentList, role: UserRole | null) => (
     </td>
   </tr>
 );
+
 const StudentListPage = async ({
   searchParams,
 }: {
   searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const emptyT = await getTranslations("emptyStates");
   const { role, userId, schoolId } = await enforceRouteAccess("/list/students");
+
   const currentAcademicYear = await getCurrentAcademicYearOrNull(schoolId);
   const academicYearId = currentAcademicYear?.id ?? null;
-  const academicYears =
-    role === "admin" ? await getAcademicYears(schoolId) : [];
 
   if (!academicYearId || !currentAcademicYear) {
     return <NoCurrentAcademicYearMessage role={role} />;
   }
 
-  const resolvedSearchParams = await searchParams;
-  const { page, ...queryParams } = resolvedSearchParams;
-  const currentPage = getQueryParam(page);
-  const p = currentPage ? parseInt(currentPage) : 1;
-
-  const academicYearParam = getQueryParam(queryParams.academicYearId);
-  const statusParam = getQueryParam(queryParams.status);
-  const repeatCountParam = getQueryParam(queryParams.repeatCount);
-  const selectedAcademicYearId = academicYearParam
-    ? Number.parseInt(academicYearParam, 10)
-    : academicYearId;
-
-  const validStatuses: StudentStatus[] = [
-    "ACTIVE",
-    "REPEATED",
-    "GRADUATED",
-    "LEFT",
-  ];
-  const selectedStatus = validStatuses.includes(statusParam as StudentStatus)
-    ? (statusParam as StudentStatus)
-    : "ACTIVE";
-
-  const selectedRepeatCount =
-    repeatCountParam && selectedStatus === "REPEATED"
-      ? Number.parseInt(repeatCountParam, 10)
-      : 1;
-
-  const query: Prisma.StudentWhereInput = {
+  const {
+    query,
+    orderBy,
+    page: p,
+  } = await buildStudentQuery({
+    searchParams,
     schoolId,
-    academicYears: {
-      some: {
-        academicYearId: selectedAcademicYearId,
-      },
-    },
-    status: selectedStatus,
-  };
+    currentAcademicYearId: academicYearId,
+    role,
+    userId,
+  });
+
+  const resolvedSearchParams = await searchParams;
 
-  const conditions: Prisma.StudentWhereInput[] = [];
+  const exportQuery = new URLSearchParams(
+    Object.entries(resolvedSearchParams).flatMap(([key, value]) => {
+      if (Array.isArray(value)) {
+        return value.map((item) => [key, item]);
+      }
 
-  if (selectedStatus === "REPEATED") {
-    query.repeatCount = Number.isNaN(selectedRepeatCount)
-      ? 1
-      : selectedRepeatCount;
-  }
+      return value ? [[key, value]] : [];
+    }),
+  );
+
+  exportQuery.set("academicYearId", String(academicYearId));
 
-  if (queryParams) {
-    for (const [key, rawValue] of Object.entries(queryParams)) {
-      const value = getQueryParam(rawValue);
-
-      if (value !== undefined) {
-        switch (key) {
-          case "teacherId":
-            conditions.push({
-              class: {
-                lessons: {
-                  some: { teacherId: value },
-                },
-              },
-            });
-            break;
-
-          case "search":
-            conditions.push({
-              name: { contains: value, mode: "insensitive" },
-            });
-            break;
+  const classWhere =
+    role === "teacher"
+      ? {
+          schoolId,
+          OR: [
+            { teachers: { some: { id: userId } } },
+            { lessons: { some: { teacherId: userId } } },
+          ],
         }
-      }
-    }
-  }
+      : { schoolId };
 
-  switch (role) {
-    case "admin":
-      break;
-
-    case "teacher":
-      conditions.push({
-        class: {
-          lessons: {
-            some: { teacherId: userId },
-          },
-        },
-      });
-      break;
-  }
+  const classes = await prisma.class.findMany({
+    where: classWhere,
+    select: {
+      id: true,
+      name: true,
+      gradeId: true,
+    },
+    orderBy: {
+      name: "asc",
+    },
+  });
 
-  if (conditions.length > 0) {
-    query.AND = conditions;
-  }
+  const teacherGradeIds =
+    role === "teacher"
+      ? Array.from(new Set(classes.map((classItem) => classItem.gradeId)))
+      : [];
+
+  const grades = await prisma.grade.findMany({
+    where: {
+      schoolId,
+      ...(role === "teacher" ? { id: { in: teacherGradeIds } } : {}),
+    },
+    select: {
+      id: true,
+      level: true,
+    },
+    orderBy: {
+      level: "asc",
+    },
+  });
 
   const [data, count] = await prisma.$transaction([
     prisma.student.findMany({
@@ -199,7 +183,7 @@ const StudentListPage = async ({
       include: {
         class: true,
       },
-      orderBy: { name: "asc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
@@ -209,41 +193,64 @@ const StudentListPage = async ({
   ]);
 
   return (
-    <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
-      {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">All Students</h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+  <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
+
+    {/* HEADER */}
+    <div className="flex flex-col gap-4">
+
+      {/* TOP ROW */}
+      <div className="flex flex-wrap items-center justify-between gap-4">
+        <h1 className="font-semibold text-lg">{t("allStudents")}</h1>
+
+        <div className="flex flex-wrap items-center gap-2">
           <TableSearch />
+
+          <FilterSortActions />
+
           {role === "admin" && (
-            <StudentsFilters
-              academicYears={academicYears}
-              currentAcademicYearId={academicYearId}
-            />
+            <>
+              <ExportButton
+                href={`/api/admin/students/export?${exportQuery.toString()}`}
+              />
+
+              <FormContainer table="student" type="create" />
+            </>
           )}
-          <div className="flex items-center self-end gap-4">
-            {role === "admin" && (
-              <>
-                <PromoteStudentsButton
-                  academicYearName={currentAcademicYear.name}
-                  academicYearEndDate={currentAcademicYear.endDate}
-                />
-                <FormContainer table="student" type="create" />
-              </>
-            )}
-          </div>
         </div>
       </div>
-      {/* LIST */}
-      <Table
-        columns={getColumns(role)}
-        renderRow={(item) => renderRow(item, role)}
-        data={data}
-      />
-      {/* PAGINATION */}
+
+      {/* FILTERS */}
+      <div className="flex flex-wrap items-end gap-2">
+
+  <GradeFilter grades={grades} />
+
+  <ClassFilter classes={classes} />
+
+</div>
+    </div>
+
+    {/* TABLE */}
+    <Table
+      columns={getColumns(role, th)}
+      renderRow={(item) => renderRow(item, role)}
+      data={data}
+      emptyTitle={emptyT("students")}
+      emptyDescription={emptyT("filterDescription")}
+    />
+
+    {/* PAGINATION */}
+    <div className="flex justify-between items-center">
+      {role === "admin" && (
+        <PromoteStudentsButton
+          academicYearName={currentAcademicYear.name}
+          academicYearEndDate={currentAcademicYear.endDate}
+        />
+      )}
+
       <Pagination page={p} count={count} />
     </div>
-  );
+  </div>
+);
 };
 
 export default StudentListPage;
diff --git a/src/app/(dashboard)/list/subjects/[id]/loading.tsx b/src/app/(dashboard)/list/subjects/[id]/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/subjects/[id]/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/subjects/[id]/page.tsx b/src/app/(dashboard)/list/subjects/[id]/page.tsx
new file mode 100644
index 0000000..b61ef77
--- /dev/null
+++ b/src/app/(dashboard)/list/subjects/[id]/page.tsx
@@ -0,0 +1,667 @@
+import { notFound } from "next/navigation";
+import Link from "next/link";
+import Image from "next/image";
+import type { ElementType, ReactNode } from "react";
+import {
+  BookOpen,
+  Users,
+  ClipboardList,
+  FileText,
+  ChevronRight,
+  GraduationCap,
+} from "lucide-react";
+import prisma from "@/lib/prisma";
+import { requireAuth } from "@/lib/auth";
+import StudyMaterialList, {
+  StudyMaterialItem,
+} from "@/components/StudyMaterialList";
+import SubjectPageEditor from "@/components/SubjectPageEditor";
+import SubjectDetailsTabs from "@/components/SubjectDetailsTabs";
+import FormContainer from "@/components/FormContainer";
+import { getTranslations } from "next-intl/server";
+
+// ─── Stat card ────────────────────────────────────────────────────────────────
+function StatCard({
+  icon: Icon,
+  label,
+  value,
+  color,
+}: {
+  icon: ElementType;
+  label: string;
+  value: number | string;
+  color: string;
+}) {
+  return (
+    <div className="flex items-center gap-4 bg-white shadow-sm p-5 border border-gray-100 rounded-xl">
+      <div className={`p-3 rounded-xl ${color}`}>
+        <Icon className="w-5 h-5 text-white" />
+      </div>
+      <div>
+        <p className="font-bold text-gray-800 text-2xl">{value}</p>
+        <p className="text-gray-500 text-sm">{label}</p>
+      </div>
+    </div>
+  );
+}
+
+// ─── Day label map ────────────────────────────────────────────────────────────
+// ─── Section renderers ────────────────────────────────────────────────────────
+function AssignmentsSection({
+  assignments,
+  createAction,
+  emptyLabel,
+  labels,
+}: {
+  assignments: {
+    id: number;
+    title: string;
+    description: string | null;
+    endDate: Date;
+    fileUrl: string | null;
+    class: { name: string } | null;
+    lesson: { class: { name: string } } | null;
+  }[];
+  createAction?: ReactNode;
+  emptyLabel: string;
+  labels: {
+    assignments: string;
+    manageAssignments: string;
+    class: string;
+    due: string;
+    overdue: string;
+    download: string;
+    downloadAssignmentFile: string;
+  };
+}) {
+  return (
+    <div className="bg-white shadow-sm border border-gray-100 rounded-xl h-[300px] overflow-auto">
+      <div className="flex justify-between items-center px-6 py-4 border-gray-100 border-b">
+        <div className="flex items-center gap-2">
+          <ClipboardList className="w-4 h-4 text-orange-500" />
+          <h2 className="font-semibold text-gray-800 text-base">
+            {labels.assignments}
+          </h2>
+          <span className="ml-1 text-gray-400 text-sm">
+            ({assignments.length})
+          </span>
+        </div>
+        <div className="flex items-center gap-2">
+          <Link
+            href="/list/assignments"
+            className="bg-orange-500 hover:bg-orange-600 px-3 py-1.5 rounded-md text-white text-sm transition-colors"
+          >
+            {labels.manageAssignments}
+          </Link>
+          {createAction}
+        </div>
+      </div>
+      {assignments.length === 0 ? (
+        <div className="px-6 py-8 text-center">
+          <p className="text-gray-400 text-sm">{emptyLabel}</p>
+        </div>
+      ) : (
+        <ul className="divide-y divide-gray-50">
+          {assignments.map((a) => {
+            const isOverdue = new Date(a.endDate) < new Date() && !a.fileUrl;
+            return (
+              <li
+                key={a.id}
+                className="flex justify-between items-start gap-4 hover:bg-gray-50 px-6 py-4 transition-colors"
+              >
+                <div className="flex-1 min-w-0">
+                  <p className="font-medium text-gray-800 truncate">
+                    {a.title}
+                  </p>
+                  {a.description && (
+                    <p className="mt-0.5 text-gray-500 text-sm line-clamp-1">
+                      {a.description}
+                    </p>
+                  )}
+                  <div className="flex items-center gap-2 mt-1 text-gray-400 text-xs">
+                    <span>
+                      {labels.class}: {a.class?.name ?? a.lesson?.class.name ?? "-"}
+                    </span>
+                    <span>·</span>
+                    <span>
+                      {labels.due}:{" "}
+                      {new Date(a.endDate).toLocaleDateString("en-GB", {
+                        day: "numeric",
+                        month: "short",
+                      })}
+                    </span>
+                    {isOverdue && (
+                      <span className="font-medium text-red-500">
+                        {labels.overdue}
+                      </span>
+                    )}
+                  </div>
+                </div>
+                {a.fileUrl && (
+                  <a
+                    href={`/api/download/${a.id}?type=assignment`}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    title={labels.downloadAssignmentFile}
+                    className="flex flex-shrink-0 items-center gap-1.5 bg-orange-50 hover:bg-orange-100 px-3 py-1.5 rounded-lg font-medium text-orange-700 text-xs transition-colors"
+                  >
+                    <FileText className="w-3.5 h-3.5" />
+                    {labels.download}
+                  </a>
+                )}
+              </li>
+            );
+          })}
+        </ul>
+      )}
+    </div>
+  );
+}
+
+function ExamsSection({
+  exams,
+  createAction,
+  tableHeaders,
+  labels,
+}: {
+  exams: {
+    id: number;
+    title: string;
+    startTime: Date;
+    endTime: Date;
+    class: { name: string } | null;
+  }[];
+  createAction?: ReactNode;
+  tableHeaders: {
+    title: string;
+    class: string;
+    startTime: string;
+    endTime: string;
+  };
+  labels: {
+    exams: string;
+    manageExams: string;
+    noExams: string;
+  };
+}) {
+  return (
+    <div className="bg-white shadow-sm border border-gray-100 rounded-xl h-[300px] overflow-auto">
+      <div className="flex justify-between items-center px-6 py-4 border-gray-100 border-b">
+        <div className="flex items-center gap-2">
+          <FileText className="w-4 h-4 text-yellow-500" />
+          <h2 className="font-semibold text-gray-800 text-base">
+            {labels.exams}
+          </h2>
+          <span className="ml-1 text-gray-400 text-sm">({exams.length})</span>
+        </div>
+        <div className="flex items-center gap-2">
+          <Link
+            href="/list/exams"
+            className="bg-yellow-500 hover:bg-yellow-600 px-3 py-1.5 rounded-md text-white text-sm transition-colors"
+          >
+            {labels.manageExams}
+          </Link>
+          {createAction}
+        </div>
+      </div>
+      {exams.length === 0 ? (
+        <div className="px-6 py-8 text-center">
+          <p className="text-gray-400 text-sm">{labels.noExams}</p>
+        </div>
+      ) : (
+        <div className="overflow-x-auto">
+          <table className="w-full text-sm">
+            <thead>
+              <tr className="bg-gray-50 text-gray-500 text-start">
+                <th className="px-6 py-3 font-medium">{tableHeaders.title}</th>
+                <th className="px-6 py-3 font-medium">{tableHeaders.class}</th>
+                <th className="px-6 py-3 font-medium">{tableHeaders.startTime}</th>
+                <th className="px-6 py-3 font-medium">{tableHeaders.endTime}</th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-gray-50">
+              {exams.map((exam) => (
+                <tr key={exam.id} className="hover:bg-gray-50">
+                  <td className="px-6 py-3 font-medium text-gray-800">
+                    {exam.title}
+                  </td>
+                  <td className="px-6 py-3 text-gray-600">
+                    {exam.class?.name ?? "-"}
+                  </td>
+                  <td className="px-6 py-3 text-gray-600">
+                    {new Date(exam.startTime).toLocaleString("en-GB", {
+                      day: "numeric",
+                      month: "short",
+                      hour: "2-digit",
+                      minute: "2-digit",
+                    })}
+                  </td>
+                  <td className="px-6 py-3 text-gray-600">
+                    {new Date(exam.endTime).toLocaleString("en-GB", {
+                      day: "numeric",
+                      month: "short",
+                      hour: "2-digit",
+                      minute: "2-digit",
+                    })}
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+      )}
+    </div>
+  );
+}
+// ─── Page ─────────────────────────────────────────────────────────────────────
+export default async function SubjectDetailPage({
+  params,
+}: {
+  params: Promise<{ id: string }>;
+}) {
+  const th = await getTranslations("tableHeaders");
+  const emptyT = await getTranslations("emptyStates");
+  const subjectT = await getTranslations("subjectDetails");
+  const { id } = await params;
+  const subjectId = Number(id);
+  if (isNaN(subjectId)) notFound();
+
+  const { userId, role, schoolId } = await requireAuth();
+  const roleStr = role as string;
+
+  // جلب المادة مع كل البيانات + إعدادات الصفحة
+  const subject = await prisma.subject.findFirst({
+    where: {
+      id: subjectId,
+      schoolId,
+      ...(roleStr === "student"
+        ? {
+            grade: {
+              students: {
+                some: {
+                  id: userId,
+                },
+              },
+            },
+          }
+        : {}),
+    },
+    include: {
+      grade: { select: { level: true } },
+      teachers: {
+        select: { id: true, name: true, img: true },
+      },
+      studyMaterials: {
+        include: {
+          teacher: { select: { id: true, name: true } },
+        },
+        orderBy: { createdAt: "desc" },
+      },
+      assignments: {
+        select: {
+          id: true,
+          title: true,
+          description: true,
+          startDate: true,
+          endDate: true,
+          fileUrl: true,
+          fileName: true,
+          class: { select: { name: true } },
+          lesson: {
+            select: { class: { select: { name: true } } },
+          },
+        },
+        orderBy: { id: "desc" },
+      },
+      exams: {
+        select: {
+          id: true,
+          title: true,
+          startTime: true,
+          endTime: true,
+          class: { select: { name: true } },
+        },
+        orderBy: { startTime: "asc" },
+      },
+      // جلب إعدادات الصفحة — المعلم يجلب إعداداته، الأدمن والطالب يجلبون أول إعداد موجود
+      pageSettings:
+        roleStr === "teacher" && userId
+          ? { where: { teacherId: userId }, take: 1 }
+          : { take: 1 },
+    },
+  });
+
+  if (!subject) notFound();
+
+  const classCount = new Set([
+    ...subject.assignments
+      .map((assignment) => assignment.class?.name ?? assignment.lesson?.class.name)
+      .filter((className): className is string => !!className),
+    ...subject.exams
+      .map((exam) => exam.class?.name)
+      .filter((className): className is string => !!className),
+  ]).size;
+
+  const materials: StudyMaterialItem[] = subject.studyMaterials.map((m) => ({
+    ...m,
+    createdAt: new Date(m.createdAt),
+  }));
+
+  // إعدادات الصفحة
+  const pageSettings = subject.pageSettings[0] ?? null;
+  const sectionsOrder: string[] = (
+    (pageSettings?.sectionsOrder as string[]) ?? [
+      "materials",
+      "assignments",
+      "exams",
+    ]
+  ).map((section) => (section === "lessons" ? "exams" : section));
+
+  const isAuthorized = roleStr === "teacher" || roleStr === "admin"; // الأدمن له نفس صلاحيات المعلم
+
+  // خريطة الأقسام
+  const sectionMap: Record<string, ReactNode> = {
+    assignments: (
+      <AssignmentsSection
+        assignments={subject.assignments}
+        emptyLabel={emptyT("assignments")}
+        labels={{
+          assignments: subjectT("assignments"),
+          manageAssignments: subjectT("manageAssignments"),
+          class: subjectT("class"),
+          due: subjectT("due"),
+          overdue: subjectT("overdue"),
+          download: subjectT("download"),
+          downloadAssignmentFile: subjectT("downloadAssignmentFile"),
+        }}
+        createAction={
+          isAuthorized ? (
+            <FormContainer
+              table="assignment"
+              type="create"
+              data={{
+                subjectId,
+                subjectName: subject.name,
+                lockSubject: true,
+              }}
+            />
+          ) : undefined
+        }
+      />
+    ),
+    exams: (
+      <ExamsSection
+        exams={subject.exams}
+        labels={{
+          exams: subjectT("exams"),
+          manageExams: subjectT("manageExams"),
+          noExams: subjectT("noExams"),
+        }}
+        tableHeaders={{
+          title: th("title"),
+          class: th("class"),
+          startTime: th("startTime"),
+          endTime: th("endTime"),
+        }}
+        createAction={
+          isAuthorized ? (
+            <Link
+              href={`/list/exams/create-workflow?subjectId=${subjectId}`}
+              className="inline-flex items-center gap-1.5 bg-academixPurpleDark px-3 py-1.5 rounded-md text-white text-sm hover:scale-[1.05] transition"
+            >
+              {subjectT("createExam")}
+            </Link>
+          ) : undefined
+        }
+      />
+    ),
+    materials: (
+      <StudyMaterialList
+        materials={materials}
+        subjectId={subjectId}
+        currentUserId={userId ?? undefined}
+        role={roleStr}
+      />
+    ),
+  };
+
+  return (
+    <div className="space-y-6 bg-gray-50 p-6 min-h-screen">
+      {/* Breadcrumb */}
+      <nav className="flex items-center gap-1.5 text-gray-500 text-sm">
+        <Link
+          href="/list/subjects"
+          className="hover:text-purple-600 transition-colors"
+        >
+          {subjectT("subjects")}
+        </Link>
+        <ChevronRight className="w-4 h-4" />
+        <span className="font-medium text-gray-800">{subject.name}</span>
+      </nav>
+
+      {/* Banner Image */}
+      {pageSettings?.bannerImage && (
+        <div
+          className={`relative w-full rounded-xl overflow-hidden shadow-sm ${
+            pageSettings.bannerHeight === "sm"
+              ? "h-32"
+              : pageSettings.bannerHeight === "lg"
+                ? "h-72"
+                : "h-48"
+          }`}
+        >
+          <Image
+            src={pageSettings.bannerImage}
+            alt={`${subject.name} banner`}
+            fill
+            unoptimized
+            className="object-cover"
+            priority
+          />
+        </div>
+      )}
+
+      {/* Header */}
+      <div className="flex justify-between items-start gap-4 bg-white shadow-sm p-6 border border-gray-100 rounded-xl">
+        <div className="flex items-start gap-4">
+          <div className="bg-purple-100 p-3 sm:p-4 rounded-xl">
+            <BookOpen className="w-6 sm:w-8 h-6 sm:h-8 text-purple-600" />
+          </div>
+          <div>
+            <h1 className="font-bold text-gray-800 text-xl sm:text-2xl">
+              {subject.name}
+            </h1>
+            <p className="mt-1 text-gray-500 text-sm">
+              {subjectT("gradeLevel", { level: subject.grade.level })} ·{" "}
+              {subjectT("teacherCount", { count: subject.teachers.length })}
+            </p>
+            {/* Course description */}
+            {pageSettings?.description && (
+              <p className="mt-2 max-w-xl text-gray-600 text-sm">
+                {pageSettings.description}
+              </p>
+            )}
+          </div>
+        </div>
+
+        {/* Edit Page button — teachers only */}
+        {isAuthorized && (
+          <SubjectPageEditor
+            subjectId={subjectId}
+            initialSettings={{
+              announcement: pageSettings?.announcement ?? null,
+              description: pageSettings?.description ?? null,
+              bannerImage: pageSettings?.bannerImage ?? null,
+              bannerHeight: pageSettings?.bannerHeight ?? "md",
+              sectionsOrder,
+            }}
+          />
+        )}
+      </div>
+
+      {/* Announcement banner */}
+      {pageSettings?.announcement && (
+        <div className="bg-purple-50 px-5 py-4 border border-purple-200 rounded-xl font-medium text-purple-800 text-sm">
+          📢 {pageSettings.announcement}
+        </div>
+      )}
+
+      {/* Stats */}
+      <div className="gap-4 grid grid-cols-2 md:grid-cols-4">
+        <StatCard
+          icon={Users}
+          label={subjectT("teachers")}
+          value={subject.teachers.length}
+          color="bg-blue-500"
+        />
+        <StatCard
+          icon={GraduationCap}
+          label={subjectT("classes")}
+          value={classCount}
+          color="bg-green-500"
+        />
+        <StatCard
+          icon={ClipboardList}
+          label={subjectT("assignments")}
+          value={subject.assignments.length}
+          color="bg-orange-500"
+        />
+        <StatCard
+          icon={FileText}
+          label={subjectT("exams")}
+          value={subject.exams.length}
+          color="bg-yellow-500"
+        />
+      </div>
+
+      {/* Main grid */}
+      <div className="gap-6 grid grid-cols-1 lg:grid-cols-3">
+        <div className="space-y-6 lg:col-span-2">
+          <SubjectDetailsTabs
+            sectionsOrder={sectionsOrder}
+            assignmentsContent={sectionMap.assignments}
+            examsContent={sectionMap.exams}
+            materialsContent={sectionMap.materials}
+          />
+        </div>
+
+        {/* Right column (1/3) */}
+        <div className="space-y-6 h-full">
+          {/* Subject info card */}
+          <div className="bg-white shadow-sm p-5 border border-gray-100 rounded-xl">
+            <h3 className="mb-3 font-semibold text-gray-700 text-sm">
+              {subjectT("subjectInfo")}
+            </h3>
+            <dl className="space-y-2.5 text-sm">
+              <div className="flex justify-between">
+                <dt className="text-gray-500">{subjectT("grade")}</dt>
+                <dd className="font-medium text-gray-700">
+                  {subjectT("gradeLevel", { level: subject.grade.level })}
+                </dd>
+              </div>
+              <div className="flex justify-between">
+                <dt className="text-gray-500">{subjectT("classes")}</dt>
+                <dd className="font-medium text-gray-700">{classCount}</dd>
+              </div>
+              <div className="flex justify-between">
+                <dt className="text-gray-500">{subjectT("assignments")}</dt>
+                <dd className="font-medium text-gray-700">
+                  {subject.assignments.length}
+                </dd>
+              </div>
+              <div className="flex justify-between">
+                <dt className="text-gray-500">{subjectT("materials")}</dt>
+                <dd className="font-medium text-gray-700">
+                  {subject.studyMaterials.length}
+                </dd>
+              </div>
+              <div className="flex justify-between">
+                <dt className="text-gray-500">{subjectT("exams")}</dt>
+                <dd className="font-medium text-gray-700">
+                  {subject.exams.length}
+                </dd>
+              </div>
+            </dl>
+          </div>
+
+          {roleStr === "admin" && (
+            <div className="bg-white shadow-sm p-6 border border-gray-100 rounded-xl">
+              <h2 className="flex items-center gap-2 mb-4 font-semibold text-gray-800 text-base">
+                <Users className="w-4 h-4 text-blue-500" />
+                {subjectT("teachers")}
+              </h2>
+              {subject.teachers.length === 0 ? (
+                <p className="text-gray-400 text-sm">
+                  {emptyT("teachersAssigned")}
+                </p>
+              ) : (
+                <ul className="flex flex-wrap gap-3">
+                  {subject.teachers.map((t) => (
+                    <li key={t.id}>
+                      <Link
+                        href={`/list/teachers/${t.id}`}
+                        className="flex items-center gap-2 hover:bg-purple-50 px-3 py-2 border border-gray-100 hover:border-purple-200 rounded-lg transition-colors"
+                      >
+                        {t.img ? (
+                          <Image
+                            src={t.img}
+                            alt={t.name}
+                            width={28}
+                            height={28}
+                            className="rounded-full w-7 h-7 object-cover"
+                          />
+                        ) : (
+                          <div className="flex justify-center items-center bg-purple-100 rounded-full w-7 h-7 font-semibold text-purple-700 text-xs">
+                            {t.name[0]}
+                          </div>
+                        )}
+                        <span className="font-medium text-gray-700 text-sm">
+                          {t.name}
+                        </span>
+                      </Link>
+                    </li>
+                  ))}
+                </ul>
+              )}
+            </div>
+          )}
+          {roleStr === "student" && subject.teachers.length > 0 && (
+            <div className="bg-white shadow-sm p-5 border border-gray-100 rounded-xl">
+              <h3 className="flex items-center gap-2 mb-4 font-semibold text-gray-700 text-sm">
+                <Users className="w-4 h-4 text-blue-500" />
+                {subjectT("yourTeachers", { count: subject.teachers.length })}
+              </h3>
+              <ul className="space-y-3">
+                {subject.teachers.map((t) => (
+                  <li key={t.id} className="flex items-center gap-3">
+                    {t.img ? (
+                      <Image
+                        src={t.img}
+                        alt={t.name}
+                        width={40}
+                        height={40}
+                        className="flex-shrink-0 rounded-full w-10 h-10 object-cover"
+                      />
+                    ) : (
+                      <div className="flex flex-shrink-0 justify-center items-center bg-purple-100 rounded-full w-10 h-10 font-bold text-purple-700 text-sm">
+                        {t.name[0]}
+                      </div>
+                    )}
+                    <div>
+                      <p className="font-medium text-gray-800 text-sm">
+                        {t.name}
+                      </p>
+                      <p className="text-gray-400 text-xs">
+                        {subjectT("subjectTeacher")}
+                      </p>
+                    </div>
+                  </li>
+                ))}
+              </ul>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/app/(dashboard)/list/subjects/loading.tsx b/src/app/(dashboard)/list/subjects/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/subjects/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/subjects/page.tsx b/src/app/(dashboard)/list/subjects/page.tsx
index 773519e..d0e5422 100644
--- a/src/app/(dashboard)/list/subjects/page.tsx
+++ b/src/app/(dashboard)/list/subjects/page.tsx
@@ -1,149 +1,55 @@
+import ExportButton from "@/components/ExportButton";
 import FilterSortActions from "@/components/FilterSortActions";
 import FormContainer from "@/components/FormContainer";
+import GradeFilter from "@/components/GradeFilter";
 import Pagination from "@/components/Pagination";
-import Table from "@/components/Table";
 import TableSearch from "@/components/TableSearch";
+import { getTranslations } from "next-intl/server";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
-import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import { buildSubjectQuery } from "@/lib/query-builders/subject-query";
 import prisma from "@/lib/prisma";
 import { ITEM_PER_PAGE } from "@/lib/settings";
 import { UserRole } from "@/lib/utils";
-import { Prisma, Subject, Teacher } from "@prisma/client";
+import { Subject, Teacher } from "@prisma/client";
+import type { PageSearchParams } from "@/lib/pageParams";
+import Link from "next/link";
+import { BookText } from "lucide-react";
 
 type SubjectList = Subject & {
   teachers: Teacher[];
   grade: { id: number; level: number } | null;
 };
 
-const getColumns = (role: UserRole | null) => [
-  {
-    header: "Subject Name",
-    accessor: "name",
-  },
-  {
-    header: "Grade",
-    accessor: "grade",
-    className: "hidden md:table-cell",
-  },
-  {
-    header: "Teachers",
-    accessor: "teachers",
-    className: "hidden md:table-cell",
-  },
-  {
-    header: role === "admin" ? "Actions" : "",
-    accessor: "action",
-  },
-];
-
-const renderRow = (item: SubjectList, role: UserRole | null) => (
-  <tr
-    key={item.id}
-    className="hover:bg-academixPurpleLight even:bg-slate-50 border-gray-200 border-b text-sm"
-  >
-    <td className="flex items-center gap-4 p-4">{item.name}</td>
-    <td className="hidden md:table-cell">{item.grade?.level ?? "-"}</td>
-    <td className="hidden md:table-cell">
-      {item.teachers.map((t) => t.name).join(", ")}
-    </td>
-    <td>
-      <div className="flex items-center gap-2">
-        {role === "admin" && (
-          <>
-            <FormContainer table="subject" type="update" data={item} />
-            <FormContainer table="subject" type="delete" id={item.id} />
-          </>
-        )}
-      </div>
-    </td>
-  </tr>
-);
 const SubjectListPage = async ({
   searchParams,
 }: {
   searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const emptyT = await getTranslations("emptyStates");
   const { role, userId, schoolId } = await enforceRouteAccess("/list/subjects");
-  const resolvedSearchParams = await searchParams;
-  const { page, ...queryParams } = resolvedSearchParams;
-  const currentPage = getQueryParam(page);
-  const p = currentPage ? parseInt(currentPage) : 1;
-
-  const query: Prisma.SubjectWhereInput = { schoolId };
-  const conditions: Prisma.SubjectWhereInput[] = [];
-  if (queryParams) {
-    for (const [key, rawValue] of Object.entries(queryParams)) {
-      const value = getQueryParam(rawValue);
-
-      if (value !== undefined) {
-        switch (key) {
-          case "search":
-            conditions.push({
-              name: { contains: value, mode: "insensitive" },
-            });
-            break;
-        }
-      }
-    }
-  }
-
-  // ROLE CONDITIONS
-  switch (role) {
-    case "admin":
-      break;
-
-    case "teacher":
-      if (!userId) throw new Error("Unauthorized");
-
-      conditions.push({
-        teachers: {
-          some: { id: userId },
-        },
-      });
-      break;
-
-    case "student":
-      if (!userId) throw new Error("Unauthorized");
-
-      const student = await prisma.student.findUnique({
-        where: { id: userId },
-        select: { gradeId: true },
-      });
-
-      if (student?.gradeId) {
-        conditions.push({
-          gradeId: student.gradeId,
-        });
-      }
-      break;
-
-    case "parent":
-      if (!userId) throw new Error("Unauthorized");
 
-      const children = await prisma.student.findMany({
-        where: { parentId: userId },
-        select: { gradeId: true },
-      });
+  const {
+    query,
+    orderBy,
+    page: p,
+  } = await buildSubjectQuery({
+    searchParams,
+    schoolId,
+    role,
+    userId,
+  });
 
-      const gradeIds = children.map((c) => c.gradeId);
+  const resolvedSearchParams = await searchParams;
 
-      if (gradeIds.length > 0) {
-        conditions.push({
-          gradeId: { in: gradeIds },
-        });
-      } else {
-        conditions.push({ id: -1 });
+  const exportQuery = new URLSearchParams(
+    Object.entries(resolvedSearchParams).flatMap(([key, value]) => {
+      if (Array.isArray(value)) {
+        return value.map((item) => [key, item]);
       }
-
-      break;
-
-    default:
-      break;
-  }
-
-  if (conditions.length > 0) {
-    query.AND = conditions;
-  }
+      return value ? [[key, value]] : [];
+    }),
+  );
 
   const [data, count] = await prisma.$transaction([
     prisma.subject.findMany({
@@ -152,36 +58,115 @@ const SubjectListPage = async ({
         teachers: true,
         grade: true,
       },
-      orderBy: { name: "asc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
-    prisma.subject.count({
-      where: query,
-    }),
+    prisma.subject.count({ where: query }),
   ]);
+  const grades =
+    role === "admin"
+      ? await prisma.grade.findMany({
+          where: { schoolId },
+          select: { id: true, level: true },
+          orderBy: { level: "asc" },
+        })
+      : [];
+
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
-      {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">All Subjects</h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allSubjects")}</h1>
+
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
           <TableSearch />
-          <div className="flex items-center self-end gap-4">
-            <FilterSortActions />
+          {role === "admin" && <GradeFilter grades={grades} />}
+
+          <div className="flex items-center self-end gap-2">
+            <FilterSortActions sortKey="sort" />
+
             {role === "admin" && (
-              <FormContainer table="subject" type="create" />
+              <>
+                <ExportButton
+                  href={`/api/admin/subjects/export?${exportQuery.toString()}`}
+                />
+                <FormContainer table="subject" type="create" />
+              </>
             )}
           </div>
         </div>
       </div>
-      {/* LIST */}
-      <Table
-        columns={getColumns(role)}
-        renderRow={(item) => renderRow(item, role)}
-        data={data}
-      />
-      {/* PAGINATION */}
+
+      {data.length === 0 ? (
+        <div className="flex flex-col justify-center items-center bg-gray-50 mt-6 p-10 rounded-xl text-center">
+          <h3 className="font-semibold text-gray-700 text-base">
+            {emptyT("subjects")}
+          </h3>
+          <p className="mt-1 text-gray-400 text-sm">
+            {emptyT("filterDescription")}
+          </p>
+        </div>
+      ) : (
+        <div className="gap-4 grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 mt-6">
+          {data.map((item: SubjectList) => (
+            <article
+              key={item.id}
+              className="group relative flex flex-col justify-between bg-gradient-to-br from-academixPurpleDark via-academixPurple to-academixPurpleLight hover:shadow-md p-5 rounded-xl min-h-[150px] transition-shadow"
+            >
+              <Link
+                href={`/list/subjects/${item.id}`}
+                aria-label={item.name}
+                className="absolute inset-0 z-0 rounded-xl"
+              />
+
+              <div className="z-10 relative space-y-8 pointer-events-none">
+                <div className="flex justify-between items-start">
+                  {" "}
+                  <div className="flex items-center gap-1 font-semibold text-white group-hover:text-purple-600 text-lg transition-colors">
+                    <BookText className="inline mr-1 w-5 h-5" />
+                    {item.name}
+                  </div>
+                  {role === "admin" && (
+                    <div className="flex items-center gap-2 pointer-events-auto">
+                      <FormContainer
+                        table="subject"
+                        type="update"
+                        data={item}
+                      />
+                      <FormContainer
+                        table="subject"
+                        type="delete"
+                        id={item.id}
+                      />
+                    </div>
+                  )}
+                </div>
+
+                <div>
+                  <p className="text-black text-sm">
+                    Grade:{" "}
+                    <span className="font-medium text-gray-700">
+                      {item.grade?.level ?? "-"}
+                    </span>
+                  </p>
+
+                  <p className="text-black text-sm line-clamp-2">
+                    Teachers:{" "}
+                    <span className="font-medium text-gray-700">
+                      {item.teachers.length > 0
+                        ? item.teachers
+                            .map((teacher) => teacher.name)
+                            .join(", ")
+                        : "-"}
+                    </span>
+                  </p>
+                </div>
+              </div>
+            </article>
+          ))}
+        </div>
+      )}
+
       <Pagination page={p} count={count} />
     </div>
   );
diff --git a/src/app/(dashboard)/list/teachers/[id]/page.tsx b/src/app/(dashboard)/list/teachers/[id]/page.tsx
index dd63b75..b60843a 100644
--- a/src/app/(dashboard)/list/teachers/[id]/page.tsx
+++ b/src/app/(dashboard)/list/teachers/[id]/page.tsx
@@ -2,19 +2,33 @@ import Announcements from "@/components/Announcements";
 import BigCalendarContainer from "@/components/BigCalendarContainer";
 import FormContainer from "@/components/FormContainer";
 import UserActionButtons from "@/components/UserActionButtons";
-import Performance from "@/components/Performance";
+import AttendanceCard from "@/components/AttendanceCard";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
 import prisma from "@/lib/prisma";
 import { Prisma } from "@prisma/client";
+import {
+  BookOpen,
+  Calendar,
+  CalendarCheck2,
+  Droplet,
+  GraduationCap,
+  Mail,
+  Phone,
+  School,
+} from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
 import { notFound } from "next/navigation";
+import { getTranslations } from "next-intl/server";
+import { Suspense } from "react";
 
 const SingleTeacherPage = async ({
   params,
 }: {
   params: Promise<{ id: string }>;
 }) => {
+  const t = await getTranslations("profilePages");
+  const statesT = await getTranslations("states");
   const { id } = await params;
 
   const { role, schoolId } = await enforceRouteAccess(`/list/teachers`);
@@ -50,7 +64,7 @@ const SingleTeacherPage = async ({
         <div className="flex flex-wrap md:flex-nowrap gap-4">
           {/* USER INFO CARD */}
           <div className="relative flex sm:flex-row flex-col md:justify-between gap-4 bg-academixSky px-4 py-6 rounded-md w-full md:w-2/3">
-            <div className="top-3 right-3 absolute flex items-center gap-2">
+            <div className="top-3 absolute flex items-center gap-2 end-3">
               {role === "admin" && (
                 <FormContainer table="teacher" type="update" data={teacher} />
               )}
@@ -73,28 +87,25 @@ const SingleTeacherPage = async ({
             <div className="flex flex-col gap-8">
               <div>
                 <h1 className="font-semibold text-xl">{teacher.name}</h1>
-                <p className="text-gray-500 text-sm">
-                  Lorem ipsum, dolor sit amet consectetur adipisicing elit.
-                </p>
               </div>
 
               <div className="flex flex-wrap justify-between items-center gap-2 font-medium text-xs">
                 <div className="flex items-center gap-2 w-full md:w-1/3 lg:w-full 2xl:w-1/3">
-                  <Image src="/blood.png" alt="" width={14} height={14} />
+                  <Droplet className="w-4 h-4 text-gray-600" />
                   <span>{teacher.bloodType}</span>
                 </div>
                 <div className="flex items-center gap-2 w-full md:w-1/3 lg:w-full 2xl:w-1/3">
-                  <Image src="/date.png" alt="" width={14} height={14} />
+                  <Calendar className="w-4 h-4 text-gray-600" />
                   <span>
                     {new Intl.DateTimeFormat("en-US").format(teacher.birthday)}
                   </span>
                 </div>
                 <div className="flex items-center gap-2 w-full md:w-1/3 lg:w-full 2xl:w-1/3">
-                  <Image src="/mail.png" alt="" width={14} height={14} />
+                  <Mail className="w-4 h-4 text-gray-600" />
                   <span>{teacher.email || "-"}</span>
                 </div>
                 <div className="flex items-center gap-2 w-full md:w-1/3 lg:w-full 2xl:w-1/3">
-                  <Image src="/phone.png" alt="" width={14} height={14} />
+                  <Phone className="w-4 h-4 text-gray-600" />
                   <span>{teacher.phone || "-"}</span>
                 </div>
               </div>
@@ -105,108 +116,90 @@ const SingleTeacherPage = async ({
             {/* CARD */}
             <div className="flex flex-col gap-4 bg-white p-4 rounded-md w-full">
               <div className="flex items-center gap-4">
-                <Image
-                  src="/singleAttendance.png"
-                  alt=""
-                  width={24}
-                  height={24}
-                  className="w-6 h-6"
-                />
-                <h1 className="font-semibold text-xl">90%</h1>
+                <CalendarCheck2 className="w-6 h-6 text-academixPurpleDark" />
+                <Suspense fallback={statesT("loading")}>
+                  <AttendanceCard id={id} scope="teacher" />
+                </Suspense>
               </div>
-              <span className="text-gray-400 text-sm">Attendance</span>
+              <span className="text-gray-400 text-sm">
+                {t("cards.attendance")}
+              </span>
             </div>
             {/* CARD */}
             <div className="flex flex-col gap-4 bg-white p-4 rounded-md w-full">
               <div className="flex items-center gap-4">
-                {" "}
-                <Image
-                  src="/singleBranch.png"
-                  alt=""
-                  width={24}
-                  height={24}
-                  className="w-6 h-6"
-                />
+                <GraduationCap className="w-6 h-6 text-academixPurpleDark" />
                 <h1 className="font-semibold text-xl">
                   {teacher._count.subjects}
                 </h1>
               </div>
-              <span className="text-gray-400 text-sm">Branches</span>
+              <span className="text-gray-400 text-sm">
+                {t("cards.subjects")}
+              </span>
             </div>
             {/* CARD */}
             <div className="flex flex-col gap-4 bg-white p-4 rounded-md w-full">
               <div className="flex items-center gap-4">
-                {" "}
-                <Image
-                  src="/singleLesson.png"
-                  alt=""
-                  width={24}
-                  height={24}
-                  className="w-6 h-6"
-                />
+                <BookOpen className="w-6 h-6 text-academixPurpleDark" />
                 <h1 className="font-semibold text-xl">
                   {teacher._count.lessons}
                 </h1>
               </div>
-              <span className="text-gray-400 text-sm">Lessons</span>
+              <span className="text-gray-400 text-sm">
+                {t("cards.lessons")}
+              </span>
             </div>
             {/* CARD */}
             <div className="flex flex-col gap-4 bg-white p-4 rounded-md w-full">
               <div className="flex items-center gap-4">
-                {" "}
-                <Image
-                  src="/singleClass.png"
-                  alt=""
-                  width={24}
-                  height={24}
-                  className="w-6 h-6"
-                />{" "}
+                <School className="w-6 h-6 text-academixPurpleDark" />
                 <h1 className="font-semibold text-xl">
                   {teacher._count.classes}
                 </h1>
               </div>
-              <span className="text-gray-400 text-sm">Classes</span>
+              <span className="text-gray-400 text-sm">
+                {t("cards.classes")}
+              </span>
             </div>
           </div>
         </div>
         {/* BOTTOM */}
         <div className="bg-white mt-4 p-4 rounded-md h-[800px]">
-          <h1>Teacher&apos;s Schedule</h1>
+          <h1>{t("teacher.schedule")}</h1>
           <BigCalendarContainer type="teacherId" id={id} />
         </div>
       </div>
       {/* RIGHT */}
       <div className="flex flex-col gap-4 w-full xl:w-1/4">
         <div className="bg-white p-4 rounded-md">
-          <h1 className="font-semibold text-xl">Shortcuts</h1>
-          <div className="flex flex-wrap gap-4 mt-4 text-gray-500 text-xs">
+          <h1 className="font-semibold text-xl">{t("shortcuts.title")}</h1>
+          <div className="flex flex-col gap-2 mt-4 text-gray-500 text-xs">
             <Link
-              className="bg-academixSkyLight p-3 rounded-md"
+              className="bg-academixSkyLight p-3 rounded-md hover:font-bold hover:scale-[1.05] transition-all"
               href={`/list/classes?teacherId=${id}`}
             >
-              Teacher&apos;s Classes
+              {t("teacher.classes")}
             </Link>
             <Link
-              className="bg-academixPurpleLight p-3 rounded-md"
+              className="bg-academixPurpleLight p-3 rounded-md hover:font-bold hover:scale-[1.05] transition-all"
               href={`/list/students?teacherId=${id}`}
             >
-              Teacher&apos;s Students
+              {t("teacher.students")}
             </Link>
             <Link
-              className="bg-pink-50 p-3 rounded-md"
+              className="bg-pink-50 p-3 rounded-md hover:font-bold hover:scale-[1.05] transition-all"
               href={`/list/exams?teacherId=${id}`}
             >
-              Teacher&apos;s Exams
+              {t("teacher.exams")}
             </Link>
             <Link
-              className="bg-academixSkyLight p-3 rounded-md"
+              className="bg-academixSkyLight p-3 rounded-md hover:font-bold hover:scale-[1.05] transition-all"
               href={`/list/assignments?teacherId=${id}`}
             >
-              Teacher&apos;s Assignments
+              {t("teacher.assignments")}
             </Link>
           </div>
         </div>
-        <Performance />
         <Announcements />
       </div>
     </div>
diff --git a/src/app/(dashboard)/list/teachers/loading.tsx b/src/app/(dashboard)/list/teachers/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/list/teachers/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/list/teachers/page.tsx b/src/app/(dashboard)/list/teachers/page.tsx
index 2dd78c9..b57072a 100644
--- a/src/app/(dashboard)/list/teachers/page.tsx
+++ b/src/app/(dashboard)/list/teachers/page.tsx
@@ -1,49 +1,50 @@
+import ExportButton from "@/components/ExportButton";
 import FilterSortActions from "@/components/FilterSortActions";
 import FormContainer from "@/components/FormContainer";
 import Pagination from "@/components/Pagination";
 import Table from "@/components/Table";
 import TableSearch from "@/components/TableSearch";
+import { getTranslations } from "next-intl/server";
 import { enforceRouteAccess } from "@/lib/enforce-route-access";
-import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+import { buildTeacherQuery } from "@/lib/query-builders/teacher-query";
 import prisma from "@/lib/prisma";
 import { ITEM_PER_PAGE } from "@/lib/settings";
 import { UserRole } from "@/lib/utils";
-import { Prisma, Subject, Teacher } from "@prisma/client";
+import { Subject, Teacher } from "@prisma/client";
 import { Eye } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
-
+import type { PageSearchParams } from "@/lib/pageParams";
+import SubjectFilter from "@/components/SubjectFilter";
+import ClassFilter from "@/components/ClassFilter";
 type TeacherList = Teacher & {
   subjects: Subject[];
 };
 
-const getColumns = (role: UserRole | null) => [
-  {
-    header: "Info",
-    accessor: "info",
-  },
+const getColumns = (role: UserRole | null, th: (key: string) => string) => [
+  { header: th("info"), accessor: "info" },
   {
-    header: "Teacher ID",
+    header: th("teacherId"),
     accessor: "teacherId",
     className: "hidden md:table-cell",
   },
   {
-    header: "Subjects",
+    header: th("subjects"),
     accessor: "subjects",
     className: "hidden md:table-cell",
   },
   {
-    header: "Phone",
+    header: th("phone"),
     accessor: "phone",
     className: "hidden lg:table-cell",
   },
   {
-    header: "Address",
+    header: th("address"),
     accessor: "address",
     className: "hidden lg:table-cell",
   },
   {
-    header: role === "admin" ? "Actions" : "",
+    header: role === "admin" ? th("actions") : "",
     accessor: "action",
   },
 ];
@@ -63,22 +64,28 @@ const renderRow = (item: TeacherList, role: UserRole | null) => (
       />
       <div className="flex flex-col">
         <h3 className="font-semibold">{item.name}</h3>
-        <p className="text-gray-500 text-xs">{item?.email}</p>
+        <p className="text-gray-500 text-xs">{item.email}</p>
       </div>
     </td>
+
     <td className="hidden md:table-cell">{item.username}</td>
+
     <td className="hidden md:table-cell">
       {item.subjects.map((subject) => subject.name).join(", ")}
     </td>
+
     <td className="hidden md:table-cell">{item.phone}</td>
     <td className="hidden md:table-cell">{item.address}</td>
+
     <td>
       <div className="flex items-center gap-2">
         <Link href={`/list/teachers/${item.id}`}>
-          <button className="flex justify-center items-center bg-academixSky rounded-full w-7 h-7">
+          <button className="flex justify-center items-center bg-academixPurpleDark p-2 rounded-md w-8 h-8 text-white hover:scale-[1.05] transition">
+            {" "}
             <Eye className="w-4 h-4" />
           </button>
         </Link>
+
         {role === "admin" && (
           <FormContainer table="teacher" type="delete" id={item.id} />
         )}
@@ -86,49 +93,64 @@ const renderRow = (item: TeacherList, role: UserRole | null) => (
     </td>
   </tr>
 );
+
 const TeacherListPage = async ({
   searchParams,
 }: {
   searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const th = await getTranslations("tableHeaders");
+  const emptyT = await getTranslations("emptyStates");
   const { role, schoolId } = await enforceRouteAccess("/list/teachers");
 
+  const {
+    query,
+    orderBy,
+    page: p,
+  } = await buildTeacherQuery({
+    searchParams,
+    schoolId,
+  });
+
   const resolvedSearchParams = await searchParams;
-  const { page, ...queryParams } = resolvedSearchParams;
-  const currentPage = getQueryParam(page);
-  const p = currentPage ? parseInt(currentPage) : 1;
-
-  const query: Prisma.TeacherWhereInput = { schoolId };
-  const conditions: Prisma.TeacherWhereInput[] = [];
-  if (queryParams) {
-    for (const [key, rawValue] of Object.entries(queryParams)) {
-      const value = getQueryParam(rawValue);
-
-      if (value !== undefined) {
-        switch (key) {
-          case "classId":
-            conditions.push({
-              lessons: {
-                some: {
-                  classId: parseInt(value),
-                },
-              },
-            });
-            break;
-
-          case "search":
-            conditions.push({
-              name: { contains: value, mode: "insensitive" },
-            });
-            break;
-        }
+
+  const exportQuery = new URLSearchParams(
+    Object.entries(resolvedSearchParams).flatMap(([key, value]) => {
+      if (Array.isArray(value)) {
+        return value.map((item) => [key, item]);
       }
-    }
-  }
 
-  if (conditions.length > 0) {
-    query.AND = conditions;
-  }
+      return value ? [[key, value]] : [];
+    }),
+  );
+    const subjects = await prisma.subject.findMany({
+  where: {
+    schoolId,
+  },
+  select: {
+    id: true,
+    name: true,
+    gradeId: true,
+  },
+  orderBy: {
+    name: "asc",
+  },
+});
+
+const classes = await prisma.class.findMany({
+  where: {
+    schoolId,
+  },
+  select: {
+    id: true,
+    name: true,
+    gradeId: true,
+  },
+  orderBy: {
+    name: "asc",
+  },
+});
 
   const [data, count] = await prisma.$transaction([
     prisma.teacher.findMany({
@@ -136,7 +158,7 @@ const TeacherListPage = async ({
       include: {
         subjects: true,
       },
-      orderBy: { name: "asc" },
+      orderBy,
       take: ITEM_PER_PAGE,
       skip: (p - 1) * ITEM_PER_PAGE,
     }),
@@ -147,26 +169,38 @@ const TeacherListPage = async ({
 
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
-      {/* TOP */}
-      <div className="flex justify-between items-center">
-        <h1 className="hidden md:block font-semibold text-lg">All Teachers</h1>
-        <div className="flex md:flex-row flex-col items-center gap-4 w-full md:w-auto">
+      <div className="flex flex-wrap justify-between items-center gap-4">
+        <h1 className="font-semibold text-lg">{t("allTeachers")}</h1>
+
+        <div className="flex flex-wrap items-center gap-2 w-full md:w-auto">
+         <SubjectFilter subjects={subjects} classes={classes} />
+         <ClassFilter classes={classes} />
           <TableSearch />
-          <div className="flex items-center self-end gap-4">
-            <FilterSortActions />
+
+          <div className="flex items-center self-end gap-2">
+            <FilterSortActions sortKey="sort" />
+
             {role === "admin" && (
-              <FormContainer table="teacher" type="create" />
+              <>
+                <ExportButton
+                  href={`/api/admin/teachers/export?${exportQuery.toString()}`}
+                />
+
+                <FormContainer table="teacher" type="create" />
+              </>
             )}
           </div>
         </div>
       </div>
-      {/* LIST */}
+
       <Table
-        columns={getColumns(role)}
+        columns={getColumns(role, th)}
         renderRow={(item) => renderRow(item, role)}
         data={data}
+        emptyTitle={emptyT("teachers")}
+        emptyDescription={emptyT("filterDescription")}
       />
-      {/* PAGINATION */}
+
       <Pagination page={p} count={count} />
     </div>
   );
diff --git a/src/app/(dashboard)/parent/layout.tsx b/src/app/(dashboard)/parent/layout.tsx
index 36e383e..faf2381 100644
--- a/src/app/(dashboard)/parent/layout.tsx
+++ b/src/app/(dashboard)/parent/layout.tsx
@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation";
-import { getAuthUser, requireRole } from "@/lib/auth";
+import { enforceAdminSchoolAccess, getAuthUser, requireRole } from "@/lib/auth";
 
 export default async function ParentLayout({
   children,
@@ -13,6 +13,7 @@ export default async function ParentLayout({
   }
 
   requireRole(user, ["parent"]);
+  await enforceAdminSchoolAccess(user);
 
   return <>{children}</>;
 }
diff --git a/src/app/(dashboard)/parent/loading.tsx b/src/app/(dashboard)/parent/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/parent/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/parent/page.tsx b/src/app/(dashboard)/parent/page.tsx
index 401c2a6..37537a2 100644
--- a/src/app/(dashboard)/parent/page.tsx
+++ b/src/app/(dashboard)/parent/page.tsx
@@ -1,57 +1,106 @@
 import Announcements from "@/components/Announcements";
 import BigCalendarContainer from "@/components/BigCalendarContainer";
+import EmptyState from "@/components/states/EmptyState";
 import EventCalendarContainer from "@/components/EventCalendarContainer";
 import StudentSelector from "@/components/StudentSelector";
-import { getAuthUser, requireAuth } from "@/lib/auth";
+import { requireAuth } from "@/lib/auth";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
 import prisma from "@/lib/prisma";
+import { getTranslations } from "next-intl/server";
 
 const ParentPage = async ({
   searchParams,
 }: {
-  searchParams: Promise<{ [key: string]: string }>;
+  searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("sidebar.items");
+  const th = await getTranslations("tableHeaders");
+  const statesT = await getTranslations("states");
   const params = await searchParams;
-  const user = requireAuth();
+  const user = await requireAuth();
 
   const students = await prisma.student.findMany({
     where: {
-      parentId: (await user).userId,
-      schoolId: (await user).schoolId,
+      parentId: user.userId,
+      schoolId: user.schoolId,
     },
     select: {
       id: true,
       name: true,
       classId: true,
+      class: {
+        select: {
+          name: true,
+        },
+      },
     },
+    orderBy: { name: "asc" },
   });
 
   if (!students.length) {
-    return <div>No students found</div>;
+    return (
+      <div className="flex-1 bg-white m-4 mt-0 p-4 rounded-md">
+        <EmptyState
+          title={statesT("noStudentsLinked")}
+          description={statesT("noStudentsLinkedDescription")}
+        />
+      </div>
+    );
   }
 
-  const selectedStudentId = params?.studentId || students[0].id;
-
-  const selectedStudent = students.find((s) => s.id === selectedStudentId);
+  const classOptions = Array.from(
+    new Map(
+      students
+        .filter((student) => student.classId)
+        .map((student) => [
+          student.classId,
+          {
+            id: student.classId!,
+            name: student.class?.name ?? String(student.classId),
+          },
+        ]),
+    ).values(),
+  );
+  const requestedClassId = Number.parseInt(
+    getQueryParam(params.classId) ?? "",
+    10,
+  );
+  const selectedClass =
+    classOptions.find((classOption) => classOption.id === requestedClassId) ??
+    classOptions[0];
 
-  const classId = selectedStudent?.classId;
+  const classId = selectedClass?.id;
 
   return (
     <div className="flex xl:flex-row flex-col flex-1 gap-4 p-4">
       {/* LEFT */}
       <div className="w-full xl:w-2/3">
         <div className="bg-white p-4 rounded-md h-full">
-          <h1 className="font-semibold text-xl">Schedule</h1>
-          {students.length > 1 && <StudentSelector students={students} />}
+          <div className="flex sm:flex-row flex-col sm:justify-between sm:items-center gap-3 mb-4">
+            <h1 className="font-semibold text-xl">{t("schedules")}</h1>
+            {classOptions.length > 1 && (
+              <StudentSelector
+                classes={classOptions}
+                selectedClassId={classId}
+                label={th("class")}
+              />
+            )}
+          </div>
+
           {classId ? (
             <BigCalendarContainer type="classId" id={classId} />
           ) : (
-            <div>No class found</div>
+            <EmptyState
+              title={statesT("noClassAssigned")}
+              description={statesT("selectedStudentNoClass")}
+              className="py-8"
+            />
           )}
         </div>
       </div>
 
       {/* RIGHT */}
-      <div className="flex flex-col gap-8 w-full xl:w-1/3">
+      <div className="flex flex-col justify-between w-full lg:w-1/3">
         <EventCalendarContainer searchParams={searchParams} />
         <Announcements />
       </div>
diff --git a/src/app/(dashboard)/profile/page.tsx b/src/app/(dashboard)/profile/page.tsx
new file mode 100644
index 0000000..cf1bf1a
--- /dev/null
+++ b/src/app/(dashboard)/profile/page.tsx
@@ -0,0 +1,232 @@
+import Image from "next/image";
+import { requireAuth } from "@/lib/auth";
+import prisma from "@/lib/prisma";
+import { getTranslations } from "next-intl/server";
+
+const ProfilePage = async () => {
+  const t = await getTranslations("profile");
+  const user = await requireAuth();
+
+  if (user.role === "admin") {
+    const profile = await prisma.admin.findUnique({
+      where: { id: user.userId },
+      include: { school: true },
+    });
+
+    if (!profile) return <div className="p-6">{t("notFound")}</div>;
+
+    return (
+      <ProfileLayout image={null} name={profile.username} avatarAlt={t("avatarAlt")}>
+        <Info title={t("fields.adminUsername")} value={profile.username} fallback={t("notProvided")} />
+        <Info title={t("fields.schoolName")} value={profile.school.name} fallback={t("notProvided")} />
+        <Info title={t("fields.schoolId")} value={profile.school.id} fallback={t("notProvided")} />
+        <Info
+          title={t("fields.createdAt")}
+          value={profile.school.createdAt.toLocaleDateString()}
+          fallback={t("notProvided")}
+        />
+        <Info
+          title={t("fields.updatedAt")}
+          value={profile.school.updatedAt.toLocaleDateString()}
+          fallback={t("notProvided")}
+        />
+      </ProfileLayout>
+    );
+  }
+
+  if (user.role === "teacher") {
+    const profile = await prisma.teacher.findUnique({
+      where: { id: user.userId },
+      include: { school: true, subjects: true, classes: true },
+    });
+
+    if (!profile) return <div className="p-6">{t("notFound")}</div>;
+
+    return (
+      <ProfileLayout image={profile.img} name={profile.name} avatarAlt={t("avatarAlt")}>
+        <Info title={t("fields.name")} value={profile.name} fallback={t("notProvided")} />
+        <Info title={t("fields.username")} value={profile.username} fallback={t("notProvided")} />
+        <Info title={t("fields.email")} value={profile.email} fallback={t("notProvided")} />
+        <Info title={t("fields.phone")} value={profile.phone} fallback={t("notProvided")} />
+        <Info title={t("fields.address")} value={profile.address} fallback={t("notProvided")} />
+        <Info title={t("fields.bloodType")} value={profile.bloodType} fallback={t("notProvided")} />
+        <Info title={t("fields.gender")} value={profile.sex} fallback={t("notProvided")} />
+        <Info
+          title={t("fields.birthday")}
+          value={profile.birthday.toLocaleDateString()}
+          fallback={t("notProvided")}
+        />
+        <Info
+          title={t("fields.subjects")}
+          value={profile.subjects.map((s) => s.name).join(", ")}
+          fallback={t("notProvided")}
+        />
+        <Info
+          title={t("fields.classes")}
+          value={profile.classes.map((c) => c.name).join(", ")}
+          fallback={t("notProvided")}
+        />
+        <Info title={t("fields.school")} value={profile.school.name} fallback={t("notProvided")} />
+      </ProfileLayout>
+    );
+  }
+
+  if (user.role === "student") {
+    const profile = await prisma.student.findUnique({
+      where: { id: user.userId },
+      include: { school: true, grade: true, class: true, parent: true },
+    });
+
+    if (!profile) return <div className="p-6">{t("notFound")}</div>;
+
+    return (
+      <ProfileLayout image={profile.img} name={profile.name} avatarAlt={t("avatarAlt")}>
+        <Info title={t("fields.name")} value={profile.name} fallback={t("notProvided")} />
+        <Info title={t("fields.username")} value={profile.username} fallback={t("notProvided")} />
+        <Info title={t("fields.email")} value={profile.email} fallback={t("notProvided")} />
+        <Info title={t("fields.phone")} value={profile.phone} fallback={t("notProvided")} />
+        <Info title={t("fields.address")} value={profile.address} fallback={t("notProvided")} />
+        <Info title={t("fields.bloodType")} value={profile.bloodType} fallback={t("notProvided")} />
+        <Info title={t("fields.gender")} value={profile.sex} fallback={t("notProvided")} />
+        <Info
+          title={t("fields.birthday")}
+          value={profile.birthday.toLocaleDateString()}
+          fallback={t("notProvided")}
+        />
+        <Info title={t("fields.grade")} value={profile.grade.level} fallback={t("notProvided")} />
+        <Info title={t("fields.class")} value={profile.class.name} fallback={t("notProvided")} />
+        <Info title={t("fields.status")} value={profile.status} fallback={t("notProvided")} />
+        <Info title={t("fields.parent")} value={profile.parent?.name} fallback={t("notProvided")} />
+        <Info title={t("fields.school")} value={profile.school.name} fallback={t("notProvided")} />
+      </ProfileLayout>
+    );
+  }
+
+  const profile = await prisma.parent.findUnique({
+    where: { id: user.userId },
+    include: { school: true, students: true },
+  });
+
+  if (!profile) return <div className="p-6">{t("notFound")}</div>;
+
+  return (
+    <ProfileLayout image={null} name={profile.name} avatarAlt={t("avatarAlt")}>
+      <Info title={t("fields.name")} value={profile.name} fallback={t("notProvided")} />
+      <Info title={t("fields.username")} value={profile.username} fallback={t("notProvided")} />
+      <Info title={t("fields.email")} value={profile.email} fallback={t("notProvided")} />
+      <Info title={t("fields.phone")} value={profile.phone} fallback={t("notProvided")} />
+      <Info title={t("fields.address")} value={profile.address} fallback={t("notProvided")} />
+      <Info
+        title={t("fields.children")}
+        value={profile.students.map((s) => s.name).join(", ")}
+        fallback={t("notProvided")}
+      />
+      <Info title={t("fields.school")} value={profile.school.name} fallback={t("notProvided")} />
+    </ProfileLayout>
+  );
+};
+
+const ProfileLayout = ({
+  image,
+  name,
+  avatarAlt,
+  children,
+}: {
+  image: string | null;
+  name: string;
+  avatarAlt: string;
+  children: React.ReactNode;
+}) => {
+  return (
+    <div className="p-4 md:p-8 bg-[#f4f7fb] min-h-screen">
+      <div className="max-w-6xl mx-auto bg-white rounded-[32px] shadow-[0_10px_60px_rgba(0,0,0,0.08)] overflow-hidden border border-gray-100">
+
+        {/* Banner */}
+       <div className="h-44 bg-gradient-to-r from-[#7c3aed] via-[#7c3aed] to-[#c026d3]" />
+
+        <div className="px-6 md:px-10 pb-10">
+          <div className="flex flex-col items-center -mt-24">
+
+            <Image
+              src={image || "/avatar.png"}
+              alt={avatarAlt}
+              width={170}
+              height={170}
+              className="
+                rounded-full
+                object-cover
+                border-[6px]
+                border-white
+                shadow-[0_20px_60px_rgba(0,0,0,0.18)]
+                ring-4
+                ring-blue-100
+              "
+            />
+
+            <h2
+              className="
+                  mt-5
+    text-2xl
+    font-extrabold
+    text-center
+    bg-gradient-to-r
+    from-violet-600
+    via-fuchsia-500
+    to-pink-500
+    bg-clip-text
+    text-transparent
+              "
+            >
+              {name}
+            </h2>
+          </div>
+
+          <div className="mt-10">
+            
+
+            <div className="grid grid-cols-1 md:grid-cols-2 gap-5">
+              {children}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+const Info = ({
+  title,
+  value,
+  fallback,
+}: {
+  title: string;
+  value?: React.ReactNode;
+  fallback: string;
+}) => {
+  return (
+    <div
+      className="
+        bg-white
+        hover:-translate-y-1
+        transition-all
+        duration-300
+        border
+        border-gray-200
+        rounded-2xl
+        p-5
+        shadow-sm
+        hover:shadow-xl
+      "
+    >
+      <p className="text-sm text-gray-500 font-medium">
+        {title}
+      </p>
+
+      <p className="text-base font-semibold text-gray-800 mt-2 break-words">
+        {value || fallback}
+      </p>
+    </div>
+  );
+};
+
+export default ProfilePage;
diff --git a/src/app/(dashboard)/settings/loading.tsx b/src/app/(dashboard)/settings/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/settings/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/settings/page.tsx b/src/app/(dashboard)/settings/page.tsx
index 99f005f..db1c7cb 100644
--- a/src/app/(dashboard)/settings/page.tsx
+++ b/src/app/(dashboard)/settings/page.tsx
@@ -1,40 +1,37 @@
-import AcademicYearForm from "@/components/AcademicYearForm";
-import SchoolSettingsForm from "@/components/SchoolSettingsForm";
+import SettingsSectionsPanel from "@/components/SettingsSectionsPanel";
 import { getAcademicYears } from "@/lib/academicYears";
-import { requireAuth, requireRole } from "@/lib/auth";
-import { getSchoolScheduleSettings } from "@/lib/schoolSettings";
+import { enforceAdminSchoolAccess, requireAuth, requireRole } from "@/lib/auth";
+import {
+  getSchoolDayExceptions,
+  getSchoolScheduleSettings,
+} from "@/lib/schoolSettings";
+import { getTranslations } from "next-intl/server";
 
 const SettingsPage = async () => {
+  const t = await getTranslations("pages");
+  const settingsT = await getTranslations("settings");
   const user = await requireAuth();
   requireRole(user, ["admin"]);
+  await enforceAdminSchoolAccess(user);
 
-  const [settings, academicYears] = await Promise.all([
+  const [settings, academicYears, dayExceptions] = await Promise.all([
     getSchoolScheduleSettings(user.schoolId),
     getAcademicYears(user.schoolId),
+    getSchoolDayExceptions(user.schoolId),
   ]);
 
   return (
     <div className="bg-white m-4 mt-0 p-6 rounded-md">
-      <h1 className="font-semibold text-xl">School Settings</h1>
+      <h1 className="font-semibold text-xl">{t("settings")}</h1>
       <p className="mt-2 text-gray-500 text-sm">
-        Configure weekly schedule defaults used by lessons and calendar
-        rendering.
+        {settingsT("description")}
       </p>
 
-      <div className="mt-6 max-w-3xl">
-        <SchoolSettingsForm initialSettings={settings} />
-      </div>
-
-      <div className="mt-10 max-w-4xl">
-        <h2 className="font-semibold text-lg">Academic Years</h2>
-        <p className="mt-2 text-gray-500 text-sm">
-          Create and maintain academic year ranges.
-        </p>
-
-        <div className="mt-4">
-          <AcademicYearForm academicYears={academicYears} />
-        </div>
-      </div>
+      <SettingsSectionsPanel
+        settings={settings}
+        academicYears={academicYears}
+        dayExceptions={dayExceptions}
+      />
     </div>
   );
 };
diff --git a/src/app/(dashboard)/student/layout.tsx b/src/app/(dashboard)/student/layout.tsx
index 981a32c..73ffab0 100644
--- a/src/app/(dashboard)/student/layout.tsx
+++ b/src/app/(dashboard)/student/layout.tsx
@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation";
-import { getAuthUser, requireRole } from "@/lib/auth";
+import { enforceAdminSchoolAccess, getAuthUser, requireRole } from "@/lib/auth";
 
 export default async function StudentLayout({
   children,
@@ -13,6 +13,7 @@ export default async function StudentLayout({
   }
 
   requireRole(user, ["student"]);
+  await enforceAdminSchoolAccess(user);
 
   return <>{children}</>;
 }
diff --git a/src/app/(dashboard)/student/loading.tsx b/src/app/(dashboard)/student/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/student/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/student/page.tsx b/src/app/(dashboard)/student/page.tsx
index 1b625cc..e81a082 100644
--- a/src/app/(dashboard)/student/page.tsx
+++ b/src/app/(dashboard)/student/page.tsx
@@ -1,8 +1,10 @@
 import Announcements from "@/components/Announcements";
 import BigCalendarContainer from "@/components/BigCalendarContainer";
+import EmptyState from "@/components/states/EmptyState";
 import EventCalendarContainer from "@/components/EventCalendarContainer";
 import { getAuthUser, requireAuth } from "@/lib/auth";
 import prisma from "@/lib/prisma";
+import { getTranslations } from "next-intl/server";
 
 const StudentPage = async ({
   searchParams,
@@ -10,6 +12,8 @@ const StudentPage = async ({
   searchParams: Promise<{ [key: string]: string }>;
 }) => {
   const user = requireAuth();
+  const t = await getTranslations("sidebar.items");
+  const statesT = await getTranslations("states");
 
   const studentClass = await prisma.class.findFirst({
     where: {
@@ -30,18 +34,22 @@ const StudentPage = async ({
       {/* LEFT */}
       <div className="w-full xl:w-2/3">
         <div className="bg-white p-4 rounded-md h-full">
-          <h1 className="font-semibold text-xl">Schedule</h1>
+          <h1 className="font-semibold text-xl">{t("schedules")}</h1>
 
           {classId ? (
             <BigCalendarContainer type="classId" id={classId} />
           ) : (
-            <div>No class found</div>
+            <EmptyState
+              title={statesT("noClassAssigned")}
+              description={statesT("selectedStudentNoClass")}
+              className="py-8"
+            />
           )}
         </div>
       </div>
 
       {/* RIGHT */}
-      <div className="flex flex-col gap-8 w-full xl:w-1/3">
+      <div className="flex flex-col justify-between w-full lg:w-1/3">
         <EventCalendarContainer searchParams={searchParams} />
         <Announcements />
       </div>
diff --git a/src/app/(dashboard)/super-admin/layout.tsx b/src/app/(dashboard)/super-admin/layout.tsx
new file mode 100644
index 0000000..43985b9
--- /dev/null
+++ b/src/app/(dashboard)/super-admin/layout.tsx
@@ -0,0 +1,16 @@
+import { redirect } from "next/navigation";
+import { getAuthUser, requireRole } from "@/lib/auth";
+
+export default async function SuperAdminLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const user = await getAuthUser();
+  if (!user) {
+    redirect("/sign-in");
+  }
+
+  requireRole(user, ["superAdmin"]);
+  return <>{children}</>;
+}
diff --git a/src/app/(dashboard)/super-admin/page.tsx b/src/app/(dashboard)/super-admin/page.tsx
new file mode 100644
index 0000000..077b863
--- /dev/null
+++ b/src/app/(dashboard)/super-admin/page.tsx
@@ -0,0 +1,172 @@
+import Pagination from "@/components/Pagination";
+import SchoolStatusActions from "@/components/SchoolStatusActions";
+import SchoolStatusFilter from "@/components/SchoolStatusFilter";
+import Table from "@/components/Table";
+import TableSearch from "@/components/TableSearch";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import type { PageSearchParams } from "@/lib/pageParams";
+import { getQueryParam } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+import { ITEM_PER_PAGE } from "@/lib/settings";
+import { School, SchoolStatus } from "@prisma/client";
+import { getTranslations } from "next-intl/server";
+
+const statusPillClass: Record<SchoolStatus, string> = {
+  PENDING: "bg-yellow-100 text-yellow-800",
+  ACTIVE: "bg-green-100 text-green-800",
+  PAUSED: "bg-red-100 text-red-800",
+};
+
+const StatusPill = ({ status }: { status: SchoolStatus }) => (
+  <span className={`px-2 py-1 rounded-full text-xs ${statusPillClass[status]}`}>
+    {status}
+  </span>
+);
+
+const SuperAdminPage = async ({
+  searchParams,
+}: {
+  searchParams: PageSearchParams;
+}) => {
+  const pagesT = await getTranslations("sidebar.items");
+  const th = await getTranslations("tableHeaders");
+  const emptyT = await getTranslations("emptyStates");
+  await enforceRouteAccess("/super-admin");
+  const resolved = await searchParams;
+  const page = Number.parseInt(getQueryParam(resolved.page) ?? "1", 10) || 1;
+  const search = getQueryParam(resolved.search)?.trim() ?? "";
+  const status = getQueryParam(resolved.status) as SchoolStatus | undefined;
+
+  const where = {
+    ...(search
+      ? {
+          OR: [
+            { name: { contains: search, mode: "insensitive" as const } },
+            {
+              admins: {
+                some: {
+                  username: { contains: search, mode: "insensitive" as const },
+                },
+              },
+            },
+          ],
+        }
+      : {}),
+    ...(status && ["PENDING", "ACTIVE", "PAUSED"].includes(status)
+      ? { status }
+      : {}),
+  };
+
+  const [schools, count] = await Promise.all([
+    prisma.school.findMany({
+      where,
+      include: { admins: true },
+      orderBy: { createdAt: "desc" },
+      take: ITEM_PER_PAGE,
+      skip: (page - 1) * ITEM_PER_PAGE,
+    }),
+    prisma.school.count({ where }),
+  ]);
+
+  return (
+    <div className="flex-1 bg-white m-2 sm:m-4 mt-0 sm:mt-0 p-3 sm:p-4 rounded-md">
+      <div className="flex sm:flex-row flex-col sm:flex-wrap justify-between sm:items-center gap-4">
+        <h1 className="font-semibold text-lg">{pagesT("schools")}</h1>
+        <div className="flex sm:flex-row flex-col sm:flex-wrap sm:items-center gap-2 w-fit">
+          <TableSearch />
+          <SchoolStatusFilter />
+        </div>
+      </div>
+
+      <div className="md:hidden space-y-3 mt-4">
+        {schools.length === 0 ? (
+          <div className="flex justify-center items-center min-h-[300px]">
+            <div className="text-gray-500 text-sm text-center">
+              <p className="font-medium text-gray-700">
+                {emptyT("defaultTitle")}
+              </p>
+              <p>{emptyT("defaultDescription")}</p>
+            </div>
+          </div>
+        ) : (
+          schools.map((school) => (
+            <div
+              key={school.id}
+              className="bg-white shadow-sm p-3 border border-gray-100 rounded-md"
+            >
+              <div className="flex justify-between items-start gap-3">
+                <div className="min-w-0">
+                  <p className="font-medium text-sm truncate">{school.name}</p>
+                  <p className="mt-1 text-gray-500 text-xs">
+                    {th("adminUsername")}: {school.admins[0]?.username ?? "-"}
+                  </p>
+                </div>
+                <StatusPill status={school.status} />
+              </div>
+
+              {school.pauseReason && (
+                <p className="mt-3 text-gray-600 text-xs">
+                  <span className="font-medium">{th("pauseReason")}:</span>{" "}
+                  {school.pauseReason}
+                </p>
+              )}
+
+              <div className="mt-3">
+                <SchoolStatusActions
+                  schoolId={school.id}
+                  schoolName={school.name}
+                  schoolStatus={school.status}
+                />
+              </div>
+            </div>
+          ))
+        )}
+      </div>
+
+      <div className="hidden md:block">
+        <Table
+          columns={[
+            { header: th("school"), accessor: "school" },
+            { header: th("adminUsername"), accessor: "admin" },
+            { header: th("status"), accessor: "status" },
+            {
+              header: th("pauseReason"),
+              accessor: "reason",
+              className: "hidden lg:table-cell",
+            },
+            { header: th("actions"), accessor: "actions" },
+          ]}
+          data={schools}
+          emptyTitle={emptyT("defaultTitle")}
+          emptyDescription={emptyT("defaultDescription")}
+          renderRow={(school: School & { admins: { username: string }[] }) => (
+            <tr
+              key={school.id}
+              className="hover:bg-academixPurpleLight even:bg-slate-50 border-b text-sm"
+            >
+              <td className="p-4 font-medium">{school.name}</td>
+              <td>{school.admins[0]?.username ?? "-"}</td>
+              <td>
+                <StatusPill status={school.status} />
+              </td>
+              <td className="hidden lg:table-cell">
+                {school.pauseReason ?? "-"}
+              </td>
+              <td>
+                <SchoolStatusActions
+                  schoolId={school.id}
+                  schoolName={school.name}
+                  schoolStatus={school.status}
+                />
+              </td>
+            </tr>
+          )}
+        />
+      </div>
+
+      <Pagination page={page} count={count} />
+    </div>
+  );
+};
+
+export default SuperAdminPage;
diff --git a/src/app/(dashboard)/teacher/layout.tsx b/src/app/(dashboard)/teacher/layout.tsx
index 474f18f..83c08c8 100644
--- a/src/app/(dashboard)/teacher/layout.tsx
+++ b/src/app/(dashboard)/teacher/layout.tsx
@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation";
-import { getAuthUser, requireRole } from "@/lib/auth";
+import { enforceAdminSchoolAccess, getAuthUser, requireRole } from "@/lib/auth";
 
 export default async function TeacherLayout({
   children,
@@ -13,6 +13,7 @@ export default async function TeacherLayout({
   }
 
   requireRole(user, ["teacher"]);
+  await enforceAdminSchoolAccess(user);
 
   return <>{children}</>;
 }
diff --git a/src/app/(dashboard)/teacher/loading.tsx b/src/app/(dashboard)/teacher/loading.tsx
new file mode 100644
index 0000000..6cc68f2
--- /dev/null
+++ b/src/app/(dashboard)/teacher/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
+
+export default function Loading() {
+  return <LoadingIndicator />;
+}
diff --git a/src/app/(dashboard)/teacher/page.tsx b/src/app/(dashboard)/teacher/page.tsx
index a4f7d6d..7290f1e 100644
--- a/src/app/(dashboard)/teacher/page.tsx
+++ b/src/app/(dashboard)/teacher/page.tsx
@@ -23,7 +23,7 @@ const TeacherPage = async ({
       </div>
 
       {/* RIGHT */}
-      <div className="flex flex-col gap-8 w-full xl:w-1/3">
+      <div className="flex flex-col justify-between w-full lg:w-1/3">
         <EventCalendarContainer searchParams={searchParams} />
         <Announcements />
       </div>
diff --git a/src/app/api/admin/assignments/export/route.ts b/src/app/api/admin/assignments/export/route.ts
new file mode 100644
index 0000000..9a995e5
--- /dev/null
+++ b/src/app/api/admin/assignments/export/route.ts
@@ -0,0 +1,102 @@
+import { buildAssignmentQuery } from "@/lib/query-builders/assignment-query";
+import { createCsvResponse, generateCsv } from "@/lib/csv";
+import { searchParamsToRecord } from "@/lib/pageParams";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import prisma from "@/lib/prisma";
+import { NextRequest, NextResponse } from "next/server";
+
+const formatDateTime = (date: Date) =>
+  new Intl.DateTimeFormat("en-US", {
+    dateStyle: "medium",
+    timeStyle: "short",
+  }).format(date);
+
+export async function GET(request: NextRequest) {
+  const { role, userId, schoolId } =
+    await enforceRouteAccess("/list/assignments");
+
+  if (role !== "admin") {
+    return new NextResponse("Forbidden", { status: 403 });
+  }
+
+  const searchParams = Promise.resolve(
+    searchParamsToRecord(request.nextUrl.searchParams),
+  );
+
+const { academicYearId, query, orderBy } =
+  await buildAssignmentQuery({
+    searchParams,
+    schoolId,
+    role,
+    userId,
+  });
+
+  if (!academicYearId || !query) {
+    return new NextResponse("No active academic year found.", {
+      status: 400,
+    });
+  }
+
+  const assignments = await prisma.assignment.findMany({
+    where: query,
+    include: {
+      subject: {
+        select: {
+          name: true,
+        },
+      },
+      class: {
+        select: {
+          name: true,
+        },
+      },
+      lesson: {
+        select: {
+          teacher: {
+            select: {
+              name: true,
+            },
+          },
+        },
+      },
+      teacher: {
+        select: {
+          name: true,
+        },
+      },
+    },
+    orderBy,
+  });
+
+  const csv = generateCsv(
+    [
+      {
+        header: "Title",
+        value: (row) => row.title,
+      },
+      {
+        header: "Subject",
+        value: (row) => row.subject?.name ?? "-",
+      },
+      {
+        header: "Class",
+        value: (row) => row.class?.name ?? "-",
+      },
+      {
+        header: "Teacher",
+        value: (row) => row.teacher?.name ?? row.lesson?.teacher.name ?? "-",
+      },
+      {
+        header: "Start Date",
+        value: (row) => formatDateTime(row.startDate),
+      },
+      {
+        header: "End Date",
+        value: (row) => formatDateTime(row.endDate),
+      },
+    ],
+    assignments
+  );
+
+  return createCsvResponse("assignments.csv", csv);
+}
diff --git a/src/app/api/admin/classes/export/route.ts b/src/app/api/admin/classes/export/route.ts
new file mode 100644
index 0000000..3a1f100
--- /dev/null
+++ b/src/app/api/admin/classes/export/route.ts
@@ -0,0 +1,60 @@
+import { NextRequest } from "next/server";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { buildClassQuery } from "@/lib/query-builders/class-query";
+import { createCsvResponse, generateCsv } from "@/lib/csv";
+import { searchParamsToRecord } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+
+export async function GET(req: NextRequest) {
+  const { role, schoolId } = await enforceRouteAccess("/list/classes");
+
+  if (role !== "admin") {
+    return new Response("Forbidden", { status: 403 });
+  }
+
+  const searchParams = Promise.resolve(
+    searchParamsToRecord(req.nextUrl.searchParams),
+  );
+
+  const { query, orderBy } = await buildClassQuery({
+    searchParams,
+    schoolId,
+  });
+
+  const classes = await prisma.class.findMany({
+    where: query,
+    include: {
+      supervisor: true,
+      grade: {
+        select: {
+          level: true,
+        },
+      },
+    },
+    orderBy,
+  });
+
+  const csv = generateCsv(
+    [
+      {
+        header: "Class Name",
+        value: (item) => item.name,
+      },
+      {
+        header: "Capacity",
+        value: (item) => item.capacity,
+      },
+      {
+        header: "Grade",
+        value: (item) => item.grade?.level ?? "",
+      },
+      {
+        header: "Supervisor",
+        value: (item) => item.supervisor?.name ?? "No supervisor",
+      },
+    ],
+    classes
+  );
+
+  return createCsvResponse("classes-export.csv", csv);
+}
diff --git a/src/app/api/admin/exams/export/route.ts b/src/app/api/admin/exams/export/route.ts
new file mode 100644
index 0000000..d3b91fe
--- /dev/null
+++ b/src/app/api/admin/exams/export/route.ts
@@ -0,0 +1,98 @@
+import { NextRequest } from "next/server";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { createCsvResponse, generateCsv } from "@/lib/csv";
+import { buildExamQuery } from "@/lib/query-builders/exam-query";
+import { searchParamsToRecord } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+
+export async function GET(req: NextRequest) {
+  const { role, userId, schoolId } = await enforceRouteAccess("/list/exams");
+
+  if (role !== "admin") {
+    return new Response("Forbidden", { status: 403 });
+  }
+
+  const { query, orderBy } = await buildExamQuery({
+    searchParams: Promise.resolve(
+      searchParamsToRecord(req.nextUrl.searchParams),
+    ),
+    schoolId,
+    role,
+    userId,
+  });
+
+  if (!query) {
+    return new Response("No current academic year found", { status: 400 });
+  }
+
+  const exams = await prisma.exam.findMany({
+    where: query,
+    include: {
+      subject: {
+        select: {
+          name: true,
+        },
+      },
+      class: {
+        select: {
+          name: true,
+        },
+      },
+      lesson: {
+        select: {
+          teacher: {
+            select: {
+              name: true,
+            },
+          },
+        },
+      },
+      teacher: {
+        select: {
+          name: true,
+        },
+      },
+    },
+    orderBy,
+  });
+
+  const csv = generateCsv(
+    [
+      {
+        header: "Title",
+        value: (exam) => exam.title,
+      },
+      {
+        header: "Subject",
+        value: (exam) => exam.subject?.name,
+      },
+      {
+        header: "Class",
+        value: (exam) => exam.class?.name,
+      },
+      {
+        header: "Teacher",
+        value: (exam) => exam.teacher?.name ?? exam.lesson?.teacher.name,
+      },
+      {
+        header: "Start Time",
+        value: (exam) =>
+          new Intl.DateTimeFormat("en-US", {
+            dateStyle: "short",
+            timeStyle: "short",
+          }).format(exam.startTime),
+      },
+      {
+        header: "End Time",
+        value: (exam) =>
+          new Intl.DateTimeFormat("en-US", {
+            dateStyle: "short",
+            timeStyle: "short",
+          }).format(exam.endTime),
+      },
+    ],
+    exams
+  );
+
+  return createCsvResponse("exams-export.csv", csv);
+}
diff --git a/src/app/api/admin/lessons/export/route.ts b/src/app/api/admin/lessons/export/route.ts
new file mode 100644
index 0000000..181d781
--- /dev/null
+++ b/src/app/api/admin/lessons/export/route.ts
@@ -0,0 +1,88 @@
+import { NextRequest } from "next/server";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { createCsvResponse, generateCsv } from "@/lib/csv";
+import prisma from "@/lib/prisma";
+
+export async function GET(req: NextRequest) {
+  const { role, schoolId } = await enforceRouteAccess("/list/lessons");
+
+  if (role !== "admin") {
+    return new Response("Forbidden", { status: 403 });
+  }
+
+  const classId = req.nextUrl.searchParams.get("classId");
+
+  if (!classId) {
+    return new Response("Class ID is required", { status: 400 });
+  }
+
+  const lessons = await prisma.lesson.findMany({
+    where: {
+      classId: Number(classId),
+      class: {
+        schoolId,
+      },
+    },
+    include: {
+      subject: true,
+      teacher: true,
+      class: {
+        include: {
+          grade: true,
+        },
+      },
+    },
+    orderBy: [
+      { day: "asc" },
+      { startTime: "asc" },
+    ],
+  });
+
+  const csv = generateCsv(
+    [
+      {
+        header: "Lesson Name",
+        value: (lesson) => lesson.name,
+      },
+      {
+        header: "Day",
+        value: (lesson) => lesson.day,
+      },
+      {
+        header: "Start Time",
+        value: (lesson) =>
+          new Intl.DateTimeFormat("en-US", {
+            hour: "2-digit",
+            minute: "2-digit",
+          }).format(lesson.startTime),
+      },
+      {
+        header: "End Time",
+        value: (lesson) =>
+          new Intl.DateTimeFormat("en-US", {
+            hour: "2-digit",
+            minute: "2-digit",
+          }).format(lesson.endTime),
+      },
+      {
+        header: "Subject",
+        value: (lesson) => lesson.subject?.name,
+      },
+      {
+        header: "Teacher",
+        value: (lesson) => lesson.teacher?.name,
+      },
+      {
+        header: "Class",
+        value: (lesson) => lesson.class?.name,
+      },
+      {
+        header: "Grade",
+        value: (lesson) => lesson.class?.grade?.level,
+      },
+    ],
+    lessons
+  );
+
+  return createCsvResponse("lessons-export.csv", csv);
+}
\ No newline at end of file
diff --git a/src/app/api/admin/parents/export/route.ts b/src/app/api/admin/parents/export/route.ts
new file mode 100644
index 0000000..defba45
--- /dev/null
+++ b/src/app/api/admin/parents/export/route.ts
@@ -0,0 +1,68 @@
+import { NextRequest } from "next/server";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { buildParentQuery } from "@/lib/query-builders/parent-query";
+import { createCsvResponse, generateCsv } from "@/lib/csv";
+import { searchParamsToRecord } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+
+export async function GET(req: NextRequest) {
+  const { role, userId, schoolId } = await enforceRouteAccess("/list/parents");
+
+  if (role !== "admin") {
+    return new Response("Forbidden", { status: 403 });
+  }
+
+  const searchParams = Promise.resolve(
+    searchParamsToRecord(req.nextUrl.searchParams),
+  );
+
+  const { query } = await buildParentQuery({
+    searchParams,
+    schoolId,
+    role,
+    userId,
+  });
+
+  const parents = await prisma.parent.findMany({
+    where: query,
+    include: {
+      students: true,
+    },
+    orderBy: {
+      name: "asc",
+    },
+  });
+
+  const csv = generateCsv(
+    [
+      {
+        header: "Name",
+        value: (parent) => parent.name,
+      },
+      {
+        header: "Username",
+        value: (parent) => parent.username,
+      },
+      {
+        header: "Email",
+        value: (parent) => parent.email,
+      },
+      {
+        header: "Student Names",
+        value: (parent) =>
+          parent.students.map((student) => student.name).join(" | "),
+      },
+      {
+        header: "Phone",
+        value: (parent) => parent.phone,
+      },
+      {
+        header: "Address",
+        value: (parent) => parent.address,
+      },
+    ],
+    parents
+  );
+
+  return createCsvResponse("parents-export.csv", csv);
+}
diff --git a/src/app/api/admin/results/export/route.ts b/src/app/api/admin/results/export/route.ts
new file mode 100644
index 0000000..d16a29e
--- /dev/null
+++ b/src/app/api/admin/results/export/route.ts
@@ -0,0 +1,54 @@
+import { buildResultQuery } from "@/lib/query-builders/result-query";
+import { createCsvResponse, generateCsv } from "@/lib/csv";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { searchParamsToRecord } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+import { NextRequest, NextResponse } from "next/server";
+
+export async function GET(request: NextRequest) {
+  const { role, userId, schoolId } =
+    await enforceRouteAccess("/list/results");
+
+  if (role !== "admin") {
+    return new NextResponse("Forbidden", { status: 403 });
+  }
+
+  const searchParams = Promise.resolve(
+    searchParamsToRecord(request.nextUrl.searchParams),
+  );
+
+  const { academicYearId, query, orderBy } = await buildResultQuery({
+    searchParams,
+    schoolId,
+    role,
+    userId,
+  });
+
+  if (!academicYearId || !query) {
+    return new NextResponse("No active academic year found.", { status: 400 });
+  }
+
+  const results = await prisma.result.findMany({
+    where: query,
+    include: {
+      student: { select: { name: true } },
+      exam: { select: { title: true } },
+      assignment: { select: { title: true } },
+    },
+    orderBy,
+  });
+
+  const csv = generateCsv(
+    [
+      { header: "Student", value: (row) => row.student.name },
+      {
+        header: "Assessment",
+        value: (row) => row.exam?.title ?? row.assignment?.title ?? "-",
+      },
+      { header: "Score", value: (row) => row.score },
+    ],
+    results
+  );
+
+  return createCsvResponse("results.csv", csv);
+}
diff --git a/src/app/api/admin/students/export/route.ts b/src/app/api/admin/students/export/route.ts
new file mode 100644
index 0000000..3922124
--- /dev/null
+++ b/src/app/api/admin/students/export/route.ts
@@ -0,0 +1,71 @@
+import { NextRequest } from "next/server";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { buildStudentQuery } from "@/lib/query-builders/student-query";
+import { createCsvResponse, generateCsv } from "@/lib/csv";
+import { searchParamsToRecord } from "@/lib/pageParams";
+import {
+  getCurrentAcademicYearOrNull,
+} from "@/lib/academicYears";
+import prisma from "@/lib/prisma";
+
+export async function GET(req: NextRequest) {
+  const { role, userId, schoolId } = await enforceRouteAccess("/list/students");
+
+  if (role !== "admin") {
+    return new Response("Forbidden", { status: 403 });
+  }
+
+  const currentAcademicYear = await getCurrentAcademicYearOrNull(schoolId);
+
+  if (!currentAcademicYear) {
+    return new Response("No current academic year found", { status: 400 });
+  }
+
+  const searchParams = Promise.resolve(
+    searchParamsToRecord(req.nextUrl.searchParams),
+  );
+
+  const { query, orderBy } = await buildStudentQuery({
+    searchParams,
+    schoolId,
+    currentAcademicYearId: currentAcademicYear.id,
+    role,
+    userId,
+  });
+
+  const students = await prisma.student.findMany({
+    where: query,
+    include: {
+      class: true,
+    },
+    orderBy,
+  });
+
+  const csv = generateCsv(
+    [
+      {
+        header: "Name",
+        value: (student) => student.name,
+      },
+      {
+        header: "Student ID",
+        value: (student) => student.username,
+      },
+      {
+        header: "Class",
+        value: (student) => student.class?.name,
+      },
+      {
+        header: "Phone",
+        value: (student) => student.phone,
+      },
+      {
+        header: "Address",
+        value: (student) => student.address,
+      },
+    ],
+    students
+  );
+
+  return createCsvResponse("students-export.csv", csv);
+}
diff --git a/src/app/api/admin/subjects/export/route.ts b/src/app/api/admin/subjects/export/route.ts
new file mode 100644
index 0000000..1d63751
--- /dev/null
+++ b/src/app/api/admin/subjects/export/route.ts
@@ -0,0 +1,55 @@
+import { NextRequest } from "next/server";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { buildSubjectQuery } from "@/lib/query-builders/subject-query";
+import { createCsvResponse, generateCsv } from "@/lib/csv";
+import { searchParamsToRecord } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+
+export async function GET(req: NextRequest) {
+  const { role, userId, schoolId } = await enforceRouteAccess("/list/subjects");
+
+  if (role !== "admin") {
+    return new Response("Forbidden", { status: 403 });
+  }
+
+  const searchParams = Promise.resolve(
+    searchParamsToRecord(req.nextUrl.searchParams),
+  );
+
+  const { query, orderBy } = await buildSubjectQuery({
+    searchParams,
+    schoolId,
+    role,
+    userId,
+  });
+
+  const subjects = await prisma.subject.findMany({
+    where: query,
+    include: {
+      teachers: true,
+      grade: true,
+    },
+    orderBy,
+  });
+
+  const csv = generateCsv(
+    [
+      {
+        header: "Subject Name",
+        value: (subject) => subject.name,
+      },
+      {
+        header: "Grade",
+        value: (subject) => subject.grade?.level ?? "",
+      },
+      {
+        header: "Teachers",
+        value: (subject) =>
+          subject.teachers.map((teacher) => teacher.name).join(" | "),
+      },
+    ],
+    subjects
+  );
+
+  return createCsvResponse("subjects-export.csv", csv);
+}
diff --git a/src/app/api/admin/teachers/export/route.ts b/src/app/api/admin/teachers/export/route.ts
new file mode 100644
index 0000000..e1ca209
--- /dev/null
+++ b/src/app/api/admin/teachers/export/route.ts
@@ -0,0 +1,64 @@
+import { NextRequest } from "next/server";
+import { enforceRouteAccess } from "@/lib/enforce-route-access";
+import { buildTeacherQuery } from "@/lib/query-builders/teacher-query";
+import { createCsvResponse, generateCsv } from "@/lib/csv";
+import { searchParamsToRecord } from "@/lib/pageParams";
+import prisma from "@/lib/prisma";
+
+export async function GET(req: NextRequest) {
+  const { role, schoolId } = await enforceRouteAccess("/list/teachers");
+
+  if (role !== "admin") {
+    return new Response("Forbidden", { status: 403 });
+  }
+
+  const searchParams = Promise.resolve(
+    searchParamsToRecord(req.nextUrl.searchParams),
+  );
+
+  const { query, orderBy } = await buildTeacherQuery({
+    searchParams,
+    schoolId,
+  });
+
+  const teachers = await prisma.teacher.findMany({
+    where: query,
+    include: {
+      subjects: true,
+    },
+    orderBy,
+  });
+
+  const csv = generateCsv(
+    [
+      {
+        header: "Name",
+        value: (teacher) => teacher.name,
+      },
+      {
+        header: "Teacher ID",
+        value: (teacher) => teacher.username,
+      },
+      {
+        header: "Email",
+        value: (teacher) => teacher.email,
+      },
+      {
+        header: "Subjects",
+        value: (teacher) =>
+          teacher.subjects.map((subject) => subject.name).join(" | "),
+      },
+      {
+        header: "Phone",
+        value: (teacher) => teacher.phone,
+      },
+      {
+        header: "Address",
+        value: (teacher) => teacher.address,
+      },
+    ],
+    teachers
+  );
+
+  return createCsvResponse("teachers-export.csv", csv);
+}
diff --git a/src/app/api/cron/auto-submit/route.ts b/src/app/api/cron/auto-submit/route.ts
new file mode 100644
index 0000000..8c1c822
--- /dev/null
+++ b/src/app/api/cron/auto-submit/route.ts
@@ -0,0 +1,33 @@
+import { NextRequest, NextResponse } from "next/server";
+import { autoSubmitExpiredSubmissions } from "@/lib/actions/examWorkflow.actions";
+
+const validateCronSecret = (req: NextRequest): boolean => {
+  const authHeader = req.headers.get("authorization");
+  if (authHeader?.startsWith("Bearer ")) {
+    const token = authHeader.slice(7);
+    if (token === process.env.CRON_SECRET) return true;
+  }
+
+  const { searchParams } = new URL(req.url);
+  const secretParam = searchParams.get("secret");
+  if (secretParam === process.env.CRON_SECRET) return true;
+
+  return false;
+};
+
+export async function GET(req: NextRequest) {
+  if (!validateCronSecret(req)) {
+    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+  }
+
+  try {
+    const result = await autoSubmitExpiredSubmissions();
+    return NextResponse.json(result);
+  } catch (err) {
+    console.error("[cron:auto-submit]", err);
+    return NextResponse.json(
+      { error: "Internal Server Error" },
+      { status: 500 }
+    );
+  }
+}
diff --git a/src/app/api/cron/cleanup-files/route.ts b/src/app/api/cron/cleanup-files/route.ts
new file mode 100644
index 0000000..925b001
--- /dev/null
+++ b/src/app/api/cron/cleanup-files/route.ts
@@ -0,0 +1,82 @@
+import { NextRequest, NextResponse } from "next/server";
+import cloudinary, { deleteExamFileFromCloudinary } from "@/lib/cloudinary";
+import prisma from "@/lib/prisma";
+
+const validateCronSecret = (req: NextRequest): boolean => {
+  const authHeader = req.headers.get("authorization");
+  if (authHeader?.startsWith("Bearer ")) {
+    const token = authHeader.slice(7);
+    if (token === process.env.CRON_SECRET) return true;
+  }
+
+  const { searchParams } = new URL(req.url);
+  const secretParam = searchParams.get("secret");
+  if (secretParam === process.env.CRON_SECRET) return true;
+
+  return false;
+};
+
+export async function GET(req: NextRequest) {
+  if (!validateCronSecret(req)) {
+    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+  }
+
+  try {
+    const twoHoursAgo = Date.now() - 2 * 60 * 60 * 1000;
+
+    const searchResult = await cloudinary.search
+      .expression("resource_type:raw AND type:private AND folder:exams/*")
+      .max_results(500)
+      .execute();
+
+    const allResources = searchResult.resources as Array<{
+      public_id: string;
+      created_at: string;
+    }>;
+
+    const oldResources = allResources.filter(
+      (r) => new Date(r.created_at).getTime() < twoHoursAgo
+    );
+
+    if (oldResources.length === 0) {
+      return NextResponse.json({ deleted: 0, orphaned: 0, total: 0 });
+    }
+
+    const dbPublicIds = await prisma.answer.findMany({
+      where: { filePublicId: { not: null } },
+      select: { filePublicId: true },
+    });
+
+    const knownPublicIds = new Set(
+      dbPublicIds
+        .map((a) => a.filePublicId)
+        .filter((id): id is string => id !== null)
+    );
+
+    const orphaned = oldResources.filter(
+      (r) => !knownPublicIds.has(r.public_id)
+    );
+
+    let deletedCount = 0;
+    for (const resource of orphaned) {
+      try {
+        await deleteExamFileFromCloudinary(resource.public_id);
+        deletedCount++;
+      } catch {
+        // Continue deleting remaining orphaned files
+      }
+    }
+
+    return NextResponse.json({
+      deleted: deletedCount,
+      orphaned: orphaned.length,
+      total: oldResources.length,
+    });
+  } catch (err) {
+    console.error("[cron:cleanup-files]", err);
+    return NextResponse.json(
+      { error: "Internal Server Error" },
+      { status: 500 }
+    );
+  }
+}
diff --git a/src/app/api/download/[id]/route.ts b/src/app/api/download/[id]/route.ts
new file mode 100644
index 0000000..cb5b35f
--- /dev/null
+++ b/src/app/api/download/[id]/route.ts
@@ -0,0 +1,334 @@
+// src/app/api/download/[id]/route.ts
+import { NextRequest, NextResponse } from "next/server";
+import prisma from "@/lib/prisma";
+import cloudinary from "@/lib/cloudinary";
+
+// ========== استخراج resource_type من URL ==========
+function extractResourceType(fileUrl: string): "image" | "video" | "raw" {
+  if (fileUrl.includes("/image/upload/")) return "image";
+  if (fileUrl.includes("/video/upload/")) return "video";
+  return "raw";
+}
+
+// ========== استخراج delivery type من URL ==========
+function extractDeliveryType(
+  fileUrl: string,
+): "upload" | "private" | "authenticated" {
+  try {
+    const url = new URL(fileUrl);
+    if (url.pathname.includes("/private/")) return "private";
+    if (url.pathname.includes("/authenticated/")) return "authenticated";
+    return "upload";
+  } catch {
+    return "upload";
+  }
+}
+
+// ========== استخراج public_id (بدون extension) + format ==========
+function extractCloudinaryAssetParts(fileUrl: string): {
+  publicIdNoExt: string;
+  format: string;
+} | null {
+  try {
+    const url = new URL(fileUrl);
+    const match = url.pathname.match(
+      /\/(?:image|video|raw)\/(?:upload|private|authenticated)\/(?:v\d+\/)?(.+)$/,
+    );
+    const pathAfterType = match?.[1];
+    if (!pathAfterType) return null;
+
+    const lastDot = pathAfterType.lastIndexOf(".");
+    if (lastDot === -1) return null;
+
+    const publicIdNoExt = pathAfterType.slice(0, lastDot);
+    const format = pathAfterType.slice(lastDot + 1).toLowerCase();
+    if (!publicIdNoExt || !format) return null;
+
+    return { publicIdNoExt, format };
+  } catch {
+    return null;
+  }
+}
+
+// ========== بناء قائمة URLs ==========
+function buildUrlsToTry(fileUrl: string): string[] {
+  try {
+    const url = new URL(fileUrl);
+    url.protocol = "https:";
+
+    const resourceType = extractResourceType(fileUrl);
+    const deliveryType = extractDeliveryType(fileUrl);
+    const assetParts = extractCloudinaryAssetParts(fileUrl);
+
+    console.log("[Download] resourceType:", resourceType);
+    console.log("[Download] deliveryType:", deliveryType);
+    console.log("[Download] assetParts:", assetParts);
+
+    // URL أصلي كما هو (بالـ version)
+    url.protocol = "https:";
+    const originalUrl = url.toString();
+
+    if (!assetParts) return [originalUrl];
+
+    // Cloudinary SDK-generated signed download URLs (more reliable than manual signing).
+    const signedPrimary = cloudinary.utils.private_download_url(
+      assetParts.publicIdNoExt,
+      assetParts.format,
+      {
+        resource_type: resourceType,
+        type: deliveryType,
+        expires_at: Math.floor(Date.now() / 1000) + 300,
+        attachment: true,
+      },
+    );
+
+    const signedRawUpload = cloudinary.utils.private_download_url(
+      assetParts.publicIdNoExt,
+      assetParts.format,
+      {
+        resource_type: "raw",
+        type: "upload",
+        expires_at: Math.floor(Date.now() / 1000) + 300,
+        attachment: true,
+      },
+    );
+
+    // Try original first (public assets), then signed fallbacks.
+    return [originalUrl, signedPrimary, signedRawUpload];
+  } catch {
+    return [fileUrl];
+  }
+}
+
+// ========== كشف الامتداد من Magic Bytes ==========
+function detectExtensionFromBuffer(buffer: Buffer): string | null {
+  const signatures: { bytes: number[]; ext: string }[] = [
+    { bytes: [0x25, 0x50, 0x44, 0x46], ext: "pdf" },
+    { bytes: [0x50, 0x4b, 0x03, 0x04], ext: "zip" },
+    { bytes: [0x50, 0x4b, 0x05, 0x06], ext: "zip" },
+    { bytes: [0x50, 0x4b, 0x07, 0x08], ext: "zip" },
+    { bytes: [0xff, 0xd8, 0xff], ext: "jpg" },
+    { bytes: [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a], ext: "png" },
+    { bytes: [0x47, 0x49, 0x46, 0x38], ext: "gif" },
+    { bytes: [0x52, 0x61, 0x72, 0x21, 0x1a, 0x07], ext: "rar" },
+    { bytes: [0x1f, 0x8b], ext: "gz" },
+    { bytes: [0x42, 0x5a, 0x68], ext: "bz2" },
+  ];
+
+  for (const sig of signatures) {
+    if (
+      buffer.length >= sig.bytes.length &&
+      sig.bytes.every((b, i) => buffer[i] === b)
+    ) {
+      if (sig.ext === "zip") {
+        const str = buffer.toString("utf8", 0, 200);
+        if (str.includes("[Content_Types].xml")) return "docx";
+        if (str.includes("xl/")) return "xlsx";
+        if (str.includes("ppt/")) return "pptx";
+        return "zip";
+      }
+      return sig.ext;
+    }
+  }
+  return null;
+}
+
+function getExtensionFromUrl(url: string): string | null {
+  try {
+    const pathname = new URL(url).pathname;
+    const lastSegment = pathname.split("/").pop() || "";
+    const dotIndex = lastSegment.lastIndexOf(".");
+    if (dotIndex !== -1) {
+      const ext = lastSegment.slice(dotIndex + 1).toLowerCase();
+      if (ext.length > 0 && ext.length <= 5) return ext;
+    }
+  } catch {}
+  return null;
+}
+
+function getExtensionFromFileName(
+  fileName: string | null | undefined,
+): string | null {
+  if (!fileName) return null;
+  const trimmed = fileName.trim();
+  const dotIndex = trimmed.lastIndexOf(".");
+  if (dotIndex === -1) return null;
+  const ext = trimmed.slice(dotIndex + 1).toLowerCase();
+  if (ext.length === 0 || ext.length > 8) return null;
+  return ext;
+}
+
+function getExtensionFromContentType(contentType: string): string {
+  const map: Record<string, string> = {
+    "application/pdf": "pdf",
+    "application/msword": "doc",
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document":
+      "docx",
+    "application/vnd.ms-excel": "xls",
+    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
+    "application/vnd.ms-powerpoint": "ppt",
+    "application/vnd.openxmlformats-officedocument.presentationml.presentation":
+      "pptx",
+    "image/jpeg": "jpg",
+    "image/png": "png",
+    "image/gif": "gif",
+    "image/webp": "webp",
+    "text/plain": "txt",
+    "application/zip": "zip",
+    "application/x-rar-compressed": "rar",
+    "application/x-7z-compressed": "7z",
+  };
+  const baseType = contentType.split(";")[0].trim();
+  return map[baseType] || "bin";
+}
+
+type DownloadType = "assignment" | "studyMaterial" | "submission";
+
+export async function GET(
+  request: NextRequest,
+  { params }: { params: Promise<{ id: string }> },
+) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const type = searchParams.get("type") as DownloadType;
+    const { id: idStr } = await params;
+    const recordId = Number(idStr);
+
+    if (isNaN(recordId)) {
+      return new NextResponse("Invalid download id", { status: 400 });
+    }
+
+    let fileUrl: string | null = null;
+    let baseName = "file";
+    let originalFileName: string | null = null;
+
+    // ========== 1. جلب البيانات من DB ==========
+    if (type === "assignment") {
+      const assignment = await prisma.assignment.findUnique({
+        where: { id: recordId },
+        select: { fileUrl: true, title: true, fileName: true },
+      });
+      if (!assignment)
+        return new NextResponse("Assignment not found", { status: 404 });
+      if (!assignment.fileUrl)
+        return new NextResponse("This assignment has no attached file", {
+          status: 404,
+        });
+      fileUrl = assignment.fileUrl;
+      originalFileName = assignment.fileName || null;
+      baseName = assignment.fileName || assignment.title || "assignment";
+    } else if (type === "studyMaterial") {
+      const material = await prisma.studyMaterial.findUnique({
+        where: { id: recordId },
+        select: { fileUrl: true, title: true, fileName: true },
+      });
+      if (!material)
+        return new NextResponse("Study material not found", { status: 404 });
+      if (!material.fileUrl)
+        return new NextResponse("This material has no attached file", {
+          status: 404,
+        });
+      fileUrl = material.fileUrl;
+      originalFileName = material.fileName || null;
+      baseName = material.fileName || material.title || "study-material";
+    } else if (type === "submission") {
+      const submission = await prisma.assignmentSubmission.findUnique({
+        where: { id: recordId },
+        include: {
+          student: { select: { name: true } },
+          assignment: { select: { title: true } },
+        },
+      });
+      if (!submission)
+        return new NextResponse("Submission not found", { status: 404 });
+      if (!submission.fileUrl)
+        return new NextResponse("This submission has no attached file", {
+          status: 404,
+        });
+      fileUrl = submission.fileUrl;
+      originalFileName = submission.fileName || null;
+      const studentName = submission.student?.name || "student";
+      const assignmentTitle = submission.assignment?.title || "submission";
+      baseName = submission.fileName || `${studentName}_${assignmentTitle}`;
+    } else {
+      return new NextResponse("Invalid download type", { status: 400 });
+    }
+
+    // ========== 2. بناء قائمة URLs ==========
+    const isCloudinaryUrl =
+      fileUrl.includes("cloudinary.com") || fileUrl.includes("res.cloudinary");
+
+    const urlsToTry = isCloudinaryUrl ? buildUrlsToTry(fileUrl) : [fileUrl];
+
+    console.log("[Download] fileUrl from DB:", fileUrl);
+    console.log("[Download] urlsToTry:", urlsToTry);
+
+    // ========== 3. جلب الملف ==========
+    let fileResponse: Response | null = null;
+    let lastStatus = 0;
+    let lastUrl = "";
+
+    for (const url of urlsToTry) {
+      try {
+        const res = await fetch(url, {
+          redirect: "follow",
+          headers: { "User-Agent": "Mozilla/5.0 (compatible; SchoolApp/1.0)" },
+        });
+        console.log("[Download] tried:", url, "->", res.status);
+        if (res.ok) {
+          fileResponse = res;
+          break;
+        }
+        lastStatus = res.status;
+        lastUrl = url;
+      } catch (err) {
+        console.error("[Download] fetch error for:", url, err);
+      }
+    }
+
+    if (!fileResponse) {
+      console.error("[Download] All URLs failed. Last:", lastUrl, lastStatus);
+      return new NextResponse(
+        `Failed to fetch file (storage returned ${lastStatus})`,
+        { status: 502 },
+      );
+    }
+
+    const arrayBuffer = await fileResponse.arrayBuffer();
+    const buffer = Buffer.from(arrayBuffer);
+
+    if (buffer.length === 0) {
+      return new NextResponse("File is empty", { status: 502 });
+    }
+
+    // ========== 4. كشف الامتداد ==========
+    const extension =
+      getExtensionFromFileName(originalFileName) ||
+      getExtensionFromUrl(fileUrl) ||
+      getExtensionFromContentType(
+        fileResponse.headers.get("Content-Type") || "application/octet-stream",
+      ) ||
+      detectExtensionFromBuffer(buffer) ||
+      getExtensionFromFileName(baseName);
+
+    // ========== 5. الرد ==========
+    const safeBaseName = baseName.replace(/[^a-zA-Z0-9\u0600-\u06FF\-_]/g, "_");
+    const finalFileName = `${safeBaseName}.${extension}`;
+
+    const headers = new Headers();
+    const contentType =
+      fileResponse.headers.get("Content-Type") || "application/octet-stream";
+    headers.set("Content-Type", contentType.split(";")[0].trim());
+    headers.set(
+      "Content-Disposition",
+      `attachment; filename*=UTF-8''${encodeURIComponent(finalFileName)}`,
+    );
+    headers.set("Content-Length", buffer.length.toString());
+    headers.set("Cache-Control", "no-cache, no-store, must-revalidate");
+
+    return new NextResponse(buffer, { status: 200, headers });
+  } catch (error) {
+    console.error("[Download] Unexpected error:", error);
+    return new NextResponse("Internal Server Error", { status: 500 });
+  }
+}
diff --git a/src/app/api/exam-files/[answerId]/preview/route.ts b/src/app/api/exam-files/[answerId]/preview/route.ts
new file mode 100644
index 0000000..ffb5428
--- /dev/null
+++ b/src/app/api/exam-files/[answerId]/preview/route.ts
@@ -0,0 +1,158 @@
+import { NextResponse } from "next/server";
+import { auth } from "@clerk/nextjs/server";
+import prisma from "@/lib/prisma";
+import cloudinary from "@/lib/cloudinary";
+
+function getFormat(fileName: string | null, mimeType: string | null) {
+  if (fileName) {
+    const dotIndex = fileName.lastIndexOf(".");
+    if (dotIndex !== -1) return fileName.slice(dotIndex + 1).toLowerCase();
+  }
+
+  return mimeType?.split("/")?.[1]?.toLowerCase() || "bin";
+}
+
+function getContentType(fileName: string | null, fallback: string | null) {
+  const format = getFormat(fileName, fallback);
+  const map: Record<string, string> = {
+    pdf: "application/pdf",
+    jpg: "image/jpeg",
+    jpeg: "image/jpeg",
+    png: "image/png",
+    gif: "image/gif",
+    webp: "image/webp",
+    txt: "text/plain; charset=utf-8",
+  };
+
+  return map[format] || fallback || "application/octet-stream";
+}
+
+export async function GET(
+  _req: Request,
+  { params }: { params: Promise<{ answerId: string }> },
+) {
+  try {
+    const { userId } = await auth();
+    if (!userId) {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
+
+    const { answerId: answerIdStr } = await params;
+    const answerId = parseInt(answerIdStr, 10);
+    if (isNaN(answerId)) {
+      return NextResponse.json({ error: "Invalid answer ID" }, { status: 400 });
+    }
+
+    const student = await prisma.student.findUnique({
+      where: { id: userId },
+      select: { id: true, schoolId: true },
+    });
+
+    const teacher = student
+      ? null
+      : await prisma.teacher.findUnique({
+          where: { id: userId },
+          select: { id: true, schoolId: true },
+        });
+
+    const admin =
+      student || teacher
+        ? null
+        : await prisma.admin.findUnique({
+            where: { id: userId },
+            select: { id: true, schoolId: true },
+          });
+
+    if (!student && !teacher && !admin) {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
+
+    const answer = await prisma.answer.findUnique({
+      where: { id: answerId },
+      include: {
+        submission: {
+          include: {
+            exam: { include: { lesson: true } },
+          },
+        },
+      },
+    });
+
+    if (!answer) {
+      return NextResponse.json({ error: "Answer not found" }, { status: 404 });
+    }
+
+    if (!answer.filePublicId) {
+      return NextResponse.json(
+        { error: "No file uploaded for this answer" },
+        { status: 404 },
+      );
+    }
+
+    if (student) {
+      if (
+        answer.submission.studentId !== userId ||
+        answer.submission.schoolId !== student.schoolId
+      ) {
+        return NextResponse.json({ error: "Forbidden" }, { status: 403 });
+      }
+    } else if (teacher) {
+      if (
+        answer.submission.schoolId !== teacher.schoolId ||
+        (answer.submission.exam.teacherId !== teacher.id &&
+          answer.submission.exam.lesson?.teacherId !== teacher.id)
+      ) {
+        return NextResponse.json({ error: "Forbidden" }, { status: 403 });
+      }
+    } else if (admin && answer.submission.schoolId !== admin.schoolId) {
+      return NextResponse.json({ error: "Forbidden" }, { status: 403 });
+    }
+
+    const format = getFormat(answer.fileOriginalName, answer.fileMimeType);
+    const signedUrl = cloudinary.utils.private_download_url(
+      answer.filePublicId,
+      format,
+      {
+        resource_type: "raw",
+        type: "private",
+        expires_at: Math.floor(Date.now() / 1000) + 300,
+        attachment: false,
+      },
+    );
+
+    const response = await fetch(signedUrl, {
+      redirect: "follow",
+      headers: { "User-Agent": "Mozilla/5.0 (compatible; SchoolApp/1.0)" },
+    });
+
+    if (!response.ok) {
+      return NextResponse.json(
+        { error: "Failed to fetch preview file" },
+        { status: 502 },
+      );
+    }
+
+    const buffer = Buffer.from(await response.arrayBuffer());
+    const fileName = answer.fileOriginalName || "answer-file";
+    const headers = new Headers();
+
+    headers.set(
+      "Content-Type",
+      getContentType(fileName, response.headers.get("Content-Type")),
+    );
+    headers.set(
+      "Content-Disposition",
+      `inline; filename*=UTF-8''${encodeURIComponent(fileName)}`,
+    );
+    headers.set("Content-Length", buffer.length.toString());
+    headers.set("Cache-Control", "private, max-age=300");
+
+    return new NextResponse(buffer, { status: 200, headers });
+  } catch (err) {
+    console.error("[exam-file-preview]", err);
+    return NextResponse.json(
+      { error: "Internal Server Error" },
+      { status: 500 },
+    );
+  }
+}
diff --git a/src/app/api/exam-files/[answerId]/route.ts b/src/app/api/exam-files/[answerId]/route.ts
new file mode 100644
index 0000000..8954db4
--- /dev/null
+++ b/src/app/api/exam-files/[answerId]/route.ts
@@ -0,0 +1,118 @@
+import { NextRequest, NextResponse } from "next/server";
+import { auth } from "@clerk/nextjs/server";
+import prisma from "@/lib/prisma";
+import { generatePrivateDownloadUrl } from "@/lib/cloudinary";
+
+export async function GET(
+  req: NextRequest,
+  { params }: { params: Promise<{ answerId: string }> }
+) {
+  try {
+    const { userId } = await auth();
+    if (!userId) {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
+
+    const { answerId: answerIdStr } = await params;
+    const answerId = parseInt(answerIdStr, 10);
+    if (isNaN(answerId)) {
+      return NextResponse.json({ error: "Invalid answer ID" }, { status: 400 });
+    }
+
+    const user = await prisma.student.findUnique({
+      where: { id: userId },
+      select: { id: true, schoolId: true },
+    });
+
+    const isStudent = !!user;
+
+    let teacher: { id: string; schoolId: number } | null = null;
+    let admin: { id: string; schoolId: number } | null = null;
+
+    if (!isStudent) {
+      teacher = await prisma.teacher.findUnique({
+        where: { id: userId },
+        select: { id: true, schoolId: true },
+      });
+      if (!teacher) {
+        admin = await prisma.admin.findUnique({
+          where: { id: userId },
+          select: { id: true, schoolId: true },
+        });
+      }
+    }
+
+    if (!teacher && !admin && !isStudent) {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
+
+    const answer = await prisma.answer.findUnique({
+      where: { id: answerId },
+      include: {
+        submission: {
+          include: {
+            exam: {
+              include: { lesson: true },
+            },
+          },
+        },
+      },
+    });
+
+    if (!answer) {
+      return NextResponse.json({ error: "Answer not found" }, { status: 404 });
+    }
+
+    if (!answer.filePublicId) {
+      return NextResponse.json(
+        { error: "No file uploaded for this answer" },
+        { status: 404 }
+      );
+    }
+
+    if (isStudent) {
+      if (
+        answer.submission.studentId !== userId ||
+        answer.submission.schoolId !== user!.schoolId
+      ) {
+        return NextResponse.json({ error: "Forbidden" }, { status: 403 });
+      }
+    } else if (teacher) {
+      if (
+        answer.submission.schoolId !== teacher.schoolId ||
+        (answer.submission.exam.teacherId !== teacher.id &&
+          answer.submission.exam.lesson?.teacherId !== teacher.id)
+      ) {
+        return NextResponse.json({ error: "Forbidden" }, { status: 403 });
+      }
+    } else if (admin) {
+      if (answer.submission.schoolId !== admin.schoolId) {
+        return NextResponse.json({ error: "Forbidden" }, { status: 403 });
+      }
+    }
+
+    let format = "bin";
+    if (answer.fileOriginalName) {
+      const dotIndex = answer.fileOriginalName.lastIndexOf(".");
+      if (dotIndex !== -1) {
+        format = answer.fileOriginalName.slice(dotIndex + 1);
+      } else if (answer.fileMimeType) {
+        const parts = answer.fileMimeType.split("/");
+        if (parts.length === 2 && parts[1]) format = parts[1];
+      }
+    } else if (answer.fileMimeType) {
+      const parts = answer.fileMimeType.split("/");
+      if (parts.length === 2 && parts[1]) format = parts[1];
+    }
+
+    const signedUrl = generatePrivateDownloadUrl(answer.filePublicId, format);
+
+    return NextResponse.redirect(signedUrl, { status: 302 });
+  } catch (err) {
+    console.error("[exam-files]", err);
+    return NextResponse.json(
+      { error: "Internal Server Error" },
+      { status: 500 }
+    );
+  }
+}
diff --git a/src/app/api/exam-timer/[submissionId]/route.ts b/src/app/api/exam-timer/[submissionId]/route.ts
index af82ce4..c053426 100644
--- a/src/app/api/exam-timer/[submissionId]/route.ts
+++ b/src/app/api/exam-timer/[submissionId]/route.ts
@@ -22,6 +22,7 @@ export async function GET(
   const stream = new ReadableStream({
     async start(controller) {
       let intervalId: NodeJS.Timeout;
+      let lastDbUpdate = 0;
 
       const sendTime = async () => {
         try {
@@ -40,6 +41,15 @@ export async function GET(
             return;
           }
 
+          // Update lastSyncedAt every 20 seconds to keep the session alive
+          if (Date.now() - lastDbUpdate > 20000) {
+            await prisma.submission.update({
+              where: { id: submissionId },
+              data: { lastSyncedAt: new Date() },
+            });
+            lastDbUpdate = Date.now();
+          }
+
           const examEndsAt = new Date(
             submission.startedAt.getTime() +
             ((submission.exam.duration ?? 0) + (submission.extraTime ?? 0)) * 60000
diff --git a/src/app/api/export/archive/route.ts b/src/app/api/export/archive/route.ts
new file mode 100644
index 0000000..4c82a18
--- /dev/null
+++ b/src/app/api/export/archive/route.ts
@@ -0,0 +1,255 @@
+import { NextRequest, NextResponse } from "next/server";
+import { requireAuth } from "@/lib/auth";
+import prisma from "@/lib/prisma";
+
+export async function GET(req: NextRequest) {
+  const { searchParams } = new URL(req.url);
+
+  const type = searchParams.get("type");
+  const academicYearId = searchParams.get("academicYearId");
+
+  if (!type || !academicYearId) {
+    return NextResponse.json(
+      { error: "Missing parameters" },
+      { status: 400 }
+    );
+  }
+
+  const user = await requireAuth();
+
+  const admin = await prisma.admin.findUnique({
+    where: {
+      id: user.userId,
+    },
+  });
+
+  if (!admin) {
+    return NextResponse.json(
+      { error: "Unauthorized" },
+      { status: 401 }
+    );
+  }
+
+  let data: Record<string, unknown>[] = [];
+
+  switch (type) {
+    case "students":
+      const students = await prisma.student.findMany({
+        where: {
+          schoolId: admin.schoolId,
+          academicYears: {
+            some: {
+              academicYearId: Number(academicYearId),
+            },
+          },
+        },
+      });
+      const studentIds = students.map((student) => student.id);
+      const finalResults: Array<{
+        studentId: string;
+        averageScore: number;
+      }> = studentIds.length
+        ? await (
+            prisma as unknown as {
+              studentFinalResult: {
+                findMany: (args: {
+                  where: {
+                    schoolId: number;
+                    academicYearId: number;
+                    studentId: { in: string[] };
+                  };
+                  select: {
+                    studentId: boolean;
+                    averageScore: boolean;
+                  };
+                }) => Promise<Array<{ studentId: string; averageScore: number }>>;
+              };
+            }
+          ).studentFinalResult.findMany({
+            where: {
+              schoolId: admin.schoolId,
+              academicYearId: Number(academicYearId),
+              studentId: { in: studentIds },
+            },
+            select: {
+              studentId: true,
+              averageScore: true,
+            },
+          })
+        : [];
+      const finalGradeByStudent = new Map(
+        finalResults.map((result) => [
+          result.studentId,
+          `${result.averageScore.toFixed(2)}%`,
+        ]),
+      );
+
+      data = students.map((student) => ({
+        ...student,
+        finalGrade: finalGradeByStudent.get(student.id) ?? "",
+      }));
+      break;
+
+    case "teachers":
+      data = await prisma.teacher.findMany({
+        where: {
+          schoolId: admin.schoolId,
+        },
+      });
+      break;
+
+    case "parents":
+      data = await prisma.parent.findMany({
+        where: {
+          schoolId: admin.schoolId,
+        },
+      });
+      break;
+
+    case "subjects":
+      data = await prisma.subject.findMany({
+        where: {
+          schoolId: admin.schoolId,
+        },
+      });
+      break;
+
+    case "classes":
+      data = await prisma.class.findMany({
+        where: {
+          schoolId: admin.schoolId,
+        },
+      });
+      break;
+
+    case "exams":
+      data = await prisma.exam.findMany({
+        where: {
+          lesson: {
+            subject: {
+              schoolId: admin.schoolId,
+            },
+          },
+        },
+        select: {
+          id: true,
+          title: true,
+          startTime: true,
+          endTime: true,
+          lessonId: true,
+        },
+      });
+      break;
+
+ case "assignments":
+  try {
+    data = await prisma.assignment.findMany({
+      select: {
+        id: true,
+        title: true,
+      },
+    });
+  } catch (error) {
+    return NextResponse.json({
+      error: "Assignments export failed",
+      details: String(error),
+    });
+  }
+  break;
+      
+
+    case "results":
+      data = await prisma.result
+        .findMany({
+          where: {
+            student: {
+              schoolId: admin.schoolId,
+            },
+          },
+          select: {
+            id: true,
+            score: true,
+            student: {
+              select: {
+                name: true,
+                username: true,
+              },
+            },
+          },
+        })
+        .then((items) =>
+          items.map((item) => ({
+            id: item.id,
+            studentName: item.student?.name || "",
+            studentUsername: item.student?.username || "",
+            score: item.score,
+          }))
+        );
+      break;
+
+    case "attendance":
+      data = await prisma.attendance
+        .findMany({
+          where: {
+            student: {
+              schoolId: admin.schoolId,
+            },
+          },
+          select: {
+            id: true,
+            date: true,
+            present: true,
+            student: {
+              select: {
+                name: true,
+                username: true,
+              },
+            },
+          },
+        })
+        .then((items) =>
+          items.map((item) => ({
+            id: item.id,
+            studentName: item.student?.name || "",
+            studentUsername: item.student?.username || "",
+            date: item.date,
+            status: item.present ? "Present" : "Absent",
+          }))
+        );
+      break;
+
+    default:
+      data = [];
+  }
+
+  if (data.length === 0) {
+    return NextResponse.json({
+      success: true,
+      count: 0,
+      message: "No data found",
+    });
+  }
+
+  const headers = Object.keys(data[0]);
+
+  const csvRows = [
+    headers.join(","),
+    ...data.map((row) =>
+      headers
+        .map((header) => {
+          const value = row[header];
+          return `"${String(value ?? "").replace(/"/g, '""')}"`;
+        })
+        .join(",")
+    ),
+  ];
+
+  const csv = csvRows.join("\n");
+
+  return new NextResponse(csv, {
+    headers: {
+      "Content-Type": "text/csv; charset=utf-8",
+      "Content-Disposition": `attachment; filename="${type}-${academicYearId}.csv"`,
+    },
+  });
+}
diff --git a/src/app/api/messages/count/route.ts b/src/app/api/messages/count/route.ts
new file mode 100644
index 0000000..043ab0d
--- /dev/null
+++ b/src/app/api/messages/count/route.ts
@@ -0,0 +1,58 @@
+import { getAuthUser } from "@/lib/auth";
+import prisma from "@/lib/prisma";
+import { NextResponse } from "next/server";
+
+export async function GET() {
+  try {
+    const authUser = await getAuthUser();
+
+    if (!authUser) {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
+
+    const { userId, role, schoolId } = authUser;
+
+    let messageCount = 0;
+
+    if (role === "admin") {
+      messageCount = await prisma.message.count({
+        where: { schoolId },
+      });
+    } else if (role === "teacher") {
+      messageCount = await prisma.message.count({
+        where: {
+          schoolId,
+          teachers: {
+            some: { id: userId },
+          },
+        },
+      });
+    } else if (role === "student") {
+      messageCount = await prisma.message.count({
+        where: {
+          schoolId,
+          students: {
+            some: { id: userId },
+          },
+        },
+      });
+    } else if (role === "parent") {
+      messageCount = await prisma.message.count({
+        where: {
+          schoolId,
+          parents: {
+            some: { id: userId },
+          },
+        },
+      });
+    }
+
+    return NextResponse.json({ count: messageCount });
+  } catch (error) {
+    console.error("Error fetching message count:", error);
+    return NextResponse.json(
+      { error: "Internal server error" },
+      { status: 500 },
+    );
+  }
+}
diff --git a/src/app/api/notifications/route.ts b/src/app/api/notifications/route.ts
new file mode 100644
index 0000000..79757e7
--- /dev/null
+++ b/src/app/api/notifications/route.ts
@@ -0,0 +1,83 @@
+// src/app/api/notifications/route.ts
+import { auth } from "@clerk/nextjs/server";
+import { NextRequest, NextResponse } from "next/server";
+import prisma from "@/lib/prisma";
+
+// ─── GET: جلب إشعارات المستخدم ───────────────────────────────────────────────
+export async function GET() {
+  try {
+    const { userId } = await auth();
+    if (!userId) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+
+    const notifications = await prisma.notification.findMany({
+      where:   { userId },
+      orderBy: { createdAt: "desc" },
+      take:    20,
+    });
+
+    const unreadCount = await prisma.notification.count({
+      where: { userId, isRead: false },
+    });
+
+    return NextResponse.json({ notifications, unreadCount });
+  } catch (err) {
+    console.error("[GET /api/notifications]", err);
+    return NextResponse.json({ error: "Something went wrong" }, { status: 500 });
+  }
+}
+
+// ─── PATCH: تحديد إشعار كـ مقروء ─────────────────────────────────────────────
+export async function PATCH(req: NextRequest) {
+  try {
+    const { userId } = await auth();
+    if (!userId) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+
+    const body = await req.json();
+    const { id, markAllRead } = body;
+
+    if (markAllRead) {
+      await prisma.notification.updateMany({
+        where: { userId, isRead: false },
+        data:  { isRead: true },
+      });
+    } else if (id) {
+      await prisma.notification.update({
+        where: { id: Number(id) },
+        data:  { isRead: true },
+      });
+    }
+
+    return NextResponse.json({ success: true });
+  } catch (err) {
+    console.error("[PATCH /api/notifications]", err);
+    return NextResponse.json({ error: "Something went wrong" }, { status: 500 });
+  }
+}
+
+// ─── DELETE: حذف إشعار أو كل الإشعارات ──────────────────────────────────────
+export async function DELETE(req: NextRequest) {
+  try {
+    const { userId } = await auth();
+    if (!userId) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+
+    const body = await req.json();
+    const { id, deleteAll } = body;
+
+    if (deleteAll) {
+      // حذف كل إشعارات المستخدم
+      await prisma.notification.deleteMany({
+        where: { userId },
+      });
+    } else if (id) {
+      // حذف إشعار واحد — التأكد أنه يخص المستخدم
+      await prisma.notification.deleteMany({
+        where: { id: Number(id), userId },
+      });
+    }
+
+    return NextResponse.json({ success: true });
+  } catch (err) {
+    console.error("[DELETE /api/notifications]", err);
+    return NextResponse.json({ error: "Something went wrong" }, { status: 500 });
+  }
+}
\ No newline at end of file
diff --git a/src/app/api/preview/[id]/route.ts b/src/app/api/preview/[id]/route.ts
new file mode 100644
index 0000000..cfc6d8e
--- /dev/null
+++ b/src/app/api/preview/[id]/route.ts
@@ -0,0 +1,173 @@
+import { NextRequest, NextResponse } from "next/server";
+import cloudinary from "@/lib/cloudinary";
+import prisma from "@/lib/prisma";
+
+type PreviewType = "submission";
+
+function extractResourceType(fileUrl: string): "image" | "video" | "raw" {
+  if (fileUrl.includes("/image/upload/")) return "image";
+  if (fileUrl.includes("/video/upload/")) return "video";
+  return "raw";
+}
+
+function extractDeliveryType(
+  fileUrl: string,
+): "upload" | "private" | "authenticated" {
+  try {
+    const url = new URL(fileUrl);
+    if (url.pathname.includes("/private/")) return "private";
+    if (url.pathname.includes("/authenticated/")) return "authenticated";
+    return "upload";
+  } catch {
+    return "upload";
+  }
+}
+
+function extractCloudinaryAssetParts(fileUrl: string): {
+  publicIdNoExt: string;
+  format: string;
+} | null {
+  try {
+    const url = new URL(fileUrl);
+    const match = url.pathname.match(
+      /\/(?:image|video|raw)\/(?:upload|private|authenticated)\/(?:v\d+\/)?(.+)$/,
+    );
+    const pathAfterType = match?.[1];
+    if (!pathAfterType) return null;
+
+    const lastDot = pathAfterType.lastIndexOf(".");
+    if (lastDot === -1) return null;
+
+    const publicIdNoExt = pathAfterType.slice(0, lastDot);
+    const format = pathAfterType.slice(lastDot + 1).toLowerCase();
+    if (!publicIdNoExt || !format) return null;
+
+    return { publicIdNoExt, format };
+  } catch {
+    return null;
+  }
+}
+
+function buildPreviewUrlsToTry(fileUrl: string): string[] {
+  try {
+    const url = new URL(fileUrl);
+    url.protocol = "https:";
+    const originalUrl = url.toString();
+
+    const resourceType = extractResourceType(fileUrl);
+    const deliveryType = extractDeliveryType(fileUrl);
+    const assetParts = extractCloudinaryAssetParts(fileUrl);
+
+    if (!assetParts) return [originalUrl];
+
+    const signedPrimary = cloudinary.utils.private_download_url(
+      assetParts.publicIdNoExt,
+      assetParts.format,
+      {
+        resource_type: resourceType,
+        type: deliveryType,
+        expires_at: Math.floor(Date.now() / 1000) + 300,
+        attachment: false,
+      },
+    );
+
+    const signedRawUpload = cloudinary.utils.private_download_url(
+      assetParts.publicIdNoExt,
+      assetParts.format,
+      {
+        resource_type: "raw",
+        type: "upload",
+        expires_at: Math.floor(Date.now() / 1000) + 300,
+        attachment: false,
+      },
+    );
+
+    return [originalUrl, signedPrimary, signedRawUpload];
+  } catch {
+    return [fileUrl];
+  }
+}
+
+function getContentType(fileName: string, fallback: string | null) {
+  const ext = fileName.split(".").pop()?.toLowerCase();
+  const map: Record<string, string> = {
+    pdf: "application/pdf",
+    jpg: "image/jpeg",
+    jpeg: "image/jpeg",
+    png: "image/png",
+    gif: "image/gif",
+    webp: "image/webp",
+    txt: "text/plain; charset=utf-8",
+  };
+
+  return (ext && map[ext]) || fallback || "application/octet-stream";
+}
+
+export async function GET(
+  request: NextRequest,
+  { params }: { params: Promise<{ id: string }> },
+) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const type = searchParams.get("type") as PreviewType;
+    const { id: idRaw } = await params;
+    const id = Number.parseInt(idRaw, 10);
+
+    if (Number.isNaN(id) || type !== "submission") {
+      return new NextResponse("Invalid preview request", { status: 400 });
+    }
+
+    const submission = await prisma.assignmentSubmission.findUnique({
+      where: { id },
+      select: { fileUrl: true, fileName: true },
+    });
+
+    if (!submission) {
+      return new NextResponse("Submission not found", { status: 404 });
+    }
+
+    const urlsToTry =
+      submission.fileUrl.includes("cloudinary.com") ||
+      submission.fileUrl.includes("res.cloudinary")
+        ? buildPreviewUrlsToTry(submission.fileUrl)
+        : [submission.fileUrl];
+
+    let response: Response | null = null;
+
+    for (const url of urlsToTry) {
+      const candidate = await fetch(url, {
+        redirect: "follow",
+        headers: { "User-Agent": "Mozilla/5.0 (compatible; SchoolApp/1.0)" },
+      }).catch(() => null);
+
+      if (candidate?.ok) {
+        response = candidate;
+        break;
+      }
+    }
+
+    if (!response) {
+      return new NextResponse("Failed to fetch preview file", { status: 502 });
+    }
+
+    const buffer = Buffer.from(await response.arrayBuffer());
+    const fileName = submission.fileName || "submission";
+    const headers = new Headers();
+
+    headers.set(
+      "Content-Type",
+      getContentType(fileName, response.headers.get("Content-Type")),
+    );
+    headers.set(
+      "Content-Disposition",
+      `inline; filename*=UTF-8''${encodeURIComponent(fileName)}`,
+    );
+    headers.set("Content-Length", buffer.length.toString());
+    headers.set("Cache-Control", "private, max-age=300");
+
+    return new NextResponse(buffer, { status: 200, headers });
+  } catch (error) {
+    console.error("[Preview] Unexpected error:", error);
+    return new NextResponse("Internal Server Error", { status: 500 });
+  }
+}
diff --git a/src/app/api/save-answer/route.ts b/src/app/api/save-answer/route.ts
index 8d42fc2..56e8494 100644
--- a/src/app/api/save-answer/route.ts
+++ b/src/app/api/save-answer/route.ts
@@ -1,6 +1,8 @@
 import { NextRequest, NextResponse } from "next/server";
 import { saveAnswer } from "@/lib/actions/examWorkflow.actions";
+import { saveAnswerSchema } from "@/lib/formValidationSchemas";
 import { auth } from "@clerk/nextjs/server";
+import { ZodError } from "zod";
 
 export async function POST(req: NextRequest) {
   try {
@@ -9,23 +11,25 @@ export async function POST(req: NextRequest) {
       return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
     }
 
-    let data;
+    let rawData: unknown;
     const contentType = req.headers.get("content-type") || "";
 
     if (contentType.includes("application/json")) {
-      data = await req.json();
+      rawData = await req.json();
     } else if (contentType.includes("text/plain")) {
       const text = await req.text();
-      data = JSON.parse(text);
+      rawData = JSON.parse(text);
     } else if (contentType.includes("application/x-www-form-urlencoded")) {
       const formData = await req.formData();
-      data = Object.fromEntries(formData.entries());
-      if (data.submissionId) data.submissionId = Number(data.submissionId);
-      if (data.questionId) data.questionId = Number(data.questionId);
+      rawData = Object.fromEntries(formData.entries());
     } else {
-      return NextResponse.json({ error: "Unsupported content type" }, { status: 400 });
+      return NextResponse.json(
+        { error: "Unsupported content type" },
+        { status: 400 },
+      );
     }
 
+    const data = saveAnswerSchema.parse(rawData);
     const result = await saveAnswer({ success: true, error: false }, data);
 
     if (result.error) {
@@ -34,6 +38,15 @@ export async function POST(req: NextRequest) {
 
     return NextResponse.json({ success: true });
   } catch (error) {
-    return NextResponse.json({ error: "Internal Server Error" }, { status: 500 });
+    if (error instanceof ZodError) {
+      return NextResponse.json(
+        { error: "Invalid request body", details: error.flatten() },
+        { status: 400 },
+      );
+    }
+    return NextResponse.json(
+      { error: "Internal Server Error" },
+      { status: 500 },
+    );
   }
 }
diff --git a/src/app/api/submissions/route.ts b/src/app/api/submissions/route.ts
new file mode 100644
index 0000000..cd4cf27
--- /dev/null
+++ b/src/app/api/submissions/route.ts
@@ -0,0 +1,58 @@
+import { auth } from "@clerk/nextjs/server";
+import { NextRequest, NextResponse } from "next/server";
+import prisma from "@/lib/prisma";
+
+export async function GET(req: NextRequest) {
+  try {
+    const { userId, sessionClaims } = await auth();
+    const role = (sessionClaims?.metadata as { role?: string })?.role;
+
+    // ✅ السماح للمعلم والأدمن
+    if (!userId || (role !== "teacher" && role !== "admin")) {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
+
+    const assignmentId = Number(req.nextUrl.searchParams.get("assignmentId"));
+    if (!assignmentId) {
+      return NextResponse.json({ error: "assignmentId is required" }, { status: 400 });
+    }
+
+    // ✅ التحقق من صلاحية الوصول إلى الواجب
+    let assignment;
+    if (role === "admin") {
+      // الأدمن يرى كل الواجبات
+      assignment = await prisma.assignment.findUnique({
+        where: { id: assignmentId },
+        select: { id: true },
+      });
+    } else {
+      // المعلم يرى فقط واجباته
+      assignment = await prisma.assignment.findFirst({
+        where: {
+          id: assignmentId,
+          OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }],
+        },
+        select: { id: true },
+      });
+    }
+
+    if (!assignment) {
+      return NextResponse.json({ error: "Not found" }, { status: 404 });
+    }
+
+    const submissions = await prisma.assignmentSubmission.findMany({
+      where: { assignmentId },
+      include: {
+        student: {
+          select: { id: true, name: true, img: true },
+        },
+      },
+      orderBy: { updatedAt: "desc" }  // ✅ ترتيب حسب آخر تعديل,
+    });
+
+    return NextResponse.json(submissions);
+  } catch (err) {
+    console.error("[GET /api/submissions]", err);
+    return NextResponse.json({ error: "Something went wrong" }, { status: 500 });
+  }
+}
diff --git a/src/app/error.tsx b/src/app/error.tsx
new file mode 100644
index 0000000..de49501
--- /dev/null
+++ b/src/app/error.tsx
@@ -0,0 +1,40 @@
+"use client";
+
+import { useEffect, useTransition } from "react";
+import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+import ErrorState from "@/components/states/ErrorState";
+
+export default function GlobalError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  const t = useTranslations("states");
+  const router = useRouter();
+  const [isPending, startTransition] = useTransition();
+
+  useEffect(() => {
+    console.error(error);
+  }, [error]);
+
+  const handleRetry = () => {
+    startTransition(() => {
+      router.refresh();
+      reset();
+    });
+  };
+
+  return (
+    <main className="flex justify-center items-center min-h-screen">
+      <ErrorState
+        title={t("applicationErrorTitle")}
+        description={t("applicationErrorDescription")}
+        onRetry={handleRetry}
+        retryLabel={isPending ? t("retrying") : t("tryAgain")}
+      />
+    </main>
+  );
+}
diff --git a/src/app/globals.css b/src/app/globals.css
index f620eca..7cbb758 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -2,6 +2,38 @@
 @tailwind components;
 @tailwind utilities;
 
+:root {
+  --academix-ink: #24104f;
+}
+
+html {
+  scroll-behavior: smooth;
+}
+
+.academix-menu-scroll {
+  scrollbar-color: #7c3aed transparent;
+  scrollbar-width: thin;
+}
+
+.academix-menu-scroll::-webkit-scrollbar {
+  width: 8px;
+}
+
+.academix-menu-scroll::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+.academix-menu-scroll::-webkit-scrollbar-thumb {
+  background-color: #7c3aed;
+  border: 2px solid transparent;
+  border-radius: 999px;
+  background-clip: content-box;
+}
+
+.academix-menu-scroll::-webkit-scrollbar-thumb:hover {
+  background-color: #3b1b76;
+}
+
 .react-calendar {
   width: 100% !important;
   border: none !important;
@@ -122,7 +154,35 @@
   margin-bottom: 5px;
 }
 
-.calendar-week-mode .rbc-time-header-content .rbc-header:last-child,
-.calendar-week-mode .rbc-time-content > .rbc-day-slot:last-child {
-  display: none !important;
+.custom-shape-divider-bottom-1779710312 {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  overflow: hidden;
+  line-height: 0;
+  transform: rotate(180deg);
+}
+
+.custom-shape-divider-bottom-1779710312 svg {
+  position: relative;
+  display: block;
+  width: calc(126% + 1.3px);
+  height: 124px;
+}
+
+.custom-shape-divider-bottom-1779710312 .shape-fill {
+  fill: var(--academix-ink);
+}
+
+@keyframes titleReveal {
+  from {
+    opacity: 0;
+    transform: translateY(2rem);
+  }
+
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
diff --git a/src/app/icon.png b/src/app/icon.png
index 306873f..7983c44 100644
Binary files a/src/app/icon.png and b/src/app/icon.png differ
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 5432be3..3e1195c 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,6 +3,8 @@ import { Inter } from "next/font/google";
 import "./globals.css";
 import { ClerkProvider } from "@clerk/nextjs";
 import { ToastContainer } from "react-toastify";
+import { getLocale, getMessages } from "next-intl/server";
+import { NextIntlClientProvider } from "next-intl";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -11,17 +13,25 @@ export const metadata: Metadata = {
   description: "Next.js School Management System",
 };
 
-export default function RootLayout({
+export default async function RootLayout({
   children,
 }: Readonly<{
   children: React.ReactNode;
 }>) {
+  const locale = await getLocale();
+  const messages = await getMessages();
+
   return (
-    <html lang="en">
+    <html lang={locale} dir={locale === "ar" ? "rtl" : "ltr"}>
       <body className={inter.className}>
-        <ClerkProvider>
-          {children}
-          <ToastContainer position="bottom-right" theme="dark" />
+        <ClerkProvider
+          signInFallbackRedirectUrl="/post-login"
+          signInForceRedirectUrl="/post-login"
+        >
+          <NextIntlClientProvider messages={messages}>
+            {children}
+            <ToastContainer position="bottom-right" theme="dark" />
+          </NextIntlClientProvider>
         </ClerkProvider>
       </body>
     </html>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 4a5aad1..fc5aad2 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,16 +1,38 @@
-import Link from "next/link";
+import HeroSection from "@/components/home/HeroSection";
+import AboutSection from "@/components/home/AboutSection";
+import FeaturesSection from "@/components/home/FeaturesSection";
+import RolesSection from "@/components/home/RolesSection";
+import HowItWorksSection from "@/components/home/HowItWorksSection";
+import CtaSection from "@/components/home/CtaSection";
+import Footer from "@/components/home/Footer";
+import HomeNavbar from "@/components/home/HomeNavbar";
 
 const HomePage = () => {
   return (
-    <main className="flex flex-col justify-center items-center gap-4 bg-lamaSkyLight px-4 min-h-screen">
-      <h1 className="font-semibold text-gray-800 text-3xl">Welcome</h1>
-      <p className="text-gray-600">This is the Academix portal.</p>
-      <Link
-        href="/sign-in"
-        className="bg-academixPurpleDark hover:opacity-90 px-5 py-2 rounded-md text-white transition"
-      >
-        Log In
-      </Link>
+    <main className="bg-[var(--academix-ink)] overflow-x-hidden text-white">
+      <div className="relative flex flex-col items-center bg-[radial-gradient(circle_at_top,_rgba(207,206,255,0.22),_transparent_42%),linear-gradient(135deg,#24104f,#4c1d95_54%,#7c3aed)]">
+        <HomeNavbar />
+        <HeroSection />
+        <div className="custom-shape-divider-bottom-1779710312">
+          <svg
+            data-name="Layer 1"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 1200 120"
+            preserveAspectRatio="none"
+          >
+            <path
+              d="M321.39,56.44c58-10.79,114.16-30.13,172-41.86,82.39-16.72,168.19-17.73,250.45-.39C823.78,31,906.67,72,985.66,92.83c70.05,18.48,146.53,26.09,214.34,3V0H0V27.35A600.21,600.21,0,0,0,321.39,56.44Z"
+              className="shape-fill"
+            ></path>
+          </svg>
+        </div>
+      </div>
+      <AboutSection />
+      <FeaturesSection />
+      <RolesSection />
+      <HowItWorksSection />
+      <CtaSection />
+      <Footer />
     </main>
   );
 };
diff --git a/src/app/post-login/page.tsx b/src/app/post-login/page.tsx
new file mode 100644
index 0000000..2994cfb
--- /dev/null
+++ b/src/app/post-login/page.tsx
@@ -0,0 +1,66 @@
+import { auth } from "@clerk/nextjs/server";
+import { redirect } from "next/navigation";
+import prisma from "@/lib/prisma";
+import { getRoleHome, type UserRole } from "@/lib/utils";
+import { SchoolStatus } from "@prisma/client";
+
+async function resolveRoleAndSchoolStatusFromDb(userId: string): Promise<{
+  role: UserRole | null;
+  schoolStatus: SchoolStatus | null;
+}> {
+  const [admin, teacher, student, parent] = await Promise.all([
+    prisma.admin.findUnique({
+      where: { id: userId },
+      select: { id: true, school: { select: { status: true } } },
+    }),
+    prisma.teacher.findUnique({
+      where: { id: userId },
+      select: { id: true, school: { select: { status: true } } },
+    }),
+    prisma.student.findUnique({
+      where: { id: userId },
+      select: { id: true, school: { select: { status: true } } },
+    }),
+    prisma.parent.findUnique({
+      where: { id: userId },
+      select: { id: true, school: { select: { status: true } } },
+    }),
+  ]);
+
+  if (admin) return { role: "admin", schoolStatus: admin.school.status };
+  if (teacher) return { role: "teacher", schoolStatus: teacher.school.status };
+  if (student) return { role: "student", schoolStatus: student.school.status };
+  if (parent) return { role: "parent", schoolStatus: parent.school.status };
+
+  return { role: null, schoolStatus: null };
+}
+
+export default async function PostLoginPage() {
+  const { userId, sessionClaims } = await auth();
+
+  if (!userId) {
+    redirect("/sign-in");
+  }
+
+  const roleFromClaims = (sessionClaims?.metadata as { role?: UserRole } | undefined)
+    ?.role;
+  const resolved = await resolveRoleAndSchoolStatusFromDb(userId);
+  const role = roleFromClaims ?? resolved.role;
+
+  if (role === "admin" || role === "teacher" || role === "student" || role === "parent") {
+    const status = resolved.schoolStatus;
+    if (status === "PENDING" || status === "PAUSED") {
+      redirect("/school-access");
+    }
+
+    if (status !== "ACTIVE") {
+      redirect("/unauthorized");
+    }
+  }
+
+  if (role) {
+    redirect(getRoleHome(role));
+  }
+
+  redirect("/unauthorized");
+}
diff --git a/src/app/school-access/page.tsx b/src/app/school-access/page.tsx
new file mode 100644
index 0000000..b3e54c9
--- /dev/null
+++ b/src/app/school-access/page.tsx
@@ -0,0 +1,60 @@
+import { requireAuth, requireRole } from "@/lib/auth";
+import SignOutToSignInButton from "@/components/SignOutToSignInButton";
+import Image from "next/image";
+import { getTranslations } from "next-intl/server";
+
+export default async function SchoolAccessPage() {
+  const user = await requireAuth();
+  const commonT = await getTranslations("common");
+  const t = await getTranslations("auth.schoolAccess");
+  requireRole(user, ["admin", "teacher", "student", "parent"]);
+
+  const isPending = user.schoolStatus === "PENDING";
+  const isPaused = user.schoolStatus === "PAUSED";
+
+  return (
+    <div className="relative flex justify-center items-center bg-[radial-gradient(circle_at_top,_rgba(207,206,255,0.36),_transparent_46%),linear-gradient(135deg,#24104f,#4c1d95_54%,#7c3aed)] p-4 min-h-screen overflow-hidden">
+      <div className="z-10 relative shadow-2xl backdrop-blur-sm p-8 border border-white/60 rounded-2xl w-full max-w-lg text-white">
+        <h1 className="flex items-center gap-2 mb-4 font-bold text-xl">
+          <Image
+            src="/logo-white.png"
+            alt="Academix logo"
+            className="w-[44px] h-[34px] rotate-[-15deg]"
+            width={40}
+            height={40}
+          />
+          {commonT("brand")}
+        </h1>
+
+        <h2 className="mb-4 font-semibold text-2xl">{t("title")}</h2>
+        {isPending && (
+          <p className="text-sm leading-6">
+            {t("pending")}
+          </p>
+        )}
+        {isPaused && (
+          <div className="space-y-2">
+            <p className="text-sm leading-6">
+              {t("paused")}
+            </p>
+            {user.role === "admin" && (
+              <p className="text-sm">
+                {t("reason")}{" "}
+                <span className="font-medium">
+                  {user.schoolPauseReason || t("noReason")}
+                </span>
+              </p>
+            )}
+          </div>
+        )}
+        {!isPending && !isPaused && (
+          <p className="text-sm leading-6">{t("active")}</p>
+        )}
+
+        <div className="mt-6">
+          <SignOutToSignInButton />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/app/school-signup/page.tsx b/src/app/school-signup/page.tsx
new file mode 100644
index 0000000..39971a9
--- /dev/null
+++ b/src/app/school-signup/page.tsx
@@ -0,0 +1,69 @@
+"use client";
+
+import SchoolSignupForm from "@/components/SchoolSignupForm";
+import Image from "next/image";
+import { useRouter } from "next/navigation";
+import { ArrowLeft } from "lucide-react";
+import { useTranslations } from "next-intl";
+
+export default function SchoolSignupPage() {
+  const router = useRouter();
+  const commonT = useTranslations("common");
+  const t = useTranslations("schoolSignup.page");
+
+  return (
+    <div className="relative flex justify-center items-center bg-[radial-gradient(circle_at_top,_rgba(207,206,255,0.36),_transparent_46%),linear-gradient(135deg,#24104f,#4c1d95_54%,#7c3aed)] p-3 md:p-5 min-h-screen overflow-hidden">
+      <div className="z-10 relative gap-0 grid grid-cols-1 lg:grid-cols-2 shadow-xl mx-auto rounded-3xl w-full max-w-5xl lg:h-[90dvh] overflow-hidden">
+        <div className="relative flex flex-col bg-[linear-gradient(135deg,#24104f,#4c1d95_58%,#7c3aed)] p-7 md:p-8 text-white">
+          <div>
+            <button
+              onClick={() => router.back()}
+              className="inline-flex items-center gap-2 mb-4 text-white/80 hover:text-white text-sm transition-colors"
+            >
+              <ArrowLeft className="w-4 h-4 rtl:rotate-180" />
+              {t("goBack")}
+            </button>
+            <div className="flex items-center gap-2">
+              <Image
+                src="/logo-white.png"
+                alt="Academix logo"
+                className="w-[50px] h-[40px] rotate-[-15deg]"
+                width={50}
+                height={40}
+              />
+
+              <span className="font-bold text-xl tracking-wide">
+                {commonT("brand")}
+              </span>
+            </div>
+            <h1 className="mt-8 font-bold text-white text-3xl leading-tight">
+              {t("titleStart")}{" "}
+              <span className="text-academixYellow leading-tight">
+                {t("titleHighlight")}
+              </span>
+            </h1>
+            <p className="mt-4 text-white/85 text-sm leading-6">
+              {t("description")}
+            </p>
+          </div>
+
+          <div className="space-y-3 mt-6 text-sm">
+            <p className="bg-white/10 px-4 py-3 rounded-xl">
+              1. {t("steps.profile")}
+            </p>
+            <p className="bg-white/10 px-4 py-3 rounded-xl">
+              2. {t("steps.verification")}
+            </p>
+            <p className="bg-white/10 px-4 py-3 rounded-xl">
+              3. {t("steps.access")}
+            </p>
+          </div>
+        </div>
+
+        <div className="bg-white p-6 md:p-8 h-full">
+          <SchoolSignupForm />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/app/sign-in/page.tsx b/src/app/sign-in/page.tsx
index 1aa9353..a3560ac 100644
--- a/src/app/sign-in/page.tsx
+++ b/src/app/sign-in/page.tsx
@@ -1,11 +1,12 @@
 "use client";
 
 import LoginContent from "@/components/LoginContent";
+import LoadingIndicator from "@/components/loaders/LoadingIndicator";
 import { Suspense } from "react";
 
 export default function LoginPage() {
   return (
-    <Suspense fallback={<div>Loading...</div>}>
+    <Suspense fallback={<LoadingIndicator />}>
       <LoginContent />
     </Suspense>
   );
diff --git a/src/app/unauthorized/page.tsx b/src/app/unauthorized/page.tsx
new file mode 100644
index 0000000..e51e784
--- /dev/null
+++ b/src/app/unauthorized/page.tsx
@@ -0,0 +1,36 @@
+import Image from "next/image";
+import SignOutToSignInButton from "@/components/SignOutToSignInButton";
+import { getTranslations } from "next-intl/server";
+
+export default async function UnauthorizedPage() {
+  const t = await getTranslations("states");
+  const commonT = await getTranslations("common");
+
+  return (
+    <div className="relative flex justify-center items-center bg-[radial-gradient(circle_at_top,_rgba(207,206,255,0.36),_transparent_46%),linear-gradient(135deg,#24104f,#4c1d95_54%,#7c3aed)] p-4 min-h-screen overflow-hidden">
+      <div className="z-10 relative shadow-2xl backdrop-blur-sm p-8 border border-white/60 rounded-2xl w-full max-w-lg text-white">
+        <h1 className="flex items-center gap-2 mb-4 font-bold text-xl">
+          <Image
+            src="/logo-white.png"
+            alt="Academix logo"
+            className="w-[44px] h-[34px] rotate-[-15deg]"
+            width={40}
+            height={40}
+          />
+          {commonT("brand")}
+        </h1>
+
+        <h2 className="mb-3 font-semibold text-2xl">
+          {t("unauthorizedTitle")}
+        </h2>
+        <p className="text-sm leading-6">
+          {t("unauthorizedDescription")}
+        </p>
+
+        <div className="mt-6">
+          <SignOutToSignInButton />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/AcademicYearFilter.tsx b/src/components/AcademicYearFilter.tsx
new file mode 100644
index 0000000..c7ade2d
--- /dev/null
+++ b/src/components/AcademicYearFilter.tsx
@@ -0,0 +1,47 @@
+"use client";
+
+import type { AcademicYearItem } from "@/lib/academicYears";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { useTranslations } from "next-intl";
+
+type AcademicYearFilterProps = {
+  academicYears: Pick<AcademicYearItem, "id" | "name">[];
+  currentAcademicYearId: number;
+};
+
+const AcademicYearFilter = ({
+  academicYears,
+  currentAcademicYearId,
+}: AcademicYearFilterProps) => {
+  const t = useTranslations("filters");
+  const pathname = usePathname();
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const selectedAcademicYearId =
+    searchParams.get("academicYearId") ?? String(currentAcademicYearId);
+
+  const handleChange = (academicYearId: string) => {
+    const params = new URLSearchParams(searchParams.toString());
+
+    params.set("academicYearId", academicYearId);
+    params.set("page", "1");
+    router.push(`${pathname}?${params.toString()}`);
+  };
+
+  return (
+    <select
+      value={selectedAcademicYearId}
+      onChange={(event) => handleChange(event.target.value)}
+      className="h-10 rounded-md border px-3 text-sm"
+      aria-label={t("academicYear")}
+    >
+      {academicYears.map((year) => (
+        <option key={year.id} value={year.id}>
+          {year.name}
+        </option>
+      ))}
+    </select>
+  );
+};
+
+export default AcademicYearFilter;
diff --git a/src/components/AcademicYearForm.tsx b/src/components/AcademicYearForm.tsx
index ea80baf..0278f07 100644
--- a/src/components/AcademicYearForm.tsx
+++ b/src/components/AcademicYearForm.tsx
@@ -2,7 +2,9 @@
 
 import { createAcademicYear, updateAcademicYear } from "@/lib/actions";
 import type { AcademicYearItem } from "@/lib/academicYears";
+import { X } from "lucide-react";
 import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
 import { useMemo, useState, useTransition } from "react";
 import { toast } from "react-toastify";
 
@@ -26,9 +28,13 @@ const emptyFormState: FormState = {
 };
 
 const AcademicYearForm = ({ academicYears }: Props) => {
+  const th = useTranslations("tableHeaders");
+  const t = useTranslations("settings.academicYears");
+  const actionsT = useTranslations("actions");
   const router = useRouter();
   const [isSubmitting, startTransition] = useTransition();
   const [form, setForm] = useState<FormState>(emptyFormState);
+  const [isModalOpen, setIsModalOpen] = useState(false);
 
   const sortedYears = useMemo(
     () =>
@@ -44,10 +50,12 @@ const AcademicYearForm = ({ academicYears }: Props) => {
       endDate: year.endDate,
       isCurrent: year.isCurrent,
     });
+    setIsModalOpen(true);
   };
 
   const onReset = () => {
     setForm(emptyFormState);
+    setIsModalOpen(false);
   };
 
   const onSubmit = (e: React.FormEvent<HTMLFormElement>) => {
@@ -67,110 +75,52 @@ const AcademicYearForm = ({ academicYears }: Props) => {
         : await createAcademicYear({ success: false, error: false }, payload);
 
       if (result.success) {
-        toast(form.id ? "Academic year updated." : "Academic year created.");
+        toast(form.id ? t("updated") : t("created"));
         onReset();
         router.refresh();
         return;
       }
 
-      toast.error(result.message ?? "Something went wrong!");
+      toast.error(result.message ?? actionsT("somethingWentWrong"));
     });
   };
 
   return (
     <div className="flex flex-col gap-6">
-      <form className="flex flex-col gap-4" onSubmit={onSubmit}>
-        <div className="gap-4 grid grid-cols-1 md:grid-cols-2">
-          <label className="flex flex-col gap-2 md:col-span-2">
-            <span className="font-medium text-gray-600 text-sm">Name</span>
-            <input
-              type="text"
-              className="p-2 rounded-md ring-[1.5px] ring-gray-300 text-sm"
-              value={form.name}
-              onChange={(e) =>
-                setForm((prev) => ({ ...prev, name: e.target.value }))
-              }
-              placeholder="2025/2026"
-              required
-            />
-          </label>
-
-          <label className="flex flex-col gap-2">
-            <span className="font-medium text-gray-600 text-sm">
-              Start Date
-            </span>
-            <input
-              type="date"
-              className="p-2 rounded-md ring-[1.5px] ring-gray-300 text-sm"
-              value={form.startDate}
-              onChange={(e) =>
-                setForm((prev) => ({ ...prev, startDate: e.target.value }))
-              }
-              required
-            />
-          </label>
-
-          <label className="flex flex-col gap-2">
-            <span className="font-medium text-gray-600 text-sm">End Date</span>
-            <input
-              type="date"
-              className="p-2 rounded-md ring-[1.5px] ring-gray-300 text-sm"
-              value={form.endDate}
-              onChange={(e) =>
-                setForm((prev) => ({ ...prev, endDate: e.target.value }))
-              }
-              required
-            />
-          </label>
+      <div className="flex justify-between items-center">
+        <div className="flex flex-col">
+          <h2 className="font-semibold text-lg">{t("title")}</h2>
+          <p className="mt-2 text-gray-500 text-sm">
+            {t("description")}
+          </p>
         </div>
-
-        <label className="flex items-center gap-2 text-sm">
-          <input
-            type="checkbox"
-            checked={form.isCurrent}
-            onChange={(e) =>
-              setForm((prev) => ({ ...prev, isCurrent: e.target.checked }))
-            }
-          />
-          Mark as current academic year
-        </label>
-
-        <div className="flex gap-3">
-          <button
-            className="bg-blue-500 disabled:opacity-60 px-4 py-2 rounded-md w-fit text-white"
-            disabled={isSubmitting}
-            type="submit"
-          >
-            {form.id ? "Update Academic Year" : "Create Academic Year"}
-          </button>
-
-          {form.id ? (
-            <button
-              className="px-4 py-2 border border-gray-300 rounded-md w-fit text-gray-700"
-              type="button"
-              onClick={onReset}
-            >
-              Cancel Edit
-            </button>
-          ) : null}
-        </div>
-      </form>
+        <button
+          type="button"
+          onClick={() => {
+            setForm(emptyFormState);
+            setIsModalOpen(true);
+          }}
+          className="bg-academixPurpleDark hover:brightness-90 px-4 py-2 rounded-md font-semibold text-white text-sm transition-all"
+        >
+          {t("add")}
+        </button>
+      </div>
 
       <div className="overflow-x-auto">
         <table className="min-w-full text-sm">
           <thead>
-            <tr className="border-b text-left">
-              <th className="px-2 py-2 font-semibold">Name</th>
-              <th className="px-2 py-2 font-semibold">Range</th>
-              <th className="px-2 py-2 font-semibold">Current</th>
-              <th className="px-2 py-2 font-semibold">Actions</th>
+            <tr className="border-b text-start">
+              <th className="px-2 py-2 font-semibold">{th("name")}</th>
+              <th className="px-2 py-2 font-semibold">{th("range")}</th>
+              <th className="px-2 py-2 font-semibold">{th("current")}</th>
+              <th className="px-2 py-2 font-semibold">{th("actions")}</th>
             </tr>
           </thead>
           <tbody>
             {sortedYears.length === 0 ? (
               <tr>
                 <td className="px-2 py-3 text-gray-500" colSpan={4}>
-                  No academic years yet.
+                  {t("empty")}
                 </td>
               </tr>
             ) : (
@@ -180,14 +130,16 @@ const AcademicYearForm = ({ academicYears }: Props) => {
                   <td className="px-2 py-3">
                     {year.startDate} - {year.endDate}
                   </td>
-                  <td className="px-2 py-3">{year.isCurrent ? "Yes" : "No"}</td>
+                  <td className="px-2 py-3">
+                    {year.isCurrent ? actionsT("yes") : actionsT("no")}
+                  </td>
                   <td className="px-2 py-3">
                     <button
-                      className="text-blue-600 hover:underline"
+                      className="text-academixPurpleDark hover:underline"
                       type="button"
                       onClick={() => onEdit(year)}
                     >
-                      Edit
+                      {actionsT("edit")}
                     </button>
                   </td>
                 </tr>
@@ -196,6 +148,115 @@ const AcademicYearForm = ({ academicYears }: Props) => {
           </tbody>
         </table>
       </div>
+
+      {isModalOpen ? (
+        <div
+          className="z-50 fixed inset-0 flex justify-center items-center bg-black/60 p-4"
+          onMouseDown={(event) => {
+            if (event.target === event.currentTarget) {
+              onReset();
+            }
+          }}
+        >
+          <form
+            className="relative bg-white p-5 rounded-md w-full max-w-3xl"
+            onSubmit={onSubmit}
+            role="dialog"
+            aria-modal="true"
+            onMouseDown={(event) => event.stopPropagation()}
+          >
+            <div className="flex justify-between items-center mb-4">
+              <h3 className="font-semibold text-lg">
+                {form.id ? t("editTitle") : t("add")}
+              </h3>
+              <button
+                type="button"
+                onClick={onReset}
+                className="text-gray-500 hover:text-gray-700 transition-colors"
+                aria-label={actionsT("close")}
+              >
+                <X className="w-5 h-5" />
+              </button>
+            </div>
+
+            <div className="gap-4 grid grid-cols-1 md:grid-cols-2">
+              <label className="flex flex-col gap-2 md:col-span-2">
+                <span className="font-medium text-gray-700 text-sm">
+                  {th("name")}
+                </span>
+                <input
+                  type="text"
+                  className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 text-sm transition-all"
+                  value={form.name}
+                  onChange={(e) =>
+                    setForm((prev) => ({ ...prev, name: e.target.value }))
+                  }
+                  placeholder="2025/2026"
+                  required
+                />
+              </label>
+
+              <label className="flex flex-col gap-2">
+                <span className="font-medium text-gray-600 text-sm">
+                  {t("startDate")}
+                </span>
+                <input
+                  type="date"
+                  className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 text-sm transition-all"
+                  value={form.startDate}
+                  onChange={(e) =>
+                    setForm((prev) => ({ ...prev, startDate: e.target.value }))
+                  }
+                  required
+                />
+              </label>
+
+              <label className="flex flex-col gap-2">
+                <span className="font-medium text-gray-700 text-sm">
+                  {t("endDate")}
+                </span>
+                <input
+                  type="date"
+                  className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 text-sm transition-all"
+                  value={form.endDate}
+                  onChange={(e) =>
+                    setForm((prev) => ({ ...prev, endDate: e.target.value }))
+                  }
+                  required
+                />
+              </label>
+            </div>
+
+            <label className="flex items-center gap-2 mt-4 font-medium text-gray-700 text-sm">
+              <input
+                type="checkbox"
+                checked={form.isCurrent}
+                onChange={(e) =>
+                  setForm((prev) => ({ ...prev, isCurrent: e.target.checked }))
+                }
+                className="border-gray-300 rounded focus:ring-academixPurpleDark w-4 h-4 text-academixPurpleDark"
+              />
+              {t("markCurrent")}
+            </label>
+
+            <div className="flex gap-3 mt-5">
+              <button
+                className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
+                disabled={isSubmitting}
+                type="submit"
+              >
+                {form.id
+                  ? isSubmitting
+                    ? actionsT("updating")
+                    : t("update")
+                  : isSubmitting
+                    ? actionsT("creating")
+                    : t("create")}
+              </button>
+            </div>
+          </form>
+        </div>
+      ) : null}
     </div>
   );
 };
diff --git a/src/components/AiEvaluationCard.tsx b/src/components/AiEvaluationCard.tsx
new file mode 100644
index 0000000..35013dd
--- /dev/null
+++ b/src/components/AiEvaluationCard.tsx
@@ -0,0 +1,143 @@
+"use client";
+
+import { AlertTriangle, Loader2, Sparkles } from "lucide-react";
+import { useTranslations } from "next-intl";
+import { useRouter } from "next/navigation";
+import { useMemo, useTransition } from "react";
+import { toast } from "react-toastify";
+
+type AiActionResult = {
+  success: boolean;
+  error: boolean;
+  message?: string;
+};
+
+export type AiEvaluationCardData = {
+  id: number;
+  status: string;
+  score: number | null;
+  maxScore: number;
+  feedback: string | null;
+  strengths: unknown;
+  weaknesses: unknown;
+  needsReview: boolean;
+  error: string | null;
+  approvedScore: number | null;
+  approvedFeedback: string | null;
+};
+
+type Props = {
+  evaluation: AiEvaluationCardData | null;
+  maxScore: number;
+  disabledMessage?: string;
+  onEvaluate: () => Promise<AiActionResult>;
+};
+
+const toList = (value: unknown) => {
+  if (!Array.isArray(value)) return [];
+  return value.map((item) => String(item).trim()).filter(Boolean);
+};
+
+export default function AiEvaluationCard({
+  evaluation,
+  maxScore,
+  disabledMessage,
+  onEvaluate,
+}: Props) {
+  const t = useTranslations("aiEvaluation");
+  const router = useRouter();
+  const [isEvaluating, startEvaluation] = useTransition();
+  const strengths = useMemo(() => toList(evaluation?.strengths), [evaluation]);
+  const weaknesses = useMemo(() => toList(evaluation?.weaknesses), [evaluation]);
+
+  const handleEvaluate = () => {
+    startEvaluation(async () => {
+      const result = await onEvaluate();
+      if (result.success) {
+        toast.success(result.message ?? t("saved"));
+        router.refresh();
+      } else {
+        toast.error(result.message ?? t("failed"));
+        router.refresh();
+      }
+    });
+  };
+
+  return (
+    <div className="rounded-md border border-academixPurpleLight bg-white p-3">
+      <div className="flex flex-wrap items-center justify-between gap-2">
+        <div className="flex items-center gap-2 text-sm font-semibold text-academixPurpleDark">
+          <Sparkles className="h-4 w-4" />
+          {t("title")}
+        </div>
+        <button
+          type="button"
+          onClick={handleEvaluate}
+          disabled={isEvaluating || Boolean(disabledMessage)}
+          className="inline-flex items-center gap-2 rounded-md bg-academixPurpleDark px-3 py-1.5 text-xs font-medium text-white transition hover:brightness-90 disabled:cursor-not-allowed disabled:opacity-60"
+        >
+          {isEvaluating ? <Loader2 className="h-3.5 w-3.5 animate-spin" /> : <Sparkles className="h-3.5 w-3.5" />}
+          {t("evaluate")}
+        </button>
+      </div>
+
+      {disabledMessage && (
+        <p className="mt-2 text-xs text-gray-400">{disabledMessage}</p>
+      )}
+
+      {evaluation?.status === "FAILED" && (
+        <div className="mt-3 flex gap-2 rounded-md bg-red-50 p-3 text-xs text-red-700">
+          <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
+          <span>{evaluation.error ?? t("manualFallback")}</span>
+        </div>
+      )}
+
+      {evaluation && evaluation.status !== "FAILED" && (
+        <div className="mt-3 space-y-3">
+          <div className="flex flex-wrap items-center gap-2">
+            <span className="rounded-md bg-academixPurpleLight px-2 py-1 text-xs font-semibold text-academixPurpleDark">
+              {t("appliedDraftScore", {
+                score: evaluation.score ?? "-",
+                maxScore,
+              })}
+            </span>
+            {evaluation.needsReview && (
+              <span className="rounded-md bg-amber-50 px-2 py-1 text-xs font-medium text-amber-700">
+                {t("needsReview")}
+              </span>
+            )}
+          </div>
+
+          <p className="text-sm text-gray-700 whitespace-pre-wrap">
+            {evaluation.feedback ?? t("noFeedback")}
+          </p>
+
+          {(strengths.length > 0 || weaknesses.length > 0) && (
+            <div className="grid gap-3 md:grid-cols-2">
+              <div>
+                <p className="mb-1 text-xs font-semibold text-green-700">
+                  {t("strengths")}
+                </p>
+                <ul className="space-y-1 text-xs text-gray-600">
+                  {strengths.map((item) => (
+                    <li key={item}>- {item}</li>
+                  ))}
+                </ul>
+              </div>
+              <div>
+                <p className="mb-1 text-xs font-semibold text-amber-700">
+                  {t("weaknesses")}
+                </p>
+                <ul className="space-y-1 text-xs text-gray-600">
+                  {weaknesses.map((item) => (
+                    <li key={item}>- {item}</li>
+                  ))}
+                </ul>
+              </div>
+            </div>
+          )}
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/Announcements.tsx b/src/components/Announcements.tsx
index bc280b1..f8aad31 100644
--- a/src/components/Announcements.tsx
+++ b/src/components/Announcements.tsx
@@ -3,8 +3,12 @@ import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
 import prisma from "@/lib/prisma";
 import { Prisma } from "@prisma/client";
 import NoCurrentAcademicYearMessage from "./NoCurrentAcademicYearMessage";
+import Link from "next/link";
+import { getTranslations } from "next-intl/server";
 
 const Announcements = async () => {
+  const t = await getTranslations("pages");
+  const widgetsT = await getTranslations("widgets");
   const user = await requireAuth();
   const { role, userId, schoolId } = user;
   const academicYearId = await getCurrentAcademicYearIdOrNull(schoolId);
@@ -39,8 +43,13 @@ const Announcements = async () => {
   return (
     <div className="bg-white p-4 rounded-md">
       <div className="flex justify-between items-center">
-        <h1 className="font-semibold text-xl">Announcements</h1>
-        <span className="text-gray-400 text-xs">View All</span>
+        <h1 className="font-semibold text-xl">{t("announcements")}</h1>
+        <Link
+          href="/list/announcements"
+          className="text-gray-400 text-xs hover:underline transition"
+        >
+          {widgetsT("viewAll")}
+        </Link>
       </div>
       <div className="flex flex-col gap-4 mt-4">
         {data[0] && (
diff --git a/src/components/ArchiveFilters.tsx b/src/components/ArchiveFilters.tsx
new file mode 100644
index 0000000..88be475
--- /dev/null
+++ b/src/components/ArchiveFilters.tsx
@@ -0,0 +1,74 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+
+type AcademicYear = {
+  id: number | string;
+  name: string;
+};
+
+const ArchiveFilters = ({
+  academicYears,
+  selectedType,
+  selectedYear,
+}: {
+  academicYears: AcademicYear[];
+  selectedType: string;
+  selectedYear: string;
+}) => {
+  const t = useTranslations("filters");
+  const router = useRouter();
+
+  const updateFilters = (type: string, year: string) => {
+    router.push(`/archive?type=${type}&academicYearId=${year}`);
+  };
+
+  return (
+    <div className="bg-white rounded-2xl p-6 shadow-sm border border-gray-100">
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-5">
+        <div>
+          <label className="block text-sm font-medium text-gray-600 mb-2">
+            {t("dataType")}
+          </label>
+
+          <select
+            value={selectedType}
+            onChange={(e) => updateFilters(e.target.value, selectedYear)}
+            className="w-full border border-gray-200 rounded-xl px-4 py-3 text-sm outline-none"
+          >
+            <option value="students">{t("students")}</option>
+            <option value="teachers">{t("teachers")}</option>
+            <option value="parents">{t("parents")}</option>
+            <option value="exams">{t("exams")}</option>
+            <option value="assignments">{t("assignments")}</option>
+            <option value="results">{t("results")}</option>
+            <option value="attendance">{t("attendance")}</option>
+            <option value="subjects">{t("subjects")}</option>
+            <option value="classes">{t("classes")}</option>
+          </select>
+        </div>
+
+        <div>
+          <label className="block text-sm font-medium text-gray-600 mb-2">
+            {t("academicYear")}
+          </label>
+
+          <select
+            value={selectedYear}
+            onChange={(e) => updateFilters(selectedType, e.target.value)}
+            className="w-full border border-gray-200 rounded-xl px-4 py-3 text-sm outline-none"
+          >
+            {academicYears.map((year) => (
+              <option key={year.id} value={year.id}>
+                {year.name}
+              </option>
+            ))}
+          </select>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ArchiveFilters;
diff --git a/src/components/AssignmentFileUpload.tsx b/src/components/AssignmentFileUpload.tsx
new file mode 100644
index 0000000..1e60bd1
--- /dev/null
+++ b/src/components/AssignmentFileUpload.tsx
@@ -0,0 +1,154 @@
+"use client";
+
+import { useActionState, useEffect, useRef, useState } from "react";
+import { toast } from "react-toastify";
+import { Upload, Loader2, Paperclip, X } from "lucide-react";
+import {
+  uploadAssignmentFile,
+  AssignmentFileState,
+} from "@/lib/actions/assignmentFile.actions";
+import { useTranslations } from "next-intl";
+
+const initialState: AssignmentFileState = {
+  success: false,
+  error: false,
+  message: "",
+};
+
+type Props = {
+  assignmentId: number;
+  assignmentTitle: string;
+  currentFileUrl?: string | null;
+  currentFileName?: string | null;
+};
+
+export default function AssignmentFileUpload({
+  assignmentId,
+  assignmentTitle,
+  currentFileUrl,
+  currentFileName,
+}: Props) {
+  const actionsT = useTranslations("actions");
+  const [open, setOpen] = useState(false);
+  const formRef = useRef<HTMLFormElement>(null);
+
+  const [state, formAction, isPending] = useActionState(
+    uploadAssignmentFile,
+    initialState
+  );
+
+  useEffect(() => {
+    if (state.success) {
+      toast.success(state.message);
+      formRef.current?.reset();
+      queueMicrotask(() => setOpen(false));
+    } else if (state.error) {
+      toast.error(state.message);
+    }
+  }, [state]);
+
+  return (
+    <div>
+      {/* زر فتح الفورم */}
+      <button
+        type="button"
+        onClick={() => setOpen(!open)}
+        title={currentFileUrl ? "Replace file" : "Attach file"}
+        className={`flex items-center gap-1.5 px-2.5 py-1.5 rounded-lg text-xs font-medium transition-colors
+          ${currentFileUrl
+            ? "bg-green-50 text-green-700 hover:bg-green-100"
+            : "bg-purple-50 text-purple-700 hover:bg-purple-100"
+          }`}
+      >
+        <Paperclip className="w-3.5 h-3.5" />
+        {currentFileUrl ? "Replace File" : "Attach File"}
+      </button>
+
+      {/* فورم الرفع */}
+      {open && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/40">
+          <div className="bg-white rounded-xl shadow-xl p-6 w-full max-w-md mx-4">
+            <div className="flex items-center justify-between mb-4">
+              <h3 className="font-semibold text-gray-800 text-base">
+                Attach File to Assignment
+              </h3>
+              <button
+                type="button"
+                onClick={() => setOpen(false)}
+                className="p-1 rounded-lg hover:bg-gray-100 text-gray-400"
+              >
+                <X className="w-4 h-4" />
+              </button>
+            </div>
+
+            <p className="text-sm text-gray-500 mb-4 truncate">
+              {assignmentTitle}
+            </p>
+
+            {currentFileUrl && (
+              <div className="mb-4 p-3 bg-green-50 rounded-lg border border-green-100 text-sm text-green-700">
+                Current file: <span className="font-medium">{currentFileName}</span>
+                <br />
+                <span className="text-xs text-green-500">Uploading a new file will replace it.</span>
+              </div>
+            )}
+
+            <form ref={formRef} action={formAction} className="space-y-4">
+              <input type="hidden" name="assignmentId" value={assignmentId} />
+
+              <div>
+                <label className="block text-sm font-medium text-gray-700 mb-1">
+                  File <span className="text-red-500">*</span>
+                  <span className="ml-1 text-xs text-gray-400">(Max 20MB)</span>
+                </label>
+                <input
+                  type="file"
+                  name="file"
+                  required
+                  accept=".pdf,.doc,.docx,.ppt,.pptx,.xls,.xlsx,.txt,.png,.jpg,.jpeg,.zip"
+                  className="w-full text-sm text-gray-500
+                             file:mr-3 file:py-1.5 file:px-3
+                             file:rounded-lg file:border-0
+                             file:text-sm file:font-medium
+                             file:bg-purple-50 file:text-purple-700
+                             hover:file:bg-purple-100 cursor-pointer"
+                />
+              </div>
+
+              <div className="flex gap-3 pt-1">
+                <button
+                  type="button"
+                  onClick={() => setOpen(false)}
+                  className="flex-1 py-2 px-4 rounded-lg border border-gray-200
+                             text-gray-600 hover:bg-gray-50 text-sm font-medium transition-colors"
+                >
+                  Cancel
+                </button>
+                <button
+                  type="submit"
+                  disabled={isPending}
+                  className="flex-1 flex items-center justify-center gap-2
+                             bg-purple-600 hover:bg-purple-700 disabled:bg-purple-300
+                             text-white font-medium py-2 px-4 rounded-lg
+                             transition-colors text-sm"
+                >
+                  {isPending ? (
+                    <>
+                      <Loader2 className="w-4 h-4 animate-spin" />
+                      {actionsT("uploading")}
+                    </>
+                  ) : (
+                    <>
+                      <Upload className="w-4 h-4" />
+                      Upload
+                    </>
+                  )}
+                </button>
+              </div>
+            </form>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/AssignmentSubmit.tsx b/src/components/AssignmentSubmit.tsx
new file mode 100644
index 0000000..44720ff
--- /dev/null
+++ b/src/components/AssignmentSubmit.tsx
@@ -0,0 +1,360 @@
+"use client";
+
+import { useRef, useState, useTransition } from "react";
+import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+import { toast } from "react-toastify";
+import {
+  Upload,
+  Loader2,
+  X,
+  RefreshCw,
+  Download,
+  CheckCircle,
+  Clock,
+} from "lucide-react";
+import { submitAssignment } from "@/lib/actions/submission.actions";
+
+type Props = {
+  assignmentId: number;
+  assignmentTitle: string;
+  maxScore: number;
+  endDate: Date;
+  allowLateSubmission: boolean; // ✅ prop جديد
+  existingSubmission?: {
+    id?: number;
+    fileUrl: string;
+    fileName: string;
+    createdAt: Date;
+    note?: string | null;
+    teacherFeedback?: string | null;
+    score?: number | null;
+    gradePublished?: boolean;
+  } | null;
+};
+
+export default function AssignmentSubmit({
+  assignmentId,
+  assignmentTitle,
+  maxScore,
+  endDate,
+  allowLateSubmission,
+  existingSubmission,
+}: Props) {
+  const t = useTranslations("assignmentsPage");
+  const [open, setOpen] = useState(false);
+  const [selectedFileName, setSelectedFileName] = useState("");
+  const formRef = useRef<HTMLFormElement>(null);
+  const router = useRouter();
+  const [isPending, startTransition] = useTransition();
+  const isOverdue = new Date() > new Date(endDate);
+
+  // ✅ المنطق الجديد:
+  // يمكن التسليم إذا: لم ينتهِ الوقت، أو انتهى لكن المعلم سمح بالتسليم المتأخر
+  const canSubmit = !isOverdue || allowLateSubmission;
+  const isLate = isOverdue && allowLateSubmission;
+
+  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
+    e.preventDefault();
+    const formData = new FormData(e.currentTarget);
+
+    startTransition(async () => {
+      const result = await submitAssignment(
+        { success: false, error: false, message: "" },
+        formData,
+      );
+      if (result.success) {
+        toast.success(result.message);
+        formRef.current?.reset();
+        setSelectedFileName("");
+        setOpen(false);
+        router.refresh();
+      } else {
+        toast.error(result.message);
+      }
+    });
+  }
+
+  // ─── زر الحالة ───────────────────────────────────────────────────────────
+  const renderButton = () => {
+    // عنده تسليم + انتهى الوقت + ما في سماح بالتأخير = عرض فقط
+    if (existingSubmission && isOverdue && !allowLateSubmission) {
+      return (
+        <button
+          type="button"
+          onClick={() => setOpen(true)}
+          className="flex items-center gap-1.5 bg-academixPurpleLight hover:brightness-95 px-2.5 py-1.5 rounded-lg font-medium text-academixPurpleDark text-xs transition-colors"
+        >
+          <CheckCircle className="w-3.5 h-3.5" />
+          {t("actions.viewSubmission")}
+        </button>
+      );
+    }
+
+    // عنده تسليم + يمكن التعديل (قبل deadline أو late مسموح)
+    if (existingSubmission && canSubmit) {
+      return (
+        <button
+          type="button"
+          onClick={() => setOpen(true)}
+          className="flex items-center gap-1.5 bg-academixPurpleLight hover:brightness-95 px-2.5 py-1.5 rounded-lg font-medium text-academixPurpleDark text-xs transition-colors"
+        >
+          <RefreshCw className="w-3.5 h-3.5" />
+          {t("actions.replaceFile")}
+          {isLate && <Clock className="w-3 h-3 text-amber-500" />}
+        </button>
+      );
+    }
+
+    // ما عنده تسليم
+    if (!existingSubmission) {
+      // انتهى الوقت وما في سماح = زر معطّل
+      if (isOverdue && !allowLateSubmission) {
+        return (
+          <button
+            type="button"
+            disabled
+            className="flex items-center gap-1.5 bg-red-50 px-2.5 py-1.5 rounded-lg font-medium text-red-400 text-xs cursor-not-allowed"
+          >
+            <Upload className="w-3.5 h-3.5" />
+            {t("actions.deadlinePassed")}
+          </button>
+        );
+      }
+
+      // يمكن التسليم (قبل deadline أو late مسموح)
+      return (
+        <button
+          type="button"
+          onClick={() => setOpen(true)}
+          className="flex items-center gap-1.5 bg-academixPurpleLight hover:brightness-95 px-2.5 py-1.5 rounded-lg font-medium text-academixPurpleDark text-xs transition-colors"
+        >
+          <Upload className="w-3.5 h-3.5" />
+          {isLate ? t("actions.submitLateShort") : t("actions.submit")}
+          {isLate && <Clock className="w-3 h-3 text-amber-500" />}
+        </button>
+      );
+    }
+
+    return null;
+  };
+
+  // ─── هل يُفتح المودال؟ ────────────────────────────────────────────────────
+  const canOpenModal =
+    canSubmit || (isOverdue && !allowLateSubmission && !!existingSubmission); // view-only
+
+  const isViewOnly = isOverdue && !allowLateSubmission && !!existingSubmission;
+
+  return (
+    <div>
+      {renderButton()}
+
+      {/* ========== المودال ========== */}
+      {open && canOpenModal && (
+        <div className="z-50 fixed inset-0 flex justify-center items-center bg-black/40">
+          <div className="bg-white shadow-xl mx-4 p-6 rounded-xl w-full max-w-md">
+            {/* Header */}
+            <div className="flex justify-between items-center mb-4">
+              <h3 className="font-semibold text-gray-800 text-base">
+                {isViewOnly
+                  ? t("modal.mySubmission")
+                  : existingSubmission
+                    ? t("modal.replaceSubmittedFile")
+                    : t("modal.submitAssignment")}
+              </h3>
+              <button
+                onClick={() => setOpen(false)}
+                className="text-gray-400 hover:text-gray-600"
+              >
+                <X className="w-4 h-4" />
+              </button>
+            </div>
+
+            <p className="mb-1 font-medium text-gray-700 text-sm">
+              {assignmentTitle}
+            </p>
+            <p className="mb-1 text-gray-400 text-xs">
+              {t("modal.due", {
+                date: new Date(endDate).toLocaleDateString("en-GB"),
+              })}
+            </p>
+
+            {/* تنبيه التسليم المتأخر */}
+            {isLate && (
+              <div className="flex items-center gap-2 bg-amber-50 mb-4 px-3 py-2 border border-amber-200 rounded-lg">
+                <Clock className="flex-shrink-0 w-3.5 h-3.5 text-amber-600" />
+                <p className="font-medium text-amber-700 text-xs">
+                  {t("modal.lateWarning")}
+                </p>
+              </div>
+            )}
+
+            {existingSubmission && (
+              <div className="flex items-start gap-2 bg-green-50 mb-4 px-3 py-2 border border-green-100 rounded-lg">
+                <CheckCircle className="flex-shrink-0 mt-0.5 w-3.5 h-3.5 text-green-600" />
+                <div>
+                  <p className="font-medium text-green-700 text-xs">
+                    {t("status.assignmentSubmitted")}
+                  </p>
+                  <p className="mt-0.5 text-green-600 text-xs">
+                    {existingSubmission.gradePublished
+                      ? t("status.gradePublishedMessage")
+                      : t("status.waitingReview")}
+                  </p>
+                </div>
+              </div>
+            )}
+
+            {/* الملف المسلَّم */}
+            {existingSubmission && (
+              <div className="bg-gray-50 mb-4 p-3 border rounded-lg">
+                <p className="mb-2 font-medium text-gray-700 text-sm">
+                  {t("modal.submittedFile")}
+                </p>
+                <div className="flex justify-between items-center">
+                  <span className="max-w-[200px] text-gray-600 text-sm truncate">
+                    {existingSubmission.fileName}
+                  </span>
+                  <a
+                    href={`/api/download/${existingSubmission.id}?type=submission`}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="hover:opacity-80 text-academixPurpleDark"
+                  >
+                    <Download className="w-4 h-4" />
+                  </a>
+                </div>
+                <p className="mt-1 text-gray-400 text-xs">
+                  {t("modal.submittedDate", {
+                    date: new Date(existingSubmission.createdAt).toLocaleDateString(
+                      "en-GB",
+                    ),
+                  })}
+                </p>
+                {!isViewOnly && (
+                  <p className="mt-2 text-amber-600 text-xs">
+                    {t("modal.replaceWarning")}
+                  </p>
+                )}
+              </div>
+            )}
+
+            {/* Published Grade */}
+            {existingSubmission?.gradePublished && existingSubmission.score !== null && existingSubmission.score !== undefined && (
+              <div className="bg-academixPurpleLight mb-4 p-3 border border-academixPurpleDark/20 rounded-lg">
+                <div className="flex items-center justify-between gap-3">
+                  <p className="font-medium text-academixPurpleDark text-xs">
+                    {t("modal.publishedGrade")}
+                  </p>
+                  <p className="font-semibold text-academixPurpleDark text-sm">
+                    {existingSubmission.score}/{maxScore}
+                  </p>
+                </div>
+              </div>
+            )}
+
+            {/* فورم التسليم — يظهر فقط إذا مسموح بالتسليم */}
+            {!isViewOnly && (
+              <form ref={formRef} onSubmit={handleSubmit} className="space-y-4">
+                <input type="hidden" name="assignmentId" value={assignmentId} />
+
+                <div>
+                  <label className="block mb-1 font-medium text-gray-700 text-sm">
+                    {existingSubmission ? t("modal.newFile") : t("modal.file")}{" "}
+                    <span className="text-red-500">*</span>
+                    <span className="ms-1 text-gray-400 text-xs">
+                      {t("modal.maxFileSize")}
+                    </span>
+                  </label>
+                  <input
+                    id={`assignment-file-${assignmentId}`}
+                    type="file"
+                    name="file"
+                    required
+                    accept=".pdf,.doc,.docx,.ppt,.pptx,.xls,.xlsx,.txt,.png,.jpg,.jpeg,.zip"
+                    onChange={(event) =>
+                      setSelectedFileName(event.target.files?.[0]?.name ?? "")
+                    }
+                    className="sr-only"
+                  />
+                  <div className="flex items-center gap-3">
+                    <label
+                      htmlFor={`assignment-file-${assignmentId}`}
+                      className="cursor-pointer rounded-lg bg-academixPurpleLight px-3 py-1.5 text-sm font-medium text-academixPurpleDark hover:brightness-95"
+                    >
+                      {t("modal.chooseFile")}
+                    </label>
+                    <span className="truncate text-sm text-gray-500">
+                      {selectedFileName || t("modal.noFileChosen")}
+                    </span>
+                  </div>
+                  <p className="mt-1 text-gray-400 text-xs">
+                    {t("modal.pdfHint")}
+                  </p>
+                </div>
+
+                <div>
+                  <label className="block mb-1 font-medium text-gray-700 text-sm">
+                    {t("modal.note")}{" "}
+                    <span className="font-normal text-gray-400">
+                      {t("modal.optional")}
+                    </span>
+                  </label>
+                  <textarea
+                    name="note"
+                    placeholder={t("modal.notePlaceholder")}
+                    rows={2}
+                    defaultValue={existingSubmission?.note ?? ""}
+                    className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400 resize-none"
+                  />
+                </div>
+
+                <div className="flex gap-3 pt-2">
+                  <button
+                    type="button"
+                    onClick={() => setOpen(false)}
+                    className="flex-1 hover:bg-gray-50 py-2 border rounded-lg text-gray-600 text-sm"
+                  >
+                    {t("actions.cancel")}
+                  </button>
+                  <button
+                    type="submit"
+                    disabled={isPending}
+                    className="flex flex-1 justify-center items-center gap-2 bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 py-2 rounded-lg font-medium text-white text-sm"
+                  >
+                    {isPending ? (
+                      <>
+                        <Loader2 className="w-4 h-4 animate-spin" />{" "}
+                        {t("actions.processing")}
+                      </>
+                    ) : existingSubmission ? (
+                      <>
+                        <RefreshCw className="w-4 h-4" /> {t("actions.replaceFile")}
+                      </>
+                    ) : (
+                      <>
+                        <Upload className="w-4 h-4" />{" "}
+                        {isLate ? t("actions.submitLate") : t("actions.submit")}
+                      </>
+                    )}
+                  </button>
+                </div>
+              </form>
+            )}
+
+            {/* زر Close للـ view-only */}
+            {isViewOnly && (
+              <button
+                type="button"
+                onClick={() => setOpen(false)}
+                className="hover:bg-gray-50 mt-2 py-2 border rounded-lg w-full font-medium text-gray-600 text-sm"
+              >
+                {t("actions.close")}
+              </button>
+            )}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/AttendanceCard.tsx b/src/components/AttendanceCard.tsx
new file mode 100644
index 0000000..4d20a97
--- /dev/null
+++ b/src/components/AttendanceCard.tsx
@@ -0,0 +1,112 @@
+import { getCurrentAcademicYearOrNull } from "@/lib/academicYears";
+import { getAuthUser } from "@/lib/auth";
+import prisma from "@/lib/prisma";
+import { getSchoolDayExceptions, getSchoolScheduleSettings } from "@/lib/schoolSettings";
+
+type Props = {
+  id: string;
+  scope: "student" | "teacher";
+};
+
+const jsDayToSchoolDay = [
+  "SUNDAY",
+  "MONDAY",
+  "TUESDAY",
+  "WEDNESDAY",
+  "THURSDAY",
+  "FRIDAY",
+  "SATURDAY",
+] as const;
+
+const toIsoDate = (value: Date) => value.toISOString().slice(0, 10);
+
+const enumerateAcademicDates = (start: Date, end: Date) => {
+  const dates: Date[] = [];
+  const cursor = new Date(start);
+
+  while (cursor <= end) {
+    dates.push(new Date(cursor));
+    cursor.setUTCDate(cursor.getUTCDate() + 1);
+  }
+
+  return dates;
+};
+
+const AttendanceCard = async ({ id, scope }: Props) => {
+  const user = await getAuthUser();
+  if (!user) {
+    return <h1 className="font-semibold text-xl">-</h1>;
+  }
+
+  const [currentYear, settings, exceptions] = await Promise.all([
+    getCurrentAcademicYearOrNull(user.schoolId),
+    getSchoolScheduleSettings(user.schoolId),
+    getSchoolDayExceptions(user.schoolId),
+  ]);
+
+  if (!currentYear) {
+    return <h1 className="font-semibold text-xl">-</h1>;
+  }
+
+  const today = new Date();
+  const yearStart = new Date(`${currentYear.startDate}T00:00:00.000Z`);
+  const yearEnd = new Date(`${currentYear.endDate}T23:59:59.999Z`);
+  const cappedEnd = today < yearEnd ? today : yearEnd;
+
+  if (cappedEnd < yearStart) {
+    return <h1 className="font-semibold text-xl">-</h1>;
+  }
+
+  const workingDays = new Set(settings.workingDays);
+  const exceptionsByDate = new Map(
+    exceptions.map((item) => [item.date, item.type]),
+  );
+
+  const expectedDates = enumerateAcademicDates(yearStart, cappedEnd).filter((d) => {
+    const iso = toIsoDate(d);
+    const dayName = jsDayToSchoolDay[d.getUTCDay()];
+    const exception = exceptionsByDate.get(iso);
+
+    if (exception === "WORKING_OVERRIDE") return true;
+    if (exception === "HOLIDAY" || exception === "OFF_DAY") return false;
+
+    return workingDays.has(dayName);
+  });
+
+  const expectedDateSet = new Set(expectedDates.map(toIsoDate));
+
+  const attendance = await prisma.attendance.findMany({
+    where: {
+      schoolId: user.schoolId,
+      academicYearId: currentYear.id,
+      date: {
+        gte: new Date(`${currentYear.startDate}T00:00:00.000Z`),
+        lte: cappedEnd,
+      },
+      ...(scope === "student" ? { studentId: id } : { teacherId: id }),
+    },
+    select: {
+      date: true,
+      present: true,
+    },
+  });
+
+  const presentDates = new Set(
+    attendance
+      .filter((item) => item.present)
+      .map((item) => toIsoDate(item.date))
+      .filter((iso) => expectedDateSet.has(iso)),
+  );
+
+  const expectedCount = expectedDateSet.size;
+  if (expectedCount === 0) {
+    return <h1 className="font-semibold text-xl">-</h1>;
+  }
+
+  const rawPercentage = (presentDates.size / expectedCount) * 100;
+  const percentage = Math.ceil(rawPercentage);
+
+  return <h1 className="font-semibold text-xl">{percentage}%</h1>;
+};
+
+export default AttendanceCard;
diff --git a/src/components/AttendanceChart.tsx b/src/components/AttendanceChart.tsx
index 82b9390..9bead76 100644
--- a/src/components/AttendanceChart.tsx
+++ b/src/components/AttendanceChart.tsx
@@ -38,13 +38,13 @@ const AttendanceChart = ({
         />
         <Bar
           dataKey="present"
-          fill="#FAE27C"
+          fill="#7C3AED"
           legendType="circle"
           radius={[10, 10, 0, 0]}
         />
         <Bar
           dataKey="absent"
-          fill="#C3EBFA"
+          fill="#FCD34D"
           legendType="circle"
           radius={[10, 10, 0, 0]}
         />
diff --git a/src/components/AttendanceChartContainer.tsx b/src/components/AttendanceChartContainer.tsx
index 6821dea..6dd349e 100644
--- a/src/components/AttendanceChartContainer.tsx
+++ b/src/components/AttendanceChartContainer.tsx
@@ -4,8 +4,10 @@ import prisma from "@/lib/prisma";
 import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
 import NoCurrentAcademicYearMessage from "./NoCurrentAcademicYearMessage";
 import { getAuthUser, requireAuth } from "@/lib/auth";
+import { getTranslations } from "next-intl/server";
 
 const AttendanceChartContainer = async () => {
+  const t = await getTranslations("pages");
   const user = requireAuth();
 
   const academicYearId = await getCurrentAcademicYearIdOrNull(
@@ -74,9 +76,9 @@ const AttendanceChartContainer = async () => {
   }));
 
   return (
-    <div className="bg-white p-4 rounded-lg h-full">
+    <div className="bg-white p-4 rounded-lg w-full h-full">
       <div className="flex justify-between items-center">
-        <h1 className="font-semibold text-lg">Attendance</h1>
+        <h1 className="font-semibold text-lg">{t("attendance")}</h1>
         <MoreHorizontal className="w-5 h-5 text-gray-500" />
       </div>
       <AttendanceChart data={data} />
diff --git a/src/components/AttendanceClient.tsx b/src/components/AttendanceClient.tsx
index 9ade6b8..c951243 100644
--- a/src/components/AttendanceClient.tsx
+++ b/src/components/AttendanceClient.tsx
@@ -1,9 +1,12 @@
 "use client";
 
-import { useActionState, useEffect, useState } from "react";
+import { useActionState, useEffect, useRef, useState } from "react";
 import { toast } from "react-toastify";
+import { Loader2 } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { saveDailyAttendance } from "@/lib/actions";
+import EmptyState from "@/components/states/EmptyState";
+import { useTranslations } from "next-intl";
 
 const AttendanceClient = ({
   data,
@@ -18,26 +21,61 @@ const AttendanceClient = ({
   hasAttendance: boolean;
   scope: "students" | "teachers";
 }) => {
+  const t = useTranslations("attendance");
+  const filtersT = useTranslations("filters");
+  const actionsT = useTranslations("actions");
   const router = useRouter();
 
   const [changes, setChanges] = useState<Record<string, boolean>>({});
+  const handledResultRef = useRef<string | null>(null);
 
-  const [state, formAction] = useActionState(saveDailyAttendance, {
+  const [state, formAction, isPending] = useActionState(saveDailyAttendance, {
     success: false,
     error: false,
     message: "",
   });
 
   useEffect(() => {
+    if (isPending) {
+      handledResultRef.current = null;
+      return;
+    }
+
+    const resultKey = `${state.success}:${state.error}:${state.message}`;
+    if (handledResultRef.current === resultKey) {
+      return;
+    }
+
+    handledResultRef.current = resultKey;
+
     if (state.success) {
-      toast.success(state.message || "Attendance saved");
+      toast.success(state.message || t("saved"));
       router.refresh();
+    } else if (state.error) {
+      toast.error(state.message || actionsT("somethingWentWrong"));
     }
+  }, [
+    state.success,
+    state.error,
+    state.message,
+    isPending,
+    router,
+    t,
+    actionsT,
+  ]);
 
-    if (state.error) {
-      toast.error(state.message || "Something went wrong");
-    }
-  }, [state, router]);
+  if (data.length === 0) {
+    return (
+      <EmptyState
+        title={
+          hasAttendance
+            ? t("noRecordsPage")
+            : t("noScopeFound", { scope: filtersT(scope) })
+        }
+        description={hasAttendance ? t("tryAnotherPage") : t("noRecordsDate")}
+      />
+    );
+  }
 
   return (
     <form action={formAction} className="flex flex-col gap-4 mt-4">
@@ -72,7 +110,7 @@ const AttendanceClient = ({
                           checked ? "text-green-600" : "text-red-600"
                         }`}
                       >
-                        {checked ? "Present" : "Absent"}
+                        {checked ? t("present") : t("absent")}
                       </span>
                     </>
                   ) : (
@@ -83,7 +121,7 @@ const AttendanceClient = ({
                           : "bg-red-100 text-red-700"
                       }`}
                     >
-                      {item.present ? "Present" : "Absent"}
+                      {item.present ? t("present") : t("absent")}
                     </span>
                   )}
                 </td>
@@ -93,8 +131,15 @@ const AttendanceClient = ({
         </tbody>
       </table>
       {isToday && (
-        <button className="bg-academixPurpleDark px-4 py-2 rounded-md w-max text-white">
-          Save Attendance
+        <button
+          type="submit"
+          disabled={isPending}
+          className="bg-academixPurpleDark disabled:opacity-70 px-2 py-2 rounded-md w-max text-white disabled:cursor-not-allowed"
+        >
+          <span className="inline-flex items-center gap-2">
+            {isPending && <Loader2 className="w-4 h-4 animate-spin" />}
+            {isPending ? actionsT("saving") : t("save")}
+          </span>
         </button>
       )}
     </form>
diff --git a/src/components/BigCalendarContainer.tsx b/src/components/BigCalendarContainer.tsx
index 26fd9db..8e1a3fa 100644
--- a/src/components/BigCalendarContainer.tsx
+++ b/src/components/BigCalendarContainer.tsx
@@ -4,7 +4,7 @@ import { adjustScheduleToCurrentWeek } from "@/lib/utils";
 import { getSchoolScheduleSettings } from "@/lib/schoolSettings";
 import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
 import NoCurrentAcademicYearMessage from "./NoCurrentAcademicYearMessage";
-import { getAuthUser, requireAuth } from "@/lib/auth";
+import { requireAuth } from "@/lib/auth";
 
 const BigCalendarContainer = async ({
   type,
@@ -13,12 +13,10 @@ const BigCalendarContainer = async ({
   type: "teacherId" | "classId";
   id: string | number;
 }) => {
-  const user = requireAuth();
+  const user = await requireAuth();
 
-  const schoolSettings = await getSchoolScheduleSettings((await user).schoolId);
-  const academicYearId = await getCurrentAcademicYearIdOrNull(
-    (await user).schoolId,
-  );
+  const schoolSettings = await getSchoolScheduleSettings(user.schoolId);
+  const academicYearId = await getCurrentAcademicYearIdOrNull(user.schoolId);
 
   if (!academicYearId) {
     return <NoCurrentAcademicYearMessage compact />;
@@ -28,7 +26,7 @@ const BigCalendarContainer = async ({
     const teacher = await prisma.teacher.findFirst({
       where: {
         id: id as string,
-        schoolId: (await user).schoolId,
+        schoolId: user.schoolId,
       },
     });
 
@@ -39,7 +37,7 @@ const BigCalendarContainer = async ({
     const cls = await prisma.class.findFirst({
       where: {
         id: id as number,
-        schoolId: (await user).schoolId,
+        schoolId: user.schoolId,
       },
     });
 
@@ -48,7 +46,7 @@ const BigCalendarContainer = async ({
 
   const dataRes = await prisma.lesson.findMany({
     where: {
-      schoolId: (await user).schoolId,
+      schoolId: user.schoolId,
       academicYearId,
       ...(type === "teacherId"
         ? { teacherId: id as string }
@@ -61,6 +59,9 @@ const BigCalendarContainer = async ({
       teacher: {
         select: { name: true },
       },
+      class: {
+        select: { name: true },
+      },
     },
   });
 
@@ -72,17 +73,22 @@ const BigCalendarContainer = async ({
   const data = dataRes
     .filter((lesson) => !isPlaceholderSubject(lesson.subject?.name))
     .map((lesson) => ({
-      title: `${lesson.subject.name}/${lesson.teacher.name}`,
+      title:
+        user.role === "teacher"
+          ? (lesson.class?.name ?? lesson.subject.name)
+          : user.role === "student"
+            ? lesson.subject.name
+            : `${lesson.subject.name}/${lesson.teacher.name}`,
       lessonName: lesson.name,
       day: lesson.day,
       start: lesson.startTime,
       end: lesson.endTime,
     }));
 
-  const schedule = adjustScheduleToCurrentWeek(data);
+  const schedule = adjustScheduleToCurrentWeek(data, schoolSettings.workingDays);
 
   return (
-    <div className="h-[560px]">
+    <div className="h-[560px] overflow-x-auto text-left" dir="ltr">
       <BigCalendar data={schedule} settings={schoolSettings} />
     </div>
   );
diff --git a/src/components/BigCalender.tsx b/src/components/BigCalender.tsx
index 808ee52..365a613 100644
--- a/src/components/BigCalender.tsx
+++ b/src/components/BigCalender.tsx
@@ -3,8 +3,11 @@
 import { Calendar, momentLocalizer, View, Views } from "react-big-calendar";
 import moment from "moment";
 import "react-big-calendar/lib/css/react-big-calendar.css";
-import { useMemo, useState } from "react";
+import { useMemo, useState, useSyncExternalStore } from "react";
 import type { SchoolScheduleSettings } from "@/lib/schoolSettings";
+import type { SchoolWeekDay } from "@/lib/schoolCalendar";
+import Week from "react-big-calendar/lib/Week";
+import TimeGrid from "react-big-calendar/lib/TimeGrid";
 
 moment.updateLocale(moment.locale(), {
   week: {
@@ -14,6 +17,129 @@ moment.updateLocale(moment.locale(), {
 });
 
 const localizer = momentLocalizer(moment);
+const jsDayToSchoolDay: Record<number, SchoolWeekDay> = {
+  0: "SUNDAY",
+  1: "MONDAY",
+  2: "TUESDAY",
+  3: "WEDNESDAY",
+  4: "THURSDAY",
+  5: "FRIDAY",
+  6: "SATURDAY",
+};
+const schoolDayToJsDay: Record<SchoolWeekDay, number> = {
+  SUNDAY: 0,
+  MONDAY: 1,
+  TUESDAY: 2,
+  WEDNESDAY: 3,
+  THURSDAY: 4,
+  FRIDAY: 5,
+  SATURDAY: 6,
+};
+
+const useMediaQuery = (query: string) =>
+  useSyncExternalStore(
+    (onStoreChange) => {
+      const mediaQueryList = window.matchMedia(query);
+      const listener = () => onStoreChange();
+
+      if (mediaQueryList.addEventListener) {
+        mediaQueryList.addEventListener("change", listener);
+        return () => mediaQueryList.removeEventListener("change", listener);
+      }
+
+      mediaQueryList.addListener(listener);
+      return () => mediaQueryList.removeListener(listener);
+    },
+    () => window.matchMedia(query).matches,
+    () => false,
+  );
+
+type WorkingWeekViewProps = {
+  date: Date;
+  localizer: any;
+  min?: Date;
+  max?: Date;
+  scrollToTime?: Date;
+  enableAutoScroll?: boolean;
+  workingDays?: SchoolWeekDay[];
+  [key: string]: unknown;
+};
+
+const workingWeekRange = (
+  date: Date,
+  props: WorkingWeekViewProps,
+  boundWorkingDays?: SchoolWeekDay[],
+) => {
+  const weekRange = Week.range(date, props) as Date[];
+  const allowed = new Set<number>(
+    ((boundWorkingDays ?? props.workingDays) ?? [
+      "SATURDAY",
+      "SUNDAY",
+      "MONDAY",
+      "TUESDAY",
+      "WEDNESDAY",
+      "THURSDAY",
+      "FRIDAY",
+    ]).map((day) => schoolDayToJsDay[day]),
+  );
+
+  const filtered = weekRange.filter((d) => allowed.has(d.getDay()));
+
+  return filtered.length > 0 ? filtered : weekRange;
+};
+
+const buildWorkingWeekView = (workingDays: SchoolWeekDay[]) => {
+  const WorkingWeekView = ((props: WorkingWeekViewProps) => {
+    const {
+      date,
+      localizer: viewLocalizer,
+      min = viewLocalizer.startOf(new Date(), "day"),
+      max = viewLocalizer.endOf(new Date(), "day"),
+      scrollToTime = viewLocalizer.startOf(new Date(), "day"),
+      enableAutoScroll = true,
+      ...rest
+    } = props;
+
+    const range = workingWeekRange(date, props, workingDays);
+
+    return (
+      <TimeGrid
+        {...rest}
+        range={range}
+        eventOffset={15}
+        localizer={viewLocalizer}
+        min={min}
+        max={max}
+        scrollToTime={scrollToTime}
+        enableAutoScroll={enableAutoScroll}
+      />
+    );
+  }) as any;
+
+  WorkingWeekView.range = (date: Date, props: WorkingWeekViewProps) =>
+    workingWeekRange(date, props, workingDays);
+  WorkingWeekView.navigate = Week.navigate;
+  WorkingWeekView.title = (
+    date: Date,
+    { localizer: viewLocalizer }: { localizer: any },
+  ) => {
+    const range = workingWeekRange(
+      date,
+      {
+        date,
+        localizer: viewLocalizer,
+      } as WorkingWeekViewProps,
+      workingDays,
+    );
+
+    return viewLocalizer.format(
+      { start: range[0], end: range[range.length - 1] },
+      "dayRangeHeaderFormat",
+    );
+  };
+
+  return WorkingWeekView;
+};
 
 const toTimeOfDayDate = (hour: number, minute: number) =>
   new Date(2025, 0, 1, hour, minute, 0, 0);
@@ -68,7 +194,16 @@ const BigCalendar = ({
   }[];
   settings: SchoolScheduleSettings;
 }) => {
-  const [view, setView] = useState<View>(Views.WEEK);
+  const isMdDown = useMediaQuery("(max-width: 1023px)");
+  const defaultView = isMdDown ? Views.DAY : Views.WEEK;
+  const WorkingWeekView = useMemo(
+    () => buildWorkingWeekView(settings.workingDays),
+    [settings.workingDays],
+  );
+
+  // Keep a user override so toggling views still works.
+  const [userView, setUserView] = useState<View | null>(null);
+  const view = userView ?? defaultView;
 
   const calendarMinTime = useMemo(
     () =>
@@ -158,36 +293,61 @@ const BigCalendar = ({
     return labelsByTime;
   }, [settings]);
 
+  const workingDaysSet = useMemo(
+    () => new Set<SchoolWeekDay>(settings.workingDays),
+    [settings.workingDays],
+  );
+
+  const dayPropGetter = (date: Date) => {
+    const schoolDay = jsDayToSchoolDay[date.getDay()];
+    if (workingDaysSet.has(schoolDay)) {
+      return {};
+    }
+
+    return {
+      style: {
+        backgroundColor: "#f8fafc",
+        opacity: 0.55,
+      },
+    };
+  };
+
   const timeGutterFormat = (date: Date) => {
     const key = moment(date).format("HH:mm");
     return lessonStartLabels.get(key) ?? "";
   };
 
   const handleOnChangeView = (selectedView: View) => {
-    setView(selectedView);
+    setUserView(selectedView);
   };
 
   return (
-    <Calendar
-      className={view === Views.WEEK ? "calendar-week-mode" : ""}
-      localizer={localizer}
-      events={displayEvents}
-      startAccessor="start"
-      endAccessor="end"
-      views={[Views.WEEK, Views.DAY]}
-      view={view}
-      style={{ height: "100%" }}
-      onView={handleOnChangeView}
-      min={calendarMinTime}
-      max={calendarMaxTime}
-      step={settings.lessonDurationMinutes}
-      timeslots={1}
-      formats={{
-        timeGutterFormat,
-        eventTimeRangeFormat: () => "",
-      }}
-      components={{ event: EventContent }}
-    />
+    <div className="h-full">
+      <Calendar
+        className={view === Views.WEEK ? "calendar-week-mode" : ""}
+        localizer={localizer}
+        events={displayEvents}
+        startAccessor="start"
+        endAccessor="end"
+        views={{
+          week: WorkingWeekView,
+          day: true,
+        } as any}
+        view={view}
+        style={{ height: "100%" }}
+        onView={handleOnChangeView}
+        min={calendarMinTime}
+        max={calendarMaxTime}
+        step={settings.lessonDurationMinutes}
+        timeslots={1}
+        formats={{
+          timeGutterFormat,
+          eventTimeRangeFormat: () => "",
+        }}
+        components={{ event: EventContent }}
+        dayPropGetter={dayPropGetter}
+      />
+    </div>
   );
 };
 
diff --git a/src/components/ClassFilter.tsx b/src/components/ClassFilter.tsx
new file mode 100644
index 0000000..727cf09
--- /dev/null
+++ b/src/components/ClassFilter.tsx
@@ -0,0 +1,72 @@
+"use client";
+
+import { useRouter, useSearchParams } from "next/navigation";
+import { useTranslations } from "next-intl";
+import { useEffect } from "react";
+
+type Props = {
+  classes: {
+    id: number;
+    name: string;
+    gradeId?: number | null;
+  }[];
+};
+
+export default function ClassFilter({ classes }: Props) {
+  const t = useTranslations("filters");
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const selectedGradeId = searchParams.get("gradeId");
+  const filteredClasses = selectedGradeId
+    ? classes.filter((cls) => String(cls.gradeId) === selectedGradeId)
+    : classes;
+  const currentClassId = searchParams.get("classId") || "";
+  const selectedClassExists = filteredClasses.some(
+    (cls) => String(cls.id) === currentClassId,
+  );
+
+  useEffect(() => {
+    if (!selectedGradeId || !currentClassId || selectedClassExists) return;
+
+    const params = new URLSearchParams(searchParams.toString());
+    params.delete("classId");
+    params.set("page", "1");
+    router.replace(`?${params.toString()}`);
+  }, [
+    currentClassId,
+    router,
+    searchParams,
+    selectedClassExists,
+    selectedGradeId,
+  ]);
+
+  const handleChange = (classId: string) => {
+    const params = new URLSearchParams(searchParams.toString());
+
+    if (classId) {
+      params.set("classId", classId);
+    } else {
+      params.delete("classId");
+    }
+
+    params.delete("subjectId");
+    params.set("page", "1");
+    router.push(`?${params.toString()}`);
+  };
+
+  return (
+    <select
+      value={selectedClassExists ? currentClassId : ""}
+      onChange={(e) => handleChange(e.target.value)}
+      className="h-10 rounded-md border px-3 text-sm"
+    >
+      <option value="">{t("allClasses")}</option>
+
+      {filteredClasses.map((cls) => (
+        <option key={cls.id} value={cls.id}>
+          {cls.name}
+        </option>
+      ))}
+    </select>
+  );
+}
diff --git a/src/components/CountChart.tsx b/src/components/CountChart.tsx
deleted file mode 100644
index 923302d..0000000
--- a/src/components/CountChart.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-"use client";
-import { MoreHorizontal } from "lucide-react";
-import Image from "next/image";
-import {
-  RadialBarChart,
-  RadialBar,
-  Legend,
-  ResponsiveContainer,
-} from "recharts";
-
-const CountChart = ({ boys, girls }: { boys: number; girls: number }) => {
-  const data = [
-    {
-      name: "Total",
-      count: boys + girls,
-      fill: "white",
-    },
-    {
-      name: "Girls",
-      count: girls,
-      fill: "#FAE27C",
-    },
-    {
-      name: "Boys",
-      count: boys,
-      fill: "#C3EBFA",
-    },
-  ];
-
-  return (
-    <div className="relative w-full h-[75%]">
-      <ResponsiveContainer>
-        <RadialBarChart
-          cx="50%"
-          cy="50%"
-          innerRadius="40%"
-          outerRadius="100%"
-          barSize={32}
-          data={data}
-        >
-          <RadialBar background dataKey="count" />
-        </RadialBarChart>
-      </ResponsiveContainer>
-      <Image
-        src="/maleFemale.png"
-        alt=""
-        width={50}
-        height={50}
-        className="top-1/2 left-1/2 absolute -translate-x-1/2 -translate-y-1/2"
-      />
-    </div>
-  );
-};
-
-export default CountChart;
diff --git a/src/components/CountChartContainer.tsx b/src/components/CountChartContainer.tsx
deleted file mode 100644
index aed482b..0000000
--- a/src/components/CountChartContainer.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { MoreHorizontal } from "lucide-react";
-import CountChart from "./CountChart";
-import prisma from "@/lib/prisma";
-
-const CountChartContainer = async () => {
-  const data = await prisma.student.groupBy({
-    by: ["sex"],
-    _count: true,
-  });
-
-  const boys = data.find((s) => s.sex === "MALE")?._count || 0;
-  const girls = data.find((s) => s.sex === "FEMALE")?._count || 0;
-
-  return (
-    <div className="bg-white p-4 rounded-xl w-full h-full">
-      {/* TITLE */}
-      <div className="flex justify-between items-center">
-        <h1 className="font-semibold text-lg">Students</h1>
-        <MoreHorizontal className="w-5 h-5 text-gray-500" />
-      </div>
-      {/* CHART */}
-      <CountChart boys={boys} girls={girls} />
-      {/* BOTTOM */}
-      <div className="flex justify-center gap-16">
-        <div className="flex flex-col gap-1">
-          <div className="bg-academixSky rounded-full w-5 h-5" />
-          <h1 className="font-bold">{boys}</h1>
-          <h2 className="text-gray-300 text-xs">
-            Boys {Math.round((boys / (boys + girls)) * 100)}%
-          </h2>
-        </div>
-        <div className="flex flex-col gap-1">
-          <div className="bg-academixYellow rounded-full w-5 h-5" />
-          <h1 className="font-bold">{girls}</h1>
-          <h2 className="text-gray-300 text-xs">
-            Girls {Math.round((girls / (boys + girls)) * 100)}%
-          </h2>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default CountChartContainer;
diff --git a/src/components/DashboardShell.tsx b/src/components/DashboardShell.tsx
new file mode 100644
index 0000000..c1a3aa4
--- /dev/null
+++ b/src/components/DashboardShell.tsx
@@ -0,0 +1,110 @@
+"use client";
+
+import Menu from "@/components/Menu";
+import Navbar from "@/components/Navbar";
+import type { AuthUser } from "@/lib/auth";
+import { X } from "lucide-react";
+import Image from "next/image";
+import Link from "next/link";
+import type { ReactNode } from "react";
+import { useState } from "react";
+import { useTranslations } from "next-intl";
+
+type DashboardShellProps = {
+  authUser: AuthUser | null;
+  schoolName: string | null;
+  children: ReactNode;
+};
+
+const DashboardShell = ({
+  authUser,
+  schoolName,
+  children,
+}: DashboardShellProps) => {
+  const t = useTranslations("common");
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const [isMenuCollapsed, setIsMenuCollapsed] = useState(false);
+
+  const closeMenu = () => setIsMenuOpen(false);
+
+  return (
+    <div className="flex bg-academixPurpleLight h-screen overflow-hidden">
+      {isMenuOpen && (
+        <button
+          type="button"
+          aria-label="Close menu backdrop"
+          className="lg:hidden z-40 fixed inset-0 bg-black/35"
+          onClick={closeMenu}
+        />
+      )}
+
+      <aside
+        className={`academix-menu-scroll fixed inset-y-0 start-0 z-50 bg-academixPurpleLight p-4 w-64 overflow-auto transition-all duration-300 lg:static lg:translate-x-0 ${
+          isMenuCollapsed ? "lg:w-[76px]" : "lg:w-[16%] xl:w-[14%]"
+        } ${
+          isMenuOpen
+            ? "translate-x-0"
+            : "-translate-x-full rtl:translate-x-full lg:translate-x-0 lg:rtl:translate-x-0"
+        }`}
+      >
+        <div
+          className={`flex relative items-center gap-3 ${
+            isMenuCollapsed ? "lg:justify-center" : "justify-between"
+          }`}
+        >
+          <Link
+            href="/"
+            onClick={closeMenu}
+            className={`flex justify-center lg:justify-start items-center gap-1 ${
+              isMenuCollapsed ? "mb-4" : ""
+            }`}
+          >
+            <Image
+              src="/logo-purple.png"
+              alt="logo"
+              className="w-[32px] h-[32px] rotate-[-15deg]"
+              width={32}
+              height={32}
+              style={{ height: "auto" }}
+            />
+            <span
+              className={`font-bold text-academixPurpleDark transition-opacity ${
+                isMenuCollapsed ? "lg:hidden" : ""
+              }`}
+            >
+              {t("brand")}
+            </span>
+          </Link>
+
+          <button
+            type="button"
+            aria-label="Close menu"
+            onClick={closeMenu}
+            className="lg:hidden -top-1 end-0 absolute flex justify-center items-center hover:bg-academixPurple/35 rounded-md w-8 h-8 text-academixPurpleDark transition"
+          >
+            <X className="w-5 h-5" />
+          </button>
+        </div>
+
+        <Menu
+          authUser={authUser}
+          collapsed={isMenuCollapsed}
+          onNavigate={closeMenu}
+        />
+      </aside>
+
+      <div className="flex flex-col flex-1 bg-academixPurpleLight min-w-0">
+        <Navbar
+          authUser={authUser}
+          schoolName={schoolName}
+          isMenuCollapsed={isMenuCollapsed}
+          onMenuClick={() => setIsMenuOpen(true)}
+          onMenuCollapseToggle={() => setIsMenuCollapsed((value) => !value)}
+        />
+        <div className="flex-1 overflow-auto">{children}</div>
+      </div>
+    </div>
+  );
+};
+
+export default DashboardShell;
diff --git a/src/components/DirectMessageModal.tsx b/src/components/DirectMessageModal.tsx
index 80071ff..2dd9bf2 100644
--- a/src/components/DirectMessageModal.tsx
+++ b/src/components/DirectMessageModal.tsx
@@ -11,6 +11,7 @@ import type { MessageSchema } from "@/lib/formValidationSchemas";
 import { useRouter } from "next/navigation";
 import { toast } from "react-toastify";
 import { X } from "lucide-react";
+import { useTranslations } from "next-intl";
 
 type DirectMessageModalProps = {
   open: boolean;
@@ -28,6 +29,7 @@ export default function DirectMessageModal({
   userName,
 }: DirectMessageModalProps) {
   const router = useRouter();
+  const t = useTranslations("directMessage");
   const [title, setTitle] = useState("");
   const [description, setDescription] = useState("");
   const [error, setError] = useState<string | null>(null);
@@ -38,7 +40,7 @@ export default function DirectMessageModal({
     setError(null);
 
     if (!title.trim() || !description.trim()) {
-      setError("Title and message are required");
+      setError(t("titleMessageRequired"));
       return;
     }
 
@@ -69,18 +71,19 @@ export default function DirectMessageModal({
         );
 
         if (result.success) {
-          toast.success(`Message sent to ${userName}`);
+          toast.success(t("sentTo", { name: userName }));
           setTitle("");
           setDescription("");
           setOpen(false);
           router.refresh();
         } else {
-          setError(result.message || "Failed to send message");
-          toast.error(result.message || "Failed to send message");
+          const message = result.message || t("sendFailed");
+          setError(message);
+          toast.error(message);
         }
       } catch (err) {
         const message =
-          err instanceof Error ? err.message : "An error occurred";
+          err instanceof Error ? err.message : t("errorOccurred");
         setError(message);
         toast.error(message);
       }
@@ -91,69 +94,73 @@ export default function DirectMessageModal({
 
   return (
     <div className="z-50 fixed inset-0 flex justify-center items-center bg-black bg-opacity-50">
-      <div className="relative bg-white shadow-xl p-6 rounded-lg w-full max-w-md">
+      <div className="relative bg-white shadow-xl p-6 rounded-xl w-full max-w-xl">
         <button
           onClick={() => setOpen(false)}
-          className="top-4 right-4 absolute text-gray-400 hover:text-gray-600"
+          className="top-4 end-4 absolute text-gray-400 hover:text-academixPurpleDark transition-colors"
         >
           <X className="w-5 h-5" />
         </button>
 
-        <h2 className="mb-4 font-semibold text-lg">
-          Send Message to {userName}
+        <h2 className="mb-4 pe-8 font-bold text-gray-900 text-2xl">
+          {t("heading", { name: userName })}
         </h2>
 
-        <form onSubmit={handleSubmit} className="flex flex-col gap-4">
-          <div>
-            <label className="block mb-1 font-medium text-gray-600 text-sm">
-              Title
-            </label>
-            <input
-              type="text"
-              name="title"
-              value={title}
-              onChange={(e) => setTitle(e.target.value)}
-              className="p-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 w-full text-sm"
-              placeholder="Enter message title"
-              required
-            />
-          </div>
+        <form onSubmit={handleSubmit} className="flex flex-col gap-6">
+          <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+            <div className="grid grid-cols-1 gap-4">
+              <div className="flex flex-col gap-2 w-full">
+                <label className="font-medium text-gray-700 text-sm">
+                  {t("title")}
+                </label>
+                <input
+                  type="text"
+                  name="title"
+                  value={title}
+                  onChange={(e) => setTitle(e.target.value)}
+                  className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                  placeholder={t("titlePlaceholder")}
+                  required
+                />
+              </div>
+
+              <div className="flex flex-col gap-2 w-full">
+                <label className="font-medium text-gray-700 text-sm">
+                  {t("message")}
+                </label>
+                <textarea
+                  name="description"
+                  value={description}
+                  onChange={(e) => setDescription(e.target.value)}
+                  className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all resize-none"
+                  placeholder={t("messagePlaceholder")}
+                  rows={5}
+                  required
+                />
+              </div>
+            </div>
 
-          <div>
-            <label className="block mb-1 font-medium text-gray-600 text-sm">
-              Message
-            </label>
-            <textarea
-              name="description"
-              value={description}
-              onChange={(e) => setDescription(e.target.value)}
-              className="p-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 w-full text-sm resize-none"
-              placeholder="Enter message body"
-              rows={4}
-              required
-            />
+            {error && (
+              <div className="bg-red-50 px-4 py-3 border border-red-200 rounded-lg font-medium text-red-600 text-sm">
+                {error}
+              </div>
+            )}
           </div>
 
-          {error && (
-            <div className="bg-red-50 p-2 rounded text-red-600 text-sm">
-              {error}
-            </div>
-          )}
-
-          <div className="flex justify-end gap-2 pt-2">
+          <div className="flex justify-end gap-3">
             <button
               type="button"
               onClick={() => setOpen(false)}
-              className="hover:bg-gray-50 px-4 py-2 border border-gray-300 rounded-md text-gray-600"
+              className="hover:bg-gray-50 px-4 py-2 border border-gray-300 rounded-lg font-medium text-gray-700 text-sm transition-colors"
             >
-              Cancel
+              {t("cancel")}
             </button>
             <button
               type="submit"
               disabled={isSubmitting}
-              className="bg-blue-500 hover:bg-blue-600 disabled:opacity-50 px-4 py-2 rounded-md text-white"
+              className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-2 rounded-lg font-semibold text-white text-sm transition-all"
             >
-              {isSubmitting ? "Sending..." : "Send"}
+              {isSubmitting ? t("sending") : t("send")}
             </button>
           </div>
         </form>
diff --git a/src/components/EventCalendar.tsx b/src/components/EventCalendar.tsx
index 953c9d2..7331e3b 100644
--- a/src/components/EventCalendar.tsx
+++ b/src/components/EventCalendar.tsx
@@ -19,9 +19,15 @@ const EventCalendar = () => {
       router.push(`?date=${value.toLocaleDateString("en-US")}`);
     }
   }, [value, router]);
+  
   return (
-    <Calendar onChange={onChange} value={value} className="react-calendar" />
+    <Calendar 
+      onChange={onChange} 
+      value={value} 
+      className="react-calendar"
+      locale="en-US"
+    />
   );
 };
 
-export default EventCalendar;
+export default EventCalendar;
\ No newline at end of file
diff --git a/src/components/EventCalendarContainer.tsx b/src/components/EventCalendarContainer.tsx
index 527296a..88e358c 100644
--- a/src/components/EventCalendarContainer.tsx
+++ b/src/components/EventCalendarContainer.tsx
@@ -1,21 +1,30 @@
-import { MoreHorizontal } from "lucide-react";
 import EventCalendar from "./EventCalendar";
 import EventList from "./EventList";
+import Link from "next/link";
+import { getTranslations } from "next-intl/server";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
 
 const EventCalendarContainer = async ({
   searchParams,
 }: {
-  searchParams: Promise<{ [key: string]: string }>;
+  searchParams: PageSearchParams;
 }) => {
+  const t = await getTranslations("pages");
+  const widgetsT = await getTranslations("widgets");
   const params = await searchParams;
-  const dateParam = params?.date;
+  const dateParam = getQueryParam(params.date);
 
   return (
-    <div className="bg-white p-4 rounded-md">
+    <div className="bg-white mb-2 px-4 rounded-md h-full">
       <EventCalendar />
       <div className="flex justify-between items-center">
-        <h1 className="my-4 font-semibold text-xl">Events</h1>
-        <MoreHorizontal className="w-5 h-5 text-gray-500" />
+        <h1 className="my-4 font-semibold text-xl">{t("events")}</h1>
+        <Link
+          href="/list/events"
+          className="text-gray-400 text-xs hover:underline transition"
+        >
+          {widgetsT("viewAll")}
+        </Link>
       </div>
       <div className="flex flex-col gap-4">
         <EventList dateParam={dateParam} />
diff --git a/src/components/EventList.tsx b/src/components/EventList.tsx
index 8ffc1bd..bbaef0a 100644
--- a/src/components/EventList.tsx
+++ b/src/components/EventList.tsx
@@ -2,9 +2,11 @@ import prisma from "@/lib/prisma";
 import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
 import NoCurrentAcademicYearMessage from "./NoCurrentAcademicYearMessage";
 import { getAuthUser, requireAuth } from "@/lib/auth";
+import { getTranslations } from "next-intl/server";
 
 const EventList = async ({ dateParam }: { dateParam: string | undefined }) => {
   const user = requireAuth();
+  const t = await getTranslations("widgets");
 
   const baseDate = dateParam ? new Date(dateParam) : new Date();
 
@@ -23,7 +25,7 @@ const EventList = async ({ dateParam }: { dateParam: string | undefined }) => {
   endOfDay.setHours(23, 59, 59, 999);
 
   const data = await prisma.event.findMany({
-    take: 3,
+    take: 1,
     orderBy: { startDate: "desc" },
     where: {
       schoolId: (await user).schoolId,
@@ -34,6 +36,13 @@ const EventList = async ({ dateParam }: { dateParam: string | undefined }) => {
       },
     },
   });
+  if (data.length === 0) {
+    return (
+      <div className="p-4 rounded-md text-center">
+        <p className="text-gray-500 text-sm">{t("noEventsForDay")}</p>
+      </div>
+    );
+  }
 
   return (
     <div>
diff --git a/src/components/ExportButton.tsx b/src/components/ExportButton.tsx
new file mode 100644
index 0000000..e8dd2e9
--- /dev/null
+++ b/src/components/ExportButton.tsx
@@ -0,0 +1,25 @@
+import { Download } from "lucide-react";
+import { getTranslations } from "next-intl/server";
+import Link from "next/link";
+
+type ExportButtonProps = {
+  href: string;
+  title?: string;
+};
+
+const ExportButton = async ({ href, title }: ExportButtonProps) => {
+  const t = await getTranslations("actions");
+  const resolvedTitle = title ?? t("exportCsv");
+
+  return (
+    <Link
+      href={href}
+      className="flex justify-center items-center bg-academixPurple hover:bg-academixPurpleDark p-2 rounded-md w-8 h-8 text-academixPurpleDark hover:text-academixPurple transition"
+      title={resolvedTitle}
+    >
+      <Download className="w-4 h-4" />
+    </Link>
+  );
+};
+
+export default ExportButton;
diff --git a/src/components/FeedbackModal.tsx b/src/components/FeedbackModal.tsx
new file mode 100644
index 0000000..6e608c0
--- /dev/null
+++ b/src/components/FeedbackModal.tsx
@@ -0,0 +1,122 @@
+"use client";
+
+import { FormEvent, useState } from "react";
+import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+import { toast } from "react-toastify";
+import { createFeedback } from "@/lib/actions/feedback";
+
+export default function FeedbackModal() {
+  const t = useTranslations("feedbackPage");
+  const router = useRouter();
+  const [open, setOpen] = useState(false);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const handleSubmit = async (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    setIsSubmitting(true);
+
+    try {
+      const form = event.currentTarget;
+      const result = await createFeedback(new FormData(form));
+
+      if (result.success) {
+        toast.success(result.message);
+        form.reset();
+        setOpen(false);
+        router.refresh();
+      } else {
+        toast.error(result.message);
+      }
+    } catch (error) {
+      toast.error(t("unexpectedError"));
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={() => setOpen(true)}
+        className="bg-[#7C3AED] hover:bg-[#6D28D9] shadow-sm px-5 py-2.5 rounded-lg font-semibold text-white text-sm transition"
+      >
+        {t("submit")}
+      </button>
+
+      {open && (
+        <div className="z-50 fixed inset-0 flex justify-center items-center bg-black/40 p-4">
+          <div className="bg-white shadow-xl p-6 rounded-2xl w-full max-w-2xl">
+            <div className="flex justify-between items-start gap-4 mb-5">
+              <div>
+                <h2 className="font-semibold text-lg">{t("submit")}</h2>
+                <p className="text-gray-500 text-sm">{t("description")}</p>
+              </div>
+
+              <button
+                type="button"
+                onClick={() => setOpen(false)}
+                disabled={isSubmitting}
+                className="disabled:opacity-60 px-3 py-1 rounded-full text-gray-600 text-sm disabled:cursor-not-allowed"
+              >
+                x
+              </button>
+            </div>
+
+            <form onSubmit={handleSubmit} className="space-y-4">
+              <div>
+                <label className="block mb-2 font-medium text-gray-700 text-sm">
+                  {t("type")}
+                </label>
+
+                <select
+                  name="type"
+                  required
+                  disabled={isSubmitting}
+                  className="bg-white disabled:bg-gray-100 p-3 border border-gray-300 focus:border-[#7C3AED] rounded-lg outline-none w-full text-sm disabled:cursor-not-allowed"
+                >
+                  <option value="suggestion">{t("types.suggestion")}</option>
+                  <option value="complaint">{t("types.complaint")}</option>
+                </select>
+              </div>
+
+              <div>
+                <label className="block mb-2 font-medium text-gray-700 text-sm">
+                  {t("message")}
+                </label>
+
+                <textarea
+                  name="message"
+                  required
+                  disabled={isSubmitting}
+                  placeholder={t("messagePlaceholder")}
+                  className="bg-white disabled:bg-gray-100 p-3 border border-gray-300 focus:border-[#7C3AED] rounded-lg outline-none w-full h-36 text-sm resize-none disabled:cursor-not-allowed"
+                />
+              </div>
+
+              <div className="flex justify-end gap-2 pt-2">
+                <button
+                  type="button"
+                  onClick={() => setOpen(false)}
+                  disabled={isSubmitting}
+                  className="bg-gray-100 hover:bg-gray-200 disabled:opacity-60 px-5 py-2.5 rounded-lg font-medium text-gray-700 text-sm disabled:cursor-not-allowed"
+                >
+                  {t("cancel")}
+                </button>
+
+                <button
+                  type="submit"
+                  disabled={isSubmitting}
+                  className="bg-[#7C3AED] hover:bg-[#6D28D9] disabled:opacity-70 shadow-sm px-6 py-2.5 rounded-lg font-semibold text-white text-sm transition disabled:cursor-not-allowed"
+                >
+                  {isSubmitting ? t("sending") : t("send")}
+                </button>
+              </div>
+            </form>
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/src/components/FilterSortActions.tsx b/src/components/FilterSortActions.tsx
index 4e00290..1e741c6 100644
--- a/src/components/FilterSortActions.tsx
+++ b/src/components/FilterSortActions.tsx
@@ -1,21 +1,73 @@
-import { Filter, ArrowUpDown } from "lucide-react";
+"use client";
+
+import { ArrowUpDown, Filter } from "lucide-react";
+import { useTranslations } from "next-intl";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
 
 type Props = {
-  onFilterClick?: () => void;
-  onSortClick?: () => void;
+  filterKey?: string;
+  filterValue?: string;
+  sortKey?: string;
 };
 
 export default function FilterSortActions({
-  onFilterClick,
-  onSortClick,
+  filterKey,
+  filterValue,
+  sortKey = "sort",
 }: Props) {
+  const t = useTranslations("actions");
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+
+  const updateParams = (key: string, value: string) => {
+    const params = new URLSearchParams(searchParams.toString());
+
+    if (params.get(key) === value) {
+      params.delete(key);
+    } else {
+      params.set(key, value);
+    }
+
+    params.set("page", "1");
+    router.push(`${pathname}?${params.toString()}`);
+  };
+
+  const handleFilterClick = () => {
+    if (!filterKey || !filterValue) return;
+    updateParams(filterKey, filterValue);
+  };
+
+  const handleSortClick = () => {
+    const currentSort = searchParams.get(sortKey);
+    const nextSort = currentSort === "asc" ? "desc" : "asc";
+
+    const params = new URLSearchParams(searchParams.toString());
+    params.set(sortKey, nextSort);
+    params.set("page", "1");
+
+    router.push(`${pathname}?${params.toString()}`);
+  };
+
   return (
     <div className="flex items-center gap-2">
-      <button className="flex justify-center items-center bg-academixYellow rounded-full w-8 h-8">
-        <Filter className="w-[14px] h-[14px]" />
-      </button>
+      {filterKey && filterValue && (
+        <button
+          type="button"
+          onClick={handleFilterClick}
+          className="flex justify-center items-center bg-academixPurple hover:bg-academixPurpleDark rounded-md w-8 h-8 text-academixPurpleDark hover:text-academixPurple transition"
+          title={t("filter")}
+        >
+          <Filter className="w-[14px] h-[14px]" />
+        </button>
+      )}
 
-      <button className="flex justify-center items-center bg-academixYellow rounded-full w-8 h-8">
+      <button
+        type="button"
+        onClick={handleSortClick}
+        className="flex justify-center items-center bg-academixPurple hover:bg-academixPurpleDark rounded-md w-8 h-8 text-academixPurpleDark hover:text-academixPurple transition"
+        title={t("sort")}
+      >
         <ArrowUpDown className="w-[14px] h-[14px]" />
       </button>
     </div>
diff --git a/src/components/FinalGradeEditButton.tsx b/src/components/FinalGradeEditButton.tsx
new file mode 100644
index 0000000..f3b74b3
--- /dev/null
+++ b/src/components/FinalGradeEditButton.tsx
@@ -0,0 +1,121 @@
+"use client";
+
+import { updateStudentFinalGrade } from "@/lib/actions";
+import { Pencil, X } from "lucide-react";
+import { useTranslations } from "next-intl";
+import { useRouter } from "next/navigation";
+import { useActionState, useEffect, useState } from "react";
+import { toast } from "react-toastify";
+
+type FinalGradeEditButtonProps = {
+  studentId: string;
+  studentName: string;
+  academicYearId: number;
+  averageScore: number | null;
+};
+
+const initialState = {
+  success: false,
+  error: false,
+  message: "",
+};
+
+export default function FinalGradeEditButton({
+  studentId,
+  studentName,
+  academicYearId,
+  averageScore,
+}: FinalGradeEditButtonProps) {
+  const t = useTranslations("finalGradeEdit");
+  const router = useRouter();
+  const [open, setOpen] = useState(false);
+  const [state, formAction, isPending] = useActionState(
+    updateStudentFinalGrade,
+    initialState,
+  );
+
+  useEffect(() => {
+    if (state.success) {
+      toast.success(state.message || t("updated"));
+      setOpen(false);
+      router.refresh();
+    } else if (state.error && state.message) {
+      toast.error(state.message);
+    }
+  }, [router, state, t]);
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={() => setOpen(true)}
+        className="inline-flex h-8 w-8 items-center justify-center rounded-md bg-academixPurpleDark text-white transition hover:scale-[1.05]"
+        title={t("edit")}
+      >
+        <Pencil className="h-4 w-4" />
+      </button>
+
+      {open && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4">
+          <div className="w-full max-w-sm rounded-lg bg-white p-5 shadow-xl">
+            <div className="mb-4 flex items-center justify-between gap-3">
+              <div>
+                <h2 className="font-semibold text-gray-900">{t("title")}</h2>
+                <p className="mt-1 text-sm text-gray-500">{studentName}</p>
+              </div>
+              <button
+                type="button"
+                onClick={() => setOpen(false)}
+                className="rounded-md p-1 text-gray-400 hover:bg-gray-100 hover:text-gray-700"
+                disabled={isPending}
+              >
+                <X className="h-4 w-4" />
+              </button>
+            </div>
+
+            <form action={formAction} className="space-y-4">
+              <input type="hidden" name="studentId" value={studentId} />
+              <input
+                type="hidden"
+                name="academicYearId"
+                value={academicYearId}
+              />
+
+              <label className="block text-sm font-medium text-gray-700">
+                {t("finalGrade")}
+                <input
+                  name="averageScore"
+                  type="number"
+                  min={0}
+                  max={100}
+                  step="0.01"
+                  required
+                  defaultValue={averageScore ?? ""}
+                  className="mt-2 w-full rounded-md border border-gray-200 px-3 py-2 text-sm outline-none focus:border-academixPurpleDark focus:ring-2 focus:ring-academixPurple/40"
+                />
+              </label>
+
+              <div className="flex justify-end gap-2">
+                <button
+                  type="button"
+                  onClick={() => setOpen(false)}
+                  disabled={isPending}
+                  className="rounded-md px-4 py-2 text-sm text-gray-600 hover:bg-gray-100"
+                >
+                  {t("cancel")}
+                </button>
+                <button
+                  type="submit"
+                  disabled={isPending}
+                  className="rounded-md bg-academixPurpleDark px-4 py-2 text-sm font-medium text-white disabled:opacity-60"
+                >
+                  {isPending ? t("saving") : t("save")}
+                </button>
+              </div>
+            </form>
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/src/components/FinanceChart.tsx b/src/components/FinanceChart.tsx
deleted file mode 100644
index 5b088ff..0000000
--- a/src/components/FinanceChart.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-"use client";
-
-import { MoreHorizontal } from "lucide-react";
-import {
-  LineChart,
-  Line,
-  XAxis,
-  YAxis,
-  CartesianGrid,
-  Tooltip,
-  Legend,
-  ResponsiveContainer,
-} from "recharts";
-
-const data = [
-  {
-    name: "Jan",
-    income: 4000,
-    expense: 2400,
-  },
-  {
-    name: "Feb",
-    income: 3000,
-    expense: 1398,
-  },
-  {
-    name: "Mar",
-    income: 2000,
-    expense: 9800,
-  },
-  {
-    name: "Apr",
-    income: 2780,
-    expense: 3908,
-  },
-  {
-    name: "May",
-    income: 1890,
-    expense: 4800,
-  },
-  {
-    name: "Jun",
-    income: 2390,
-    expense: 3800,
-  },
-  {
-    name: "Jul",
-    income: 3490,
-    expense: 4300,
-  },
-  {
-    name: "Aug",
-    income: 3490,
-    expense: 4300,
-  },
-  {
-    name: "Sep",
-    income: 3490,
-    expense: 4300,
-  },
-  {
-    name: "Oct",
-    income: 3490,
-    expense: 4300,
-  },
-  {
-    name: "Nov",
-    income: 3490,
-    expense: 4300,
-  },
-  {
-    name: "Dec",
-    income: 3490,
-    expense: 4300,
-  },
-];
-
-const FinanceChart = () => {
-  return (
-    <div className="bg-white p-4 rounded-xl w-full h-full">
-      <div className="flex justify-between items-center">
-        <h1 className="font-semibold text-lg">Finance</h1>
-        <MoreHorizontal className="w-5 h-5 text-gray-500" />
-      </div>
-      <ResponsiveContainer width="100%" height="90%">
-        <LineChart
-          width={500}
-          height={300}
-          data={data}
-          margin={{
-            top: 5,
-            right: 30,
-            left: 20,
-            bottom: 5,
-          }}
-        >
-          <CartesianGrid strokeDasharray="3 3" stroke="#ddd" />
-          <XAxis
-            dataKey="name"
-            axisLine={false}
-            tick={{ fill: "#d1d5db" }}
-            tickLine={false}
-            tickMargin={10}
-          />
-          <YAxis
-            axisLine={false}
-            tick={{ fill: "#d1d5db" }}
-            tickLine={false}
-            tickMargin={20}
-          />
-          <Tooltip />
-          <Legend
-            align="center"
-            verticalAlign="top"
-            wrapperStyle={{ paddingTop: "10px", paddingBottom: "30px" }}
-          />
-          <Line
-            type="monotone"
-            dataKey="income"
-            stroke="#C3EBFA"
-            strokeWidth={5}
-          />
-          <Line
-            type="monotone"
-            dataKey="expense"
-            stroke="#CFCEFF"
-            strokeWidth={5}
-          />
-        </LineChart>
-      </ResponsiveContainer>
-    </div>
-  );
-};
-
-export default FinanceChart;
diff --git a/src/components/FinanceChartLoader.tsx b/src/components/FinanceChartLoader.tsx
deleted file mode 100644
index 26f8132..0000000
--- a/src/components/FinanceChartLoader.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-"use client";
-
-import dynamic from "next/dynamic";
-
-const FinanceChartLoader = dynamic(() => import("@/components/FinanceChart"), {
-  ssr: false,
-  loading: () => <div className="bg-white rounded-xl w-full h-full animate-pulse" />,
-});
-
-export default FinanceChartLoader;
diff --git a/src/components/FormContainer.tsx b/src/components/FormContainer.tsx
index 06cdfc7..5a3f4f9 100644
--- a/src/components/FormContainer.tsx
+++ b/src/components/FormContainer.tsx
@@ -6,6 +6,7 @@ import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
 
 export type FormContainerProps = {
   table:
+    | "grade"
     | "teacher"
     | "student"
     | "parent"
@@ -62,6 +63,8 @@ const FormContainer = async ({ table, type, data, id }: FormContainerProps) => {
     }
 
     switch (table) {
+      case "grade":
+        break;
       case "subject":
         if (!schoolId) break;
         const teachers = await prisma.teacher.findMany({
@@ -210,6 +213,54 @@ const FormContainer = async ({ table, type, data, id }: FormContainerProps) => {
         if (!schoolId) break;
         const assignmentRole = authUser?.role;
         const assignmentUserId = authUser?.userId;
+        const assignmentSubjects = await prisma.subject.findMany({
+          where: {
+            schoolId,
+            ...(assignmentRole === "teacher"
+              ? {
+                  OR: [
+                    { teachers: { some: { id: assignmentUserId! } } },
+                    {
+                      lessons: {
+                        some: {
+                          teacherId: assignmentUserId!,
+                          academicYearId: academicYearId!,
+                        },
+                      },
+                    },
+                  ],
+                }
+              : {}),
+          },
+          select: { id: true, name: true, gradeId: true },
+          orderBy: { name: "asc" },
+        });
+        const assignmentSubjectGradeIds = Array.from(
+          new Set(assignmentSubjects.map((subject) => subject.gradeId)),
+        );
+        const assignmentClasses = await prisma.class.findMany({
+          where: {
+            schoolId,
+            ...(assignmentRole === "teacher"
+              ? {
+                  OR: [
+                    { gradeId: { in: assignmentSubjectGradeIds } },
+                    { teachers: { some: { id: assignmentUserId! } } },
+                    {
+                      lessons: {
+                        some: {
+                          teacherId: assignmentUserId!,
+                          academicYearId: academicYearId!,
+                        },
+                      },
+                    },
+                  ],
+                }
+              : {}),
+          },
+          select: { id: true, name: true, gradeId: true },
+          orderBy: { name: "asc" },
+        });
         const assignmentLessons = await prisma.lesson.findMany({
           where: {
             schoolId,
@@ -222,33 +273,46 @@ const FormContainer = async ({ table, type, data, id }: FormContainerProps) => {
             id: true,
             subjectId: true,
             classId: true,
-            subject: { select: { id: true, name: true } },
-            class: { select: { id: true, name: true } },
           },
         });
+        const assignmentTeachers =
+          assignmentRole === "admin"
+            ? await prisma.teacher.findMany({
+                where: { schoolId },
+                select: { id: true, name: true },
+                orderBy: { name: "asc" },
+              })
+            : [];
 
-        const assignmentSubjectsMap = new Map<
-          number,
-          { id: number; name: string }
-        >();
-        const assignmentClassesMap = new Map<
-          number,
-          { id: number; name: string }
+        const assignmentPairsMap = new Map<
+          string,
+          { subjectId: number; classId: number }
         >();
 
-        for (const lesson of assignmentLessons) {
-          assignmentSubjectsMap.set(lesson.subject.id, lesson.subject);
-          assignmentClassesMap.set(lesson.class.id, lesson.class);
+        for (const subject of assignmentSubjects) {
+          for (const classItem of assignmentClasses) {
+            if (classItem.gradeId === subject.gradeId) {
+              assignmentPairsMap.set(`${subject.id}:${classItem.id}`, {
+                subjectId: subject.id,
+                classId: classItem.id,
+              });
+            }
+          }
         }
 
-        relatedData = {
-          subjects: Array.from(assignmentSubjectsMap.values()),
-          classes: Array.from(assignmentClassesMap.values()),
-          lessons: assignmentLessons.map((lesson) => ({
-            id: lesson.id,
+        for (const lesson of assignmentLessons) {
+          assignmentPairsMap.set(`${lesson.subjectId}:${lesson.classId}`, {
             subjectId: lesson.subjectId,
             classId: lesson.classId,
-          })),
+          });
+        }
+
+        relatedData = {
+          subjects: assignmentSubjects,
+          classes: assignmentClasses,
+          lessons: Array.from(assignmentPairsMap.values()),
+          teachers: assignmentTeachers,
+          role: assignmentRole,
         };
         break;
       case "result":
@@ -281,12 +345,19 @@ const FormContainer = async ({ table, type, data, id }: FormContainerProps) => {
             schoolId,
             academicYearId: academicYearId!,
             ...(resultRole === "teacher"
-              ? { lesson: { teacherId: resultUserId! } }
+              ? {
+                  OR: [
+                    { teacherId: resultUserId! },
+                    { lesson: { teacherId: resultUserId! } },
+                  ],
+                }
               : {}),
           },
           select: {
             id: true,
             title: true,
+            subject: { select: { name: true } },
+            class: { select: { name: true } },
             lesson: {
               select: {
                 subject: { select: { name: true } },
@@ -302,12 +373,19 @@ const FormContainer = async ({ table, type, data, id }: FormContainerProps) => {
             schoolId,
             academicYearId: academicYearId!,
             ...(resultRole === "teacher"
-              ? { lesson: { teacherId: resultUserId! } }
+              ? {
+                  OR: [
+                    { teacherId: resultUserId! },
+                    { lesson: { teacherId: resultUserId! } },
+                  ],
+                }
               : {}),
           },
           select: {
             id: true,
             title: true,
+            subject: { select: { name: true } },
+            class: { select: { name: true } },
             lesson: {
               select: {
                 subject: { select: { name: true } },
@@ -323,14 +401,16 @@ const FormContainer = async ({ table, type, data, id }: FormContainerProps) => {
           exams: resultExams.map((exam) => ({
             id: exam.id,
             title: exam.title,
-            subjectName: exam.lesson.subject.name,
-            className: exam.lesson.class.name,
+            subjectName: exam.subject?.name ?? exam.lesson?.subject.name ?? "-",
+            className: exam.class?.name ?? exam.lesson?.class.name ?? "-",
           })),
           assignments: resultAssignments.map((assignment) => ({
             id: assignment.id,
             title: assignment.title,
-            subjectName: assignment.lesson.subject.name,
-            className: assignment.lesson.class.name,
+            subjectName:
+              assignment.subject?.name ?? assignment.lesson?.subject.name ?? "-",
+            className:
+              assignment.class?.name ?? assignment.lesson?.class.name ?? "-",
           })),
         };
         break;
@@ -399,6 +479,37 @@ const FormContainer = async ({ table, type, data, id }: FormContainerProps) => {
         };
         break;
     }
+  } else if (table === "grade" && id) {
+    if (!schoolId) {
+      return (
+        <div>
+          <FormModal table={table} type={type} data={data} id={id} relatedData={{}} />
+        </div>
+      );
+    }
+
+    const gradeId = typeof id === "string" ? Number.parseInt(id, 10) : id;
+
+    if (!Number.isNaN(gradeId)) {
+      const [grade, classItems] = await prisma.$transaction([
+        prisma.grade.findFirst({
+          where: { id: gradeId, schoolId },
+          select: {
+            id: true,
+            level: true,
+            _count: { select: { classes: true } },
+          },
+        }),
+        prisma.class.findMany({
+          where: { schoolId, gradeId },
+          select: { id: true, name: true },
+          orderBy: { name: "asc" },
+        }),
+      ]);
+
+      relatedData = { classes: classItems };
+      modalData = grade ?? data;
+    }
   } else if (table === "class" && id) {
     if (!schoolId) {
       return (
diff --git a/src/components/FormModal.tsx b/src/components/FormModal.tsx
index 0e06988..ca4e22b 100644
--- a/src/components/FormModal.tsx
+++ b/src/components/FormModal.tsx
@@ -11,9 +11,11 @@ import {
 import { Plus, Pencil, Trash2, X } from "lucide-react";
 import dynamic from "next/dynamic";
 import { toast } from "react-toastify";
+import { useFormStatus } from "react-dom";
 import {
   deleteAnnouncement,
   deleteClass,
+  deleteGrade,
   deleteAssignment,
   deleteExam,
   deleteEvent,
@@ -28,8 +30,15 @@ import { useRouter } from "next/navigation";
 import { FormContainerProps } from "./FormContainer";
 import AssignmentForm from "./forms/AssignmentForm";
 import ClassDeleteForm from "./forms/ClassDeleteForm";
+import { useTranslations } from "next-intl";
+
+const DynamicFormLoading = () => {
+  const t = useTranslations("states");
+  return <h1>{t("loading")}</h1>;
+};
 
 const deleteActionMap = {
+  grade: deleteGrade,
   subject: deleteSubject,
   class: deleteClass,
   teacher: deleteTeacher,
@@ -52,40 +61,46 @@ const iconMap = {
 };
 
 const TeacherForm = dynamic(() => import("./forms/TeacherForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
 });
 const StudentForm = dynamic(() => import("./forms/StudentForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
 });
 const ParentForm = dynamic(() => import("./forms/ParentForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
 });
 const SubjectForm = dynamic(() => import("./forms/SubjectForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
 });
 const ClassForm = dynamic(() => import("./forms/ClassForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
+});
+const GradeForm = dynamic(() => import("./forms/GradeForm"), {
+  loading: () => <DynamicFormLoading />,
 });
 const LessonForm = dynamic(() => import("./forms/LessonForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
 });
 const ExamForm = dynamic(() => import("./forms/ExamForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
 });
 const ResultForm = dynamic(() => import("./forms/ResultForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
 });
 const EventForm = dynamic(() => import("./forms/EventForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
 });
 const AnnouncementForm = dynamic(() => import("./forms/AnnouncementForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
 });
 const MessageForm = dynamic(() => import("@/components/forms/MessageForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
 });
 const StudentDeleteForm = dynamic(() => import("./forms/StudentDeleteForm"), {
-  loading: () => <h1>Loading...</h1>,
+  loading: () => <DynamicFormLoading />,
+});
+const GradeDeleteForm = dynamic(() => import("./forms/GradeDeleteForm"), {
+  loading: () => <DynamicFormLoading />,
 });
 
 const forms: {
@@ -136,6 +151,14 @@ const forms: {
       relatedData={relatedData}
     />
   ),
+  grade: (setOpen, type, data, relatedData) => (
+    <GradeForm
+      setOpen={setOpen}
+      type={type}
+      data={data}
+      relatedData={relatedData}
+    />
+  ),
   lesson: (setOpen, type, data, relatedData) => (
     <LessonForm
       setOpen={setOpen}
@@ -194,90 +217,131 @@ const forms: {
   ),
 };
 
-const FormModal = ({
+const DeleteSubmitButton = () => {
+  const t = useTranslations("actions");
+  const { pending } = useFormStatus();
+
+  return (
+    <button
+      type="submit"
+      disabled={pending}
+      className="self-center bg-red-700 disabled:opacity-60 px-4 py-2 rounded-md w-max text-white"
+    >
+      {pending ? t("deleting") : t("delete")}
+    </button>
+  );
+};
+
+const ModalBody = ({
   table,
   type,
   data,
   id,
   relatedData,
-}: FormContainerProps & { relatedData?: any }) => {
-  const size = type === "create" ? "w-8 h-8" : "w-7 h-7";
-  const bgColor =
-    type === "create"
-      ? "bg-academixYellow"
-      : type === "update"
-        ? "bg-academixSky"
-        : "bg-academixPurple";
-
-  const [open, setOpen] = useState(false);
-
-  const Form = () => {
-    const [state, formAction] = useActionState(deleteActionMap[table], {
-      success: false,
-      error: false,
-    });
+  setOpen,
+}: FormContainerProps & {
+  relatedData?: any;
+  setOpen: Dispatch<SetStateAction<boolean>>;
+}) => {
+  const t = useTranslations("actions");
+  const tableT = useTranslations("tables");
+  const [state, formAction] = useActionState(deleteActionMap[table], {
+    success: false,
+    error: false,
+  });
 
-    const router = useRouter();
-    useEffect(() => {
-      if (state.success) {
-        toast(
-          `${table.charAt(0).toUpperCase() + table.slice(1)} deleted successfully`,
-        );
-        setOpen(false);
-        router.refresh();
-      }
-    }, [state, router]);
+  const router = useRouter();
 
-    if (type === "delete" && id) {
-      if (table === "class") {
-        return (
-          <ClassDeleteForm
-            data={data}
-            relatedData={relatedData}
-            setOpen={setOpen}
-          />
-        );
-      }
+  useEffect(() => {
+    if (state.success) {
+      toast(t("deleteSuccess", { entity: tableT(table) }));
+      setOpen(false);
+      router.refresh();
+    }
+  }, [state, router, setOpen, t, table, tableT]);
 
-      if (table === "student") {
-        return (
-          <StudentDeleteForm
-            data={data}
-            relatedData={relatedData}
-            setOpen={setOpen}
-          />
-        );
-      }
+  if (type === "delete" && id) {
+    if (table === "class") {
+      return (
+        <ClassDeleteForm
+          data={data}
+          relatedData={relatedData}
+          setOpen={setOpen}
+        />
+      );
+    }
+    if (table === "grade") {
+      return (
+        <GradeDeleteForm
+          data={data}
+          relatedData={relatedData}
+          setOpen={setOpen}
+        />
+      );
+    }
 
+    if (table === "student") {
       return (
-        <form action={formAction} className="flex flex-col gap-4 p-4">
-          <input type="hidden" name="id" defaultValue={id} />
-          <span className="font-medium text-center">
-            All data will be lost. Are you sure you want to delete this {table}?
-          </span>
-          <button className="self-center bg-red-700 px-4 py-2 rounded-md w-max text-white">
-            Delete
-          </button>
-        </form>
+        <StudentDeleteForm
+          data={data}
+          relatedData={relatedData}
+          setOpen={setOpen}
+        />
       );
     }
 
-    if (type === "create" || type === "update") {
-      const form = forms[table as keyof typeof forms];
+    return (
+      <form action={formAction} className="flex flex-col gap-4 p-4">
+        <input type="hidden" name="id" defaultValue={id} />
+        <span className="font-medium text-center">
+          {t("deleteConfirmation", { entity: tableT(table) })}
+        </span>
+        <DeleteSubmitButton />
+      </form>
+    );
+  }
 
-      if (!form) return <span>Form not found!</span>;
+  if (type === "create" || type === "update") {
+    const form = forms[table as keyof typeof forms];
 
-      return form(setOpen, type, data, relatedData);
-    }
+    if (!form) return <span>{t("formNotFound")}</span>;
+
+    return form(setOpen, type, data, relatedData);
+  }
+
+  return null;
+};
+
+const FormModal = ({
+  table,
+  type,
+  data,
+  id,
+  relatedData,
+}: FormContainerProps & { relatedData?: any }) => {
+  const t = useTranslations("actions");
+  const [open, setOpen] = useState(false);
+
+  useEffect(() => {
+    if (!open) return;
+
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.key === "Escape") {
+        setOpen(false);
+      }
+    };
 
-    return null;
-  };
+    document.addEventListener("keydown", onKeyDown);
+    return () => document.removeEventListener("keydown", onKeyDown);
+  }, [open]);
 
   return (
     <>
       <button
-        className={`p-2 flex items-center justify-center text-academixPurpleDark hover:bg-gray-100 rounded-md transition bg-academixPurple`}
+        className={`p-2 flex items-center justify-center bg-academixPurpleDark hover:scale-[1.05] rounded-md transition text-white`}
         onClick={() => setOpen(true)}
+        title={t(type)}
+        aria-label={t(type)}
       >
         {(() => {
           const ActionIcon = iconMap[type];
@@ -285,11 +349,30 @@ const FormModal = ({
         })()}
       </button>
       {open && (
-        <div className="z-50 fixed inset-0 flex justify-center items-center bg-black/60 p-4">
-          <div className="relative bg-white p-4 rounded-md w-full max-w-4xl max-h-[90vh] overflow-y-auto">
-            <Form />
+        <div
+          className="z-50 fixed inset-0 flex justify-center items-center bg-black/60 p-4"
+          onMouseDown={(event) => {
+            if (event.target === event.currentTarget) {
+              setOpen(false);
+            }
+          }}
+        >
+          <div
+            className="relative bg-white p-4 rounded-md w-full max-w-4xl max-h-[90vh] overflow-y-auto"
+            role="dialog"
+            aria-modal="true"
+            onMouseDown={(event) => event.stopPropagation()}
+          >
+            <ModalBody
+              table={table}
+              type={type}
+              data={data}
+              id={id}
+              relatedData={relatedData}
+              setOpen={setOpen}
+            />
             <div
-              className="top-4 right-4 absolute cursor-pointer"
+              className="top-4 end-4 absolute cursor-pointer"
               onClick={() => setOpen(false)}
             >
               <X className="w-4 h-4 text-gray-500" />
diff --git a/src/components/GradeFilter.tsx b/src/components/GradeFilter.tsx
new file mode 100644
index 0000000..aa15c08
--- /dev/null
+++ b/src/components/GradeFilter.tsx
@@ -0,0 +1,48 @@
+"use client";
+
+import { useRouter, useSearchParams } from "next/navigation";
+import { useTranslations } from "next-intl";
+
+type Props = {
+  grades: {
+    id: number;
+    level: number;
+  }[];
+};
+
+export default function GradeFilter({ grades }: Props) {
+  const t = useTranslations("filters");
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const handleChange = (gradeId: string) => {
+    const params = new URLSearchParams(searchParams.toString());
+
+    if (gradeId) {
+      params.set("gradeId", gradeId);
+    } else {
+      params.delete("gradeId");
+    }
+
+    params.delete("classId");
+    params.set("page", "1");
+
+    router.push(`?${params.toString()}`);
+  };
+
+  return (
+    <select
+      defaultValue={searchParams.get("gradeId") || ""}
+      onChange={(e) => handleChange(e.target.value)}
+      className="h-10 rounded-md border px-3 text-sm"
+    >
+      <option value="">{t("allGrades")}</option>
+
+      {grades.map((grade) => (
+        <option key={grade.id} value={grade.id}>
+          {t("gradeLevel", { level: grade.level })}
+        </option>
+      ))}
+    </select>
+  );
+}
diff --git a/src/components/InputField.tsx b/src/components/InputField.tsx
index 4a0647c..ddea1c0 100644
--- a/src/components/InputField.tsx
+++ b/src/components/InputField.tsx
@@ -20,20 +20,23 @@ const InputField = ({
   inputProps,
 }: InputFieldProps) => {
   return (
-    <div className="flex flex-col gap-2 w-full md:w-1/3">
-      <label className="text-gray-500 text-xs">{label}</label>
+    <div className="flex flex-col gap-2 w-full">
+      <label className="font-medium text-gray-700 text-sm">{label}</label>
       <input
         type={type}
         {...register(name)}
-        className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+        className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 text-sm transition-all placeholder-gray-400"
         {...inputProps}
         defaultValue={defaultValue}
       />
       {error?.message && (
-        <p className="text-red-400 text-xs">{error.message.toString()}</p>
+        <p className="font-medium text-red-500 text-xs">
+          {error.message.toString()}
+        </p>
       )}
     </div>
   );
 };
 
 export default InputField;
+
diff --git a/src/components/LanguageSwitcher.tsx b/src/components/LanguageSwitcher.tsx
new file mode 100644
index 0000000..14c7f86
--- /dev/null
+++ b/src/components/LanguageSwitcher.tsx
@@ -0,0 +1,139 @@
+"use client";
+
+import { Check, ChevronDown, Languages } from "lucide-react";
+import { useLocale, useTranslations } from "next-intl";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { useEffect, useRef, useState, useTransition } from "react";
+
+const locales = ["en", "ar"] as const;
+
+type LanguageSwitcherProps = {
+  variant?: "default" | "compact";
+};
+
+const LanguageSwitcher = ({ variant = "default" }: LanguageSwitcherProps) => {
+  const locale = useLocale();
+  const t = useTranslations("navbar.language");
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+  const [isOpen, setIsOpen] = useState(false);
+  const [isPending, startTransition] = useTransition();
+  const rootRef = useRef<HTMLDivElement>(null);
+
+  const currentLocale = locales.includes(locale as (typeof locales)[number])
+    ? (locale as (typeof locales)[number])
+    : "en";
+
+  useEffect(() => {
+    if (!isOpen) return;
+
+    const handleClickOutside = (event: MouseEvent) => {
+      if (!rootRef.current?.contains(event.target as Node)) {
+        setIsOpen(false);
+      }
+    };
+
+    document.addEventListener("mousedown", handleClickOutside);
+
+    return () => document.removeEventListener("mousedown", handleClickOutside);
+  }, [isOpen]);
+
+  const handleChange = (nextLocale: string) => {
+    if (nextLocale === currentLocale) {
+      setIsOpen(false);
+      return;
+    }
+
+    const query = searchParams.toString();
+    const href = query ? `${pathname}?${query}` : pathname;
+
+    startTransition(() => {
+      setIsOpen(false);
+      document.cookie = `NEXT_LOCALE=${nextLocale}; path=/; max-age=31536000; SameSite=Lax`;
+      router.replace(href);
+      router.refresh();
+    });
+  };
+
+  const toggleLocale = () => {
+    handleChange(currentLocale === "en" ? "ar" : "en");
+  };
+
+  if (variant === "compact") {
+    return (
+      <button
+        type="button"
+        onClick={toggleLocale}
+        disabled={isPending}
+        aria-label={t("label")}
+        title={t(currentLocale === "en" ? "ar" : "en")}
+        className="flex items-center gap-1.5 bg-white/10 hover:bg-white/15 disabled:opacity-60 shadow-sm backdrop-blur-sm px-2.5 border border-white/20 hover:border-white/35 rounded-md min-w-16 h-8 font-semibold text-white text-xs uppercase transition disabled:cursor-not-allowed"
+      >
+        <Languages className="w-3.5 h-3.5" aria-hidden="true" />
+        <span className="w-5 text-center">
+          {currentLocale === "ar" ? "EN" : "AR"}
+        </span>
+      </button>
+    );
+  }
+
+  return (
+    <div ref={rootRef} className="relative">
+      <button
+        type="button"
+        onClick={() => setIsOpen((value) => !value)}
+        disabled={isPending}
+        aria-label={t("label")}
+        aria-expanded={isOpen}
+        className="group flex h-10 items-center gap-1.5 rounded-md border border-academixPurple/20 bg-white/95 px-1.5 text-sm text-gray-700 shadow-sm ring-1 ring-white/70 transition hover:border-academixPurple/40 hover:shadow-md disabled:cursor-not-allowed disabled:opacity-60 sm:gap-2 sm:ps-2 sm:pe-3"
+      >
+        <span className="flex h-7 w-7 items-center justify-center rounded-full bg-academixPurpleLight ring-1 ring-academixPurple/20">
+          <Languages className="w-4 h-4 text-academixPurpleDark" />
+        </span>
+        <span className="hidden sm:flex flex-col items-start min-w-0 leading-none">
+          <span className="mt-0.5 font-medium text-gray-600 text-xs">
+            {t(currentLocale)}
+          </span>
+        </span>
+        <span className="hidden rounded-md bg-academixPurpleDark px-1.5 py-0.5 text-[10px] font-bold uppercase text-white min-[360px]:inline">
+          {currentLocale}
+        </span>
+        <ChevronDown
+          className={`hidden h-4 w-4 text-gray-400 transition group-hover:text-academixPurpleDark min-[420px]:block ${
+            isOpen ? "rotate-180" : ""
+          }`}
+          aria-hidden="true"
+        />
+      </button>
+
+      {isOpen && (
+        <div className="top-12 z-50 absolute bg-white shadow-xl border border-academixPurple/15 rounded-md ring-1 ring-black/5 w-56 overflow-hidden end-0">
+          <div className="p-1.5">
+            {locales.map((item) => {
+              const isActive = item === currentLocale;
+
+              return (
+                <button
+                  key={item}
+                  type="button"
+                  onClick={() => handleChange(item)}
+                  className={`flex w-full items-center justify-between rounded-lg px-3 py-2 text-sm transition ${
+                    isActive
+                      ? "bg-academixPurpleLight text-academixPurpleDark"
+                      : "text-gray-600 hover:bg-gray-50"
+                  }`}
+                >
+                  <span className="font-medium">{t(item)}</span>
+                  {isActive && <Check className="w-4 h-4" />}
+                </button>
+              );
+            })}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default LanguageSwitcher;
diff --git a/src/components/LoginContent.tsx b/src/components/LoginContent.tsx
index 0934edc..8414e07 100644
--- a/src/components/LoginContent.tsx
+++ b/src/components/LoginContent.tsx
@@ -2,11 +2,16 @@
 
 import { useSignIn, useUser } from "@clerk/nextjs";
 import Image from "next/image";
+import Link from "next/link";
 import { useRouter, useSearchParams } from "next/navigation";
 import { FormEvent, useEffect, useState } from "react";
 import { getRoleHome, type UserRole } from "@/lib/utils";
+import { ArrowLeft, Eye, EyeOff } from "lucide-react";
+import { useTranslations } from "next-intl";
 
 const LoginContent = () => {
+  const commonT = useTranslations("common");
+  const t = useTranslations("auth.login");
   const { isLoaded: isUserLoaded, user } = useUser();
   const { signIn, errors, fetchStatus } = useSignIn();
   const router = useRouter();
@@ -21,8 +26,18 @@ const LoginContent = () => {
 
     const redirectUrl = searchParams.get("redirect_url");
     const role = user.publicMetadata.role as UserRole | undefined;
-
-    const destination = redirectUrl || (role ? getRoleHome(role) : "/");
+    const shouldUsePostLogin =
+      role === "admin" ||
+      role === "teacher" ||
+      role === "student" ||
+      role === "parent";
+    const destination =
+      redirectUrl ||
+      (shouldUsePostLogin
+        ? "/post-login"
+        : role
+          ? getRoleHome(role)
+          : "/post-login");
 
     if (window.location.pathname === destination) return;
 
@@ -33,7 +48,6 @@ const LoginContent = () => {
     e.preventDefault();
 
     const { error } = await signIn.password({ identifier, password });
-
     if (error) return;
 
     if (signIn.status === "complete") {
@@ -46,22 +60,26 @@ const LoginContent = () => {
 
   if (user) {
     return (
-      <div className="flex justify-center items-center bg-lamaSkyLight h-screen">
-        <div className="bg-white shadow-2xl px-10 py-9 rounded-2xl w-[360px] text-gray-600">
-          <h1 className="flex items-center gap-2 mb-4 font-bold text-xl">
-            <Image src="/icon.png" alt="Academix logo" width={24} height={24} />
-            Academix
+      <div className="relative flex justify-center items-center bg-[radial-gradient(circle_at_top,_rgba(207,206,255,0.36),_transparent_46%),linear-gradient(135deg,#24104f,#4c1d95_54%,#7c3aed)] p-4 h-screen overflow-hidden">
+        <div className="z-10 relative shadow-2xl backdrop-blur-sm px-10 py-9 border border-white/60 rounded-2xl w-[380px] text-gray-600">
+          <h1 className="flex items-center gap-2 mb-4 font-bold text-white text-xl">
+            <Image
+              src="/logo-white.png"
+              alt="Academix logo"
+              className="w-[44px] h-[34px] rotate-[-15deg]"
+              width={40}
+              height={40}
+            />
+            {commonT("brand")}
           </h1>
           <div className="flex items-center gap-3 bg-academixPurpleLight/40 px-4 py-3 rounded-xl">
             <span
-              className="border-2 border-academixPurple/30 border-t-academixPurple rounded-full w-5 h-5 animate-spin"
+              className="border-2 border-academixPurple/30 border-t-white rounded-full w-5 h-5 animate-spin"
               aria-hidden="true"
             />
-            <div>
-              <p className="font-medium text-sm">Welcome back</p>
-              <p className="text-gray-500 text-xs">
-                Redirecting to your dashboard...
-              </p>
+            <div className="text-white">
+              <p className="font-medium text-sm">{t("welcomeBack")}</p>
+              <p className="text-xs">{t("redirecting")}</p>
             </div>
           </div>
         </div>
@@ -70,31 +88,44 @@ const LoginContent = () => {
   }
 
   return (
-    <div className="flex justify-center items-center bg-lamaSkyLight h-screen">
-      <div className="flex flex-col gap-6 bg-white shadow-2xl p-12 rounded-md">
-        <div className="flex flex-col gap-2">
-          <h1 className="flex items-center gap-2 font-bold text-xl">
-            <Image src="/icon.png" alt="Academix logo" width={24} height={24} />
-            Academix
-          </h1>
-          <h2 className="text-gray-400">Sign in to your account</h2>
+    <div className="relative flex justify-center items-center bg-[radial-gradient(circle_at_top,_rgba(207,206,255,0.36),_transparent_46%),linear-gradient(135deg,#24104f,#4c1d95_54%,#7c3aed)] p-4 h-screen overflow-hidden">
+      <div className="z-10 relative flex flex-col gap-6 shadow-2xl backdrop-blur-sm p-10 md:p-12 border border-white/60 rounded-2xl w-full max-w-[460px]">
+        <div>
+          <Link
+            href="/"
+            className="inline-flex items-center gap-2 mb-4 text-gray-200 hover:text-white text-sm transition-colors"
+          >
+            <ArrowLeft className="w-4 h-4 rtl:rotate-180" />
+            {t("goHome")}
+          </Link>
+          <div>
+            <h1 className="flex items-center gap-2 mb-2 font-bold text-white text-2xl">
+              <Image
+                src="/logo-white.png"
+                alt="Academix logo"
+                className="w-[48px] h-[36px] rotate-[-15deg]"
+                width={40}
+                height={40}
+              />
+              {commonT("brand")}
+            </h1>
+            <h2 className="ms-4 text-gray-300">{t("title")}</h2>
+          </div>
         </div>
-
-        <form className="flex flex-col gap-4 min-w-[300px]" onSubmit={onSubmit}>
+        <form className="flex flex-col gap-4" onSubmit={onSubmit}>
           <div className="flex flex-col gap-1">
-            <label className="text-gray-500 text-xs" htmlFor="identifier">
-              Username or Email
+            <label className="text-white text-xs" htmlFor="identifier">
+              {t("identifier")}
             </label>
             <input
               id="identifier"
               type="text"
               value={identifier}
               onChange={(e) => setIdentifier(e.target.value)}
-              className="p-2 rounded-md ring-[1.5px] ring-gray-300 text-sm"
+              className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
               required
               autoComplete="username"
             />
-            {/* v7: per-field errors via errors.fields */}
             {errors?.fields?.identifier && (
               <p role="alert" className="text-red-500 text-xs">
                 {errors.fields.identifier.message}
@@ -103,8 +134,8 @@ const LoginContent = () => {
           </div>
 
           <div className="flex flex-col gap-1">
-            <label className="text-gray-500 text-xs" htmlFor="password">
-              Password
+            <label className="text-white text-xs" htmlFor="password">
+              {t("password")}
             </label>
             <div className="relative">
               <input
@@ -112,17 +143,23 @@ const LoginContent = () => {
                 type={showPassword ? "text" : "password"}
                 value={password}
                 onChange={(e) => setPassword(e.target.value)}
-                className="p-2 pr-20 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+                className="focus:bg-academixPurpleLight px-4 py-3 pe-20 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
                 required
                 autoComplete="current-password"
               />
               <button
                 type="button"
                 onClick={() => setShowPassword((v) => !v)}
-                className="right-2 absolute inset-y-0 text-gray-500 text-xs"
-                aria-label={showPassword ? "Hide password" : "Show password"}
+                className="end-2 absolute inset-y-0 text-gray-500 text-xs"
+                aria-label={
+                  showPassword ? t("hidePassword") : t("showPassword")
+                }
               >
-                {showPassword ? "Hide" : "Show"}
+                {showPassword ? (
+                  <EyeOff className="w-5 h-5" />
+                ) : (
+                  <Eye className="w-5 h-5" />
+                )}
               </button>
             </div>
             {errors?.fields?.password && (
@@ -135,7 +172,7 @@ const LoginContent = () => {
           <button
             type="submit"
             disabled={fetchStatus === "fetching"}
-            className="flex justify-center items-center gap-2 bg-academixPurpleDark disabled:opacity-60 mt-2 p-2 rounded-md text-white"
+            className="flex justify-center items-center gap-2 bg-academixPurpleDark hover:bg-academixPurpleMuted disabled:opacity-80 shadow-md mt-2 py-2.5 rounded-md text-white transition"
           >
             {fetchStatus === "fetching" ? (
               <>
@@ -143,13 +180,19 @@ const LoginContent = () => {
                   className="border-2 border-white/40 border-t-white rounded-full w-4 h-4 animate-spin"
                   aria-hidden="true"
                 />
-                Signing in...
+                {t("signingIn")}
               </>
             ) : (
-              "Sign In"
+              t("signIn")
             )}
           </button>
         </form>
+        <p className="text-white text-xs">
+          {t("newSchool")}{" "}
+          <Link href="/school-signup" className="text-gray-300 hover:underline">
+            {t("signupRequest")}
+          </Link>
+        </p>
       </div>
     </div>
   );
diff --git a/src/components/Menu.tsx b/src/components/Menu.tsx
index 9e1fa5c..7aae4ef 100644
--- a/src/components/Menu.tsx
+++ b/src/components/Menu.tsx
@@ -8,154 +8,205 @@ import {
   CheckCircle,
   ClipboardCheck,
   ClipboardList,
+  Layers,
   FileText,
   GraduationCap,
   LayoutDashboard,
   LogOut,
   Megaphone,
   MessageCircle,
+  MessageSquare,
   School,
   Settings,
   User,
   UsersRound,
+  Archive,
+  Bell,
   type LucideIcon,
+  Percent,
 } from "lucide-react";
-import Link from "next/link";
 import { usePathname, useRouter } from "next/navigation";
 import { useEffect, useMemo, useState } from "react";
+import { NavigationLink } from "./NavigationLink";
+import { getRoleHome } from "@/lib/utils";
+import { useTranslations } from "next-intl";
 
 type MenuItem = {
   icon: LucideIcon;
-  label: string;
+  labelKey: string;
   href: string | ((role: string) => string);
   shouldPrefetch?: boolean;
   visible: string[];
 };
 
 type MenuSection = {
-  title: string;
+  titleKey: string;
   items: MenuItem[];
 };
 
 export const menuItems: MenuSection[] = [
   {
-    title: "MENU",
+    titleKey: "main",
     items: [
       {
         icon: LayoutDashboard,
-        label: "Dashboard",
-        href: (role) => `/${role}`,
+        labelKey: "dashboard",
+        href: (role) => getRoleHome(role as Parameters<typeof getRoleHome>[0]),
         shouldPrefetch: true,
-        visible: ["admin", "teacher", "student", "parent"],
+        visible: ["admin", "teacher", "student", "parent", "superAdmin"],
+      },
+      {
+        icon: School,
+        labelKey: "schools",
+        href: "/super-admin",
+        visible: [],
       },
       {
         icon: GraduationCap,
-        label: "Teachers",
+        labelKey: "teachers",
         href: "/list/teachers",
         shouldPrefetch: true,
         visible: ["admin"],
       },
       {
         icon: User,
-        label: "Students",
+        labelKey: "students",
         href: "/list/students",
         shouldPrefetch: true,
         visible: ["admin", "teacher"],
       },
       {
         icon: UsersRound,
-        label: "Parents",
+        labelKey: "parents",
         href: "/list/parents",
         visible: ["admin", "teacher"],
       },
       {
         icon: BookOpen,
-        label: "Subjects",
+        labelKey: "subjects",
         href: "/list/subjects",
         visible: ["admin", "student", "teacher", "parent"],
       },
       {
         icon: School,
-        label: "Classes",
+        labelKey: "classes",
         href: "/list/classes",
         visible: ["admin", "teacher"],
       },
+      {
+        icon: Layers,
+        labelKey: "grades",
+        href: "/list/grades",
+        visible: ["admin"],
+      },
       {
         icon: ClipboardList,
-        label: "Schedules",
+        labelKey: "schedules",
         href: "/list/lessons",
         shouldPrefetch: true,
         visible: ["admin"],
       },
       {
         icon: FileText,
-        label: "Exams",
+        labelKey: "exams",
         href: "/list/exams",
         shouldPrefetch: true,
         visible: ["admin", "teacher", "student", "parent"],
       },
       {
         icon: ClipboardCheck,
-        label: "Assignments",
+        labelKey: "assignments",
         href: "/list/assignments",
         shouldPrefetch: true,
         visible: ["admin", "teacher", "student", "parent"],
       },
       {
         icon: BarChart3,
-        label: "Results",
+        labelKey: "results",
         href: "/list/results",
         shouldPrefetch: true,
         visible: ["admin", "teacher", "student", "parent"],
       },
+      {
+        icon: Percent,
+        labelKey: "finalResults",
+        href: "/list/final-results",
+        shouldPrefetch: true,
+        visible: ["admin", "teacher", "student", "parent"],
+      },
       {
         icon: CheckCircle,
-        label: "Attendance",
+        labelKey: "attendance",
         href: "/list/attendance",
         visible: ["admin", "teacher"],
       },
       {
         icon: Calendar,
-        label: "Events",
+        labelKey: "events",
         href: "/list/events",
         shouldPrefetch: true,
         visible: ["admin", "teacher", "student", "parent"],
       },
       {
         icon: MessageCircle,
-        label: "Messages",
+        labelKey: "messages",
         href: "/list/messages",
         visible: ["admin", "teacher", "student", "parent"],
       },
       {
         icon: Megaphone,
-        label: "Announcements",
+        labelKey: "announcements",
         href: "/list/announcements",
         shouldPrefetch: true,
         visible: ["admin", "teacher", "student", "parent"],
       },
+      {
+        icon: Bell,
+        labelKey: "notifications",
+        href: "/list/notifications",
+        shouldPrefetch: true,
+        visible: ["admin", "teacher", "student", "parent"],
+      },
+      {
+        icon: Archive,
+        labelKey: "archive",
+        href: "/archive",
+        visible: ["admin"],
+      },
+      {
+        icon: MessageSquare,
+        labelKey: "feedback",
+        href: "/feedback",
+        visible: ["student", "parent"],
+      },
+      {
+        icon: MessageSquare,
+        labelKey: "feedbacks",
+        href: "/admin/feedbacks",
+        visible: ["admin"],
+      },
     ],
   },
   {
-    title: "OTHER",
+    titleKey: "other",
     items: [
       {
         icon: User,
-        label: "Profile",
+        labelKey: "profile",
         href: "/profile",
         visible: ["admin", "teacher", "student", "parent"],
       },
       {
         icon: Settings,
-        label: "Settings",
+        labelKey: "settings",
         href: "/settings",
         visible: ["admin"],
       },
       {
         icon: LogOut,
-        label: "Logout",
+        labelKey: "logout",
         href: "/sign-in",
-        visible: ["admin", "teacher", "student", "parent"],
+        visible: ["admin", "teacher", "student", "parent", "superAdmin"],
       },
     ],
   },
@@ -167,7 +218,17 @@ type AuthUser = {
   schoolId: number;
 } | null;
 
-const Menu = ({ authUser }: { authUser: AuthUser }) => {
+const Menu = ({
+  authUser,
+  collapsed = false,
+  onNavigate,
+}: {
+  authUser: AuthUser;
+  collapsed?: boolean;
+  onNavigate?: () => void;
+}) => {
+  const t = useTranslations("sidebar");
+  const actionsT = useTranslations("actions");
   const { signOut } = useClerk();
   const { user, isLoaded } = useUser();
   const pathname = usePathname();
@@ -242,30 +303,43 @@ const Menu = ({ authUser }: { authUser: AuthUser }) => {
   return (
     <div className="mt-4 text-sm">
       {resolvedMenuItems.map((section) => (
-        <div key={section.title} className="flex flex-col gap-2">
-          <span className="hidden lg:block my-4 font-light text-gray-400">
-            {section.title}
+        <div key={section.titleKey} className="flex flex-col gap-2">
+          <span
+            className={`block my-4 font-light text-gray-400 ${
+              collapsed ? "lg:hidden" : ""
+            }`}
+          >
+            {t(`sections.${section.titleKey}`)}
           </span>
 
           {section.items.map((item) => {
             if (!item.visible.includes(role)) return null;
 
-            if (item.label === "Logout") {
+            const label = t(`items.${item.labelKey}`);
+
+            if (item.labelKey === "logout") {
               return (
                 <button
-                  key={item.label}
+                  key={item.labelKey}
                   type="button"
                   onClick={handleSignOut}
                   disabled={isSigningOut}
-                  className="group relative flex justify-center lg:justify-start items-center gap-4 hover:bg-academixSkyLight disabled:opacity-70 md:px-2 py-2 rounded-md w-full text-gray-500 text-left transition-colors duration-200"
+                  title={collapsed ? label : undefined}
+                  className={`group relative flex justify-start ${
+                    collapsed ? "lg:justify-center" : "lg:justify-start"
+                  } items-center gap-4 hover:bg-academixPurple/35 disabled:opacity-70 md:px-2 py-2 rounded-md w-full text-gray-500 text-start transition-all duration-200 hover:translate-x-0.5 rtl:hover:-translate-x-0.5 active:scale-[0.98]`}
                 >
                   <item.icon
                     size={20}
-                    className="w-5 h-5 text-gray-500 group-hover:text-academixPurpleDark transition-colors"
+                    className="w-5 h-5 text-gray-500 group-hover:text-academixPurpleDark group-hover:scale-105 transition-all duration-200"
                   />
 
-                  <span className="hidden lg:block text-gray-500 group-hover:text-academixPurpleDark transition-colors">
-                    {isSigningOut ? "Signing out..." : item.label}
+                  <span
+                    className={`block text-gray-500 group-hover:text-academixPurpleDark transition-colors duration-200 ${
+                      collapsed ? "lg:hidden" : ""
+                    }`}
+                  >
+                    {isSigningOut ? actionsT("signingOut") : label}
                   </span>
                 </button>
               );
@@ -277,39 +351,42 @@ const Menu = ({ authUser }: { authUser: AuthUser }) => {
                 : pathname.startsWith(item.href);
 
             return (
-              <Link
+              <NavigationLink
                 href={item.href}
-                key={item.label}
+                key={item.labelKey}
                 prefetch={item.shouldPrefetch ?? true}
+                onClick={onNavigate}
+                title={collapsed ? label : undefined}
                 className={`
-                  relative group flex items-center justify-center lg:justify-start gap-4 py-2 md:px-2 rounded-md
-                  transition-colors duration-200
+                  relative group flex items-center justify-start ${collapsed ? "lg:justify-center" : "lg:justify-start"} gap-4 py-2 px-2 rounded-md
+                  transition-all duration-200 active:scale-[0.98]
                   ${
                     isActive
-                      ? "bg-academixPurpleLight"
-                      : "text-gray-500 hover:bg-academixSkyLight"
+                      ? "bg-academixPurple/45 ring-1 ring-academixPurple/70"
+                      : "text-gray-500 hover:bg-academixPurple/35 hover:translate-x-0.5 rtl:hover:-translate-x-0.5"
                   }
                 `}
               >
                 {isActive && (
-                  <span className="top-0 left-0 absolute bg-academixPurpleDark rounded-r w-1 h-full" />
+                  <span className="hidden lg:block top-1 bottom-1 absolute bg-academixPurpleDark rounded-e w-1 start-0" />
                 )}
 
                 <item.icon
                   size={20}
                   className={`
-                    w-5 h-5 transition-colors
+                    w-5 h-5 transition-all duration-200
                     ${
                       isActive
                         ? "text-academixPurpleDark"
-                        : "text-gray-500 group-hover:text-academixPurpleDark"
+                        : "text-gray-500 group-hover:text-academixPurpleDark group-hover:scale-105"
                     }
                   `}
                 />
 
                 <span
                   className={`
-                    hidden lg:block transition-colors
+                    block transition-colors duration-200
+                    ${collapsed ? "lg:hidden" : ""}
                     ${
                       isActive
                         ? "text-academixPurpleDark font-medium"
@@ -317,9 +394,9 @@ const Menu = ({ authUser }: { authUser: AuthUser }) => {
                     }
                   `}
                 >
-                  {item.label}
+                  {label}
                 </span>
-              </Link>
+              </NavigationLink>
             );
           })}
         </div>
diff --git a/src/components/MessageViewModal.tsx b/src/components/MessageViewModal.tsx
index a7f57d7..668f330 100644
--- a/src/components/MessageViewModal.tsx
+++ b/src/components/MessageViewModal.tsx
@@ -2,12 +2,13 @@
 
 import { useState } from "react";
 import { Eye, X } from "lucide-react";
+import { useLocale, useTranslations } from "next-intl";
 
-const formatDate = (value: Date) =>
-  new Intl.DateTimeFormat("en-US").format(value);
+const formatDate = (value: Date, locale: string) =>
+  new Intl.DateTimeFormat(locale).format(value);
 
-const formatTime = (value: Date) =>
-  value.toLocaleTimeString("en-US", {
+const formatTime = (value: Date, locale: string) =>
+  value.toLocaleTimeString(locale, {
     hour: "2-digit",
     minute: "2-digit",
     hour12: false,
@@ -22,15 +23,17 @@ type MessageViewModalProps = {
 };
 
 const MessageViewModal = ({ message }: MessageViewModalProps) => {
+  const t = useTranslations("messageView");
+  const locale = useLocale();
   const [open, setOpen] = useState(false);
 
   return (
     <>
       <button
         type="button"
-        className="flex justify-center items-center bg-academixSky rounded-full w-7 h-7"
+        className="flex justify-center items-center bg-academixPurpleDark p-2 rounded-md text-white hover:scale-[1.05] transition"
         onClick={() => setOpen(true)}
-        aria-label="View message"
+        aria-label={t("view")}
       >
         <Eye className="w-4 h-4" />
       </button>
@@ -40,9 +43,9 @@ const MessageViewModal = ({ message }: MessageViewModalProps) => {
           <div className="relative bg-white shadow-lg p-5 rounded-md w-full max-w-lg">
             <button
               type="button"
-              className="top-4 right-4 absolute text-gray-500 hover:text-gray-800"
+              className="top-4 end-4 absolute text-gray-500 hover:text-gray-800"
               onClick={() => setOpen(false)}
-              aria-label="Close message view"
+              aria-label={t("close")}
             >
               <X className="w-4 h-4" />
             </button>
@@ -50,7 +53,7 @@ const MessageViewModal = ({ message }: MessageViewModalProps) => {
             <div className="flex flex-col gap-5">
               <div>
                 <p className="text-gray-500 text-xs uppercase tracking-wide">
-                  Title
+                  {t("title")}
                 </p>
                 <h2 className="mt-1 font-semibold text-gray-900 text-xl">
                   {message.title}
@@ -59,7 +62,7 @@ const MessageViewModal = ({ message }: MessageViewModalProps) => {
 
               <div>
                 <p className="text-gray-500 text-xs uppercase tracking-wide">
-                  Body
+                  {t("body")}
                 </p>
                 <p className="mt-1 text-gray-700 text-sm leading-6 whitespace-pre-wrap">
                   {message.description}
@@ -69,18 +72,18 @@ const MessageViewModal = ({ message }: MessageViewModalProps) => {
               <div className="gap-4 grid grid-cols-2">
                 <div>
                   <p className="text-gray-500 text-xs uppercase tracking-wide">
-                    Date
+                    {t("date")}
                   </p>
                   <p className="mt-1 text-gray-900 text-sm">
-                    {formatDate(message.date)}
+                    {formatDate(message.date, locale)}
                   </p>
                 </div>
                 <div>
                   <p className="text-gray-500 text-xs uppercase tracking-wide">
-                    Time
+                    {t("time")}
                   </p>
                   <p className="mt-1 text-gray-900 text-sm">
-                    {formatTime(message.date)}
+                    {formatTime(message.date, locale)}
                   </p>
                 </div>
               </div>
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 9de335e..2c59a22 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -1,25 +1,73 @@
 "use client";
 
-import { Search, MessageCircle, Bell } from "lucide-react";
+import {
+  Menu,
+  MessageCircle,
+  PanelLeftClose,
+  PanelLeftOpen,
+  PanelRightClose,
+  PanelRightOpen,
+} from "lucide-react";
+import NotificationBell from "./NotificationBell";
 import { useUser } from "@clerk/nextjs";
+import { useEffect, useState } from "react";
 import UserAvatarMenu from "./UserAvatarMenu";
 import { AuthUser } from "@/lib/auth";
+import Link from "next/link";
+import LanguageSwitcher from "./LanguageSwitcher";
+import { useLocale, useTranslations } from "next-intl";
 
 type NavbarProps = {
   authUser: AuthUser | null;
   schoolName: string | null;
+  isMenuCollapsed?: boolean;
+  onMenuClick?: () => void;
+  onMenuCollapseToggle?: () => void;
 };
 
-const Navbar = ({ authUser, schoolName }: NavbarProps) => {
+const Navbar = ({
+  authUser,
+  schoolName,
+  isMenuCollapsed = false,
+  onMenuClick,
+  onMenuCollapseToggle,
+}: NavbarProps) => {
+  const locale = useLocale();
+  const t = useTranslations("navbar");
+  const roleT = useTranslations("roles");
   const { user, isLoaded } = useUser();
-
-  const fallbackName = "User";
+  const [messageCount, setMessageCount] = useState<number>(0);
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    const fetchMessageCount = async () => {
+      try {
+        const response = await fetch("/api/messages/count");
+        if (response.ok) {
+          const data = await response.json();
+          setMessageCount(data.count);
+        }
+      } catch (error) {
+        console.error("Failed to fetch message count:", error);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    if (authUser) {
+      fetchMessageCount();
+    }
+  }, [authUser]);
+
+  const fallbackName = t("userFallback");
   const fallbackRole = authUser?.role ?? null;
 
   const fullName =
     (isLoaded && user?.fullName) ||
     (isLoaded && [user?.firstName, user?.lastName].filter(Boolean).join(" ")) ||
+    authUser?.displayName ||
     fallbackName;
+  const imageUrl = authUser?.profileImageUrl || (isLoaded ? user?.imageUrl : undefined);
 
   const role =
     (isLoaded &&
@@ -27,9 +75,11 @@ const Navbar = ({ authUser, schoolName }: NavbarProps) => {
         null)) ||
     fallbackRole;
 
-  const formattedRole = role
-    ? role.charAt(0).toUpperCase() + role.slice(1)
-    : "";
+  const formattedRole = role ? roleT(role) : "";
+  const normalizedRole = role?.toLowerCase().replace(/[\s_]/g, "");
+  const canViewMessages =
+    normalizedRole !== "admin" && normalizedRole !== "superadmin";
+  const isRtl = locale === "ar";
 
   const initials =
     fullName
@@ -40,51 +90,75 @@ const Navbar = ({ authUser, schoolName }: NavbarProps) => {
       .join("") || "U";
 
   return (
-    <div className="flex justify-between items-center p-4">
+    <div className="flex items-center justify-between gap-2 p-3 sm:gap-4 sm:p-4">
       {/* SEARCH */}
-      <div className="flex items-center gap-4 text-xs">
-        {schoolName && (
-          <span className="ml-2 font-bold text-academixPurpleDark text-lg whitespace-nowrap">
-            {schoolName}
-          </span>
-        )}
-
-        <div className="hidden md:flex items-center gap-4 px-3 py-1 rounded-full ring-[1.5px] ring-gray-300 text-xs">
-          <Search className="w-4 h-4 text-gray-500" />
-
-          <input
-            type="text"
-            placeholder="Search..."
-            className="bg-transparent outline-none w-[140px]"
-          />
-        </div>
-      </div>
-
-      {/* RIGHT */}
-      <div className="flex justify-end items-center gap-6 w-full">
-        <div className="flex items-center gap-2">
+      <div className="flex min-w-0 flex-1 items-center gap-2 sm:gap-3">
+        {onMenuClick && (
           <button
-            aria-label="Messages"
-            className="flex justify-center items-center bg-white rounded-full w-7 h-7"
+            type="button"
+            aria-label={t("openMenu")}
+            onClick={onMenuClick}
+            className="lg:hidden flex flex-shrink-0 justify-center items-center bg-academixPurpleDark hover:bg-academixPurpleDark/80 shadow-sm border border-academixPurple/25 rounded-md w-10 h-10 text-white transition"
           >
-            <MessageCircle className="w-5 h-5 text-gray-600" />
+            <Menu className="w-5 h-5" />
           </button>
-
+        )}
+        {onMenuCollapseToggle && (
           <button
-            aria-label="Notifications"
-            className="relative flex justify-center items-center bg-white rounded-full w-7 h-7"
+            type="button"
+            aria-label={isMenuCollapsed ? t("expandMenu") : t("collapseMenu")}
+            onClick={onMenuCollapseToggle}
+            className="hidden lg:flex flex-shrink-0 justify-center items-center bg-academixPurpleDark hover:bg-academixPurpleDark/70 shadow-sm border border-academixPurple/25 rounded-md w-10 h-10 text-white transition"
           >
-            <Bell className="w-5 h-5 text-gray-600" />
-            <div className="-top-3 -right-3 absolute flex justify-center items-center bg-academixPurpleDark rounded-full w-5 h-5 text-white text-xs">
-              1
-            </div>
+            {isRtl ? (
+              isMenuCollapsed ? (
+                <PanelRightOpen className="w-5 h-5" />
+              ) : (
+                <PanelRightClose className="w-5 h-5" />
+              )
+            ) : isMenuCollapsed ? (
+              <PanelLeftOpen className="w-5 h-5" />
+            ) : (
+              <PanelLeftClose className="w-5 h-5" />
+            )}
           </button>
+        )}
+        {schoolName && authUser?.role !== "superAdmin" && (
+          <div className="ms-0 flex min-w-0 items-center gap-3 rounded-md bg-gradient-to-r from-academixYellow via-academixYellow/50 to-academixYellow/30 px-3 py-2 text-xs sm:ms-2 sm:px-4 sm:py-3">
+            <span className="min-w-0 truncate text-[13px] font-bold uppercase text-academixPurpleDeep sm:text-[16px]">
+              {schoolName}
+            </span>
+          </div>
+        )}
+      </div>
+
+      {/* RIGHT */}
+      <div className="flex flex-shrink-0 items-center justify-end gap-2 sm:gap-4 lg:gap-6">
+        <div className="flex items-center gap-2 sm:gap-3">
+          <LanguageSwitcher />
+
+          {canViewMessages && (
+            <Link
+              href="/list/messages"
+              aria-label={t("messages")}
+              className="relative w-7 h-7"
+            >
+              <MessageCircle className="w-5 h-5 hover:font-bold text-gray-600 hover:scale-[1.05] transition" />
+              {messageCount > 0 && (
+                <div className="-top-2.5 absolute flex justify-center items-center bg-academixPurpleDark rounded-full w-5 h-5 text-white text-xs -end-1.5">
+                  {messageCount > 99 ? "99+" : messageCount}
+                </div>
+              )}
+            </Link>
+          )}
+
+          {authUser?.role !== "superAdmin" && <NotificationBell />}
         </div>
 
         {/* USER INFO */}
-        <div className="flex flex-col">
+        <div className="hidden sm:flex flex-col">
           <span className="font-medium text-xs leading-3">{fullName}</span>
-          <span className="text-[10px] text-gray-500 text-right">
+          <span className="text-[10px] text-gray-500 text-end">
             {formattedRole}
           </span>
         </div>
@@ -93,7 +167,7 @@ const Navbar = ({ authUser, schoolName }: NavbarProps) => {
           fullName={fullName}
           role={formattedRole}
           initials={initials}
-          imageUrl={isLoaded ? user?.imageUrl : undefined}
+          imageUrl={imageUrl}
         />
       </div>
     </div>
diff --git a/src/components/NavigationLink.tsx b/src/components/NavigationLink.tsx
new file mode 100644
index 0000000..2c35405
--- /dev/null
+++ b/src/components/NavigationLink.tsx
@@ -0,0 +1,25 @@
+"use client";
+
+import Link, { LinkProps } from "next/link";
+import { AnchorHTMLAttributes, ReactNode } from "react";
+
+type NavigationLinkProps = LinkProps &
+  Omit<AnchorHTMLAttributes<HTMLAnchorElement>, keyof LinkProps> & {
+  children: ReactNode;
+  className?: string;
+  prefetch?: boolean;
+};
+
+export function NavigationLink({
+  href,
+  children,
+  className,
+  prefetch = true,
+  ...props
+}: NavigationLinkProps) {
+  return (
+    <Link href={href} className={className} prefetch={prefetch} {...props}>
+      {children}
+    </Link>
+  );
+}
diff --git a/src/components/NoCurrentAcademicYearMessage.tsx b/src/components/NoCurrentAcademicYearMessage.tsx
index 6436ad6..fd85516 100644
--- a/src/components/NoCurrentAcademicYearMessage.tsx
+++ b/src/components/NoCurrentAcademicYearMessage.tsx
@@ -1,6 +1,7 @@
-import Link from "next/link";
 import { getAuthUser } from "@/lib/auth";
 import { UserRole } from "@/lib/utils";
+import EmptyState from "@/components/states/EmptyState";
+import { getTranslations } from "next-intl/server";
 
 type Props = {
   compact?: boolean;
@@ -11,6 +12,7 @@ const NoCurrentAcademicYearMessage = async ({
   compact = false,
   role,
 }: Props) => {
+  const t = await getTranslations("states");
   const resolvedRole = role ?? (await getAuthUser())?.role ?? null;
   const isAdmin = resolvedRole === "admin";
 
@@ -18,17 +20,24 @@ const NoCurrentAcademicYearMessage = async ({
     if (!isAdmin) {
       return (
         <div className="bg-white p-4 rounded-md text-sm">
-          <p className="text-gray-600">No data yet.</p>
+          <EmptyState
+            title={t("noDataYet")}
+            description={t("academicYearNotStarted")}
+            className="py-2"
+          />
         </div>
       );
     }
 
     return (
       <div className="bg-white p-4 rounded-md text-sm">
-        <p className="text-gray-600">No current year selected.</p>
-        <Link href="/settings" className="text-blue-600 hover:underline">
-          Go to settings
-        </Link>
+        <EmptyState
+          title={t("noCurrentYear")}
+          description={t("selectCurrentYear")}
+          actionLabel={t("goToSettings")}
+          actionHref="/settings"
+          className="py-2"
+        />
       </div>
     );
   }
@@ -36,26 +45,22 @@ const NoCurrentAcademicYearMessage = async ({
   if (!isAdmin) {
     return (
       <div className="flex-1 bg-white m-4 mt-0 p-6 rounded-md">
-        <h1 className="font-semibold text-lg">No data yet</h1>
-        <p className="mt-2 text-gray-500 text-sm">
-          Academic year did not begin yet.
-        </p>
+      <EmptyState
+          title={t("noDataYet")}
+          description={t("academicYearNotStarted")}
+        />
       </div>
     );
   }
 
   return (
     <div className="flex-1 bg-white m-4 mt-0 p-6 rounded-md">
-      <h1 className="font-semibold text-lg">No current year selected</h1>
-      <p className="mt-2 text-gray-500 text-sm">
-        Select a current academic year to view data.
-      </p>
-      <Link
-        href="/settings"
-        className="inline-block bg-blue-500 mt-4 px-4 py-2 rounded-md text-white text-sm"
-      >
-        Go to settings
-      </Link>
+      <EmptyState
+        title={t("noCurrentYear")}
+        description={t("selectCurrentYear")}
+        actionLabel={t("goToSettings")}
+        actionHref="/settings"
+      />
     </div>
   );
 };
diff --git a/src/components/NotificationBell.tsx b/src/components/NotificationBell.tsx
new file mode 100644
index 0000000..260c5b2
--- /dev/null
+++ b/src/components/NotificationBell.tsx
@@ -0,0 +1,257 @@
+"use client";
+
+import { useEffect, useRef, useState, useCallback } from "react";
+import { Bell, X, CheckCheck, ClipboardList, MessageSquare, Megaphone, BookOpen, Mail, BarChart3, Calendar, Users } from "lucide-react";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+
+type NotificationType =
+  | "NEW_ASSIGNMENT"
+  | "ASSIGNMENT_UPDATED"
+  | "ASSIGNMENT_SUBMITTED"
+  | "ASSIGNMENT_FEEDBACK"
+  | "NEW_EXAM"
+  | "GRADE_POSTED"
+  | "GRADE_UPDATED"
+  | "NEW_ANNOUNCEMENT"
+  | "NEW_EVENT"
+  | "SCHEDULE_UPDATED"
+  | "ATTENDANCE_SAVED"
+  | "SUPERVISOR_ASSIGNED"
+  | "NEW_MESSAGE";
+
+type Notification = {
+  id: number;
+  type: NotificationType;
+  title: string;
+  body: string;
+  link: string | null;
+  isRead: boolean;
+  createdAt: string;
+};
+
+const TYPE_ICON: Record<NotificationType, { icon: React.ElementType; color: string; bg: string }> = {
+  NEW_ASSIGNMENT:       { icon: ClipboardList, color: "text-orange-600", bg: "bg-orange-100" },
+  ASSIGNMENT_UPDATED:   { icon: ClipboardList, color: "text-amber-600",  bg: "bg-amber-100"  },
+  ASSIGNMENT_SUBMITTED: { icon: ClipboardList, color: "text-green-600",  bg: "bg-green-100"  },
+  ASSIGNMENT_FEEDBACK:  { icon: MessageSquare, color: "text-indigo-600", bg: "bg-indigo-100" },
+  NEW_EXAM:             { icon: BookOpen,      color: "text-red-600",    bg: "bg-red-100"    },
+  GRADE_POSTED:         { icon: BarChart3,     color: "text-green-600",  bg: "bg-green-100"  },
+  GRADE_UPDATED:        { icon: BarChart3,     color: "text-amber-600",  bg: "bg-amber-100"  },
+  NEW_ANNOUNCEMENT:     { icon: Megaphone,     color: "text-purple-600", bg: "bg-purple-100" },
+  NEW_EVENT:            { icon: Calendar,      color: "text-blue-600",   bg: "bg-blue-100"   },
+  SCHEDULE_UPDATED:     { icon: Calendar,      color: "text-teal-600",   bg: "bg-teal-100"   },
+  ATTENDANCE_SAVED:     { icon: CheckCheck,    color: "text-gray-600",   bg: "bg-gray-100"   },
+  SUPERVISOR_ASSIGNED:  { icon: Users,         color: "text-violet-600", bg: "bg-violet-100" },
+  NEW_MESSAGE:          { icon: Mail,          color: "text-blue-600",   bg: "bg-blue-100"   },
+};
+
+function timeAgo(dateStr: string): string {
+  const diff = Date.now() - new Date(dateStr).getTime();
+  const mins  = Math.floor(diff / 60000);
+  const hours = Math.floor(diff / 3600000);
+  const days  = Math.floor(diff / 86400000);
+  if (days  >= 1) return `${days}d ago`;
+  if (hours >= 1) return `${hours}h ago`;
+  if (mins  >= 1) return `${mins}m ago`;
+  return "Just now";
+}
+
+export default function NotificationBell() {
+  const t = useTranslations("navbar.notifications");
+  const [open, setOpen]               = useState(false);
+  const [notifications, setNotifs]    = useState<Notification[]>([]);
+  const [unreadCount, setUnreadCount] = useState(0);
+  const [loading, setLoading]         = useState(false);
+  const dropdownRef = useRef<HTMLDivElement>(null);
+  const router = useRouter();
+
+  // ─── Fetch ──────────────────────────────────────────────────────────────────
+  const fetchNotifs = useCallback(async () => {
+    setLoading(true);
+    try {
+      const res  = await fetch("/api/notifications");
+      const data = await res.json();
+      setNotifs(data.notifications ?? []);
+      setUnreadCount(data.unreadCount ?? 0);
+    } catch {}
+    finally { setLoading(false); }
+  }, []);
+
+  useEffect(() => {
+    const initialFetch = setTimeout(fetchNotifs, 0);
+    // polling كل 30 ثانية
+    const interval = setInterval(fetchNotifs, 30000);
+    return () => {
+      clearTimeout(initialFetch);
+      clearInterval(interval);
+    };
+  }, [fetchNotifs]);
+
+  // ─── Close on outside click ──────────────────────────────────────────────────
+  useEffect(() => {
+    function handleClick(e: MouseEvent) {
+      if (dropdownRef.current && !dropdownRef.current.contains(e.target as Node)) {
+        setOpen(false);
+      }
+    }
+    if (open) document.addEventListener("mousedown", handleClick);
+    return () => document.removeEventListener("mousedown", handleClick);
+  }, [open]);
+
+  // ─── Mark single as read ─────────────────────────────────────────────────────
+  async function markRead(id: number) {
+    setNotifs((prev) => prev.map((n) => n.id === id ? { ...n, isRead: true } : n));
+    setUnreadCount((c) => Math.max(0, c - 1));
+    await fetch("/api/notifications", {
+      method: "PATCH",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ id }),
+    });
+  }
+
+  // ─── Mark all as read ────────────────────────────────────────────────────────
+  async function markAllRead() {
+    setNotifs((prev) => prev.map((n) => ({ ...n, isRead: true })));
+    setUnreadCount(0);
+    await fetch("/api/notifications", {
+      method: "PATCH",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ markAllRead: true }),
+    });
+  }
+
+  return (
+    <div className="relative" ref={dropdownRef}>
+      {/* ─── Bell Button ─── */}
+      <button
+        type="button"
+        onClick={() => setOpen((o) => !o)}
+        className="relative w-7 h-7 flex items-center justify-center"
+        aria-label={t("label")}
+      >
+        <Bell className="w-5 h-5 text-gray-600 hover:scale-[1.05] transition" />
+        {unreadCount > 0 && (
+          <span className="absolute -top-2.5 -end-1.5 flex items-center justify-center
+                           bg-academixPurpleDark text-white rounded-full w-5 h-5 text-xs font-medium">
+            {unreadCount > 99 ? "99+" : unreadCount}
+          </span>
+        )}
+      </button>
+
+      {/* ─── Dropdown ─── */}
+      {open && (
+        <div className="fixed inset-x-2 top-16 z-50 overflow-hidden rounded-2xl border border-gray-100 bg-white shadow-xl sm:absolute sm:inset-x-auto sm:end-0 sm:top-10 sm:w-80">
+          {/* Header */}
+          <div className="flex items-start justify-between gap-3 border-b border-gray-100 px-3 py-3 sm:items-center sm:px-4">
+            <div className="flex min-w-0 flex-wrap items-center gap-2">
+              <Bell className="h-4 w-4 flex-shrink-0 text-gray-600" />
+              <Link
+                href="/list/notifications"
+                onClick={() => setOpen(false)}
+                className="truncate text-sm font-semibold text-gray-800 transition-colors hover:text-purple-600"
+              >
+                {t("label")}
+              </Link>
+              {unreadCount > 0 && (
+                <span className="rounded-full bg-purple-100 px-1.5 py-0.5 text-xs font-medium text-purple-700">
+                  {t("newCount", { count: unreadCount })}
+                </span>
+              )}
+            </div>
+            <div className="flex flex-shrink-0 items-center gap-1 sm:gap-2">
+              {unreadCount > 0 && (
+                <button
+                  type="button"
+                  onClick={markAllRead}
+                  className="flex items-center gap-1 text-xs text-gray-500 transition-colors hover:text-purple-600"
+                  title={t("markAllRead")}
+                >
+                  <CheckCheck className="w-3.5 h-3.5" />
+                  <span className="hidden min-[380px]:inline">{t("allRead")}</span>
+                </button>
+              )}
+              <button
+                type="button"
+                onClick={() => setOpen(false)}
+                className="p-1 rounded-lg hover:bg-gray-100 text-gray-400"
+              >
+                <X className="w-3.5 h-3.5" />
+              </button>
+            </div>
+          </div>
+
+          {/* List */}
+          <div className="max-h-[min(24rem,calc(100vh-11rem))] overflow-y-auto">
+            {loading ? (
+              <div className="flex items-center justify-center py-10">
+                <div className="w-5 h-5 border-2 border-purple-500 border-t-transparent rounded-full animate-spin" />
+              </div>
+            ) : notifications.length === 0 ? (
+              <div className="text-center py-10">
+                <Bell className="w-8 h-8 text-gray-200 mx-auto mb-2" />
+                <p className="text-sm text-gray-400">{t("empty")}</p>
+              </div>
+            ) : (
+              <ul className="divide-y divide-gray-50">
+                {notifications.map((n) => {
+                  const { icon: Icon, color, bg } = TYPE_ICON[n.type] ?? TYPE_ICON.NEW_MESSAGE;
+                  const content = (
+                    <div
+                      className={`flex cursor-pointer items-start gap-2 px-3 py-3 transition-colors sm:gap-3 sm:px-4
+                                  ${n.isRead ? "bg-white hover:bg-gray-50" : "bg-purple-50 hover:bg-purple-100"}`}
+                      onClick={() => !n.isRead && markRead(n.id)}
+                    >
+                      <div className={`flex-shrink-0 p-2 rounded-xl ${bg}`}>
+                        <Icon className={`w-4 h-4 ${color}`} />
+                      </div>
+                      <div className="flex-1 min-w-0">
+                        <p className={`text-sm font-medium ${n.isRead ? "text-gray-700" : "text-gray-900"}`}>
+                          {n.title}
+                        </p>
+                        <p className="text-xs text-gray-500 mt-0.5 line-clamp-2">{n.body}</p>
+                        <p className="text-[10px] text-gray-400 mt-1">{timeAgo(n.createdAt)}</p>
+                      </div>
+                      {!n.isRead && (
+                        <div className="flex-shrink-0 w-2 h-2 rounded-full bg-purple-500 mt-1.5" />
+                      )}
+                    </div>
+                  );
+
+                  return (
+                    <li key={n.id}>
+                      {n.link ? (
+                        <Link href={n.link} onClick={() => { markRead(n.id); setOpen(false); }}>
+                          {content}
+                        </Link>
+                      ) : content}
+                    </li>
+                  );
+                })}
+              </ul>
+            )}
+          </div>
+
+          {/* Footer */}
+          <div className="px-4 py-2.5 border-t border-gray-100 flex items-center justify-between">
+            <Link
+              href="/list/notifications"
+              onClick={() => setOpen(false)}
+              className="text-xs font-medium text-purple-600 hover:text-purple-800 transition-colors"
+            >
+              {t("viewAll")}
+            </Link>
+            <button
+              type="button"
+              onClick={() => setOpen(false)}
+              className="text-xs text-gray-400 hover:text-gray-600 transition-colors"
+            >
+              {t("close")}
+            </button>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/Pagination.tsx b/src/components/Pagination.tsx
index ffe780d..91f8168 100644
--- a/src/components/Pagination.tsx
+++ b/src/components/Pagination.tsx
@@ -1,10 +1,20 @@
 "use client";
 
 import { ITEM_PER_PAGE } from "@/lib/settings";
+import { ArrowLeftIcon, ArrowRightIcon } from "lucide-react";
+import { useLocale } from "next-intl";
 import { useRouter } from "next/navigation";
 
 const Pagination = ({ page, count }: { page: number; count: number }) => {
+  const locale = useLocale();
   const router = useRouter();
+  const isRtl = locale === "ar";
+  const PrevIcon = isRtl ? ArrowRightIcon : ArrowLeftIcon;
+  const NextIcon = isRtl ? ArrowLeftIcon : ArrowRightIcon;
+
+  if (count === 0) {
+    return null;
+  }
 
   const hasPrev = ITEM_PER_PAGE * (page - 1) > 0;
   const hasNext = ITEM_PER_PAGE * (page - 1) + ITEM_PER_PAGE < count;
@@ -16,13 +26,13 @@ const Pagination = ({ page, count }: { page: number; count: number }) => {
   };
 
   return (
-    <div className="flex justify-between items-center p-4 text-gray-500">
+    <div className="flex justify-end items-center gap-2 ms-auto p-4 text-gray-500">
       <button
-        className="bg-slate-200 disabled:opacity-50 px-4 py-2 rounded-md font-semibold text-xs disabled:cursor-not-allowed"
+        className="bg-academixPurple disabled:opacity-50 p-1.5 rounded-md font-semibold text-academixPurpleDark text-xs disabled:cursor-not-allowed"
         onClick={() => changePage(page - 1)}
         disabled={!hasPrev}
       >
-        Prev
+        <PrevIcon className="w-5 h-5" />
       </button>
       <div className="flex items-center gap-2 text-sm">
         {Array.from({ length: Math.ceil(count / ITEM_PER_PAGE) }, (_, i) => {
@@ -30,10 +40,10 @@ const Pagination = ({ page, count }: { page: number; count: number }) => {
           return (
             <button
               key={pageIndex}
-              className={`px-3 py-1 rounded-md ${
+              className={`py-1.5 px-4 rounded-md ${
                 page === pageIndex
-                  ? "bg-academixSky"
-                  : "bg-slate-200 hover:bg-slate-300"
+                  ? "bg-academixPurpleDark text-white"
+                  : "bg-academixPurple hover:bg-academixPurpleDark text-academixPurpleDark hover:text-academixPurple"
               }`}
               onClick={() => changePage(pageIndex)}
             >
@@ -43,11 +53,11 @@ const Pagination = ({ page, count }: { page: number; count: number }) => {
         })}
       </div>
       <button
-        className="bg-slate-200 disabled:opacity-50 px-4 py-2 rounded-md font-semibold text-xs disabled:cursor-not-allowed"
+        className="bg-academixPurple disabled:opacity-50 p-1.5 rounded-md font-semibold text-academixPurpleDark text-xs disabled:cursor-not-allowed"
         onClick={() => changePage(page + 1)}
         disabled={!hasNext}
       >
-        Next
+        <NextIcon className="w-5 h-5" />
       </button>
     </div>
   );
diff --git a/src/components/Performance.tsx b/src/components/Performance.tsx
deleted file mode 100644
index 38a214f..0000000
--- a/src/components/Performance.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-"use client";
-import { MoreHorizontal } from "lucide-react";
-import Image from "next/image";
-import { PieChart, Pie, Sector, Cell, ResponsiveContainer } from "recharts";
-
-const data = [
-  { name: "Group A", value: 92, fill: "#C3EBFA" },
-  { name: "Group B", value: 8, fill: "#FAE27C" },
-];
-
-const Performance = () => {
-  return (
-    <div className="relative bg-white p-4 rounded-md h-80">
-      <div className="flex justify-between items-center">
-        <h1 className="font-semibold text-xl">Performance</h1>
-        <MoreHorizontal className="w-5 h-5 text-gray-500" />
-      </div>
-      <ResponsiveContainer width="100%" height="100%">
-        <PieChart>
-          <Pie
-            dataKey="value"
-            startAngle={180}
-            endAngle={0}
-            data={data}
-            cx="50%"
-            cy="50%"
-            innerRadius={70}
-            fill="#8884d8"
-          />
-        </PieChart>
-      </ResponsiveContainer>
-      <div className="top-1/2 left-1/2 absolute text-center -translate-x-1/2 -translate-y-1/2 transform">
-        <h1 className="font-bold text-3xl">9.2</h1>
-        <p className="text-gray-300 text-xs">of 10 max LTS</p>
-      </div>
-      <h2 className="right-0 bottom-16 left-0 absolute m-auto font-medium text-center">
-        1st Semester - 2nd Semester
-      </h2>
-    </div>
-  );
-};
-
-export default Performance;
diff --git a/src/components/PromoteStudentsButton.tsx b/src/components/PromoteStudentsButton.tsx
index 1a8a8f9..ac0f5cc 100644
--- a/src/components/PromoteStudentsButton.tsx
+++ b/src/components/PromoteStudentsButton.tsx
@@ -4,6 +4,7 @@ import { promoteStudentsByPerformance } from "@/lib/actions";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { X } from "lucide-react";
+import { useLocale, useTranslations } from "next-intl";
 
 type PromoteStudentsButtonProps = {
   academicYearName: string;
@@ -18,8 +19,8 @@ type PromotionOutcome = {
   repeatedCount?: number;
 };
 
-const formatDate = (value: string) =>
-  new Intl.DateTimeFormat("en-US", { dateStyle: "medium" }).format(
+const formatDate = (value: string, locale: string) =>
+  new Intl.DateTimeFormat(locale, { dateStyle: "medium" }).format(
     new Date(`${value}T00:00:00`),
   );
 
@@ -38,6 +39,9 @@ const PromoteStudentsButton = ({
   academicYearName,
   academicYearEndDate,
 }: PromoteStudentsButtonProps) => {
+  const t = useTranslations("promotion");
+  const actionsT = useTranslations("actions");
+  const locale = useLocale();
   const router = useRouter();
   const [isOpen, setIsOpen] = useState(false);
   const [modalView, setModalView] = useState<"info" | "confirm" | "result">(
@@ -86,7 +90,7 @@ const PromoteStudentsButton = ({
       if (response.success) {
         setResult({
           success: true,
-          message: response.message ?? "Students promoted successfully.",
+          message: response.message ?? t("successFallback"),
           promotedCount: response.promotedCount ?? 0,
           graduatedCount: response.graduatedCount ?? 0,
           repeatedCount: response.repeatedCount ?? 0,
@@ -94,7 +98,7 @@ const PromoteStudentsButton = ({
       } else {
         setResult({
           success: false,
-          message: response.message ?? "Something went wrong!",
+          message: response.message ?? actionsT("somethingWentWrong"),
         });
       }
 
@@ -106,23 +110,24 @@ const PromoteStudentsButton = ({
 
   const title =
     modalView === "info"
-      ? "Academic year is still in progress"
+      ? t("stillInProgress")
       : modalView === "confirm"
-        ? "Confirm student promotion"
+        ? t("confirmTitle")
         : result?.success
-          ? "Promotion completed"
-          : "Promotion could not be completed";
+          ? t("completed")
+          : t("failed");
 
   const body =
     modalView === "info" ? (
       <p className="text-gray-600 text-sm leading-6">
-        The academic year {academicYearName} ends on {formatDate(academicYearEndDate)}.
-        You can update the students once the last day has passed.
+        {t("notFinishedBody", {
+          year: academicYearName,
+          date: formatDate(academicYearEndDate, locale),
+        })}
       </p>
     ) : modalView === "confirm" ? (
       <p className="text-gray-600 text-sm leading-6">
-        The academic year {academicYearName} has finished. Confirm this action to update
-        students based on their final performance results.
+        {t("confirmBody", { year: academicYearName })}
       </p>
     ) : result?.success ? (
       <div className="flex flex-col gap-4">
@@ -130,7 +135,7 @@ const PromoteStudentsButton = ({
         <div className="gap-3 grid grid-cols-1 sm:grid-cols-3">
           <div className="bg-emerald-50 p-4 rounded-lg">
             <p className="text-emerald-700 text-xs uppercase tracking-wide">
-              Promoted
+              {t("promoted")}
             </p>
             <p className="mt-2 font-semibold text-emerald-900 text-2xl">
               {result.promotedCount ?? 0}
@@ -138,7 +143,7 @@ const PromoteStudentsButton = ({
           </div>
           <div className="bg-blue-50 p-4 rounded-lg">
             <p className="text-blue-700 text-xs uppercase tracking-wide">
-              Graduated
+              {t("graduated")}
             </p>
             <p className="mt-2 font-semibold text-blue-900 text-2xl">
               {result.graduatedCount ?? 0}
@@ -146,7 +151,7 @@ const PromoteStudentsButton = ({
           </div>
           <div className="bg-amber-50 p-4 rounded-lg">
             <p className="text-amber-700 text-xs uppercase tracking-wide">
-              Repeated
+              {t("repeated")}
             </p>
             <p className="mt-2 font-semibold text-amber-900 text-2xl">
               {result.repeatedCount ?? 0}
@@ -156,7 +161,7 @@ const PromoteStudentsButton = ({
       </div>
     ) : (
       <p className="text-gray-600 text-sm leading-6">
-        {result?.message ?? "Something went wrong!"}
+        {result?.message ?? actionsT("somethingWentWrong")}
       </p>
     );
 
@@ -164,10 +169,10 @@ const PromoteStudentsButton = ({
     <>
       <button
         type="button"
-        className="bg-academixPurpleDark p-3 rounded-md text-white text-sm"
+        className="hidden md:block bg-academixPurpleDark p-2 rounded-md text-white text-sm transition hover:scale[1.05]"
         onClick={openModal}
       >
-        Update Students Grades
+        {t("button")}
       </button>
 
       {isOpen && (
@@ -175,9 +180,9 @@ const PromoteStudentsButton = ({
           <div className="relative bg-white shadow-lg p-6 rounded-md w-full max-w-lg">
             <button
               type="button"
-              className="top-4 right-4 absolute disabled:opacity-50 text-gray-500 hover:text-gray-800 disabled:cursor-not-allowed"
+              className="top-4 end-4 absolute disabled:opacity-50 text-gray-500 hover:text-gray-800 disabled:cursor-not-allowed"
               onClick={closeModal}
-              aria-label="Close promotion dialog"
+              aria-label={t("close")}
               disabled={isSubmitting}
             >
               <X className="w-4 h-4" />
@@ -186,7 +191,7 @@ const PromoteStudentsButton = ({
             <div className="flex flex-col gap-6">
               <div>
                 <p className="text-gray-500 text-xs uppercase tracking-wide">
-                  Academic Year
+                  {t("academicYear")}
                 </p>
                 <h2 className="mt-1 font-semibold text-gray-900 text-xl">
                   {academicYearName}
@@ -195,7 +200,7 @@ const PromoteStudentsButton = ({
 
               <div>
                 <p className="text-gray-500 text-xs uppercase tracking-wide">
-                  Status
+                  {t("status")}
                 </p>
                 <h3 className="mt-1 font-medium text-gray-900 text-lg">
                   {title}
@@ -214,10 +219,10 @@ const PromoteStudentsButton = ({
                     {isSubmitting ? (
                       <span className="inline-flex justify-center items-center gap-2">
                         <span className="border-2 border-white/40 border-t-white rounded-full w-4 h-4 animate-spin" />
-                        Updating...
+                        {t("updating")}
                       </span>
                     ) : (
-                      "Confirm"
+                      t("confirm")
                     )}
                   </button>
                 </div>
@@ -230,7 +235,7 @@ const PromoteStudentsButton = ({
                     className="bg-gray-800 px-4 py-2 rounded-md text-white"
                     onClick={closeModal}
                   >
-                    Ok
+                    {t("ok")}
                   </button>
                 </div>
               )}
diff --git a/src/components/SchoolSettingsForm.tsx b/src/components/SchoolSettingsForm.tsx
index a48fd1c..d36e4b7 100644
--- a/src/components/SchoolSettingsForm.tsx
+++ b/src/components/SchoolSettingsForm.tsx
@@ -2,6 +2,7 @@
 
 import { updateSchoolSettings } from "@/lib/actions";
 import type { SchoolScheduleSettings } from "@/lib/schoolSettings";
+import { useTranslations } from "next-intl";
 import { useRouter } from "next/navigation";
 import { useMemo, useState, useTransition } from "react";
 import { toast } from "react-toastify";
@@ -14,6 +15,8 @@ const toTimeValue = (hour: number, minute: number) =>
   `${String(hour).padStart(2, "0")}:${String(minute).padStart(2, "0")}`;
 
 const SchoolSettingsForm = ({ initialSettings }: Props) => {
+  const t = useTranslations("settings.scheduleForm");
+  const actionsT = useTranslations("actions");
   const router = useRouter();
   const [isSubmitting, startTransition] = useTransition();
 
@@ -36,11 +39,6 @@ const SchoolSettingsForm = ({ initialSettings }: Props) => {
     initialSettings.lessonsPerDay,
   );
 
-  const totalMinutes = useMemo(
-    () => lessonDurationMinutes * lessonsPerDay,
-    [lessonDurationMinutes, lessonsPerDay],
-  );
-
   const onSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
 
@@ -56,85 +54,86 @@ const SchoolSettingsForm = ({ initialSettings }: Props) => {
       );
 
       if (result.success) {
-        toast("School settings updated.");
+        toast(t("updated"));
         router.refresh();
         return;
       }
 
-      toast.error(result.message ?? "Something went wrong!");
+      toast.error(result.message ?? actionsT("somethingWentWrong"));
     });
   };
 
   return (
     <form className="flex flex-col gap-6" onSubmit={onSubmit}>
-      <div className="gap-4 grid grid-cols-1 md:grid-cols-2">
-        <label className="flex flex-col gap-2">
-          <span className="font-medium text-gray-600 text-sm">
-            Work Day Start
-          </span>
-          <input
-            type="time"
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 text-sm"
-            value={workDayStart}
-            onChange={(e) => setWorkDayStart(e.target.value)}
-            required
-          />
-        </label>
-
-        <label className="flex flex-col gap-2">
-          <span className="font-medium text-gray-600 text-sm">
-            Work Day End
-          </span>
-          <input
-            type="time"
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 text-sm"
-            value={workDayEnd}
-            onChange={(e) => setWorkDayEnd(e.target.value)}
-            required
-          />
-        </label>
-
-        <label className="flex flex-col gap-2">
-          <span className="font-medium text-gray-600 text-sm">
-            Lesson Duration (minutes)
-          </span>
-          <input
-            type="number"
-            min={15}
-            max={180}
-            step={5}
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 text-sm"
-            value={lessonDurationMinutes}
-            onChange={(e) => setLessonDurationMinutes(Number(e.target.value))}
-            required
-          />
-        </label>
-
-        <label className="flex flex-col gap-2">
-          <span className="font-medium text-gray-600 text-sm">
-            Lessons Per Day
-          </span>
-          <input
-            type="number"
-            min={1}
-            max={12}
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 text-sm"
-            value={lessonsPerDay}
-            onChange={(e) => setLessonsPerDay(Number(e.target.value))}
-            required
-          />
-        </label>
-      </div>
-
-      <div className="bg-blue-50 p-3 rounded-md text-blue-900 text-sm">
-        Daily teaching time: {totalMinutes} minutes
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <span className="block font-semibold text-gray-700 text-sm">
+          {t("title")}
+        </span>
+        <div className="gap-4 grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3">
+          <label className="flex flex-col gap-2">
+            <span className="font-medium text-gray-700 text-sm">
+              {t("workDayStart")}
+            </span>
+            <input
+              type="time"
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 text-sm transition-all"
+              value={workDayStart}
+              onChange={(e) => setWorkDayStart(e.target.value)}
+              required
+            />
+          </label>
+
+          <label className="flex flex-col gap-2">
+            <span className="font-medium text-gray-700 text-sm">
+              {t("workDayEnd")}
+            </span>
+            <input
+              type="time"
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 text-sm transition-all"
+              value={workDayEnd}
+              onChange={(e) => setWorkDayEnd(e.target.value)}
+              required
+            />
+          </label>
+
+          <label className="flex flex-col gap-2">
+            <span className="font-medium text-gray-700 text-sm">
+              {t("lessonDuration")}
+            </span>
+            <input
+              type="number"
+              min={15}
+              max={180}
+              step={5}
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 text-sm transition-all"
+              value={lessonDurationMinutes}
+              onChange={(e) => setLessonDurationMinutes(Number(e.target.value))}
+              required
+            />
+          </label>
+
+          <label className="flex flex-col gap-2">
+            <span className="font-medium text-gray-700 text-sm">
+              {t("lessonsPerDay")}
+            </span>
+            <input
+              type="number"
+              min={1}
+              max={12}
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 text-sm transition-all"
+              value={lessonsPerDay}
+              onChange={(e) => setLessonsPerDay(Number(e.target.value))}
+              required
+            />
+          </label>
+        </div>
       </div>
 
       <button
-        className="bg-blue-500 disabled:opacity-60 px-4 py-2 rounded-md w-fit text-white"
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
         disabled={isSubmitting}
       >
-        Save Settings
+        {isSubmitting ? actionsT("saving") : t("save")}
       </button>
     </form>
   );
diff --git a/src/components/SchoolSignupForm.tsx b/src/components/SchoolSignupForm.tsx
new file mode 100644
index 0000000..07e23c2
--- /dev/null
+++ b/src/components/SchoolSignupForm.tsx
@@ -0,0 +1,456 @@
+"use client";
+
+import { createSchoolSignup } from "@/lib/actions/school.actions";
+import { useActionState } from "react";
+import Link from "next/link";
+import { useState } from "react";
+import { ArrowLeft, ArrowRight } from "lucide-react";
+import { useTranslations } from "next-intl";
+
+type SignupState = {
+  success: boolean;
+  message: string;
+};
+
+type SchoolFieldKey =
+  | "schoolName"
+  | "contactEmail"
+  | "contactPhone"
+  | "country"
+  | "city"
+  | "address";
+
+type AdminFieldKey = "adminName" | "adminUsername" | "adminPassword";
+
+const initialState: SignupState = {
+  success: false,
+  message: "",
+};
+
+const SchoolSignupForm = () => {
+  const t = useTranslations("schoolSignup");
+  const [step, setStep] = useState<1 | 2>(1);
+  const [schoolFieldErrors, setSchoolFieldErrors] = useState<
+    Partial<Record<SchoolFieldKey, string>>
+  >({});
+  const [adminFieldErrors, setAdminFieldErrors] = useState<
+    Partial<Record<AdminFieldKey, string>>
+  >({});
+  const [schoolForm, setSchoolForm] = useState({
+    schoolName: "",
+    registrationNumber: "",
+    contactEmail: "",
+    contactPhone: "",
+    country: "",
+    city: "",
+    website: "",
+    address: "",
+  });
+
+  const [state, formAction, pending] = useActionState(
+    async (_prevState: SignupState, formData: FormData) => {
+      const result = await createSchoolSignup(formData);
+      return {
+        success: result.success,
+        message: result.message,
+      };
+    },
+    initialState,
+  );
+
+  const validateSchoolStep = () => {
+    const nextErrors: Partial<Record<SchoolFieldKey, string>> = {};
+
+    if (!schoolForm.schoolName.trim()) {
+      nextErrors.schoolName = t("validation.schoolNameRequired");
+      return nextErrors;
+    }
+    if (!schoolForm.contactEmail.trim()) {
+      nextErrors.contactEmail = t("validation.schoolEmailRequired");
+      return nextErrors;
+    }
+    if (!schoolForm.contactPhone.trim()) {
+      nextErrors.contactPhone = t("validation.schoolPhoneRequired");
+      return nextErrors;
+    }
+    if (!schoolForm.country.trim()) {
+      nextErrors.country = t("validation.countryRequired");
+      return nextErrors;
+    }
+    if (!schoolForm.city.trim()) {
+      nextErrors.city = t("validation.cityRequired");
+      return nextErrors;
+    }
+    if (!schoolForm.address.trim()) {
+      nextErrors.address = t("validation.addressRequired");
+      return nextErrors;
+    }
+
+    return nextErrors;
+  };
+
+  const validateAdminStep = (formData: FormData) => {
+    const nextErrors: Partial<Record<AdminFieldKey, string>> = {};
+    const adminName = String(formData.get("adminName") ?? "").trim();
+    const adminUsername = String(formData.get("adminUsername") ?? "").trim();
+    const adminPassword = String(formData.get("adminPassword") ?? "").trim();
+
+    if (!adminName) {
+      nextErrors.adminName = t("validation.adminNameRequired");
+      return nextErrors;
+    }
+    if (!adminUsername) {
+      nextErrors.adminUsername = t("validation.adminUsernameRequired");
+      return nextErrors;
+    }
+    if (!adminPassword) {
+      nextErrors.adminPassword = t("validation.adminPasswordRequired");
+      return nextErrors;
+    }
+
+    return nextErrors;
+  };
+
+  const goToAdminStep = () => {
+    const nextErrors = validateSchoolStep();
+    setSchoolFieldErrors(nextErrors);
+    if (Object.keys(nextErrors).length > 0) return;
+    setStep(2);
+  };
+
+  return (
+    <div className="w-full h-full">
+      {state.success ? (
+        <div className="flex flex-col space-y-4 h-full">
+          <h2 className="font-semibold text-2xl">{t("statusTitle")}</h2>
+          <p className="text-gray-700 text-sm leading-6">
+            {t("statusDescription")}
+          </p>
+          <Link
+            href="/sign-in"
+            className="inline-flex bg-academixPurpleDark px-4 py-2 rounded-md w-fit text-white text-sm"
+          >
+            {t("goToSignIn")}
+          </Link>
+        </div>
+      ) : (
+        <form
+          action={formAction}
+          onSubmit={(e) => {
+            const formData = new FormData(e.currentTarget);
+            const schoolErrors = validateSchoolStep();
+            const adminErrors = validateAdminStep(formData);
+
+            setSchoolFieldErrors(schoolErrors);
+            setAdminFieldErrors(adminErrors);
+
+            if (
+              Object.keys(schoolErrors).length > 0 ||
+              Object.keys(adminErrors).length > 0
+            ) {
+              e.preventDefault();
+              setStep(Object.keys(schoolErrors).length > 0 ? 1 : 2);
+            }
+          }}
+          className="relative flex flex-col space-y-6 h-full"
+        >
+          <div>
+            <h1 className="font-bold text-2xl">{t("title")}</h1>
+            <p className="mt-2 text-gray-600 text-sm">
+              {t("description")}
+            </p>
+          </div>
+
+          <div className="flex items-center gap-1">
+            <button
+              type="button"
+              className={`rounded-full w-12 h-1.5 transition-colors ${
+                step === 1
+                  ? "bg-academixPurpleDark"
+                  : "border border-gray-300 bg-transparent"
+              }`}
+            >
+              <span className="sr-only">{t("step", { number: 1 })}</span>
+            </button>
+            <button
+              type="button"
+              className={`rounded-full w-12 h-1.5 transition-colors ${
+                step === 2
+                  ? "bg-academixPurpleDark"
+                  : "border border-gray-300 bg-transparent"
+              }`}
+            >
+              <span className="sr-only">{t("step", { number: 2 })}</span>
+            </button>
+          </div>
+
+          {step === 1 && (
+            <div className="flex flex-col flex-1 space-y-4 pb-20">
+              <h3 className="font-semibold text-gray-800 text-sm uppercase tracking-wide">
+                {t("schoolInfo")}
+              </h3>
+              <div className="gap-4 grid grid-cols-1 md:grid-cols-2">
+                <div className="space-y-1">
+                  <input
+                    name="schoolName"
+                    placeholder={t("fields.schoolName")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                    value={schoolForm.schoolName}
+                    onChange={(e) =>
+                      setSchoolForm((prev) => ({
+                        ...prev,
+                        schoolName: e.target.value,
+                      }))
+                    }
+                  />
+                  {schoolFieldErrors.schoolName && (
+                    <p className="text-red-600 text-xs">
+                      {schoolFieldErrors.schoolName}
+                    </p>
+                  )}
+                </div>
+                <div className="space-y-1">
+                  <input
+                    name="registrationNumber"
+                    placeholder={t("fields.registrationNumber")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                    value={schoolForm.registrationNumber}
+                    onChange={(e) =>
+                      setSchoolForm((prev) => ({
+                        ...prev,
+                        registrationNumber: e.target.value,
+                      }))
+                    }
+                  />
+                </div>
+                <div className="space-y-1">
+                  <input
+                    name="contactEmail"
+                    type="email"
+                    placeholder={t("fields.schoolEmail")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                    value={schoolForm.contactEmail}
+                    onChange={(e) =>
+                      setSchoolForm((prev) => ({
+                        ...prev,
+                        contactEmail: e.target.value,
+                      }))
+                    }
+                  />
+                  {schoolFieldErrors.contactEmail && (
+                    <p className="text-red-600 text-xs">
+                      {schoolFieldErrors.contactEmail}
+                    </p>
+                  )}
+                </div>
+                <div className="space-y-1">
+                  <input
+                    name="contactPhone"
+                    placeholder={t("fields.schoolPhone")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                    value={schoolForm.contactPhone}
+                    onChange={(e) =>
+                      setSchoolForm((prev) => ({
+                        ...prev,
+                        contactPhone: e.target.value,
+                      }))
+                    }
+                  />
+                  {schoolFieldErrors.contactPhone && (
+                    <p className="text-red-600 text-xs">
+                      {schoolFieldErrors.contactPhone}
+                    </p>
+                  )}
+                </div>
+                <div className="space-y-1">
+                  <input
+                    name="country"
+                    placeholder={t("fields.country")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                    value={schoolForm.country}
+                    onChange={(e) =>
+                      setSchoolForm((prev) => ({
+                        ...prev,
+                        country: e.target.value,
+                      }))
+                    }
+                  />
+                  {schoolFieldErrors.country && (
+                    <p className="text-red-600 text-xs">
+                      {schoolFieldErrors.country}
+                    </p>
+                  )}
+                </div>
+                <div className="space-y-1">
+                  <input
+                    name="city"
+                    placeholder={t("fields.city")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                    value={schoolForm.city}
+                    onChange={(e) =>
+                      setSchoolForm((prev) => ({
+                        ...prev,
+                        city: e.target.value,
+                      }))
+                    }
+                  />
+                  {schoolFieldErrors.city && (
+                    <p className="text-red-600 text-xs">
+                      {schoolFieldErrors.city}
+                    </p>
+                  )}
+                </div>
+                <div className="space-y-1 md:col-span-2">
+                  <input
+                    name="website"
+                    type="url"
+                    placeholder={t("fields.website")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                    value={schoolForm.website}
+                    onChange={(e) =>
+                      setSchoolForm((prev) => ({
+                        ...prev,
+                        website: e.target.value,
+                      }))
+                    }
+                  />
+                </div>
+                <div className="space-y-1 md:col-span-2">
+                  <textarea
+                    name="address"
+                    placeholder={t("fields.schoolAddress")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                    rows={3}
+                    value={schoolForm.address}
+                    onChange={(e) =>
+                      setSchoolForm((prev) => ({
+                        ...prev,
+                        address: e.target.value,
+                      }))
+                    }
+                  />
+                  {schoolFieldErrors.address && (
+                    <p className="text-red-600 text-xs">
+                      {schoolFieldErrors.address}
+                    </p>
+                  )}
+                </div>
+              </div>
+
+              <div className="end-0 bottom-5 absolute">
+                <button
+                  type="button"
+                  onClick={goToAdminStep}
+                  className="text-academixPurpleDark hover:underline transition"
+                >
+                  <ArrowRight className="rtl:rotate-180" />
+                </button>
+              </div>
+            </div>
+          )}
+
+          {step === 2 && (
+            <div className="flex flex-col flex-1 space-y-4 pb-20">
+              <input
+                type="hidden"
+                name="schoolName"
+                value={schoolForm.schoolName}
+              />
+              <input
+                type="hidden"
+                name="registrationNumber"
+                value={schoolForm.registrationNumber}
+              />
+              <input
+                type="hidden"
+                name="contactEmail"
+                value={schoolForm.contactEmail}
+              />
+              <input
+                type="hidden"
+                name="contactPhone"
+                value={schoolForm.contactPhone}
+              />
+              <input type="hidden" name="country" value={schoolForm.country} />
+              <input type="hidden" name="city" value={schoolForm.city} />
+              <input type="hidden" name="website" value={schoolForm.website} />
+              <input type="hidden" name="address" value={schoolForm.address} />
+              <h3 className="font-semibold text-gray-800 text-sm uppercase tracking-wide">
+                {t("adminInfo")}
+              </h3>
+              <div className="gap-4 grid grid-cols-1 md:grid-cols-2">
+                <div className="space-y-1">
+                  <input
+                    name="adminName"
+                    placeholder={t("fields.adminName")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                  />
+                  {adminFieldErrors.adminName && (
+                    <p className="text-red-600 text-xs">
+                      {adminFieldErrors.adminName}
+                    </p>
+                  )}
+                </div>
+                <div className="space-y-1">
+                  <input
+                    name="adminEmail"
+                    type="email"
+                    placeholder={t("fields.adminEmailOptional")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                  />
+                </div>
+                <div className="space-y-1">
+                  <input
+                    name="adminUsername"
+                    placeholder={t("fields.adminUsername")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                  />
+                  {adminFieldErrors.adminUsername && (
+                    <p className="text-red-600 text-xs">
+                      {adminFieldErrors.adminUsername}
+                    </p>
+                  )}
+                </div>
+                <div className="space-y-1">
+                  <input
+                    name="adminPassword"
+                    type="password"
+                    placeholder={t("fields.adminPassword")}
+                    className="focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+                  />
+                  {adminFieldErrors.adminPassword && (
+                    <p className="text-red-600 text-xs">
+                      {adminFieldErrors.adminPassword}
+                    </p>
+                  )}
+                </div>
+              </div>
+              {state.message && (
+                <p className="text-red-600 text-sm">{state.message}</p>
+              )}
+
+              <div className="inset-x-0 bottom-0 absolute bg-white/95 py-3 min-h-[64px]">
+                <button
+                  type="button"
+                  onClick={() => setStep(1)}
+                className="top-1/2 start-0 absolute text-academixPurpleDark hover:underline transition -translate-y-1/2"
+              >
+                  <ArrowLeft className="rtl:rotate-180" />
+                </button>
+                <button
+                  type="submit"
+                  disabled={pending}
+                  className="top-1/2 end-0 absolute bg-academixPurpleDark disabled:opacity-70 px-6 py-2.5 rounded-md text-white -translate-y-1/2"
+                >
+                  {pending ? t("submitting") : t("submit")}
+                </button>
+              </div>
+            </div>
+          )}
+        </form>
+      )}
+    </div>
+  );
+};
+
+export default SchoolSignupForm;
diff --git a/src/components/SchoolStatusActions.tsx b/src/components/SchoolStatusActions.tsx
new file mode 100644
index 0000000..5e510ed
--- /dev/null
+++ b/src/components/SchoolStatusActions.tsx
@@ -0,0 +1,213 @@
+"use client";
+
+import { type FormEvent, useState } from "react";
+import { updateSchoolStatus } from "@/lib/actions/school.actions";
+import { SchoolStatus } from "@prisma/client";
+import { toast } from "react-toastify";
+import { useRouter } from "next/navigation";
+import { X } from "lucide-react";
+import { useTranslations } from "next-intl";
+
+type Props = {
+  schoolId: number;
+  schoolName: string;
+  schoolStatus: SchoolStatus;
+};
+
+const ModalShell = ({
+  title,
+  closeLabel,
+  children,
+  onClose,
+}: {
+  title: string;
+  closeLabel: string;
+  children: React.ReactNode;
+  onClose: () => void;
+}) => (
+  <div
+    className="z-50 fixed inset-0 flex justify-center items-center bg-black/40 p-4"
+    onClick={onClose}
+  >
+    <div
+      className="bg-white p-4 rounded-lg w-full max-w-md"
+      onClick={(e) => e.stopPropagation()}
+    >
+      <div className="flex justify-between items-center mb-3">
+        <h3 className="font-semibold text-base">{title}</h3>
+        <button
+          type="button"
+          onClick={onClose}
+          className="text-gray-500 hover:text-gray-700"
+          aria-label={closeLabel}
+        >
+          <X className="w-4 h-4" />
+        </button>
+      </div>
+      {children}
+    </div>
+  </div>
+);
+
+const SchoolStatusActions = ({ schoolId, schoolName, schoolStatus }: Props) => {
+  const t = useTranslations("schoolStatus");
+  const [showActivateConfirm, setShowActivateConfirm] = useState(false);
+  const [showPauseConfirm, setShowPauseConfirm] = useState(false);
+  const [isActivating, setIsActivating] = useState(false);
+  const [isPausing, setIsPausing] = useState(false);
+  const router = useRouter();
+
+  const onActivateClick = () => {
+    if (schoolStatus === "ACTIVE") {
+      toast.info(t("alreadyActive"));
+      return;
+    }
+    setShowActivateConfirm(true);
+  };
+
+  const onPauseClick = () => {
+    if (schoolStatus === "PAUSED") {
+      toast.info(t("alreadyPaused"));
+      return;
+    }
+    setShowPauseConfirm(true);
+  };
+
+  const submitActivate = async () => {
+    const formData = new FormData();
+    formData.set("schoolId", String(schoolId));
+    formData.set("status", "ACTIVE");
+
+    try {
+      setIsActivating(true);
+      await updateSchoolStatus(formData);
+      setShowActivateConfirm(false);
+      toast.success(t("activated"));
+      router.refresh();
+    } catch {
+      toast.error(t("activateFailed"));
+    } finally {
+      setIsActivating(false);
+    }
+  };
+
+  const submitPause = async (formData: FormData) => {
+    if (isPausing) return;
+
+    const reason = String(formData.get("pauseReason") ?? "").trim();
+    if (!reason) {
+      toast.error(t("pauseReasonRequired"));
+      return;
+    }
+
+    formData.set("schoolId", String(schoolId));
+    formData.set("status", "PAUSED");
+
+    try {
+      setIsPausing(true);
+      await updateSchoolStatus(formData);
+      setShowPauseConfirm(false);
+      toast.success(t("paused"));
+      router.refresh();
+    } catch {
+      toast.error(t("pauseFailed"));
+    } finally {
+      setIsPausing(false);
+    }
+  };
+
+  const onPauseSubmit = async (e: FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    const formData = new FormData(e.currentTarget);
+    await submitPause(formData);
+  };
+
+  return (
+    <>
+      <div className="flex flex-wrap gap-2 py-2">
+        <button
+          type="button"
+          onClick={onActivateClick}
+          className="bg-green-600 px-2 py-1 rounded text-white text-xs hover:scale-[1.05] transition"
+        >
+          {t("activate")}
+        </button>
+        <button
+          type="button"
+          onClick={onPauseClick}
+          className="bg-red-600 px-2 py-1 rounded text-white text-xs hover:scale-[1.05] transition"
+        >
+          {t("pause")}
+        </button>
+      </div>
+
+      {showActivateConfirm && (
+        <ModalShell
+          title={t("confirmActivation")}
+          closeLabel={t("closeModal")}
+          onClose={() => setShowActivateConfirm(false)}
+        >
+          <p className="mb-4 text-gray-700 text-sm">
+            {t("activateConfirm", { name: schoolName })}
+          </p>
+          <div className="flex justify-end gap-2">
+            <button
+              type="button"
+              onClick={() => setShowActivateConfirm(false)}
+              className="px-3 py-1.5 border rounded text-sm"
+            >
+              {t("cancel")}
+            </button>
+            <button
+              className="bg-green-600 px-3 py-1.5 rounded text-white text-sm"
+              type="button"
+              onClick={submitActivate}
+              disabled={isActivating}
+            >
+              {isActivating ? t("activating") : t("confirm")}
+            </button>
+          </div>
+        </ModalShell>
+      )}
+
+      {showPauseConfirm && (
+        <ModalShell
+          title={t("confirmPause")}
+          closeLabel={t("closeModal")}
+          onClose={() => setShowPauseConfirm(false)}
+        >
+          <form onSubmit={onPauseSubmit} className="space-y-3">
+            <p className="text-gray-700 text-sm">
+              {t("pauseConfirm", { name: schoolName })}
+            </p>
+            <textarea
+              name="pauseReason"
+              required
+              placeholder={t("pauseReason")}
+              className="p-2 border rounded w-full text-sm"
+              rows={3}
+            />
+            <div className="flex justify-end gap-2">
+              <button
+                type="button"
+                onClick={() => setShowPauseConfirm(false)}
+                className="px-3 py-1.5 border rounded text-sm"
+              >
+                {t("cancel")}
+              </button>
+              <button
+                className="bg-red-600 px-3 py-1.5 rounded text-white text-sm"
+                type="submit"
+                disabled={isPausing}
+              >
+                {isPausing ? t("pausing") : t("confirm")}
+              </button>
+            </div>
+          </form>
+        </ModalShell>
+      )}
+    </>
+  );
+};
+
+export default SchoolStatusActions;
diff --git a/src/components/SchoolStatusFilter.tsx b/src/components/SchoolStatusFilter.tsx
new file mode 100644
index 0000000..9747ff4
--- /dev/null
+++ b/src/components/SchoolStatusFilter.tsx
@@ -0,0 +1,40 @@
+"use client";
+
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { useTranslations } from "next-intl";
+
+const statuses = ["ALL", "PENDING", "ACTIVE", "PAUSED"] as const;
+
+const SchoolStatusFilter = () => {
+  const t = useTranslations("filters");
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+
+  const onChange = (value: string) => {
+    const params = new URLSearchParams(searchParams.toString());
+    if (value === "ALL") {
+      params.delete("status");
+    } else {
+      params.set("status", value);
+    }
+    params.set("page", "1");
+    router.push(`${pathname}?${params.toString()}`);
+  };
+
+  return (
+    <select
+      value={searchParams.get("status") ?? "ALL"}
+      onChange={(e) => onChange(e.target.value)}
+      className="px-3 py-2 border border-gray-300 rounded-md text-sm"
+    >
+      {statuses.map((status) => (
+        <option key={status} value={status}>
+          {status === "ALL" ? t("all") : t(status.toLowerCase())}
+        </option>
+      ))}
+    </select>
+  );
+};
+
+export default SchoolStatusFilter;
diff --git a/src/components/SettingsSectionsPanel.tsx b/src/components/SettingsSectionsPanel.tsx
new file mode 100644
index 0000000..93f4a87
--- /dev/null
+++ b/src/components/SettingsSectionsPanel.tsx
@@ -0,0 +1,99 @@
+"use client";
+
+import AcademicYearForm from "@/components/AcademicYearForm";
+import SchoolSettingsForm from "@/components/SchoolSettingsForm";
+import WorkingDaysHolidaysForm from "@/components/WorkingDaysHolidaysForm";
+import type { AcademicYearItem } from "@/lib/academicYears";
+import type {
+  SchoolDayExceptionItem,
+  SchoolScheduleSettings,
+} from "@/lib/schoolSettings";
+import { useTranslations } from "next-intl";
+import { useState } from "react";
+
+type SectionKey = "schedule" | "workingDays" | "academicYears";
+
+type Props = {
+  settings: SchoolScheduleSettings;
+  academicYears: AcademicYearItem[];
+  dayExceptions: SchoolDayExceptionItem[];
+};
+
+const sections: { key: SectionKey; labelKey: string }[] = [
+  { key: "schedule", labelKey: "scheduleDefaults" },
+  { key: "workingDays", labelKey: "workingDaysHolidays" },
+  { key: "academicYears", labelKey: "academicYears" },
+];
+
+const SettingsSectionsPanel = ({
+  settings,
+  academicYears,
+  dayExceptions,
+}: Props) => {
+  const t = useTranslations("settings");
+  const [activeSection, setActiveSection] = useState<SectionKey>("schedule");
+
+  return (
+    <>
+      <nav aria-label="Settings sections" className="mt-6">
+        <ul className="flex flex-wrap gap-2">
+          {sections.map((section) => {
+            const isActive = activeSection === section.key;
+
+            return (
+              <li key={section.key}>
+                <button
+                  type="button"
+                  onClick={() => setActiveSection(section.key)}
+                  className={`inline-flex px-3 py-1.5 border rounded-md font-medium text-sm transition-colors ${
+                    isActive
+                      ? "bg-academixPurpleLight border-academixPurpleDark text-academixPurpleDark"
+                      : "hover:bg-academixPurpleLight border-gray-200 text-gray-700 hover:text-academixPurpleDark"
+                  }`}
+                  aria-pressed={isActive}
+                >
+                  {t(`sections.${section.labelKey}`)}
+                </button>
+              </li>
+            );
+          })}
+        </ul>
+      </nav>
+
+      {activeSection === "schedule" ? (
+        <section className="pt-6 max-w-3xl">
+          <h2 className="font-semibold text-lg">{t("sections.scheduleDefaults")}</h2>
+          <p className="mt-2 text-gray-500 text-sm">
+            {t("description")}
+          </p>
+
+          <div className="mt-4">
+            <SchoolSettingsForm initialSettings={settings} />
+          </div>
+        </section>
+      ) : activeSection === "workingDays" ? (
+        <section className="pt-6 max-w-4xl">
+          <h2 className="font-semibold text-lg">{t("sections.workingDaysHolidays")}</h2>
+          <p className="mt-2 text-gray-500 text-sm">
+            {t("workingDaysDescription")}
+          </p>
+
+          <div className="mt-4">
+            <WorkingDaysHolidaysForm
+              initialWorkingDays={settings.workingDays}
+              exceptions={dayExceptions}
+            />
+          </div>
+        </section>
+      ) : (
+        <section className="pt-6 max-w-4xl">
+          <div className="mt-4">
+            <AcademicYearForm academicYears={academicYears} />
+          </div>
+        </section>
+      )}
+    </>
+  );
+};
+
+export default SettingsSectionsPanel;
diff --git a/src/components/SignOutToSignInButton.tsx b/src/components/SignOutToSignInButton.tsx
new file mode 100644
index 0000000..5b1140c
--- /dev/null
+++ b/src/components/SignOutToSignInButton.tsx
@@ -0,0 +1,29 @@
+"use client";
+
+import { useClerk } from "@clerk/nextjs";
+import { useState } from "react";
+import { useTranslations } from "next-intl";
+
+const SignOutToSignInButton = () => {
+  const t = useTranslations("auth.signOut");
+  const { signOut } = useClerk();
+  const [isSigningOut, setIsSigningOut] = useState(false);
+
+  return (
+    <button
+      type="button"
+      onClick={async () => {
+        setIsSigningOut(true);
+        await signOut({ redirectUrl: "/sign-in" }).catch(() => {
+          setIsSigningOut(false);
+        });
+      }}
+      disabled={isSigningOut}
+      className="inline-flex bg-gradient-to-br from-fuchsia-600 to-violet-600 disabled:opacity-80 shadow-md px-4 py-2 rounded-md text-white text-sm"
+    >
+      {isSigningOut ? t("signingOut") : t("backToSignIn")}
+    </button>
+  );
+};
+
+export default SignOutToSignInButton;
diff --git a/src/components/StudentAttendanceCard.tsx b/src/components/StudentAttendanceCard.tsx
deleted file mode 100644
index 4f3181c..0000000
--- a/src/components/StudentAttendanceCard.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import prisma from "@/lib/prisma";
-import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
-import { getAuthUser } from "@/lib/auth";
-import Image from "next/image";
-
-const StudentAttendanceCard = async ({ id }: { id: string }) => {
-  const user = await getAuthUser();
-  const academicYearId = user
-    ? await getCurrentAcademicYearIdOrNull(user.schoolId)
-    : null;
-
-  if (!academicYearId) {
-    return <h1 className="font-semibold text-xl">-</h1>;
-  }
-
-  const attendance = await prisma.attendance.findMany({
-    where: {
-      studentId: id,
-      academicYearId,
-    },
-  });
-  const totalDays = attendance.length;
-  const presentDays = attendance.filter((day) => day.present).length;
-  const percentage = (presentDays / totalDays) * 100;
-
-  return <h1 className="font-semibold text-xl">{percentage || "-"}%</h1>;
-};
-
-export default StudentAttendanceCard;
diff --git a/src/components/StudentSelector.tsx b/src/components/StudentSelector.tsx
index 960033b..92aedf6 100644
--- a/src/components/StudentSelector.tsx
+++ b/src/components/StudentSelector.tsx
@@ -2,36 +2,45 @@
 
 import { useRouter, useSearchParams } from "next/navigation";
 
-type Student = {
-  id: string;
+type ClassOption = {
+  id: number;
   name: string;
-  classId: number;
 };
 
-const StudentSelector = ({ students }: { students: Student[] }) => {
+const StudentSelector = ({
+  classes,
+  selectedClassId,
+  label,
+}: {
+  classes: ClassOption[];
+  selectedClassId: number;
+  label: string;
+}) => {
   const router = useRouter();
   const searchParams = useSearchParams();
 
-  const selected = searchParams.get("studentId") || students[0]?.id;
-
-  const handleChange = (id: string) => {
+  const handleChange = (classId: string) => {
     const params = new URLSearchParams(searchParams.toString());
-    params.set("studentId", id);
+    params.delete("studentId");
+    params.set("classId", classId);
     router.push(`?${params.toString()}`);
   };
 
   return (
-    <select
-      value={selected}
-      onChange={(e) => handleChange(e.target.value)}
-      className="mb-4 p-2 border rounded-md"
-    >
-      {students.map((student) => (
-        <option key={student.id} value={student.id}>
-          {student.name}
-        </option>
-      ))}
-    </select>
+    <label className="flex flex-col gap-1 min-w-48 text-sm">
+      <span className="text-gray-500">{label}</span>
+      <select
+        value={selectedClassId}
+        onChange={(e) => handleChange(e.target.value)}
+        className="px-3 py-2 border border-gray-200 rounded-md outline-none text-sm"
+      >
+        {classes.map((classOption) => (
+          <option key={classOption.id} value={classOption.id}>
+            {classOption.name}
+          </option>
+        ))}
+      </select>
+    </label>
   );
 };
 
diff --git a/src/components/StudentsFilters.tsx b/src/components/StudentsFilters.tsx
index 99f1967..1439ae0 100644
--- a/src/components/StudentsFilters.tsx
+++ b/src/components/StudentsFilters.tsx
@@ -2,6 +2,7 @@
 
 import { AcademicYearItem } from "@/lib/academicYears";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { useTranslations } from "next-intl";
 
 type StudentsFiltersProps = {
   academicYears: AcademicYearItem[];
@@ -9,10 +10,10 @@ type StudentsFiltersProps = {
 };
 
 const STATUS_OPTIONS = [
-  { value: "ACTIVE", label: "Regular" },
-  { value: "REPEATED", label: "Repeated" },
-  { value: "GRADUATED", label: "Graduated" },
-  { value: "LEFT", label: "Left" },
+  { value: "ACTIVE", labelKey: "regular" },
+  { value: "REPEATED", labelKey: "repeated" },
+  { value: "GRADUATED", labelKey: "graduated" },
+  { value: "LEFT", labelKey: "left" },
 ] as const;
 
 const REPEAT_COUNT_OPTIONS = [1, 2, 3, 4, 5] as const;
@@ -21,6 +22,7 @@ const StudentsFilters = ({
   academicYears,
   currentAcademicYearId,
 }: StudentsFiltersProps) => {
+  const t = useTranslations("filters");
   const router = useRouter();
   const pathname = usePathname();
   const searchParams = useSearchParams();
@@ -46,9 +48,9 @@ const StudentsFilters = ({
   };
 
   return (
-    <div className="flex flex-wrap items-center gap-3">
+    <div className="hidden sm:flex flex-wrap items-center gap-3">
       <label className="flex flex-col gap-1 text-gray-500 text-xs">
-        Academic Year
+        {t("academicYear")}
         <select
           value={selectedAcademicYearId}
           onChange={(event) =>
@@ -65,7 +67,7 @@ const StudentsFilters = ({
       </label>
 
       <label className="flex flex-col gap-1 text-gray-500 text-xs">
-        Status
+        {t("status")}
         <select
           value={selectedStatus}
           onChange={(event) => {
@@ -79,7 +81,7 @@ const StudentsFilters = ({
         >
           {STATUS_OPTIONS.map((option) => (
             <option key={option.value} value={option.value}>
-              {option.label}
+              {t(option.labelKey)}
             </option>
           ))}
         </select>
@@ -87,7 +89,7 @@ const StudentsFilters = ({
 
       {selectedStatus === "REPEATED" && (
         <label className="flex flex-col gap-1 text-gray-500 text-xs">
-          Repeated Times
+          {t("repeatedTimes")}
           <select
             value={selectedRepeatCount}
             onChange={(event) =>
@@ -97,7 +99,7 @@ const StudentsFilters = ({
           >
             {REPEAT_COUNT_OPTIONS.map((count) => (
               <option key={count} value={count}>
-                {count} {count === 1 ? "time" : "times"}
+                {count} {count === 1 ? t("time") : t("times")}
               </option>
             ))}
           </select>
diff --git a/src/components/StudyMaterialList.tsx b/src/components/StudyMaterialList.tsx
new file mode 100644
index 0000000..101fdc2
--- /dev/null
+++ b/src/components/StudyMaterialList.tsx
@@ -0,0 +1,292 @@
+"use client";
+
+import { useActionState, useEffect, useState } from "react";
+import { toast } from "react-toastify";
+import {
+  FileText,
+  FileImage,
+  File,
+  Download,
+  Trash2,
+  Loader2,
+  BookOpen,
+  X,
+  Upload,
+} from "lucide-react";
+import {
+  deleteStudyMaterial,
+  StudyMaterialState,
+} from "@/lib/actions/studyMaterial.actions";
+import StudyMaterialUpload from "@/components/StudyMaterialUpload";
+import { useTranslations } from "next-intl";
+
+// ─── Types ────────────────────────────────────────────────────────────────────
+export type StudyMaterialItem = {
+  id: number;
+  title: string;
+  description: string | null;
+  fileUrl: string;
+  fileType: string;
+  fileName: string;
+  createdAt: Date;
+  teacher: { id: string; name: string };
+};
+
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+function FileIcon({ type }: { type: string }) {
+  if (["jpg", "jpeg", "png", "gif", "webp"].includes(type))
+    return <FileImage className="w-8 h-8 text-blue-400" />;
+  if (type === "pdf") return <FileText className="w-8 h-8 text-red-400" />;
+  return <File className="w-8 h-8 text-gray-400" />;
+}
+
+const badgeColors: Record<string, string> = {
+  pdf: "bg-red-100 text-red-700",
+  doc: "bg-blue-100 text-blue-700",
+  docx: "bg-blue-100 text-blue-700",
+  ppt: "bg-orange-100 text-orange-700",
+  pptx: "bg-orange-100 text-orange-700",
+  xls: "bg-green-100 text-green-700",
+  xlsx: "bg-green-100 text-green-700",
+  png: "bg-purple-100 text-purple-700",
+  jpg: "bg-purple-100 text-purple-700",
+  jpeg: "bg-purple-100 text-purple-700",
+  zip: "bg-yellow-100 text-yellow-700",
+};
+
+// ─── Delete button ────────────────────────────────────────────────────────────
+// مكون منفصل حتى لا يتشارك الـ state مع باقي العناصر
+function DeleteButton({ id, subjectId }: { id: number; subjectId: number }) {
+  const t = useTranslations("subjectDetails");
+  const init: StudyMaterialState = {
+    success: false,
+    error: false,
+    message: "",
+  };
+  const [state, formAction, isPending] = useActionState(
+    deleteStudyMaterial,
+    init,
+  );
+
+  useEffect(() => {
+    if (state.success) toast.success(state.message);
+    else if (state.error) toast.error(state.message);
+  }, [state]);
+
+  return (
+    <form action={formAction}>
+      <input type="hidden" name="id" value={id} />
+      <input type="hidden" name="subjectId" value={subjectId} />
+      <button
+        type="submit"
+        disabled={isPending}
+        title={t("delete")}
+        className="hover:bg-red-50 disabled:opacity-40 p-1.5 rounded-lg text-gray-400 hover:text-red-500 transition-colors"
+      >
+        {isPending ? (
+          <Loader2 className="w-4 h-4 animate-spin" />
+        ) : (
+          <Trash2 className="w-4 h-4" />
+        )}
+      </button>
+    </form>
+  );
+}
+
+// ─── Main component ───────────────────────────────────────────────────────────
+type Props = {
+  materials: StudyMaterialItem[];
+  subjectId: number;
+  currentUserId?: string;
+  role?: string;
+};
+
+export default function StudyMaterialList({
+  materials,
+  subjectId,
+  currentUserId,
+  role,
+}: Props) {
+  const emptyT = useTranslations("emptyStates");
+  const t = useTranslations("subjectDetails");
+  const [isUploadOpen, setIsUploadOpen] = useState(false);
+  const canUpload = role === "teacher" || role === "admin";
+
+  if (materials.length === 0) {
+    return (
+      <div className="bg-white shadow-sm p-10 border border-gray-100 rounded-xl text-center">
+        <BookOpen className="mx-auto mb-3 w-10 h-10 text-gray-200" />
+        <p className="font-medium text-gray-500">{emptyT("studyMaterials")}</p>
+        <p className="mt-1 text-gray-400 text-sm">
+          {role === "teacher"
+            ? emptyT("uploadFirstMaterial")
+            : emptyT("noStudyMaterialsForStudent")}
+        </p>
+        {canUpload && (
+          <button
+            type="button"
+            onClick={() => setIsUploadOpen(true)}
+            className="inline-flex items-center gap-2 bg-purple-600 hover:bg-purple-700 mt-4 px-4 py-2 rounded-md text-white text-sm transition-colors"
+          >
+            <Upload className="w-4 h-4" />
+            {emptyT("uploadMaterial")}
+          </button>
+        )}
+        {isUploadOpen && (
+          <div className="z-50 fixed inset-0 flex justify-center items-center p-4">
+            <div
+              className="absolute inset-0 bg-black/40"
+              onClick={() => setIsUploadOpen(false)}
+            />
+            <div className="relative bg-white shadow-xl p-6 border border-gray-100 rounded-xl w-full max-w-xl">
+              <div className="flex justify-between items-center mb-4">
+                <h3 className="font-semibold text-gray-800 text-base">
+                  {t("materialUpload.title")}
+                </h3>
+                <button
+                  type="button"
+                  onClick={() => setIsUploadOpen(false)}
+                  className="hover:bg-gray-100 p-1.5 rounded-lg text-gray-500 hover:text-gray-700"
+                >
+                  <X className="w-4 h-4" />
+                </button>
+              </div>
+              <StudyMaterialUpload
+                subjectId={subjectId}
+                compact
+                onSuccess={() => setIsUploadOpen(false)}
+              />
+            </div>
+          </div>
+        )}
+      </div>
+    );
+  }
+
+  return (
+    <div className="bg-white shadow-sm border border-gray-100 rounded-xl h-[300px] overflow-auto">
+      <div className="flex justify-between items-center px-6 py-4 border-gray-100 border-b">
+        <div className="flex items-center gap-2">
+          <BookOpen className="w-5 h-5 text-purple-500" />
+          <h2 className="font-semibold text-gray-800 text-base">
+            {t("studyMaterials")}
+          </h2>
+          <span className="ml-1 text-gray-400 text-sm">
+            ({materials.length})
+          </span>
+        </div>
+        {canUpload && (
+          <button
+            type="button"
+            onClick={() => setIsUploadOpen(true)}
+            className="inline-flex items-center gap-1.5 bg-academixPurpleDark px-3 py-1.5 rounded-md text-white text-sm hover:scale-[1.05] transition"
+          >
+            <Upload className="w-3.5 h-3.5" />
+            {t("upload")}
+          </button>
+        )}
+      </div>
+
+      <ul className="divide-y divide-gray-50">
+        {materials.map((m) => {
+          const isOwner =
+            role === "admin" ||
+            (role === "teacher" && currentUserId === m.teacher.id);
+
+          return (
+            <li
+              key={m.id}
+              className="flex items-start gap-4 hover:bg-gray-50 px-6 py-4 transition-colors"
+            >
+              {/* أيقونة نوع الملف */}
+              <div className="flex-shrink-0 mt-0.5">
+                <FileIcon type={m.fileType} />
+              </div>
+
+              {/* المعلومات */}
+              <div className="flex-1 min-w-0">
+                <div className="flex flex-wrap items-center gap-2">
+                  <span className="font-medium text-gray-800 truncate">
+                    {m.title}
+                  </span>
+                  <span
+                    className={`text-xs font-medium px-2 py-0.5 rounded-full uppercase
+                    ${badgeColors[m.fileType] ?? "bg-gray-100 text-gray-600"}`}
+                  >
+                    {m.fileType}
+                  </span>
+                </div>
+
+                {m.description && (
+                  <p className="mt-0.5 text-gray-500 text-sm line-clamp-2">
+                    {m.description}
+                  </p>
+                )}
+
+                <div className="flex flex-wrap items-center gap-2 mt-1.5 text-gray-400 text-xs">
+                  <span>{m.teacher.name}</span>
+                  <span>·</span>
+                  <span>
+                    {new Date(m.createdAt).toLocaleDateString("en-GB", {
+                      day: "numeric",
+                      month: "short",
+                      year: "numeric",
+                    })}
+                  </span>
+                  <span>·</span>
+                  <span className="max-w-[140px] truncate">{m.fileName}</span>
+                </div>
+              </div>
+
+              {/* أزرار الإجراءات */}
+              <div className="flex flex-shrink-0 items-center gap-1">
+                {/* تحميل — لجميع المستخدمين */}
+                <a
+                  href={`/api/download/${m.id}?type=studyMaterial`}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  download={m.fileName}
+                  title={t("download")}
+                  className="hover:bg-purple-50 p-1.5 rounded-lg text-gray-400 hover:text-purple-600 transition-colors"
+                >
+                  <Download className="w-4 h-4" />
+                </a>
+
+                {/* حذف — للمعلم صاحب الملف فقط */}
+                {isOwner && <DeleteButton id={m.id} subjectId={subjectId} />}
+              </div>
+            </li>
+          );
+        })}
+      </ul>
+
+      {isUploadOpen && (
+        <div className="z-50 fixed inset-0 flex justify-center items-center p-4">
+          <div
+            className="absolute inset-0 bg-black/40"
+            onClick={() => setIsUploadOpen(false)}
+          />
+          <div className="relative bg-white shadow-xl p-6 border border-gray-100 rounded-xl w-full max-w-xl">
+            <div className="flex justify-between items-center mb-4">
+              <h3 className="font-semibold text-gray-800 text-base">
+                {t("materialUpload.title")}
+              </h3>
+              <button
+                type="button"
+                onClick={() => setIsUploadOpen(false)}
+                className="hover:bg-gray-100 p-1.5 rounded-lg text-gray-500 hover:text-gray-700"
+              >
+                <X className="w-4 h-4" />
+              </button>
+            </div>
+            <StudyMaterialUpload
+              subjectId={subjectId}
+              compact
+              onSuccess={() => setIsUploadOpen(false)}
+            />
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/StudyMaterialUpload.tsx b/src/components/StudyMaterialUpload.tsx
new file mode 100644
index 0000000..17a8158
--- /dev/null
+++ b/src/components/StudyMaterialUpload.tsx
@@ -0,0 +1,147 @@
+"use client";
+
+import { useActionState, useEffect, useRef, useState } from "react";
+import { toast } from "react-toastify";
+import { Upload, Loader2 } from "lucide-react";
+import {
+  createStudyMaterial,
+  StudyMaterialState,
+} from "@/lib/actions/studyMaterial.actions";
+import { useTranslations } from "next-intl";
+
+const initialState: StudyMaterialState = {
+  success: false,
+  error: false,
+  message: "",
+};
+
+type Props = {
+  subjectId: number;
+  compact?: boolean;
+  onSuccess?: () => void;
+};
+
+export default function StudyMaterialUpload({
+  subjectId,
+  compact = false,
+  onSuccess,
+}: Props) {
+  const actionsT = useTranslations("actions");
+  const t = useTranslations("subjectDetails.materialUpload");
+  const formRef = useRef<HTMLFormElement>(null);
+  const fileInputId = `study-material-file-${subjectId}`;
+  const [selectedFileName, setSelectedFileName] = useState("");
+
+  const [state, formAction, isPending] = useActionState(
+    createStudyMaterial,
+    initialState,
+  );
+
+  useEffect(() => {
+    if (state.success) {
+      toast.success(state.message);
+      formRef.current?.reset();
+      setSelectedFileName("");
+      onSuccess?.();
+    } else if (state.error) {
+      toast.error(state.message);
+    }
+  }, [state, onSuccess]);
+
+  return (
+    <div
+      className={
+        compact
+          ? ""
+          : "bg-white rounded-xl shadow-sm border border-gray-100 p-6"
+      }
+    >
+      {!compact && (
+        <h2 className="flex items-center gap-2 mb-4 font-semibold text-gray-800 text-base">
+          <Upload className="w-4 h-4 text-purple-500" />
+          {t("title")}
+        </h2>
+      )}
+
+      <form ref={formRef} action={formAction} className="space-y-4 text-start">
+        <input type="hidden" name="subjectId" value={subjectId} />
+
+        {/* Title */}
+        <div>
+          <label className="block mb-1 font-medium text-gray-700 text-sm">
+            {t("fields.title")} <span className="text-red-500">*</span>
+          </label>
+          <input
+            type="text"
+            name="title"
+            placeholder={t("placeholders.title")}
+            required
+            className="px-3 py-2 border border-gray-200 focus:border-transparent rounded-lg focus:outline-none focus:ring-2 focus:ring-purple-300 w-full text-sm"
+          />
+        </div>
+
+        {/* Description */}
+        <div>
+          <label className="block mb-1 font-medium text-gray-700 text-sm">
+            {t("fields.description")}
+          </label>
+          <textarea
+            name="description"
+            placeholder={t("placeholders.description")}
+            rows={2}
+            className="px-3 py-2 border border-gray-200 focus:border-transparent rounded-lg focus:outline-none focus:ring-2 focus:ring-purple-300 w-full text-sm resize-none"
+          />
+        </div>
+
+        {/* File */}
+        <div>
+          <label className="block mb-1 font-medium text-gray-700 text-sm">
+            {t("fields.file")} <span className="text-red-500">*</span>
+            <span className="ml-1 text-gray-400 text-xs">{t("maxSize")}</span>
+          </label>
+          <input
+            id={fileInputId}
+            type="file"
+            name="file"
+            required
+            accept=".pdf,.doc,.docx,.ppt,.pptx,.xls,.xlsx,.txt,.png,.jpg,.jpeg,.zip"
+            className="sr-only"
+            onChange={(event) =>
+              setSelectedFileName(event.target.files?.[0]?.name ?? "")
+            }
+          />
+          <div className="flex items-center gap-3">
+            <label
+              htmlFor={fileInputId}
+              className="bg-purple-50 hover:bg-purple-100 px-3 py-1.5 rounded-lg font-medium text-purple-700 text-sm cursor-pointer"
+            >
+              {t("chooseFile")}
+            </label>
+            <span className="min-w-0 text-gray-500 text-sm truncate">
+              {selectedFileName || t("noFileChosen")}
+            </span>
+          </div>
+        </div>
+
+        {/* Submit */}
+        <button
+          type="submit"
+          disabled={isPending}
+          className="flex justify-center items-center gap-2 bg-purple-600 hover:bg-purple-700 disabled:bg-purple-300 px-4 py-2.5 rounded-lg w-full font-medium text-white text-sm transition-colors duration-200"
+        >
+          {isPending ? (
+            <>
+              <Loader2 className="w-4 h-4 animate-spin" />
+              {actionsT("uploading")}
+            </>
+          ) : (
+            <>
+              <Upload className="w-4 h-4" />
+              {t("submit")}
+            </>
+          )}
+        </button>
+      </form>
+    </div>
+  );
+}
diff --git a/src/components/SubjectDetailsTabs.tsx b/src/components/SubjectDetailsTabs.tsx
new file mode 100644
index 0000000..bd7c7f9
--- /dev/null
+++ b/src/components/SubjectDetailsTabs.tsx
@@ -0,0 +1,73 @@
+"use client";
+
+import { useMemo, useState, type ReactNode } from "react";
+import { useTranslations } from "next-intl";
+
+type SectionId = "assignments" | "exams" | "materials";
+
+interface Props {
+  sectionsOrder: string[];
+  assignmentsContent: ReactNode;
+  examsContent: ReactNode;
+  materialsContent: ReactNode;
+}
+
+export default function SubjectDetailsTabs({
+  sectionsOrder,
+  assignmentsContent,
+  examsContent,
+  materialsContent,
+}: Props) {
+  const t = useTranslations("subjectDetails");
+  const availableSections = useMemo(
+    () =>
+      sectionsOrder.filter(
+        (section): section is SectionId =>
+          section === "materials" ||
+          section === "assignments" ||
+          section === "exams",
+      ),
+    [sectionsOrder],
+  );
+  const orderedSections = useMemo(() => {
+    if (!availableSections.includes("materials")) return availableSections;
+
+    return [
+      "materials",
+      ...availableSections.filter((section) => section !== "materials"),
+    ] as SectionId[];
+  }, [availableSections]);
+
+  const [activeSection, setActiveSection] = useState<SectionId>(
+    orderedSections.includes("materials")
+      ? "materials"
+      : (orderedSections[0] ?? "assignments"),
+  );
+
+  return (
+    <>
+      <div className="bg-white shadow-sm p-2 border border-gray-100 rounded-xl">
+        <div className="flex flex-wrap gap-2">
+          {orderedSections.map((section) => (
+            <button
+              key={section}
+              type="button"
+              onClick={() => setActiveSection(section)}
+              className={`px-4 py-2 rounded-lg text-sm font-medium transition-colors ${
+                activeSection === section
+                  ? "bg-purple-600 text-white"
+                  : "bg-gray-50 text-gray-600 hover:bg-purple-50 hover:text-purple-700"
+              }`}
+            >
+              {t(`tabs.${section}`)}
+            </button>
+          ))}
+        </div>
+      </div>
+
+      {activeSection === "assignments" && assignmentsContent}
+      {activeSection === "exams" && examsContent}
+      {activeSection === "materials" && materialsContent}
+    </>
+  );
+}
diff --git a/src/components/SubjectFilter.tsx b/src/components/SubjectFilter.tsx
new file mode 100644
index 0000000..eea9ed0
--- /dev/null
+++ b/src/components/SubjectFilter.tsx
@@ -0,0 +1,82 @@
+"use client";
+
+import { useRouter, useSearchParams } from "next/navigation";
+import { useTranslations } from "next-intl";
+import { useEffect } from "react";
+
+type Props = {
+  subjects: {
+    id: number;
+    name: string;
+    gradeId?: number | null;
+  }[];
+  classes?: {
+    id: number;
+    gradeId?: number | null;
+  }[];
+};
+
+export default function SubjectFilter({ subjects, classes = [] }: Props) {
+  const t = useTranslations("filters");
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const selectedClassId = searchParams.get("classId");
+  const selectedClass = classes.find(
+    (classItem) => String(classItem.id) === selectedClassId,
+  );
+  const filteredSubjects =
+    selectedClassId && selectedClass?.gradeId
+      ? subjects.filter(
+          (subject) => String(subject.gradeId) === String(selectedClass.gradeId),
+        )
+      : subjects;
+  const currentSubjectId = searchParams.get("subjectId") || "";
+  const selectedSubjectExists = filteredSubjects.some(
+    (subject) => String(subject.id) === currentSubjectId,
+  );
+
+  useEffect(() => {
+    if (!selectedClassId || !currentSubjectId || selectedSubjectExists) return;
+
+    const params = new URLSearchParams(searchParams.toString());
+    params.delete("subjectId");
+    params.set("page", "1");
+    router.replace(`?${params.toString()}`);
+  }, [
+    currentSubjectId,
+    router,
+    searchParams,
+    selectedClassId,
+    selectedSubjectExists,
+  ]);
+
+  const handleChange = (subjectId: string) => {
+    const params = new URLSearchParams(searchParams.toString());
+
+    if (subjectId) {
+      params.set("subjectId", subjectId);
+    } else {
+      params.delete("subjectId");
+    }
+
+    params.set("page", "1");
+
+    router.push(`?${params.toString()}`);
+  };
+
+  return (
+    <select
+      value={selectedSubjectExists ? currentSubjectId : ""}
+      onChange={(e) => handleChange(e.target.value)}
+      className="h-10 rounded-md border px-3 text-sm"
+    >
+      <option value="">{t("allSubjects")}</option>
+
+      {filteredSubjects.map((subject) => (
+        <option key={subject.id} value={subject.id}>
+          {subject.name}
+        </option>
+      ))}
+    </select>
+  );
+}
diff --git a/src/components/SubjectPageEditor.tsx b/src/components/SubjectPageEditor.tsx
new file mode 100644
index 0000000..12df7e8
--- /dev/null
+++ b/src/components/SubjectPageEditor.tsx
@@ -0,0 +1,323 @@
+"use client";
+
+import { useState, useTransition } from "react";
+import Image from "next/image";
+import {
+  Settings,
+  X,
+  Save,
+  Loader2,
+  ImageIcon,
+  Trash2,
+} from "lucide-react";
+import { saveSubjectPageSettings } from "@/lib/actions/subjectPageSettings.actions";
+import { useTranslations } from "next-intl";
+
+// ─── Types ────────────────────────────────────────────────────────────────────
+type Section = "assignments" | "exams" | "materials";
+const ANNOUNCEMENT_MAX_WORDS = 12;
+const DESCRIPTION_MAX_WORDS = 24;
+const countWords = (value: string) =>
+  value.trim().split(/\s+/).filter(Boolean).length;
+const limitWords = (value: string, maxWords: number) =>
+  value.trim().split(/\s+/).filter(Boolean).slice(0, maxWords).join(" ");
+
+interface Props {
+  subjectId: number;
+  initialSettings: {
+    announcement: string | null;
+    description: string | null;
+    bannerImage: string | null;
+    bannerHeight: string | null;
+    sectionsOrder: string[];
+  };
+}
+
+const normalizeSections = (sectionsOrder: string[]): Section[] => {
+  const mapped = sectionsOrder.map((section) =>
+    section === "lessons" ? "exams" : section,
+  );
+
+  const sections = mapped.filter(
+    (section): section is Section =>
+      section === "assignments" ||
+      section === "exams" ||
+      section === "materials",
+  );
+
+  return sections.length === 3
+    ? sections
+    : ["assignments", "exams", "materials"];
+};
+
+// ─── Component ────────────────────────────────────────────────────────────────
+export default function SubjectPageEditor({
+  subjectId,
+  initialSettings,
+}: Props) {
+  const t = useTranslations("subjectDetails.editor");
+  const [open, setOpen] = useState(false);
+  const [isPending, startTransition] = useTransition();
+
+  // Form state
+  const [announcement, setAnnouncement] = useState(
+    initialSettings.announcement ?? "",
+  );
+  const [description, setDescription] = useState(
+    initialSettings.description ?? "",
+  );
+  const [bannerImage, setBannerImage] = useState<string | null>(
+    initialSettings.bannerImage,
+  );
+  const [bannerFile, setBannerFile] = useState<File | null>(null);
+  const [removeBanner, setRemoveBanner] = useState(false);
+  const [bannerHeight, setBannerHeight] = useState<"sm" | "md" | "lg">(
+    (initialSettings.bannerHeight as "sm" | "md" | "lg") ?? "md",
+  );
+  const sections = normalizeSections(initialSettings.sectionsOrder);
+  const [successMsg, setSuccessMsg] = useState("");
+  const [errorMsg, setErrorMsg] = useState("");
+  // Banner preview
+  const [bannerObjectUrl, setBannerObjectUrl] = useState<string | null>(null);
+  const announcementWords = countWords(announcement);
+  const descriptionWords = countWords(description);
+
+  const bannerPreview = bannerFile
+    ? bannerObjectUrl
+    : removeBanner
+      ? null
+      : bannerImage;
+
+  // ─── Banner file pick ─────────────────────────────────────────────────────
+  function onBannerChange(e: React.ChangeEvent<HTMLInputElement>) {
+    const file = e.target.files?.[0];
+    if (!file) return;
+    setBannerFile(file);
+    setRemoveBanner(false);
+    const url = URL.createObjectURL(file);
+    setBannerObjectUrl(url);
+  }
+
+  function onRemoveBanner() {
+    setBannerFile(null);
+    setBannerObjectUrl(null);
+    setRemoveBanner(true);
+    setBannerImage(null);
+  }
+
+  // ─── Save ─────────────────────────────────────────────────────────────────
+  function handleSave() {
+    setSuccessMsg("");
+    setErrorMsg("");
+
+    const formData = new FormData();
+    formData.set("subjectId", String(subjectId));
+    formData.set("announcement", announcement);
+    formData.set("description", description);
+    formData.set("sectionsOrder", JSON.stringify(sections));
+    formData.set("removeBanner", String(removeBanner));
+    formData.set("bannerHeight", bannerHeight);
+    if (bannerFile) formData.set("bannerImage", bannerFile);
+
+    startTransition(async () => {
+      const result = await saveSubjectPageSettings(
+        { success: false, error: false, message: "" },
+        formData,
+      );
+      if (result.success) {
+        setSuccessMsg(result.message);
+        setBannerFile(null);
+        setTimeout(() => {
+          setOpen(false);
+          setSuccessMsg("");
+        }, 1200);
+      } else {
+        setErrorMsg(result.message);
+      }
+    });
+  }
+
+  return (
+    <>
+      {/* Trigger button */}
+      <button
+        onClick={() => setOpen(true)}
+        className="flex items-center gap-2 bg-purple-50 hover:bg-purple-100 px-4 py-2 border border-purple-200 rounded-lg font-medium text-purple-700 text-sm transition-colors"
+      >
+        <Settings className="w-4 h-4" />
+        <span className="hidden sm:block">{t("trigger")}</span>
+      </button>
+
+      {/* Overlay */}
+      {open && (
+        <div className="z-50 fixed inset-0 flex justify-center items-center p-4">
+          {/* Backdrop */}
+          <div
+            className="absolute inset-0 bg-black/40 backdrop-blur-sm"
+            onClick={() => setOpen(false)}
+          />
+
+          {/* Panel */}
+          <div className="relative bg-white shadow-2xl rounded-2xl w-full max-w-lg max-h-[90vh] overflow-y-auto">
+            {/* Header */}
+            <div className="flex justify-between items-center px-6 py-4 border-gray-100 border-b">
+              <h2 className="flex items-center gap-2 font-semibold text-gray-800 text-base">
+                <Settings className="w-4 h-4 text-purple-600" />
+                {t("title")}
+              </h2>
+              <button
+                onClick={() => setOpen(false)}
+                className="hover:bg-gray-100 p-1.5 rounded-lg text-gray-400 hover:text-gray-600 transition-colors"
+              >
+                <X className="w-4 h-4" />
+              </button>
+            </div>
+
+            <div className="space-y-6 p-6">
+              {/* Banner Image */}
+              <div>
+                <label className="block flex items-center gap-1.5 mb-2 font-medium text-gray-700 text-sm">
+                  <ImageIcon className="w-4 h-4 text-gray-400" />
+                  {t("bannerImage")}
+                </label>
+                {bannerPreview ? (
+                  <div className="group relative bg-gray-100 rounded-xl h-36 overflow-hidden">
+                    <Image
+                      src={bannerPreview}
+                      alt={t("bannerPreviewAlt")}
+                      fill
+                      className="object-cover"
+                    />
+                    <button
+                      onClick={onRemoveBanner}
+                      className="top-2 right-2 absolute bg-red-500 opacity-0 group-hover:opacity-100 p-1.5 rounded-lg text-white transition-opacity"
+                    >
+                      <Trash2 className="w-3.5 h-3.5" />
+                    </button>
+                  </div>
+                ) : (
+                  <label className="flex flex-col justify-center items-center hover:bg-purple-50 border-2 border-gray-200 hover:border-purple-300 border-dashed rounded-xl h-36 transition-colors cursor-pointer">
+                    <ImageIcon className="mb-2 w-8 h-8 text-gray-300" />
+                    <span className="text-gray-400 text-sm">
+                      {t("uploadBanner")}
+                    </span>
+                    <span className="mt-1 text-gray-300 text-xs">
+                      {t("bannerHint")}
+                    </span>
+                    <input
+                      type="file"
+                      accept="image/*"
+                      className="hidden"
+                      onChange={onBannerChange}
+                    />
+                  </label>
+                )}
+
+                {/* Height selector */}
+                <div className="flex items-center gap-2 mt-3">
+                  <span className="text-gray-500 text-xs">{t("height")}</span>
+                  {(["sm", "md", "lg"] as const).map((h) => (
+                    <button
+                      key={h}
+                      type="button"
+                      onClick={() => setBannerHeight(h)}
+                      className={`px-3 py-1 rounded-lg text-xs font-medium border transition-colors ${
+                        bannerHeight === h
+                          ? "bg-purple-600 text-white border-purple-600"
+                          : "bg-white text-gray-600 border-gray-200 hover:border-purple-300"
+                      }`}
+                    >
+                      {t(`heights.${h}`)}
+                    </button>
+                  ))}
+                </div>
+              </div>
+
+              {/* Announcement */}
+              <div>
+                <label className="block mb-2 font-medium text-gray-700 text-sm">
+                  {t("announcement")}
+                  <span className="ml-1 font-normal text-gray-400">
+                    {t("announcementHint")}
+                  </span>
+                </label>
+                <textarea
+                  value={announcement}
+                  onChange={(e) =>
+                    setAnnouncement(limitWords(e.target.value, ANNOUNCEMENT_MAX_WORDS))
+                  }
+                  maxLength={500}
+                  rows={1}
+                  placeholder={t("announcementPlaceholder")}
+                  className="px-3 py-2.5 border border-gray-200 rounded-xl focus:outline-none focus:ring-2 focus:ring-purple-300 w-full text-sm resize-none"
+                />
+                <p className="mt-1 text-gray-400 text-xs text-right">
+                  {t("wordCount", {
+                    count: announcementWords,
+                    max: ANNOUNCEMENT_MAX_WORDS,
+                  })}
+                </p>
+              </div>
+
+              {/* Description */}
+              <div>
+                <label className="block mb-2 font-medium text-gray-700 text-sm">
+                  {t("courseDescription")}
+                </label>
+                <textarea
+                  value={description}
+                  onChange={(e) =>
+                    setDescription(limitWords(e.target.value, DESCRIPTION_MAX_WORDS))
+                  }
+                  maxLength={1000}
+                  rows={2}
+                  placeholder={t("descriptionPlaceholder")}
+                  className="px-3 py-2.5 border border-gray-200 rounded-xl focus:outline-none focus:ring-2 focus:ring-purple-300 w-full text-sm resize-none"
+                />
+                <p className="mt-1 text-gray-400 text-xs text-right">
+                  {t("wordCount", {
+                    count: descriptionWords,
+                    max: DESCRIPTION_MAX_WORDS,
+                  })}
+                </p>
+              </div>
+              {/* Messages */}
+              {successMsg && (
+                <div className="bg-green-50 px-4 py-3 border border-green-200 rounded-xl text-green-700 text-sm">
+                  ✅ {successMsg}
+                </div>
+              )}
+              {errorMsg && (
+                <div className="bg-red-50 px-4 py-3 border border-red-200 rounded-xl text-red-700 text-sm">
+                  ❌ {errorMsg}
+                </div>
+              )}
+            </div>
+
+            {/* Footer */}
+            <div className="flex justify-end items-center gap-3 px-6 py-4 border-gray-100 border-t">
+              <button
+                onClick={() => setOpen(false)}
+                className="px-4 py-2 text-gray-600 hover:text-gray-800 text-sm transition-colors"
+              >
+                {t("cancel")}
+              </button>
+              <button
+                onClick={handleSave}
+                disabled={isPending}
+                className="flex items-center gap-2 bg-purple-600 hover:bg-purple-700 disabled:opacity-60 px-5 py-2 rounded-xl font-medium text-white text-sm transition-colors disabled:cursor-not-allowed"
+              >
+                {isPending ? (
+                  <Loader2 className="w-4 h-4 animate-spin" />
+                ) : (
+                  <Save className="w-4 h-4" />
+                )}
+                {t("saveChanges")}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/src/components/SubmissionsModal.tsx b/src/components/SubmissionsModal.tsx
new file mode 100644
index 0000000..fc98487
--- /dev/null
+++ b/src/components/SubmissionsModal.tsx
@@ -0,0 +1,580 @@
+"use client";
+
+import { useState, useEffect } from "react";
+import { X, Download, Users, FileText, CheckCircle, Clock, MessageSquare, Send, Loader2, Award } from "lucide-react";
+import { toast } from "react-toastify";
+import { useTranslations } from "next-intl";
+import {
+  gradeAssignmentSubmission,
+  publishAssignmentGrades,
+  updateTeacherFeedback,
+} from "@/lib/actions/submission.actions";
+
+type Submission = {
+  id: number;
+  fileUrl: string;
+  fileName: string;
+  fileType: string;
+  note: string | null;
+  teacherFeedback: string | null;
+  score: number | null;
+  gradePublished: boolean;
+  createdAt: Date;
+  updatedAt: Date;
+  student: {
+    id: string;
+    name: string;
+    img: string | null;
+  };
+};
+
+type Props = {
+  assignmentId: number;
+  assignmentTitle: string;
+  maxScore: number;
+  totalStudents: number;
+  endDate: Date; // ✅ لحساب التسليم المتأخر
+};
+
+
+// ─── دالة حساب الفرق بين وقتين ─────────────────────────────────────────────
+function getTimeDiff(
+  from: Date,
+  to: Date,
+  t: (key: "day" | "hour" | "minute", values: { count: number }) => string,
+): string {
+  const diffMs = to.getTime() - from.getTime();
+  const absDiff = Math.abs(diffMs);
+  const mins = Math.floor(absDiff / 60000);
+  const hours = Math.floor(absDiff / 3600000);
+  const days = Math.floor(absDiff / 86400000);
+  if (days >= 1) return t("day", { count: days });
+  if (hours >= 1) return t("hour", { count: hours });
+  return t("minute", { count: mins });
+}
+
+export default function SubmissionsModal({
+  assignmentId,
+  assignmentTitle,
+  maxScore,
+  totalStudents,
+  endDate,
+}: Props) {
+  const t = useTranslations("submissionsModal");
+  const [open, setOpen] = useState(false);
+  const [submissions, setSubmissions] =  useState<Submission[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [feedbackModal, setFeedbackModal] = useState<{
+    submissionId: number;
+    studentName: string;
+  } | null>(null);
+  const [feedbackText, setFeedbackText] = useState("");
+  const [gradeModal, setGradeModal] = useState<{
+    submissionId: number;
+    studentName: string;
+  } | null>(null);
+  const [scoreInput, setScoreInput] = useState("");
+  const [saving, setSaving] = useState(false);
+  const [publishing, setPublishing] = useState(false);
+
+  useEffect(() => {
+    if (!open) return;
+    setLoading(true);
+    fetch(`/api/submissions?assignmentId=${assignmentId}`)
+      .then((r) => r.json())
+      .then((data) => setSubmissions(Array.isArray(data) ? data : []))
+      .finally(() => setLoading(false));
+  }, [open, assignmentId]);
+
+  const submitted = submissions.length;
+  const notSubmitted = totalStudents - submitted;
+  const graded = submissions.filter((submission) => submission.score !== null).length;
+  const published = submissions.filter((submission) => submission.gradePublished).length;
+  const hasUnpublishedGrades = submissions.some(
+    (submission) => submission.score !== null && !submission.gradePublished,
+  );
+  const isDeadlinePassed = new Date() > new Date(endDate);
+
+  async function handleSaveFeedback() {
+    if (!feedbackModal) return;
+    setSaving(true);
+    const result = await updateTeacherFeedback(feedbackModal.submissionId, feedbackText);
+    setSaving(false);
+    if (result.success) {
+      toast.success(result.message);
+      setSubmissions((prev) =>
+        prev.map((s) =>
+          s.id === feedbackModal.submissionId
+            ? { ...s, teacherFeedback: feedbackText }
+            : s
+        )
+      );
+      setFeedbackModal(null);
+    } else {
+      toast.error(result.message);
+    }
+  }
+
+  async function handleSaveGrade() {
+    if (!gradeModal) return;
+    const trimmedScore = scoreInput.trim();
+    if (!trimmedScore) {
+      toast.error(t("scoreRequired"));
+      return;
+    }
+
+    const score = Number(trimmedScore);
+
+    setSaving(true);
+    const result = await gradeAssignmentSubmission(gradeModal.submissionId, score);
+    setSaving(false);
+
+    if (result.success) {
+      toast.success(result.message);
+      setSubmissions((prev) =>
+        prev.map((submission) =>
+          submission.id === gradeModal.submissionId
+            ? {
+                ...submission,
+                score,
+                gradePublished: false,
+              }
+            : submission,
+        ),
+      );
+      setGradeModal(null);
+    } else {
+      toast.error(result.message);
+    }
+  }
+
+  async function handlePublishGrades() {
+    setPublishing(true);
+    const result = await publishAssignmentGrades(assignmentId);
+    setPublishing(false);
+
+    if (result.success) {
+      toast.success(result.message ?? t("gradesPublished"));
+      setSubmissions((prev) =>
+        prev.map((submission) =>
+          submission.score !== null
+            ? { ...submission, gradePublished: true }
+            : submission,
+        ),
+      );
+    } else {
+      toast.error(result.message);
+    }
+  }
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={() => setOpen(true)}
+        className="flex items-center gap-1.5 px-2.5 py-1.5 rounded-lg
+                   bg-academixPurpleLight text-academixPurpleDark hover:brightness-95
+                   transition-colors text-xs font-medium"
+      >
+        <Users className="w-3.5 h-3.5" />
+        {t("open")}
+      </button>
+
+      {open && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/40">
+          <div className="bg-white rounded-xl shadow-xl w-full max-w-lg mx-4 max-h-[85vh] flex flex-col">
+            {/* Header */}
+            <div className="flex items-center justify-between px-6 py-4 border-b border-gray-100">
+              <div>
+                <h3 className="font-semibold text-gray-800 text-base">
+                  {t("title")}
+                </h3>
+                <p className="text-xs text-gray-400 mt-0.5 truncate max-w-[280px]">
+                  {assignmentTitle}
+                </p>
+              </div>
+              <button
+                type="button"
+                onClick={() => setOpen(false)}
+                className="p-1 rounded-lg hover:bg-gray-100 text-gray-400"
+              >
+                <X className="w-4 h-4" />
+              </button>
+            </div>
+
+            {/* Deadline Banner */}
+            {isDeadlinePassed && (
+              <div className="flex items-center gap-2 px-6 py-2 bg-red-50 border-b border-red-100">
+                <Clock className="w-3.5 h-3.5 text-red-500 flex-shrink-0" />
+                <p className="text-xs text-red-600 font-medium">
+                  {t("deadlinePassed")}
+                </p>
+                <span className="ml-auto text-xs text-red-400">
+                  {new Date(endDate).toLocaleDateString("en-GB", { day: "numeric", month: "short", year: "numeric" })}
+                </span>
+              </div>
+            )}
+
+            {/* Stats */}
+            <div className="flex flex-wrap gap-3 px-6 py-3 border-b border-gray-100">
+              <div className="flex items-center gap-2 px-3 py-1.5 bg-green-50 rounded-lg">
+                <CheckCircle className="w-4 h-4 text-green-600" />
+                <span className="text-sm font-medium text-green-700">
+                  {t("submitted", { count: submitted })}
+                </span>
+              </div>
+              <div className="flex items-center gap-2 px-3 py-1.5 bg-gray-50 rounded-lg">
+                <Clock className="w-4 h-4 text-gray-400" />
+                <span className="text-sm font-medium text-gray-500">
+                  {t("pending", { count: notSubmitted })}
+                </span>
+              </div>
+              <div className="flex items-center gap-2 px-3 py-1.5 bg-academixPurpleLight rounded-lg">
+                <Award className="w-4 h-4 text-academixPurpleDark" />
+                <span className="text-sm font-medium text-academixPurpleDark">
+                  {t("graded", { count: graded })}
+                </span>
+              </div>
+            </div>
+
+            {/* List */}
+            <div className="flex-1 overflow-y-auto px-6 py-3">
+              {loading ? (
+                <div className="flex items-center justify-center py-10">
+                  <div className="w-6 h-6 border-2 border-academixPurpleDark border-t-transparent rounded-full animate-spin" />
+                </div>
+              ) : submissions.length === 0 ? (
+                <div className="text-center py-10">
+                  <Users className="w-10 h-10 text-gray-200 mx-auto mb-3" />
+                  <p className="text-gray-500 text-sm font-medium">
+                    {t("emptyTitle")}
+                  </p>
+                  <p className="text-gray-400 text-xs mt-1">
+                    {t("emptyDescription")}
+                  </p>
+                </div>
+              ) : (
+                <ul className="divide-y divide-gray-50">
+                  {submissions.map((s) => (
+                    <li key={s.id} className="flex items-start gap-3 py-3">
+                      {/* Student avatar */}
+                      {s.student.img ? (
+                        <img
+                          src={s.student.img}
+                          alt={s.student.name}
+                          className="w-8 h-8 rounded-full object-cover flex-shrink-0 mt-0.5"
+                        />
+                      ) : (
+                        <div className="w-8 h-8 rounded-full bg-academixPurpleLight flex items-center justify-center
+                                        text-academixPurpleDark font-semibold text-xs flex-shrink-0 mt-0.5">
+                          {s.student.name[0]}
+                        </div>
+                      )}
+
+                      {/* Submission info */}
+                      <div className="flex-1 min-w-0">
+                        <div className="flex items-center gap-2 flex-wrap">
+                          <p className="text-sm font-medium text-gray-800">
+                            {s.student.name}
+                          </p>
+                          {new Date(s.updatedAt) > new Date(endDate) ? (
+                            <span className="flex items-center gap-0.5 px-1.5 py-0.5 bg-red-100 text-red-600 rounded text-[10px] font-medium">
+                              <Clock className="w-2.5 h-2.5" />
+                              {t("late", {
+                                time: getTimeDiff(
+                                  new Date(endDate),
+                                  new Date(s.updatedAt),
+                                  t,
+                                ),
+                              })}
+                            </span>
+                          ) : (
+                            <span className="flex items-center gap-0.5 px-1.5 py-0.5 bg-green-100 text-green-700 rounded text-[10px] font-medium">
+                              <CheckCircle className="w-2.5 h-2.5" />
+                              {t("early", {
+                                time: getTimeDiff(
+                                  new Date(s.updatedAt),
+                                  new Date(endDate),
+                                  t,
+                                ),
+                              })}
+                            </span>
+                          )}
+                        </div>
+                        <div className="flex items-center gap-1.5 mt-0.5">
+                          <FileText className="w-3 h-3 text-gray-400" />
+                          <span className="text-xs text-gray-500 truncate max-w-[180px]">
+                            {s.fileName}
+                          </span>
+                        </div>
+                        <div className="flex items-center gap-1.5 mt-1">
+                          {s.score !== null ? (
+                            <>
+                              <span className="text-xs font-medium text-academixPurpleDark">
+                                {s.score}/{maxScore}
+                              </span>
+                              <span
+                                className={`px-1.5 py-0.5 rounded text-[10px] font-medium ${
+                                  s.gradePublished
+                                    ? "bg-green-100 text-green-700"
+                                    : "bg-amber-100 text-amber-700"
+                                }`}
+                              >
+                                {s.gradePublished ? t("published") : t("draft")}
+                              </span>
+                            </>
+                          ) : (
+                            <span className="text-xs text-gray-400">
+                              {t("ungraded")}
+                            </span>
+                          )}
+                        </div>
+                        {s.note && (
+                          <p className="text-xs text-gray-400 mt-1 line-clamp-2 italic">
+                            "{s.note}"
+                          </p>
+                        )}
+                        <p className="text-xs text-gray-300 mt-1">
+                          {new Date(s.createdAt).toLocaleDateString("en-GB", {
+                            day: "numeric",
+                            month: "short",
+                            year: "numeric",
+                          })}
+                        </p>
+                      </div>
+
+                      {/* زر التحميل المعدل ليستخدم API العام /api/download مع type=submission */}
+                      <a
+                        href={`/api/download/${s.id}?type=submission`}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="flex-shrink-0 p-1.5 rounded-lg text-gray-400
+                                   hover:text-academixPurpleDark hover:bg-academixPurpleLight transition-colors"
+                        title={t("downloadSubmission")}
+                      >
+                        <Download className="w-4 h-4" />
+                      </a>
+
+                      {/* Grade */}
+                      <button
+                        type="button"
+                        onClick={() => {
+                          setGradeModal({
+                            submissionId: s.id,
+                            studentName: s.student.name,
+                          });
+                          setScoreInput(s.score?.toString() ?? "");
+                        }}
+                        className="relative flex-shrink-0 p-1.5 rounded-lg text-gray-400
+                                   hover:text-academixPurpleDark hover:bg-academixPurpleLight transition-colors"
+                        title={s.score !== null ? t("editGrade") : t("addGrade")}
+                      >
+                        <Award className="w-4 h-4" />
+                        {s.score !== null && (
+                          <span className="absolute top-0.5 right-0.5 w-1.5 h-1.5 rounded-full bg-academixPurpleDark" />
+                        )}
+                      </button>
+
+                      <button
+                        type="button"
+                        onClick={() => {
+                          setFeedbackModal({
+                            submissionId: s.id,
+                            studentName: s.student.name,
+                          });
+                          setFeedbackText(s.teacherFeedback ?? "");
+                        }}
+                        className="relative flex-shrink-0 p-1.5 rounded-lg text-gray-400
+                                   hover:text-green-600 hover:bg-green-50 transition-colors"
+                        title={s.teacherFeedback ? t("editFeedback") : t("addFeedback")}
+                      >
+                        <MessageSquare className="w-4 h-4" />
+                        {s.teacherFeedback && (
+                          <span className="absolute top-0.5 right-0.5 w-1.5 h-1.5 rounded-full bg-green-500" />
+                        )}
+                      </button>
+                    </li>
+                  ))}
+                </ul>
+              )}
+            </div>
+
+            {/* Footer */}
+            <div className="px-6 py-3 border-t border-gray-100">
+              <button
+                type="button"
+                onClick={handlePublishGrades}
+                disabled={publishing || !hasUnpublishedGrades}
+                className="mb-2 w-full flex items-center justify-center gap-2 py-2 rounded-lg
+                           bg-academixPurpleDark text-white disabled:opacity-50
+                           disabled:cursor-not-allowed hover:brightness-90 text-sm font-medium transition-colors"
+              >
+                {publishing ? (
+                  <>
+                    <Loader2 className="w-4 h-4 animate-spin" />
+                    {t("publishing")}
+                  </>
+                ) : (
+                  <>
+                    <Send className="w-4 h-4" />
+                    {t("publishGrades", { published, graded })}
+                  </>
+                )}
+              </button>
+              <button
+                type="button"
+                onClick={() => setOpen(false)}
+                className="w-full py-2 rounded-lg border border-gray-200
+                           text-gray-600 hover:bg-gray-50 text-sm font-medium transition-colors"
+              >
+                {t("close")}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+
+      {/* Grade Modal */}
+      {gradeModal && (
+        <div className="fixed inset-0 z-[60] flex items-center justify-center bg-black/40">
+          <div className="bg-white rounded-xl shadow-xl p-6 w-full max-w-md mx-4">
+            <div className="flex justify-between items-center mb-4">
+              <h3 className="font-semibold text-gray-800 text-base">
+                {t("gradeTitle")}
+              </h3>
+              <button
+                type="button"
+                onClick={() => setGradeModal(null)}
+                className="p-1 rounded-lg hover:bg-gray-100 text-gray-400"
+              >
+                <X className="w-4 h-4" />
+              </button>
+            </div>
+
+            <p className="text-sm text-gray-500 mb-3">
+              {t("student")}{" "}
+              <span className="font-medium text-gray-700">
+                {gradeModal.studentName}
+              </span>
+            </p>
+
+            <label className="block mb-1 font-medium text-gray-700 text-sm">
+              {t("score")}
+            </label>
+            <input
+              type="number"
+              min={0}
+              max={maxScore}
+              step={0.5}
+              value={scoreInput}
+              onChange={(e) => setScoreInput(e.target.value)}
+              placeholder={`0 - ${maxScore}`}
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+            />
+
+            <p className="mt-2 text-xs text-gray-400">
+              {t("gradeHelp")}
+            </p>
+
+            <div className="flex gap-3 mt-4">
+              <button
+                type="button"
+                onClick={() => setGradeModal(null)}
+                className="flex-1 py-2 border rounded-lg text-gray-600
+                           hover:bg-gray-50 text-sm font-medium transition-colors"
+              >
+                {t("cancel")}
+              </button>
+              <button
+                type="button"
+                onClick={handleSaveGrade}
+                disabled={saving}
+                className="flex-1 flex items-center justify-center gap-2
+                           bg-academixPurpleDark hover:brightness-90 disabled:opacity-60
+                           text-white font-medium py-2 rounded-lg text-sm transition-colors"
+              >
+                {saving ? (
+                  <>
+                    <Loader2 className="w-4 h-4 animate-spin" />
+                    {t("saving")}
+                  </>
+                ) : (
+                  <>
+                    <Award className="w-4 h-4" />
+                    {t("saveGrade")}
+                  </>
+                )}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+
+      {/* Feedback Modal */}
+      {feedbackModal && (
+        <div className="fixed inset-0 z-[60] flex items-center justify-center bg-black/40">
+          <div className="bg-white rounded-xl shadow-xl p-6 w-full max-w-md mx-4">
+            <div className="flex justify-between items-center mb-4">
+              <h3 className="font-semibold text-gray-800 text-base">
+                {t("feedbackTitle")}
+              </h3>
+              <button
+                type="button"
+                onClick={() => setFeedbackModal(null)}
+                className="p-1 rounded-lg hover:bg-gray-100 text-gray-400"
+              >
+                <X className="w-4 h-4" />
+              </button>
+            </div>
+
+            <p className="text-sm text-gray-500 mb-3">
+              {t("student")}{" "}
+              <span className="font-medium text-gray-700">
+                {feedbackModal.studentName}
+              </span>
+            </p>
+
+            <textarea
+              value={feedbackText}
+              onChange={(e) => setFeedbackText(e.target.value)}
+              rows={4}
+              placeholder={t("feedbackPlaceholder")}
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400 resize-none"
+            />
+
+            <div className="flex gap-3 mt-4">
+              <button
+                type="button"
+                onClick={() => setFeedbackModal(null)}
+                className="flex-1 py-2 border rounded-lg text-gray-600
+                           hover:bg-gray-50 text-sm font-medium transition-colors"
+              >
+                {t("cancel")}
+              </button>
+              <button
+                type="button"
+                onClick={handleSaveFeedback}
+                disabled={saving}
+                className="flex-1 flex items-center justify-center gap-2
+                           bg-academixPurpleDark hover:brightness-90 disabled:opacity-60
+                           text-white font-medium py-2 rounded-lg text-sm transition-colors"
+              >
+                {saving ? (
+                  <>
+                    <Loader2 className="w-4 h-4 animate-spin" />
+                    {t("saving")}
+                  </>
+                ) : (
+                  <>
+                    <Send className="w-4 h-4" />
+                    {t("saveFeedback")}
+                  </>
+                )}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/src/components/Table.tsx b/src/components/Table.tsx
index bf01eb5..0c5ebd0 100644
--- a/src/components/Table.tsx
+++ b/src/components/Table.tsx
@@ -1,18 +1,41 @@
+import EmptyState from "@/components/states/EmptyState";
+
 const Table = ({
   columns,
   renderRow,
   data,
+  emptyTitle,
+  emptyDescription,
 }: {
   columns: { header: string; accessor: string; className?: string }[];
   renderRow: (item: any) => React.ReactNode;
   data: any[];
+  emptyTitle?: string;
+  emptyDescription?: string;
 }) => {
+  if (data.length === 0) {
+    return (
+      <div className="flex justify-center items-center h-full min-h-[300px]">
+        <EmptyState
+          title={emptyTitle}
+          description={emptyDescription}
+          className="py-0"
+        />
+      </div>
+    );
+  }
+
   return (
-    <table className="w-full mt-4">
+    <table className="mt-4 w-full">
       <thead>
-        <tr className="text-left text-gray-500 text-sm">
+        <tr className="text-gray-500 text-sm">
           {columns.map((col) => (
-            <th key={col.accessor} className={col.className}>{col.header}</th>
+            <th
+              key={col.accessor}
+              className={`p-4 text-start ${col.className ?? ""}`}
+            >
+              {col.header}
+            </th>
           ))}
         </tr>
       </thead>
diff --git a/src/components/TableSearch.tsx b/src/components/TableSearch.tsx
index 9e84be6..242916f 100644
--- a/src/components/TableSearch.tsx
+++ b/src/components/TableSearch.tsx
@@ -1,27 +1,41 @@
 "use client";
 
 import { Search } from "lucide-react";
-import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
 
 const TableSearch = () => {
+  const t = useTranslations("common");
   const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
 
-  const handleSubmit = (e: React.FocusEvent<HTMLFormElement>) => {
+  const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
-    const value = (e.currentTarget[0] as HTMLInputElement).value;
-    const params = new URLSearchParams(window.location.search);
-    params.set("search", value);
-    router.push(`${window.location.pathname}?${params}`);
+    const formData = new FormData(e.currentTarget);
+    const value = String(formData.get("search") ?? "").trim();
+    const params = new URLSearchParams(searchParams.toString());
+
+    if (value) {
+      params.set("search", value);
+    } else {
+      params.delete("search");
+    }
+
+    params.set("page", "1");
+    router.push(`${pathname}?${params.toString()}`);
   };
   return (
     <form
       onSubmit={handleSubmit}
-      className="flex items-center gap-2 px-2 rounded-full ring-[1.5px] ring-gray-300 w-full md:w-auto text-xs"
+      className="flex justify-center md:justify-start items-center gap-2 px-2 rounded-full ring-[1.5px] ring-gray-300 md:w-auto text-xs"
     >
       <Search className="w-4 h-4 text-gray-500" />
       <input
+        name="search"
         type="text"
-        placeholder="Search..."
+        defaultValue={searchParams.get("search") ?? ""}
+        placeholder={t("search")}
         className="bg-transparent p-2 outline-none w-[200px]"
       />
     </form>
diff --git a/src/components/UserActionButtons.tsx b/src/components/UserActionButtons.tsx
index 2dd9191..fb4f14c 100644
--- a/src/components/UserActionButtons.tsx
+++ b/src/components/UserActionButtons.tsx
@@ -22,10 +22,10 @@ export default function UserActionButtons({
       <button
         type="button"
         onClick={() => setMessageOpen(true)}
-        className={`p-2 flex items-center justify-center text-academixPurpleDark hover:bg-gray-100 rounded-md transition bg-academixPurple`}
+        className={`p-2 flex items-center justify-center bg-academixPurpleDark hover:scale-[1.05] rounded-md transition text-white`}
         title="Send message"
       >
-        <Mail className="w-4 h-4 text-academixPurpleDark" />
+        <Mail className="w-4 h-4" />
       </button>
 
       {/* Message Modal */}
diff --git a/src/components/UserAvatarMenu.tsx b/src/components/UserAvatarMenu.tsx
index 5e6cf74..3ade34d 100644
--- a/src/components/UserAvatarMenu.tsx
+++ b/src/components/UserAvatarMenu.tsx
@@ -2,6 +2,7 @@
 
 import { useClerk } from "@clerk/nextjs";
 import Image from "next/image";
+import { useTranslations } from "next-intl";
 import { useEffect, useRef, useState } from "react";
 
 type UserAvatarMenuProps = {
@@ -17,6 +18,8 @@ const UserAvatarMenu = ({
   initials,
   imageUrl,
 }: UserAvatarMenuProps) => {
+  const t = useTranslations("navbar.userMenu");
+  const actionsT = useTranslations("actions");
   const { signOut } = useClerk();
   const [isMenuOpen, setIsMenuOpen] = useState(false);
   const [isSigningOut, setIsSigningOut] = useState(false);
@@ -46,12 +49,12 @@ const UserAvatarMenu = ({
         type="button"
         onClick={() => setIsMenuOpen((prev) => !prev)}
         className="border border-gray-200 rounded-full w-9 h-9 overflow-hidden"
-        aria-label="Open user menu"
+        aria-label={t("open")}
       >
         {imageUrl ? (
           <Image
             src={imageUrl}
-            alt="User avatar"
+            alt={t("avatarAlt")}
             width={36}
             height={36}
             className="w-full h-full object-cover"
@@ -64,17 +67,17 @@ const UserAvatarMenu = ({
       </button>
 
       {isMenuOpen && (
-        <div className="right-0 z-50 absolute bg-white shadow-lg mt-2 border border-gray-100 rounded-md w-52 overflow-hidden">
+        <div className="end-0 z-50 absolute bg-white shadow-lg mt-2 border border-gray-100 rounded-md w-52 overflow-hidden">
           <div className="px-3 py-2 border-gray-100 border-b">
             <p className="font-medium text-gray-700 text-sm">{fullName}</p>
-            <p className="text-gray-500 text-xs">{role || "No role"}</p>
+            <p className="text-gray-500 text-xs">{role || t("noRole")}</p>
           </div>
 
           <button
             type="button"
             onClick={handleSignOut}
             disabled={isSigningOut}
-            className="hover:bg-gray-50 disabled:opacity-70 px-3 py-2 w-full text-red-600 text-sm text-left"
+            className="hover:bg-gray-50 disabled:opacity-70 px-3 py-2 w-full text-red-600 text-sm text-start"
           >
             {isSigningOut ? (
               <span className="flex items-center gap-2">
@@ -82,10 +85,10 @@ const UserAvatarMenu = ({
                   className="border-2 border-red-300 border-t-red-600 rounded-full w-3.5 h-3.5 animate-spin"
                   aria-hidden="true"
                 />
-                Signing out...
+                {actionsT("signingOut")}
               </span>
             ) : (
-              "Sign out"
+              actionsT("signOut")
             )}
           </button>
         </div>
diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index e1b976f..30bfae0 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -1,45 +1,39 @@
-import { requireAuth } from "@/lib/auth";
-import prisma from "@/lib/prisma";
 import { UserRole } from "@/lib/utils";
-import { MoreHorizontal } from "lucide-react";
+import { ShieldCheck, GraduationCap, Users, UserRound } from "lucide-react";
+import { getTranslations } from "next-intl/server";
 
-const UserCard = async ({ type }: { type: UserRole }) => {
-  const user = requireAuth();
+type SchoolDashboardRole = Exclude<UserRole, "superAdmin">;
 
-  const countByRole: Record<UserRole, () => Promise<number>> = {
-    admin: async () =>
-      prisma.admin.count({
-        where: { schoolId: (await user).schoolId },
-      }),
-
-    teacher: async () =>
-      prisma.teacher.count({
-        where: { schoolId: (await user).schoolId },
-      }),
-
-    student: async () =>
-      prisma.student.count({
-        where: { schoolId: (await user).schoolId },
-      }),
+const roleIconMap: Record<SchoolDashboardRole, React.ReactNode> = {
+  admin: <ShieldCheck className="opacity-80 w-6 h-6 text-black" />,
+  teacher: <GraduationCap className="opacity-80 w-6 h-6 text-black" />,
+  student: <UserRound className="opacity-80 w-6 h-6 text-black" />,
+  parent: <Users className="opacity-80 w-6 h-6 text-black" />,
+};
 
-    parent: async () =>
-      prisma.parent.count({
-        where: { schoolId: (await user).schoolId },
-      }),
-  };
+type UserCardProps = {
+  type: SchoolDashboardRole;
+  count: number;
+  currentYearName?: string | null;
+};
 
-  const data = await countByRole[type]();
+const UserCard = async ({ type, count, currentYearName }: UserCardProps) => {
+  const t = await getTranslations("dashboardCards");
 
   return (
-    <div className="flex-1 even:bg-academixYellow odd:bg-academixPurple p-4 rounded-2xl min-w-[130px]">
+    <div className="even:bg-amber-300 odd:bg-academixPurpleDark/60 p-4 rounded-2xl">
       <div className="flex justify-between items-center">
-        <span className="bg-white px-2 py-1 rounded-full text-[10px] text-green-600">
-          2024/25
-        </span>
-        <MoreHorizontal className="w-5 h-5 text-gray-500" />
+        {currentYearName && (
+          <span className="bg-white px-2 py-1 rounded-full text-[10px] text-green-600">
+            {currentYearName}
+          </span>
+        )}
+        <div>{roleIconMap[type]}</div>
+      </div>
+      <div className="flex md:flex-col items-center md:items-start gap-4 mt-4">
+        <p className="font-semibold text-2xl">{count}</p>
+        <p className="font-medium text-sm">{t(type)}</p>
       </div>
-      <h1 className="my-4 font-semibold text-2xl">{data}</h1>
-      <h2 className="font-medium text-gray-500 text-sm capitalize">{type}s</h2>
     </div>
   );
 };
diff --git a/src/components/WorkingDaysHolidaysForm.tsx b/src/components/WorkingDaysHolidaysForm.tsx
new file mode 100644
index 0000000..c95596f
--- /dev/null
+++ b/src/components/WorkingDaysHolidaysForm.tsx
@@ -0,0 +1,345 @@
+"use client";
+
+import {
+  createSchoolDayException,
+  deleteSchoolDayException,
+  updateSchoolWorkingDays,
+} from "@/lib/actions";
+import type { SchoolDayExceptionItem } from "@/lib/schoolSettings";
+import { schoolWeekDays, type SchoolWeekDay } from "@/lib/schoolCalendar";
+import { X } from "lucide-react";
+import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
+import { useMemo, useState, useTransition } from "react";
+import { toast } from "react-toastify";
+
+type Props = {
+  initialWorkingDays: SchoolWeekDay[];
+  exceptions: SchoolDayExceptionItem[];
+};
+
+const WorkingDaysHolidaysForm = ({ initialWorkingDays, exceptions }: Props) => {
+  const th = useTranslations("tableHeaders");
+  const t = useTranslations("settings.workingDays");
+  const actionsT = useTranslations("actions");
+  const router = useRouter();
+  const [isSavingWorkingDays, startSavingWorkingDays] = useTransition();
+  const [isSavingException, startSavingException] = useTransition();
+  const [isDeletingException, startDeletingException] = useTransition();
+  const [deletingExceptionId, setDeletingExceptionId] = useState<number | null>(
+    null,
+  );
+
+  const [workingDays, setWorkingDays] =
+    useState<SchoolWeekDay[]>(initialWorkingDays);
+  const [date, setDate] = useState("");
+  const [type, setType] = useState<SchoolDayExceptionItem["type"]>("HOLIDAY");
+  const [name, setName] = useState("");
+  const [notes, setNotes] = useState("");
+  const [isExceptionModalOpen, setIsExceptionModalOpen] = useState(false);
+
+  const sortedExceptions = useMemo(
+    () => [...exceptions].sort((a, b) => a.date.localeCompare(b.date)),
+    [exceptions],
+  );
+
+  const toggleDay = (day: SchoolWeekDay) => {
+    setWorkingDays((prev) => {
+      if (prev.includes(day)) {
+        return prev.filter((d) => d !== day);
+      }
+
+      return schoolWeekDays.filter((d) => [...prev, day].includes(d));
+    });
+  };
+
+  const onSaveWorkingDays = () => {
+    startSavingWorkingDays(async () => {
+      const result = await updateSchoolWorkingDays(
+        { success: false, error: false },
+        { workingDays },
+      );
+
+      if (result.success) {
+        toast(t("workingDaysUpdated"));
+        router.refresh();
+        return;
+      }
+
+      toast.error(result.message ?? actionsT("somethingWentWrong"));
+    });
+  };
+
+  const onCreateException = (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+
+    startSavingException(async () => {
+      const result = await createSchoolDayException(
+        { success: false, error: false },
+        { date, type, name, notes },
+      );
+
+      if (result.success) {
+        toast(t("exceptionSaved"));
+        setDate("");
+        setType("HOLIDAY");
+        setName("");
+        setNotes("");
+        setIsExceptionModalOpen(false);
+        router.refresh();
+        return;
+      }
+
+      toast.error(result.message ?? actionsT("somethingWentWrong"));
+    });
+  };
+
+  const onDeleteException = (id: number) => {
+    setDeletingExceptionId(id);
+    startDeletingException(async () => {
+      const formData = new FormData();
+      formData.set("id", String(id));
+
+      const result = await deleteSchoolDayException(
+        { success: false, error: false },
+        formData,
+      );
+
+      if (result.success) {
+        toast(t("exceptionRemoved"));
+        setDeletingExceptionId(null);
+        router.refresh();
+        return;
+      }
+
+      setDeletingExceptionId(null);
+      toast.error(result.message ?? actionsT("somethingWentWrong"));
+    });
+  };
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <span className="block font-semibold text-gray-700 text-sm">
+          {t("weeklyWorkingDays")}
+        </span>
+        <div className="flex flex-wrap gap-2">
+          {schoolWeekDays.map((day) => {
+            const isActive = workingDays.includes(day);
+            return (
+              <button
+                key={day}
+                type="button"
+                onClick={() => toggleDay(day)}
+                className={`px-3 py-2 border rounded-md text-sm font-medium transition-colors ${
+                  isActive
+                    ? "bg-academixPurpleLight border-academixPurpleDark text-academixPurpleDark"
+                    : "bg-white border-gray-200 text-gray-700"
+                }`}
+              >
+                {t(`days.${day}`)}
+              </button>
+            );
+          })}
+        </div>
+        <button
+          type="button"
+          onClick={onSaveWorkingDays}
+          disabled={isSavingWorkingDays}
+          className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-4 py-2 rounded-md font-semibold text-white text-sm transition-all"
+        >
+          {isSavingWorkingDays ? actionsT("saving") : t("saveWorkingDays")}
+        </button>
+      </div>
+
+      <div className="flex flex-col gap-4 bg-gray-50 p-6 rounded-xl">
+        <div className="flex justify-between items-center">
+          <span className="block font-semibold text-gray-700 text-sm">
+            {t("holidaysOffDays")}
+          </span>
+          <button
+            type="button"
+            onClick={() => setIsExceptionModalOpen(true)}
+            className="bg-academixPurpleDark hover:brightness-90 px-4 py-2 rounded-md font-semibold text-white text-sm transition-all"
+          >
+            {t("addException")}
+          </button>
+        </div>
+
+        <div className="sm:hidden space-y-3">
+          {sortedExceptions.length === 0 ? (
+            <div className="px-3 py-4 border border-gray-200 rounded-lg text-gray-500 text-sm">
+              {t("empty")}
+            </div>
+          ) : (
+            sortedExceptions.map((item) => (
+              <div
+                key={item.id}
+                className="space-y-2 p-3 border border-gray-200 rounded-lg"
+              >
+                <div className="flex justify-between items-center">
+                  <span className="font-semibold text-sm">{item.date}</span>
+                  <span className="text-gray-600 text-xs">
+                    {t(`types.${item.type}`)}
+                  </span>
+                </div>
+                <p className="text-sm">
+                  <span className="font-medium">{th("name")}:</span>{" "}
+                  {item.name || "-"}
+                </p>
+                <button
+                  type="button"
+                  onClick={() => onDeleteException(item.id)}
+                  disabled={isDeletingException}
+                  className="text-red-600 text-sm hover:underline"
+                >
+                  {isDeletingException && deletingExceptionId === item.id
+                    ? actionsT("deleting")
+                    : actionsT("delete")}
+                </button>
+              </div>
+            ))
+          )}
+        </div>
+
+        <div className="hidden sm:block overflow-x-auto">
+          <table className="min-w-full text-sm">
+            <thead>
+              <tr className="border-b text-start">
+                <th className="px-2 py-2 font-semibold">{th("date")}</th>
+                <th className="px-2 py-2 font-semibold">{th("type")}</th>
+                <th className="px-2 py-2 font-semibold">{th("name")}</th>
+                <th className="px-2 py-2 font-semibold">{th("actions")}</th>
+              </tr>
+            </thead>
+            <tbody>
+              {sortedExceptions.length === 0 ? (
+                <tr>
+                  <td colSpan={4} className="px-2 py-3 text-gray-500">
+                    {t("empty")}
+                  </td>
+                </tr>
+              ) : (
+                sortedExceptions.map((item) => (
+                  <tr key={item.id} className="border-b">
+                    <td className="px-2 py-3">{item.date}</td>
+                    <td className="px-2 py-3">{t(`types.${item.type}`)}</td>
+                    <td className="px-2 py-3">{item.name || "-"}</td>
+                    <td className="px-2 py-3">
+                      <button
+                        type="button"
+                        onClick={() => onDeleteException(item.id)}
+                        disabled={isDeletingException}
+                        className="text-red-600 hover:underline"
+                      >
+                        {isDeletingException && deletingExceptionId === item.id
+                          ? actionsT("deleting")
+                          : actionsT("delete")}
+                      </button>
+                    </td>
+                  </tr>
+                ))
+              )}
+            </tbody>
+          </table>
+        </div>
+      </div>
+
+      {isExceptionModalOpen ? (
+        <div
+          className="z-50 fixed inset-0 flex justify-center items-center bg-black/60 p-4"
+          onMouseDown={(event) => {
+            if (event.target === event.currentTarget) {
+              setIsExceptionModalOpen(false);
+            }
+          }}
+        >
+          <form
+            className="relative bg-white p-5 rounded-md w-full max-w-2xl"
+            onSubmit={onCreateException}
+            role="dialog"
+            aria-modal="true"
+            onMouseDown={(event) => event.stopPropagation()}
+          >
+            <div className="flex justify-between items-center mb-4">
+              <h3 className="font-semibold text-lg">{t("addDayException")}</h3>
+              <button
+                type="button"
+                onClick={() => setIsExceptionModalOpen(false)}
+                className="text-gray-500 hover:text-gray-700 transition-colors"
+                aria-label={actionsT("close")}
+              >
+                <X className="w-5 h-5" />
+              </button>
+            </div>
+
+            <div className="gap-4 grid grid-cols-1 md:grid-cols-2">
+              <label className="flex flex-col gap-2">
+                <span className="font-medium text-gray-700 text-sm">
+                  {th("date")}
+                </span>
+                <input
+                  type="date"
+                  value={date}
+                  onChange={(e) => setDate(e.target.value)}
+                  className="bg-white px-4 py-3 border-2 border-gray-200 rounded-lg focus:outline-none text-sm"
+                  required
+                />
+              </label>
+              <label className="flex flex-col gap-2">
+                <span className="font-medium text-gray-700 text-sm">
+                  {th("type")}
+                </span>
+                <select
+                  value={type}
+                  onChange={(e) =>
+                    setType(e.target.value as SchoolDayExceptionItem["type"])
+                  }
+                  className="bg-white px-4 py-3 border-2 border-gray-200 rounded-lg focus:outline-none text-sm"
+                >
+                  <option value="HOLIDAY">{t("types.HOLIDAY")}</option>
+                  <option value="OFF_DAY">{t("types.OFF_DAY")}</option>
+                  <option value="WORKING_OVERRIDE">
+                    {t("types.WORKING_OVERRIDE")}
+                  </option>
+                </select>
+              </label>
+              <label className="flex flex-col gap-2 md:col-span-2">
+                <span className="font-medium text-gray-700 text-sm">
+                  {t("nameOptional")}
+                </span>
+                <input
+                  type="text"
+                  value={name}
+                  onChange={(e) => setName(e.target.value)}
+                  className="bg-white px-4 py-3 border-2 border-gray-200 rounded-lg focus:outline-none text-sm"
+                  placeholder={t("namePlaceholder")}
+                />
+              </label>
+              <label className="flex flex-col gap-2 md:col-span-2">
+                <span className="font-medium text-gray-700 text-sm">
+                  {t("notesOptional")}
+                </span>
+                <textarea
+                  value={notes}
+                  onChange={(e) => setNotes(e.target.value)}
+                  rows={3}
+                  className="bg-white px-4 py-3 border-2 border-gray-200 rounded-lg focus:outline-none text-sm"
+                />
+              </label>
+            </div>
+            <button
+              type="submit"
+              disabled={isSavingException}
+              className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 mt-4 px-4 py-2 rounded-md w-fit font-semibold text-white text-sm transition-all"
+            >
+              {isSavingException ? actionsT("adding") : actionsT("add")}
+            </button>
+          </form>
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default WorkingDaysHolidaysForm;
diff --git a/src/components/exam/ExamClient.tsx b/src/components/exam/ExamClient.tsx
index f5ed171..8b9bd89 100644
--- a/src/components/exam/ExamClient.tsx
+++ b/src/components/exam/ExamClient.tsx
@@ -2,8 +2,10 @@
 
 import { useState, useEffect, useRef } from "react";
 import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
 import { toast } from "react-toastify";
 import type { Exam, Question, Answer } from "@prisma/client";
+import { Loader2, Send, X } from "lucide-react";
 import {
   getExamPage,
   saveAnswer,
@@ -15,6 +17,10 @@ import ExamTimer from "./ExamTimer";
 import FreezeOverlay from "./FreezeOverlay";
 import QuestionRenderer from "./QuestionRenderer";
 
+type DebouncedSaveFn = ((questionId: number, answer: string) => void) & {
+  flush: () => void;
+};
+
 interface ExamClientProps {
   exam: Exam;
   submission: any;
@@ -32,43 +38,63 @@ export default function ExamClient({
   initialTimeRemaining,
   totalPages,
 }: ExamClientProps) {
+  const t = useTranslations("examTaking");
   const router = useRouter();
-  
+
   const [questions, setQuestions] = useState<Question[]>(initialQuestions);
   const [answers, setAnswers] = useState<Record<number, string>>(
-    initialAnswers.reduce((acc, ans) => ({ ...acc, [ans.questionId]: ans.textAnswer || "" }), {})
+    initialAnswers.reduce(
+      (acc, ans) => ({ ...acc, [ans.questionId]: ans.textAnswer || ans.fileUrl || "" }),
+      {},
+    ),
   );
-  
+  const [answerRecords, setAnswerRecords] = useState<Record<number, Answer>>(
+    initialAnswers.reduce(
+      (acc, ans) => ({ ...acc, [ans.questionId]: ans }),
+      {} as Record<number, Answer>,
+    ),
+  );
+
   const [currentPage, setCurrentPage] = useState(submission.currentPage);
   const [isFrozen, setIsFrozen] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const [showSubmitConfirm, setShowSubmitConfirm] = useState(false);
   const [isLoadingPage, setIsLoadingPage] = useState(false);
-  const [saveStatus, setSaveStatus] = useState<"idle" | "saving" | "saved" | "error">("idle");
+  const [questionSaveStatus, setQuestionSaveStatus] = useState<
+    Record<number, "idle" | "saving" | "saved" | "error">
+  >({});
+  const saveTimersRef = useRef<Record<number, NodeJS.Timeout>>({});
 
   const pendingAnswersRef = useRef<Record<number, string>>({});
   const disconnectedAtRef = useRef<number | null>(null);
   const freezeTimerRef = useRef<NodeJS.Timeout | null>(null);
-  const debouncedSaveRef = useRef<ReturnType<typeof debounce> | null>(null);
+  const debouncedSaveRef = useRef<DebouncedSaveFn | null>(null);
+  const uploadingQuestionsRef = useRef<Set<number>>(new Set());
 
   useEffect(() => {
     const debounced = debounce(async (questionId: number, answer: string) => {
-      setSaveStatus("saving");
+      setQuestionSaveStatus((prev) => ({ ...prev, [questionId]: "saving" }));
       const res = await saveAnswer(
         { success: true, error: false },
         {
           submissionId: submission.id,
           questionId,
           textAnswer: answer,
-        }
+        },
       );
 
       if (res.error) {
-        setSaveStatus("error");
-        toast.error(res.message || "Failed to save answer.");
+        setQuestionSaveStatus((prev) => ({ ...prev, [questionId]: "error" }));
+        toast.error(res.message || t("toast.saveFailed"));
       } else {
-        setSaveStatus("saved");
+        setQuestionSaveStatus((prev) => ({ ...prev, [questionId]: "saved" }));
         // Clear from pending once saved successfully
         delete pendingAnswersRef.current[questionId];
+        // Auto-hide "saved" after 2 seconds
+        if (saveTimersRef.current[questionId]) clearTimeout(saveTimersRef.current[questionId]);
+        saveTimersRef.current[questionId] = setTimeout(() => {
+          setQuestionSaveStatus((prev) => ({ ...prev, [questionId]: "idle" }));
+        }, 2000);
       }
     }, 1000);
 
@@ -89,10 +115,38 @@ export default function ExamClient({
   const handlePageChange = async (newPage: number) => {
     if (newPage < 1 || newPage > totalPages) return;
     if (!exam.enableNavigation && newPage < currentPage) {
-      toast.error("Navigation to previous pages is disabled.");
+      toast.error(t("toast.previousDisabled"));
       return;
     }
 
+    // Check for unanswered questions on the current page when moving forward
+    if (newPage > currentPage) {
+      const unanswered = questions.filter((q) => {
+        const ans = pendingAnswersRef.current[q.id] !== undefined
+          ? pendingAnswersRef.current[q.id]
+          : answers[q.id];
+
+        if (ans === undefined || ans === null) return true;
+        const trimmed = ans.trim();
+        if (trimmed === "") return true;
+
+        if (q.type === "MCQ" && q.allowMultiple) {
+          try {
+            const parsed = JSON.parse(trimmed);
+            if (Array.isArray(parsed)) {
+              return parsed.filter(Boolean).length === 0;
+            }
+          } catch {}
+        }
+        return false;
+      });
+
+      if (unanswered.length > 0) {
+        toast.error(t("toast.answerBeforeProceeding"));
+        return;
+      }
+    }
+
     setIsLoadingPage(true);
     debouncedSaveRef.current?.flush();
 
@@ -100,7 +154,11 @@ export default function ExamClient({
     for (const [qId, ans] of Object.entries(pendingAnswersRef.current)) {
       await saveAnswer(
         { success: true, error: false },
-        { submissionId: submission.id, questionId: parseInt(qId), textAnswer: ans }
+        {
+          submissionId: submission.id,
+          questionId: parseInt(qId),
+          textAnswer: ans,
+        },
       );
     }
     pendingAnswersRef.current = {};
@@ -114,44 +172,93 @@ export default function ExamClient({
 
     if ("questions" in res && res.questions) {
       setQuestions(res.questions as Question[]);
+      const savedAnswerList = res.savedAnswers as Answer[];
       setAnswers((prev) => {
         const newAns = { ...prev };
-        (res.savedAnswers as Answer[]).forEach((ans) => {
-          newAns[ans.questionId] = ans.textAnswer || "";
+        savedAnswerList.forEach((ans) => {
+          newAns[ans.questionId] = ans.textAnswer || ans.fileUrl || "";
         });
         return newAns;
       });
+      setAnswerRecords((prev) => {
+        const newRecs = { ...prev };
+        savedAnswerList.forEach((ans) => {
+          newRecs[ans.questionId] = ans;
+        });
+        return newRecs;
+      });
       setCurrentPage(newPage);
       window.scrollTo({ top: 0, behavior: "smooth" });
     }
-    
+
     setIsLoadingPage(false);
   };
 
-  const handleSubmit = async () => {
+  const abortAllUploads = async () => {
+    if (uploadingQuestionsRef.current.size > 0) {
+      document.querySelectorAll("[data-file-upload-question]").forEach((el) => {
+        (el as any).__abortUpload?.();
+      });
+      await new Promise((r) => setTimeout(r, 100));
+    }
+  };
+
+  const requestSubmit = () => {
     if (isSubmitting) return;
-    
-    if (confirm("Are you sure you want to submit your exam? You cannot change your answers after submitting.")) {
-      setIsSubmitting(true);
-      debouncedSaveRef.current?.flush();
-      
-      const res = await submitExam(submission.id);
-      if (res.error) {
-        toast.error(res.error as string);
-        setIsSubmitting(false);
-      } else {
-        toast.success("Exam submitted successfully!");
-        router.push("/list/exams");
+
+    const unanswered = questions.filter((q) => {
+      if (q.type === "FILE") return false; // FILE questions are optional
+      const ans = pendingAnswersRef.current[q.id] !== undefined
+        ? pendingAnswersRef.current[q.id]
+        : answers[q.id];
+
+      if (ans === undefined || ans === null) return true;
+      const trimmed = ans.trim();
+      if (trimmed === "") return true;
+
+      if (q.type === "MCQ" && q.allowMultiple) {
+        try {
+          const parsed = JSON.parse(trimmed);
+          if (Array.isArray(parsed)) {
+            return parsed.filter(Boolean).length === 0;
+          }
+        } catch {}
       }
+      return false;
+    });
+
+    if (unanswered.length > 0) {
+      toast.error(t("toast.answerBeforeSubmitting"));
+      return;
+    }
+
+    setShowSubmitConfirm(true);
+  };
+
+  const handleSubmit = async () => {
+    if (isSubmitting) return;
+
+    setIsSubmitting(true);
+    await abortAllUploads();
+    debouncedSaveRef.current?.flush();
+
+    const res = await submitExam(submission.id);
+    if (res.error) {
+      toast.error(res.error as string);
+      setIsSubmitting(false);
+    } else {
+      toast.success(t("toast.submitted"));
+      router.push("/list/exams");
     }
   };
 
   const handleAutoSubmit = async () => {
     if (isSubmitting) return;
     setIsSubmitting(true);
+    await abortAllUploads();
     debouncedSaveRef.current?.flush();
     await submitExam(submission.id);
-    toast.info("Exam time is up! Auto-submitting...");
+    toast.info(t("toast.timeUp"));
     router.push("/list/exams");
   };
 
@@ -165,14 +272,16 @@ export default function ExamClient({
 
     const handleOnline = async () => {
       if (freezeTimerRef.current) clearTimeout(freezeTimerRef.current);
-      
+
       if (isFrozen && disconnectedAtRef.current) {
         setIsFrozen(false);
-        const offlineSeconds = Math.floor((Date.now() - disconnectedAtRef.current) / 1000);
+        const offlineSeconds = Math.floor(
+          (Date.now() - disconnectedAtRef.current) / 1000,
+        );
         await recordDisconnection(
           submission.id,
           offlineSeconds,
-          new Date(disconnectedAtRef.current)
+          new Date(disconnectedAtRef.current),
         );
         disconnectedAtRef.current = null;
       }
@@ -197,7 +306,7 @@ export default function ExamClient({
             submissionId: submission.id,
             questionId: parseInt(qId),
             textAnswer: answer,
-          })
+          }),
         );
       }
     };
@@ -207,31 +316,21 @@ export default function ExamClient({
   }, [submission.id]);
 
   return (
-    <div className="max-w-4xl mx-auto py-8 px-4 relative">
+    <div className="relative w-full px-4 py-8">
       <FreezeOverlay isFrozen={isFrozen} />
 
-      <div className="bg-white rounded-lg shadow-sm border border-gray-200 p-6 mb-6 sticky top-4 z-10">
-        <div className="flex flex-col md:flex-row justify-between items-start md:items-center gap-4">
+      <div className="top-4 z-10 sticky bg-white shadow-sm mb-6 p-6 border border-gray-200 rounded-lg">
+        <div className="flex md:flex-row flex-col justify-between items-start md:items-center gap-4">
           <div>
-            <h1 className="text-xl font-bold text-gray-900">{exam.title}</h1>
-            <div className="flex items-center gap-4 mt-2 text-sm text-gray-600">
+            <h1 className="font-bold text-gray-900 text-xl">{exam.title}</h1>
+            <div className="flex items-center gap-4 mt-2 text-gray-600 text-sm">
               <span className="font-medium">
-                Page {currentPage} of {totalPages}
+                {t("pageLabel", { current: currentPage, total: totalPages })}
               </span>
-              {exam.enableAutoSave && (
-                <span className={`flex items-center gap-1 ${
-                  saveStatus === "saving" ? "text-blue-500" :
-                  saveStatus === "saved" ? "text-green-500" :
-                  saveStatus === "error" ? "text-red-500" : "text-gray-400"
-                }`}>
-                  {saveStatus === "saving" && "Saving..."}
-                  {saveStatus === "saved" && "✓ Saved"}
-                  {saveStatus === "error" && "⚠ Save failed"}
-                </span>
-              )}
+
             </div>
           </div>
-          
+
           <div className="flex items-center gap-4">
             {exam.enableTimer && (
               <ExamTimer
@@ -241,68 +340,165 @@ export default function ExamClient({
                 onSubmit={handleAutoSubmit}
               />
             )}
-            
+
             <button
-              onClick={handleSubmit}
+              onClick={requestSubmit}
               disabled={isSubmitting || isLoadingPage}
-              className="bg-academixPurpleDark text-white px-6 py-2 rounded-md font-semibold hover:bg-academixPurple transition-colors disabled:opacity-50"
+              className="bg-academixPurpleDark hover:bg-academixPurple disabled:opacity-50 px-6 py-2 rounded-md font-semibold text-white transition-colors"
             >
-              {isSubmitting ? "Submitting..." : "Submit Exam"}
+              {isSubmitting ? t("submitting") : t("submitExam")}
             </button>
           </div>
         </div>
       </div>
 
       <div className="space-y-6 mb-8">
-        {questions.map((q) => (
-          <div key={q.id} className="bg-white rounded-lg shadow-sm border border-gray-200 p-6">
-            <div className="flex justify-between items-start mb-4">
-              <div className="font-medium text-gray-900">
-                <span className="mr-2">{q.order}.</span>
-                {q.text}
+        {questions.map((q) => {
+          const qStatus = questionSaveStatus[q.id] || "idle";
+          return (
+            <div
+              key={q.id}
+              className="bg-white shadow-sm p-6 border border-gray-200 rounded-lg"
+            >
+              <div className="flex justify-between items-start mb-4">
+                <div className="font-medium text-gray-900">
+                  <span className="me-2">{q.order}.</span>
+                  {q.text}
+                </div>
+                <div className="flex items-center gap-2">
+                  {qStatus === "saving" && (
+                    <span className="flex items-center gap-1 text-xs text-blue-500 animate-pulse font-medium">
+                      {t("saving")}
+                    </span>
+                  )}
+                  {qStatus === "saved" && (
+                    <span className="flex items-center gap-1 text-xs text-green-500 font-medium">
+                      {t("saved")}
+                    </span>
+                  )}
+                  {qStatus === "error" && (
+                    <span className="flex items-center gap-1 text-xs text-red-500 font-medium">
+                      {t("error")}
+                    </span>
+                  )}
+                  <span className="bg-gray-100 px-2 py-1 rounded font-medium text-gray-500 text-sm">
+                    {t("point", { count: q.points })}
+                  </span>
+                </div>
+              </div>
+
+              <div className="mt-4">
+                <QuestionRenderer
+                  question={q}
+                  savedAnswer={answers[q.id] || null}
+                  savedAnswerRecord={answerRecords[q.id] || null}
+                  submissionId={submission.id}
+                  examId={exam.id}
+                  onChange={handleAnswerChange}
+                  disabled={isSubmitting || isLoadingPage}
+                  t={t}
+                  onUploadStart={() => uploadingQuestionsRef.current.add(q.id)}
+                  onUploadEnd={() => uploadingQuestionsRef.current.delete(q.id)}
+                />
+                {q.type === "FILE" && qStatus !== "idle" && (
+                  <span className="ms-2 text-xs text-gray-400">{t("fileUpload")}</span>
+                )}
               </div>
-              <span className="text-sm font-medium text-gray-500 bg-gray-100 px-2 py-1 rounded">
-                {q.points} {q.points === 1 ? "point" : "points"}
-              </span>
-            </div>
-            
-            <div className="mt-4">
-              <QuestionRenderer
-                question={q}
-                savedAnswer={answers[q.id] || null}
-                onChange={handleAnswerChange}
-                disabled={isSubmitting || isLoadingPage}
-              />
             </div>
-          </div>
-        ))}
+          );
+        })}
       </div>
 
-      <div className="flex justify-between items-center bg-white rounded-lg shadow-sm border border-gray-200 p-4">
+      <div className="flex justify-between items-center bg-white shadow-sm p-4 border border-gray-200 rounded-lg">
         <button
           onClick={() => handlePageChange(currentPage - 1)}
-          disabled={currentPage === 1 || !exam.enableNavigation || isLoadingPage || isSubmitting}
-          className="px-4 py-2 border border-gray-300 rounded-md font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed"
+          disabled={
+            currentPage === 1 ||
+            !exam.enableNavigation ||
+            isLoadingPage ||
+            isSubmitting
+          }
+          className="hover:bg-gray-50 disabled:opacity-50 px-4 py-2 border border-gray-300 rounded-md font-medium text-gray-700 disabled:cursor-not-allowed"
         >
-          Previous
+          {t("previous")}
         </button>
-        
-        <span className="text-sm text-gray-500">
+
+        <span className="text-gray-500 text-sm">
           {currentPage} / {totalPages}
         </span>
-        
+
         {currentPage < totalPages ? (
           <button
             onClick={() => handlePageChange(currentPage + 1)}
             disabled={isLoadingPage || isSubmitting}
-            className="px-4 py-2 border border-gray-300 rounded-md font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50"
+            className="hover:bg-gray-50 disabled:opacity-50 px-4 py-2 border border-gray-300 rounded-md font-medium text-gray-700"
           >
-            Next
+            {t("next")}
           </button>
         ) : (
-          <div className="px-4 py-2 opacity-0">Next</div> // Spacer
+          <div className="opacity-0 px-4 py-2">{t("next")}</div>
         )}
       </div>
+
+      {showSubmitConfirm && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 p-4">
+          <div className="w-full max-w-md rounded-lg bg-white shadow-xl">
+            <div className="flex items-start justify-between gap-4 border-b border-gray-100 p-4">
+              <div className="flex items-center gap-3">
+                <div className="flex h-9 w-9 items-center justify-center rounded-md bg-academixPurpleLight text-academixPurpleDark">
+                  <Send className="h-4 w-4" />
+                </div>
+                <div>
+                  <p className="text-xs font-medium uppercase text-gray-400">
+                    {t("confirmEyebrow")}
+                  </p>
+                  <h2 className="text-base font-semibold text-gray-900">
+                    {t("confirmTitle")}
+                  </h2>
+                </div>
+              </div>
+              <button
+                type="button"
+                onClick={() => setShowSubmitConfirm(false)}
+                disabled={isSubmitting}
+                className="rounded-md p-1 text-gray-400 transition hover:bg-gray-100 hover:text-gray-700 disabled:cursor-not-allowed disabled:opacity-60"
+                aria-label={t("close")}
+              >
+                <X className="h-4 w-4" />
+              </button>
+            </div>
+
+            <div className="space-y-3 p-4">
+              <p className="text-sm leading-6 text-gray-600">
+                {t("confirmBody")}
+              </p>
+              <p className="rounded-md bg-academixPurpleLight p-3 text-xs text-academixPurpleDark">
+                {t("confirmNotice")}
+              </p>
+            </div>
+
+            <div className="flex justify-end gap-2 border-t border-gray-100 p-4">
+              <button
+                type="button"
+                onClick={() => setShowSubmitConfirm(false)}
+                disabled={isSubmitting}
+                className="rounded-md border border-gray-200 px-4 py-2 text-sm font-medium text-gray-600 transition hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-60"
+              >
+                {t("cancel")}
+              </button>
+              <button
+                type="button"
+                onClick={handleSubmit}
+                disabled={isSubmitting}
+                className="inline-flex items-center gap-2 rounded-md bg-academixPurpleDark px-4 py-2 text-sm font-medium text-white transition hover:brightness-90 disabled:cursor-not-allowed disabled:opacity-60"
+              >
+                {isSubmitting && <Loader2 className="h-4 w-4 animate-spin" />}
+                {isSubmitting ? t("submitting") : t("submitExam")}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   );
 }
diff --git a/src/components/exam/ExamTimer.tsx b/src/components/exam/ExamTimer.tsx
index 521f8c0..e997238 100644
--- a/src/components/exam/ExamTimer.tsx
+++ b/src/components/exam/ExamTimer.tsx
@@ -52,7 +52,13 @@ export default function ExamTimer({
         try {
           const data = JSON.parse(e.data);
           if (typeof data.timeRemaining === "number") {
-            setTimeRemaining((current) => Math.min(current, data.timeRemaining));
+            setTimeRemaining((current) => {
+              // If the server's time is greater (extended) or has drifted significantly, sync it
+              if (data.timeRemaining > current || Math.abs(current - data.timeRemaining) > 3) {
+                return data.timeRemaining;
+              }
+              return current;
+            });
           }
         } catch (err) {
           console.error("Failed to parse timer data", err);
diff --git a/src/components/exam/FileUploadRenderer.tsx b/src/components/exam/FileUploadRenderer.tsx
new file mode 100644
index 0000000..9935472
--- /dev/null
+++ b/src/components/exam/FileUploadRenderer.tsx
@@ -0,0 +1,527 @@
+"use client";
+
+import { useState, useEffect, useRef, useCallback } from "react";
+import { toast } from "react-toastify";
+import { Upload, X, FileText, AlertCircle, CheckCircle, Loader2, Replace } from "lucide-react";
+import { BLOCKED_EXTENSIONS, isFileConfig, EXAM_FILE_MAX_SIZE_MB } from "@/lib/formValidationSchemas";
+import type { FileConfig } from "@/lib/formValidationSchemas";
+import { getExamUploadSignature, saveAnswer, deleteOldExamFileOnReplace } from "@/lib/actions/examWorkflow.actions";
+import { useTranslations } from "next-intl";
+
+type UploadedFile = {
+  fileUrl: string;
+  filePublicId: string;
+  fileOriginalName: string;
+  fileMimeType: string;
+  fileSizeBytes: number;
+};
+
+type SignatureResponse = {
+  signature: string;
+  timestamp: number;
+  folder: string;
+  apiKey: string;
+  cloudName: string;
+};
+
+type UploadState =
+  | { status: "idle" }
+  | { status: "uploading"; progress: number; fileName: string; abortController: AbortController }
+  | { status: "uploaded"; file: UploadedFile }
+  | { status: "error"; message: string; fileName?: string }
+  | { status: "removing" };
+
+interface FileUploadRendererProps {
+  answerId: number | null;
+  submissionId: number;
+  examId: number;
+  questionId: number;
+  question: { id: number; options: unknown };
+  initialFileUrl: string | null;
+  initialFilePublicId: string | null;
+  initialFileOriginalName: string | null;
+  initialFileMimeType: string | null;
+  initialFileSizeBytes: number | null;
+  disabled?: boolean;
+  onUploadStart?: () => void;
+  onUploadEnd?: () => void;
+  onFileMetaSaved?: (meta: UploadedFile & { questionId: number }) => void;
+}
+
+const uploadToCloudinary = (
+  file: File,
+  sig: SignatureResponse,
+  onProgress: (pct: number) => void,
+  signal: AbortSignal
+): Promise<UploadedFile> => {
+  return new Promise((resolve, reject) => {
+    const formData = new FormData();
+    formData.append("file", file);
+    formData.append("api_key", sig.apiKey);
+    formData.append("signature", sig.signature);
+    formData.append("timestamp", String(sig.timestamp));
+    formData.append("folder", sig.folder);
+    formData.append("type", "private");
+    formData.append("resource_type", "raw");
+
+    const xhr = new XMLHttpRequest();
+    signal.addEventListener("abort", () => xhr.abort());
+
+    xhr.upload.addEventListener("progress", (e) => {
+      if (e.lengthComputable) onProgress(Math.round((e.loaded / e.total) * 100));
+    });
+
+    xhr.addEventListener("load", () => {
+      if (xhr.status === 200) {
+        try {
+          const resp = JSON.parse(xhr.responseText);
+          const originalName = file.name;
+          const extIndex = originalName.lastIndexOf(".");
+          const ext = extIndex !== -1 ? originalName.slice(extIndex + 1) : resp.format || "bin";
+          resolve({
+            fileUrl: resp.secure_url,
+            filePublicId: resp.public_id,
+            fileOriginalName: originalName,
+            fileMimeType: `raw/${ext}`,
+            fileSizeBytes: resp.bytes,
+          });
+        } catch (err) {
+          reject(new Error("Failed to parse upload response"));
+        }
+      } else {
+        let detail = xhr.responseText;
+        try {
+          detail = JSON.parse(xhr.responseText).error?.message || detail;
+        } catch {}
+        reject(new Error(`Upload failed (${xhr.status}): ${detail}`));
+      }
+    });
+
+    xhr.addEventListener("error", () => reject(new Error("Network error")));
+    xhr.addEventListener("abort", () => reject(new Error("Upload aborted")));
+
+    xhr.open("POST", `https://api.cloudinary.com/v1_1/${sig.cloudName}/raw/upload`);
+    xhr.send(formData);
+  });
+};
+
+const saveFileMetaToDB = async (
+  submissionId: number,
+  questionId: number,
+  file: UploadedFile,
+  retries = 3
+): Promise<boolean> => {
+  for (let attempt = 0; attempt < retries; attempt++) {
+    try {
+      const res = await saveAnswer(
+        { success: true, error: false },
+        {
+          submissionId,
+          questionId,
+          fileUrl: file.fileUrl,
+          filePublicId: file.filePublicId,
+          fileOriginalName: file.fileOriginalName,
+          fileMimeType: file.fileMimeType,
+          fileSizeBytes: file.fileSizeBytes,
+        }
+      );
+
+      if (res.success) return true;
+
+      if (attempt < retries - 1) {
+        await new Promise((r) => setTimeout(r, (attempt + 1) * 1000));
+      }
+    } catch {
+      if (attempt < retries - 1) {
+        await new Promise((r) => setTimeout(r, (attempt + 1) * 1000));
+      }
+    }
+  }
+  return false;
+};
+
+const formatFileSize = (bytes: number): string => {
+  const mb = bytes / (1024 * 1024);
+  return `${mb.toFixed(2)} MB`;
+};
+
+const getFileIcon = (type: string) => {
+  const subtype = type.split("/")?.[1]?.toLowerCase() || "";
+  if (["pdf"].includes(subtype)) return "PDF";
+  if (["doc", "docx"].includes(subtype)) return "DOC";
+  if (["jpg", "jpeg", "png", "gif", "webp"].includes(subtype)) return "IMG";
+  return "FILE";
+};
+
+export default function FileUploadRenderer({
+  answerId,
+  submissionId,
+  examId,
+  questionId,
+  question,
+  initialFileUrl,
+  initialFilePublicId,
+  initialFileOriginalName,
+  initialFileMimeType,
+  initialFileSizeBytes,
+  disabled = false,
+  onUploadStart,
+  onUploadEnd,
+  onFileMetaSaved,
+}: FileUploadRendererProps) {
+  const t = useTranslations("examTaking");
+  const fileConfig: FileConfig | null = isFileConfig(question.options)
+    ? question.options
+    : null;
+
+  const [uploadState, setUploadState] = useState<UploadState>(() => {
+    if (initialFileUrl && initialFilePublicId && initialFileOriginalName) {
+      return {
+        status: "uploaded",
+        file: {
+          fileUrl: initialFileUrl,
+          filePublicId: initialFilePublicId,
+          fileOriginalName: initialFileOriginalName,
+          fileMimeType: initialFileMimeType || "raw/bin",
+          fileSizeBytes: initialFileSizeBytes || 0,
+        },
+      };
+    }
+    return { status: "idle" };
+  });
+
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const rootRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const el = rootRef.current as any;
+    if (el) {
+      el.__abortUpload = () => {
+        if (uploadState.status === "uploading") {
+          uploadState.abortController.abort();
+        }
+      };
+    }
+  });
+
+  // Retry pending file save from localStorage on mount
+  useEffect(() => {
+    const pendingKey = `exam_pending_file_${submissionId}_${questionId}`;
+    const pending = localStorage.getItem(pendingKey);
+    if (!pending) return;
+
+    try {
+      const pendingFile: UploadedFile = JSON.parse(pending);
+      saveFileMetaToDB(submissionId, questionId, pendingFile).then((saved) => {
+        if (saved) {
+          localStorage.removeItem(pendingKey);
+          setUploadState({ status: "uploaded", file: pendingFile });
+          onFileMetaSaved?.({ ...pendingFile, questionId });
+        }
+      });
+    } catch {
+      localStorage.removeItem(pendingKey);
+    }
+  }, [submissionId, questionId, onFileMetaSaved]);
+
+  const validateFile = useCallback(
+    (file: File): string | null => {
+      const ext = file.name.split(".").pop()?.toLowerCase() || "";
+      if (BLOCKED_EXTENSIONS.has(ext)) {
+        return t("fileTypeBlocked", { extension: ext });
+      }
+
+      if (fileConfig && fileConfig.allowedExtensions.length > 0) {
+        if (!fileConfig.allowedExtensions.includes(ext)) {
+          return t("allowedFilesOnly", {
+            extensions: fileConfig.allowedExtensions.join(", "),
+          });
+        }
+      }
+
+      if (fileConfig && fileConfig.minFileSizeMb > 0) {
+        if (file.size < fileConfig.minFileSizeMb * 1024 * 1024) {
+          return t("minFileSize", { size: fileConfig.minFileSizeMb });
+        }
+      }
+
+      const maxMb = fileConfig?.maxFileSizeMb ?? EXAM_FILE_MAX_SIZE_MB;
+      if (file.size > maxMb * 1024 * 1024) {
+        return t("maxFileSize", { size: maxMb });
+      }
+
+      return null;
+    },
+    [fileConfig, t]
+  );
+
+  const handleFileSelect = async (e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0];
+    if (!file) return;
+
+    const oldFilePublicId =
+      uploadState.status === "uploaded" ? uploadState.file.filePublicId : null;
+
+    if (uploadState.status === "uploaded") {
+      const sameFile =
+        uploadState.file.fileOriginalName === file.name &&
+        uploadState.file.fileSizeBytes === file.size;
+      if (sameFile) {
+        const confirmed = window.confirm(
+          t("identicalFileConfirm")
+        );
+        if (!confirmed) {
+          if (fileInputRef.current) fileInputRef.current.value = "";
+          return;
+        }
+      }
+    }
+
+    const validationError = validateFile(file);
+    if (validationError) {
+      toast.error(validationError);
+      if (fileInputRef.current) fileInputRef.current.value = "";
+      return;
+    }
+
+    const abortController = new AbortController();
+
+    setUploadState({
+      status: "uploading",
+      progress: 0,
+      fileName: file.name,
+      abortController,
+    });
+
+    onUploadStart?.();
+
+    try {
+      const sigResult = await getExamUploadSignature(examId, submissionId, questionId);
+
+      if ("error" in sigResult) {
+        throw new Error(sigResult.error);
+      }
+
+      const sig: SignatureResponse = sigResult;
+
+      const uploadedFile = await uploadToCloudinary(file, sig, (pct) => {
+        setUploadState((prev) =>
+          prev.status === "uploading" ? { ...prev, progress: pct } : prev
+        );
+      }, abortController.signal);
+
+      const saved = await saveFileMetaToDB(submissionId, questionId, uploadedFile);
+
+      if (!saved) {
+        localStorage.setItem(
+          `exam_pending_file_${submissionId}_${questionId}`,
+          JSON.stringify(uploadedFile)
+        );
+        setUploadState({
+          status: "error",
+          message: t("metadataSaveFailed"),
+          fileName: file.name,
+        });
+        onUploadEnd?.();
+        if (fileInputRef.current) fileInputRef.current.value = "";
+        return;
+      }
+
+      if (oldFilePublicId) {
+        deleteOldExamFileOnReplace(oldFilePublicId, submissionId, questionId).catch(() => {});
+      }
+
+      setUploadState({ status: "uploaded", file: uploadedFile });
+      onFileMetaSaved?.({ ...uploadedFile, questionId });
+      onUploadEnd?.();
+    } catch (err: any) {
+      if (err.message === "Upload aborted") {
+        setUploadState({ status: "idle" });
+      } else {
+        setUploadState({
+          status: "error",
+          message: err.message || t("uploadFailed"),
+          fileName: file.name,
+        });
+      }
+      onUploadEnd?.();
+    }
+
+    if (fileInputRef.current) fileInputRef.current.value = "";
+  };
+
+  const handleRemove = async () => {
+    if (uploadState.status !== "uploaded") return;
+
+    setUploadState({ status: "removing" });
+
+    try {
+      const res = await saveAnswer(
+        { success: true, error: false },
+        {
+          submissionId,
+          questionId,
+          fileUrl: null,
+          filePublicId: null,
+          fileOriginalName: null,
+          fileMimeType: null,
+          fileSizeBytes: null,
+        }
+      );
+
+      if (res.success) {
+        setUploadState({ status: "idle" });
+        onFileMetaSaved?.({ fileUrl: "", filePublicId: "", fileOriginalName: "", fileMimeType: "", fileSizeBytes: 0, questionId });
+      } else {
+        setUploadState({ status: "uploaded", file: uploadState.file });
+        toast.error(t("removeFileFailed"));
+      }
+    } catch {
+      setUploadState({ status: "uploaded", file: uploadState.file });
+      toast.error(t("removeFileFailed"));
+    }
+  };
+
+  const handleReplaceClick = () => {
+    fileInputRef.current?.click();
+  };
+
+  const handleRetry = () => {
+    setUploadState({ status: "idle" });
+  };
+
+  const acceptedExtensions = fileConfig?.allowedExtensions?.length
+    ? fileConfig.allowedExtensions.map((e) => `.${e}`).join(",")
+    : undefined;
+
+  const maxSizeStr = fileConfig?.maxFileSizeMb
+    ? `${fileConfig.maxFileSizeMb} MB`
+    : `${EXAM_FILE_MAX_SIZE_MB} MB`;
+
+  return (
+    <div ref={rootRef} data-file-upload-question={questionId} className="w-full">
+      {uploadState.status === "idle" && (
+        <div className="flex flex-col gap-3">
+          {fileConfig?.instructions && (
+            <p className="text-sm text-gray-600 whitespace-pre-wrap">
+              {fileConfig.instructions}
+            </p>
+          )}
+          <div className="flex items-center gap-2 flex-wrap text-xs text-gray-400">
+            {fileConfig && fileConfig.allowedExtensions.length > 0 && (
+              <span>
+                {t("accepted")}{" "}
+                {fileConfig.allowedExtensions.map((e) => `.${e}`).join(", ")}
+              </span>
+            )}
+            <span>
+              {t("maxSize")} {maxSizeStr}
+            </span>
+          </div>
+          <button
+            type="button"
+            onClick={() => fileInputRef.current?.click()}
+            disabled={disabled}
+            className={`flex items-center gap-2 px-4 py-2 border-2 border-dashed border-gray-300 rounded-md text-sm font-medium text-gray-600 bg-white hover:bg-gray-50 cursor-pointer w-fit transition-colors ${disabled ? "opacity-50 cursor-not-allowed" : ""}`}
+          >
+            <Upload className="w-4 h-4" />
+            {t("chooseFile")}
+          </button>
+        </div>
+      )}
+
+      {uploadState.status === "uploading" && (
+        <div className="space-y-2">
+          <div className="flex items-center gap-2 text-sm text-gray-700">
+            <Loader2 className="w-4 h-4 animate-spin text-academixPurpleDark" />
+            <span className="font-medium">{uploadState.fileName}</span>
+            <span className="text-gray-400">
+              {t("uploading", { progress: uploadState.progress })}
+            </span>
+          </div>
+          <div className="w-full bg-gray-200 rounded-full h-2">
+            <div
+              className="bg-academixPurpleDark h-2 rounded-full transition-all duration-300"
+              style={{ width: `${uploadState.progress}%` }}
+            />
+          </div>
+        </div>
+      )}
+
+      {uploadState.status === "uploaded" && (
+        <div className="flex items-start gap-3 bg-green-50 border border-green-200 rounded-md p-3">
+          <CheckCircle className="w-5 h-5 text-green-600 shrink-0 mt-0.5" />
+          <div className="flex-1 min-w-0">
+            <p className="text-sm font-medium text-gray-800 truncate">
+              {uploadState.file.fileOriginalName}
+            </p>
+            <p className="text-xs text-gray-500">
+              {formatFileSize(uploadState.file.fileSizeBytes)}
+              {" · "}
+              {getFileIcon(uploadState.file.fileMimeType)}
+            </p>
+          </div>
+          <div className="flex items-center gap-2 shrink-0">
+            {!disabled && (
+              <>
+                <button
+                  type="button"
+                  onClick={handleReplaceClick}
+                  className="flex items-center gap-1 text-xs text-academixPurpleDark hover:underline font-medium"
+                >
+                  <Replace className="w-3 h-3" />
+                  {t("replace")}
+                </button>
+                <button
+                  type="button"
+                  onClick={handleRemove}
+                  className="flex items-center gap-1 text-xs text-red-500 hover:underline font-medium"
+                >
+                  <X className="w-3 h-3" />
+                  {t("remove")}
+                </button>
+              </>
+            )}
+          </div>
+        </div>
+      )}
+
+      {uploadState.status === "removing" && (
+        <div className="flex items-center gap-2 text-sm text-gray-600">
+          <Loader2 className="w-4 h-4 animate-spin" />
+          {t("removingFile")}
+        </div>
+      )}
+
+      {uploadState.status === "error" && (
+        <div className="flex items-start gap-3 bg-red-50 border border-red-200 rounded-md p-3">
+          <AlertCircle className="w-5 h-5 text-red-500 shrink-0 mt-0.5" />
+          <div className="flex-1 min-w-0">
+            <p className="text-sm font-medium text-red-700">
+              {uploadState.fileName
+                ? t("failedToUpload", { fileName: uploadState.fileName })
+                : t("uploadFailed")}
+            </p>
+            <p className="text-xs text-red-500">{uploadState.message}</p>
+          </div>
+          <button
+            type="button"
+            onClick={handleRetry}
+            className="shrink-0 text-xs text-academixPurpleDark hover:underline font-medium"
+          >
+            {t("tryAgain")}
+          </button>
+        </div>
+      )}
+
+      <input
+        ref={fileInputRef}
+        type="file"
+        className="hidden"
+        onChange={handleFileSelect}
+        disabled={disabled}
+        accept={acceptedExtensions}
+      />
+    </div>
+  );
+}
diff --git a/src/components/exam/QuestionRenderer.tsx b/src/components/exam/QuestionRenderer.tsx
index 8978ec7..634e581 100644
--- a/src/components/exam/QuestionRenderer.tsx
+++ b/src/components/exam/QuestionRenderer.tsx
@@ -7,25 +7,38 @@ import {
   parseStoredAnswer,
   serializeAnswerList,
 } from "@/lib/examAnswerUtils";
+import FileUploadRenderer from "./FileUploadRenderer";
 
 interface QuestionRendererProps {
   question: Question;
   savedAnswer: string | null;
+  savedAnswerRecord?: (Answer & Record<string, unknown>) | null;
+  submissionId: number;
+  examId: number;
   onChange: (questionId: number, value: string) => void;
   disabled?: boolean;
+  t: (key: string, values?: Record<string, string | number>) => string;
+  onUploadStart?: () => void;
+  onUploadEnd?: () => void;
 }
 
+import type { Answer } from "@prisma/client";
+
 export default function QuestionRenderer({
   question,
   savedAnswer,
+  savedAnswerRecord,
+  submissionId,
+  examId,
   onChange,
   disabled = false,
+  t,
+  onUploadStart,
+  onUploadEnd,
 }: QuestionRendererProps) {
-  const [isUploading, setIsUploading] = useState(false);
-
   const handleMultipleChoice = (option: string, checked: boolean) => {
     let currentAns = parseAnswerList(savedAnswer);
-    
+
     if (question.allowMultiple) {
       if (checked) {
         if (!currentAns.includes(option)) {
@@ -37,27 +50,15 @@ export default function QuestionRenderer({
     } else {
       currentAns = [option];
     }
-    
+
     onChange(
       question.id,
       question.allowMultiple
         ? JSON.stringify(currentAns)
-        : serializeAnswerList(currentAns)
+        : serializeAnswerList(currentAns),
     );
   };
 
-  const handleFileUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0];
-    if (!file) return;
-
-    setIsUploading(true);
-    // Simulate upload for now since local upload API is not implemented yet
-    setTimeout(() => {
-      onChange(question.id, `/uploads/mock_${file.name}`);
-      setIsUploading(false);
-    }, 1000);
-  };
-
   return (
     <div className="w-full">
       {/* TRUE_FALSE */}
@@ -73,7 +74,7 @@ export default function QuestionRenderer({
               disabled={disabled}
               className="w-4 h-4 text-academixPurpleDark"
             />
-            <span className="text-gray-700">True</span>
+            <span className="text-gray-700">{t("true")}</span>
           </label>
           <label className="flex items-center gap-2 cursor-pointer">
             <input
@@ -85,7 +86,7 @@ export default function QuestionRenderer({
               disabled={disabled}
               className="w-4 h-4 text-academixPurpleDark"
             />
-            <span className="text-gray-700">False</span>
+            <span className="text-gray-700">{t("false")}</span>
           </label>
         </div>
       )}
@@ -96,31 +97,43 @@ export default function QuestionRenderer({
           {(() => {
             const selectedAnswers = parseStoredAnswer(
               savedAnswer,
-              question.allowMultiple
+              question.allowMultiple,
             );
-            return question.options.map((option, idx) => {
+            const rawOptions = Array.isArray(question.options)
+              ? question.options
+              : [];
+            const options = rawOptions.filter(
+              (o): o is string => typeof o === "string",
+            );
+
+            return options.map((option, idx) => {
               const isChecked = question.allowMultiple
                 ? selectedAnswers.includes(option)
                 : selectedAnswers[0] === option;
               return (
-                <label key={idx} className="flex items-center gap-2 cursor-pointer hover:bg-gray-50 p-2 rounded-md transition-colors border border-transparent hover:border-gray-200">
+                <label
+                  key={idx}
+                  className="flex items-center gap-2 hover:bg-gray-50 p-2 border border-transparent hover:border-gray-200 rounded-md transition-colors cursor-pointer"
+                >
                   <input
                     type={question.allowMultiple ? "checkbox" : "radio"}
                     name={`q_${question.id}`}
                     value={option}
                     checked={isChecked}
-                    onChange={(e) => handleMultipleChoice(option, e.target.checked)}
+                    onChange={(e) =>
+                      handleMultipleChoice(option, e.target.checked)
+                    }
                     disabled={disabled}
                     className="w-4 h-4 text-academixPurpleDark"
                   />
-                  <span className="text-sm text-gray-700">{option}</span>
+                  <span className="text-gray-700 text-sm">{option}</span>
                 </label>
               );
             });
           })()}
           {question.allowMultiple && (
-            <p className="text-xs text-gray-400 mt-1">
-              * You may select more than one answer.
+            <p className="mt-1 text-gray-400 text-xs">
+              {t("multiAnswerHint")}
             </p>
           )}
         </div>
@@ -130,45 +143,32 @@ export default function QuestionRenderer({
       {question.type === "TEXT" && (
         <textarea
           rows={5}
-          placeholder="Write your answer here..."
+          placeholder={t("textPlaceholder")}
           value={savedAnswer ?? ""}
           onChange={(e) => onChange(question.id, e.target.value)}
           disabled={disabled}
-          className="w-full p-3 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-academixPurpleDark/50 resize-y"
+          className="p-3 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-academixPurpleDark/50 w-full resize-y"
         />
       )}
 
       {/* FILE */}
       {question.type === "FILE" && (
-        <div className="flex flex-col gap-2">
-          {savedAnswer && savedAnswer.trim() !== "" ? (
-            <div className="flex items-center gap-4 p-3 bg-green-50 border border-green-200 rounded-md">
-              <span className="text-sm text-green-700">File uploaded successfully.</span>
-              <button
-                type="button"
-                onClick={() => onChange(question.id, "")}
-                disabled={disabled}
-                className="text-sm text-red-500 hover:underline"
-              >
-                Remove
-              </button>
-            </div>
-          ) : (
-            <div className="flex items-center gap-4">
-              <label className={`flex items-center justify-center px-4 py-2 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 cursor-pointer ${disabled || isUploading ? "opacity-50 cursor-not-allowed" : ""}`}>
-                {isUploading ? "Uploading..." : "Choose File"}
-                <input
-                  type="file"
-                  className="hidden"
-                  onChange={handleFileUpload}
-                  disabled={disabled || isUploading}
-                  accept=".pdf,.doc,.docx,.jpg,.jpeg,.png"
-                />
-              </label>
-              <span className="text-xs text-gray-500">Max size: 10MB</span>
-            </div>
-          )}
-        </div>
+        <FileUploadRenderer
+          answerId={(savedAnswerRecord as any)?.id ?? null}
+          submissionId={submissionId}
+          examId={examId}
+          questionId={question.id}
+          question={question}
+          initialFileUrl={(savedAnswerRecord as any)?.fileUrl ?? null}
+          initialFilePublicId={(savedAnswerRecord as any)?.filePublicId ?? null}
+          initialFileOriginalName={(savedAnswerRecord as any)?.fileOriginalName ?? null}
+          initialFileMimeType={(savedAnswerRecord as any)?.fileMimeType ?? null}
+          initialFileSizeBytes={(savedAnswerRecord as any)?.fileSizeBytes ?? null}
+          disabled={disabled}
+          onUploadStart={onUploadStart}
+          onUploadEnd={onUploadEnd}
+          onFileMetaSaved={(meta) => onChange(question.id, meta.fileUrl)}
+        />
       )}
     </div>
   );
diff --git a/src/components/exam/TakeExamConfirmation.tsx b/src/components/exam/TakeExamConfirmation.tsx
new file mode 100644
index 0000000..a221f61
--- /dev/null
+++ b/src/components/exam/TakeExamConfirmation.tsx
@@ -0,0 +1,111 @@
+"use client";
+
+import { BookOpen, Loader2, X } from "lucide-react";
+import { useTranslations } from "next-intl";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+
+type TakeExamConfirmationProps = {
+  examId: number;
+  title: string;
+  instructions?: string | null;
+};
+
+export default function TakeExamConfirmation({
+  examId,
+  title,
+  instructions,
+}: TakeExamConfirmationProps) {
+  const t = useTranslations("examList");
+  const router = useRouter();
+  const [open, setOpen] = useState(false);
+  const [isStarting, setIsStarting] = useState(false);
+  const trimmedInstructions = instructions?.trim();
+
+  const handleStart = () => {
+    setIsStarting(true);
+    router.push(`/list/exams/${examId}/take`);
+  };
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={() => setOpen(true)}
+        className="bg-academixPurpleDark hover:opacity-90 px-3 py-2 rounded-md font-semibold text-white text-xs hover:scale-[1.05] transition"
+      >
+        {t("takeExam")}
+      </button>
+
+      {open && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 p-4">
+          <div className="w-full max-w-md rounded-lg bg-white shadow-xl">
+            <div className="flex items-start justify-between gap-4 border-b border-gray-100 p-4">
+              <div className="flex items-center gap-3">
+                <div className="flex h-9 w-9 items-center justify-center rounded-md bg-academixPurpleLight text-academixPurpleDark">
+                  <BookOpen className="h-4 w-4" />
+                </div>
+                <div>
+                  <p className="text-xs font-medium uppercase text-gray-400">
+                    {t("readyToStart")}
+                  </p>
+                  <h2 className="text-base font-semibold text-gray-900">
+                    {title}
+                  </h2>
+                </div>
+              </div>
+              <button
+                type="button"
+                onClick={() => setOpen(false)}
+                className="rounded-md p-1 text-gray-400 transition hover:bg-gray-100 hover:text-gray-700"
+                aria-label={t("close")}
+              >
+                <X className="h-4 w-4" />
+              </button>
+            </div>
+
+            <div className="space-y-4 p-4">
+              {trimmedInstructions ? (
+                <div className="rounded-md border border-academixPurpleDark/10 bg-academixPurpleLight p-3">
+                  <p className="mb-2 text-sm font-semibold text-academixPurpleDark">
+                    {t("instructions")}
+                  </p>
+                  <p className="whitespace-pre-wrap text-sm leading-6 text-gray-700">
+                    {trimmedInstructions}
+                  </p>
+                </div>
+              ) : (
+                <p className="text-sm text-gray-500">
+                  {t("noInstructions")}
+                </p>
+              )}
+
+              <p className="text-xs text-gray-400">
+                {t("continueNotice")}
+              </p>
+            </div>
+
+            <div className="flex justify-end gap-2 border-t border-gray-100 p-4">
+              <button
+                type="button"
+                onClick={() => setOpen(false)}
+                className="rounded-md border border-gray-200 px-4 py-2 text-sm font-medium text-gray-600 transition hover:bg-gray-50"
+              >
+                {t("cancel")}
+              </button>
+              <button
+                type="button"
+                onClick={handleStart}
+                disabled={isStarting}
+                className="inline-flex items-center gap-2 rounded-md bg-academixPurpleDark px-4 py-2 text-sm font-medium text-white transition hover:brightness-90 disabled:cursor-not-allowed disabled:opacity-60"
+              >
+                {isStarting && <Loader2 className="h-4 w-4 animate-spin" />}
+                {isStarting ? t("starting") : t("startExam")}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/src/components/forms/AnnouncementForm.tsx b/src/components/forms/AnnouncementForm.tsx
index 2c6e8b5..48acefb 100644
--- a/src/components/forms/AnnouncementForm.tsx
+++ b/src/components/forms/AnnouncementForm.tsx
@@ -8,6 +8,7 @@ import { useRouter } from "next/navigation";
 import { createAnnouncement, updateAnnouncement } from "@/lib/actions";
 import { announcementSchema } from "@/lib/formValidationSchemas";
 import InputField from "../InputField";
+import { useTranslations } from "next-intl";
 
 const toDatetimeLocalValue = (value: unknown) => {
   if (!value) return "";
@@ -35,6 +36,9 @@ const AnnouncementForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.announcement");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const nowDefault = toDatetimeLocalValue(new Date());
   const dateDefaultValue =
     type === "create" ? nowDefault : toDatetimeLocalValue(data?.date);
@@ -77,17 +81,15 @@ const AnnouncementForm = ({
         const result = await action({ success: false, error: false }, parsed);
 
         if (result.success) {
-          toast(
-            `Announcement has been ${type === "create" ? "created" : "updated"}!`,
-          );
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       } catch {
-        toast.error("Something went wrong!");
+        toast.error(commonT("somethingWentWrong"));
       }
     });
   });
@@ -148,29 +150,27 @@ const AnnouncementForm = ({
   };
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create"
-          ? "Create a new announcement"
-          : "Update the announcement"}
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
 
       {type === "update" && (
         <input type="hidden" {...register("id")} defaultValue={data?.id} />
       )}
 
-      <div className="flex flex-wrap justify-between gap-4">
+      <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
         <InputField
-          label="Announcement Title"
+          label={t("title")}
           name="title"
           defaultValue={data?.title}
           register={register}
           error={errors?.title}
-          inputProps={{ placeholder: "e.g. Parent Meeting" }}
+          inputProps={{ placeholder: t("titlePlaceholder") }}
         />
 
         <InputField
-          label="Date"
+          label={commonT("date")}
           name="date"
           type="datetime-local"
           defaultValue={dateDefaultValue}
@@ -178,8 +178,10 @@ const AnnouncementForm = ({
           error={errors?.date}
         />
 
-        <div className="flex flex-col gap-2 w-full md:w-1/3">
-          <label className="text-gray-500 text-xs">Classes</label>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {commonT("classes")}
+          </label>
           <div className="flex flex-col gap-2 p-3 rounded-md ring-[1.5px] ring-gray-300 max-h-[220px] overflow-y-auto">
             <label className="flex items-center gap-2 mb-4 text-gray-700 text-sm">
               <input
@@ -189,7 +191,7 @@ const AnnouncementForm = ({
                 disabled={classIds.length === 0}
                 className="border-gray-300 rounded focus:ring-blue-500 w-4 h-4 text-blue-500"
               />
-              <span className="font-medium">Select all</span>
+              <span className="font-medium">{commonT("selectAll")}</span>
             </label>
             {classes.map((cls: { id: number; name: string }) => (
               <label
@@ -210,29 +212,31 @@ const AnnouncementForm = ({
           </div>
           {selectedClassIdsAsNumbers.length > 0 && (
             <p className="text-gray-400 text-xs">
-              {selectedClassIdsAsNumbers.length} class
-              {selectedClassIdsAsNumbers.length === 1 ? " is" : "es are"}{" "}
-              selected
+              {commonT("selectedClasses", {
+                count: selectedClassIdsAsNumbers.length,
+              })}
             </p>
           )}
           {errors.classIds?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.classIds.message.toString()}
             </p>
           )}
         </div>
 
         <div className="flex flex-col gap-2 w-full">
-          <label className="text-gray-500 text-xs">Description</label>
+          <label className="font-medium text-gray-700 text-sm">
+            {commonT("description")}
+          </label>
           <textarea
             {...register("description")}
             defaultValue={data?.description}
             rows={4}
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            placeholder="Announcement details"
+            className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
+            placeholder={t("descriptionPlaceholder")}
           />
           {errors.description?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.description.message.toString()}
             </p>
           )}
@@ -240,13 +244,19 @@ const AnnouncementForm = ({
       </div>
 
       <button
-        className="bg-blue-400 disabled:opacity-60 p-2 rounded-md text-white"
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
         disabled={isSubmitting}
       >
-        {type === "create" ? "Create" : "Update"}
+        {isSubmitting
+          ? commonT("submitting")
+          : type === "create"
+            ? actionsT("create")
+            : actionsT("update")}
       </button>
     </form>
   );
 };
 
 export default AnnouncementForm;
+
+
diff --git a/src/components/forms/AssignmentForm.tsx b/src/components/forms/AssignmentForm.tsx
index 378aeb1..c857f28 100644
--- a/src/components/forms/AssignmentForm.tsx
+++ b/src/components/forms/AssignmentForm.tsx
@@ -8,25 +8,139 @@ import {
   AssignmentSchema,
 } from "@/lib/formValidationSchemas";
 import { createAssignment, updateAssignment } from "@/lib/actions";
-import { Dispatch, SetStateAction, useMemo, useTransition } from "react";
+import { Dispatch, SetStateAction, useMemo, useState, useTransition } from "react";
 import { toast } from "react-toastify";
 import { useRouter } from "next/navigation";
+import { Download, Upload, X, Clock, Search } from "lucide-react";
+import TeacherSearchInput from "./TeacherSearchInput";
+import { useTranslations } from "next-intl";
 
+// دالة مساعدة لتحويل التاريخ إلى صيغة datetime-local
 const toDatetimeLocalValue = (value: unknown) => {
   if (!value) return "";
-
   const date = value instanceof Date ? value : new Date(String(value));
   if (Number.isNaN(date.getTime())) return "";
-
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, "0");
   const day = String(date.getDate()).padStart(2, "0");
   const hours = String(date.getHours()).padStart(2, "0");
   const minutes = String(date.getMinutes()).padStart(2, "0");
-
   return `${year}-${month}-${day}T${hours}:${minutes}`;
 };
 
+// ─── مكون رفع الملفات الداخلي ──────────────────────────────────────────
+function FileUploadSection({
+  assignmentId,
+  currentFileUrl,
+  currentFileName,
+  onFileSelect,
+  onRemoveExisting,
+}: {
+  assignmentId?: number;
+  currentFileUrl?: string | null;
+  currentFileName?: string | null;
+  onFileSelect: (file: File | null) => void;
+  onRemoveExisting: () => void;
+}) {
+  const t = useTranslations("forms.assignment");
+  const [selectedFile, setSelectedFile] = useState<File | null>(null);
+  const [removeCurrent, setRemoveCurrent] = useState(false);
+
+  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0] || null;
+    setSelectedFile(file);
+    onFileSelect(file);
+    if (file && currentFileUrl) {
+      setRemoveCurrent(true);
+      onRemoveExisting();
+    }
+  };
+
+  const handleRemoveSelected = () => {
+    setSelectedFile(null);
+    onFileSelect(null);
+  };
+
+  const handleRemoveCurrent = () => {
+    setRemoveCurrent(true);
+    onRemoveExisting();
+  };
+
+  return (
+    <div className="border rounded-lg p-4 space-y-3">
+      <label className="block text-sm font-medium text-gray-700">
+        {t("fileOptional")}
+      </label>
+
+      {/* الملف الحالي (في حالة التعديل) */}
+      {currentFileUrl && !removeCurrent && !selectedFile && (
+        <div className="flex items-center justify-between bg-gray-50 p-2 rounded">
+          <span className="text-sm truncate">
+            {currentFileName || t("currentFile")}
+          </span>
+          <div className="flex gap-2">
+            {assignmentId && (
+              <a
+                href={`/api/download/${assignmentId}?type=assignment`}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="text-blue-500 hover:text-blue-700"
+                title={t("downloadCurrentFile")}
+              >
+                <Download className="w-4 h-4" />
+              </a>
+            )}
+            <button
+              type="button"
+              onClick={handleRemoveCurrent}
+              className="text-red-500 hover:text-red-700"
+              title={t("removeCurrentFile")}
+            >
+              <X className="w-4 h-4" />
+            </button>
+          </div>
+        </div>
+      )}
+
+      {/* اختيار ملف جديد */}
+      <div className="flex items-center gap-2">
+        <label className="cursor-pointer bg-purple-50 text-purple-700 px-3 py-2 rounded-lg text-sm font-medium flex items-center gap-2">
+          <Upload className="w-4 h-4" />
+          {selectedFile
+            ? t("changeFile")
+            : currentFileUrl && !removeCurrent
+            ? t("replaceFile")
+            : t("uploadFile")}
+          <input type="file" onChange={handleFileChange} className="hidden" />
+        </label>
+        {selectedFile && (
+          <span className="text-sm text-gray-600 truncate">{selectedFile.name}</span>
+        )}
+      </div>
+
+      {selectedFile && (
+        <button
+          type="button"
+          onClick={handleRemoveSelected}
+          className="text-xs text-red-500 hover:underline"
+        >
+          {t("removeSelected")}
+        </button>
+      )}
+
+      {!currentFileUrl && !selectedFile && (
+        <p className="text-xs text-gray-400">{t("noFileAttached")}</p>
+      )}
+      {(removeCurrent || (currentFileUrl && selectedFile)) && (
+        <p className="text-xs text-amber-600">
+          {t("currentFileWillBeReplaced")}
+        </p>
+      )}
+    </div>
+  );
+}
+
+// ─── النموذج الرئيسي ─────────────────────────────────────────────────────
 const AssignmentForm = ({
   type,
   data,
@@ -38,51 +152,92 @@ const AssignmentForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.assignment");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const {
     register,
     handleSubmit,
     control,
     setValue,
+    watch,
     formState: { errors },
   } = useForm<AssignmentSchema>({
     resolver: zodResolver(assignmentSchema),
     defaultValues: {
       subjectId: data?.subjectId,
       classIds: data?.classId ? [data.classId] : [],
+      maxScore: data?.maxScore ?? 10,
+      rubric: data?.rubric ?? "",
+      teacherId: data?.teacherId ?? "",
+      allowLateSubmission: data?.allowLateSubmission ?? false,
     },
   });
+  const isSubjectLocked = type === "create" && Boolean(data?.lockSubject) && Boolean(data?.subjectId);
 
   const router = useRouter();
   const [isSubmitting, startTransition] = useTransition();
+  const [selectedFile, setSelectedFile] = useState<File | null>(null);
+  const [shouldRemoveFile, setShouldRemoveFile] = useState(false);
 
-  const onSubmit = handleSubmit((formValues) => {
+  // مراقبة قيمة allowLateSubmission لتحديث الـ UI
+  const allowLateSubmission = watch("allowLateSubmission");
+
+  const onSubmit = handleSubmit(async (formValues) => {
     const action = type === "create" ? createAssignment : updateAssignment;
 
+    const formData = new FormData();
+    Object.entries(formValues).forEach(([key, value]) => {
+      if (key === "classIds" && Array.isArray(value)) {
+        value.forEach((clsId) => formData.append("classIds", String(clsId)));
+      } else if (value !== undefined && value !== null) {
+        formData.append(key, String(value));
+      }
+    });
+    if (type === "update" && data?.id) {
+      formData.append("id", String(data.id));
+    }
+    if (selectedFile) {
+      formData.append("file", selectedFile);
+    }
+    if (shouldRemoveFile && data?.fileUrl) {
+      formData.append("removeFile", "true");
+    }
+
     startTransition(async () => {
       try {
-        const result = await action(
-          { success: false, error: false },
-          formValues,
-        );
-
+        const result = await action({ success: false, error: false }, formData);
         if (result.success) {
-          toast(
-            `Assignment has been ${type === "create" ? "created" : "updated"}!`,
-          );
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
-          return;
+        } else {
+          toast.error(result.message ?? commonT("somethingWentWrong"));
         }
-
-        toast.error(result.message ?? "Something went wrong!");
-      } catch {
-        toast.error("Something went wrong!");
+      } catch (error) {
+        console.error(error);
+        toast.error(commonT("somethingWentWrong"));
       }
     });
   });
 
-  const { subjects = [], classes = [], lessons = [] } = relatedData ?? {};
+  const {
+    subjects = [],
+    classes = [],
+    lessons = [],
+    teachers = [],
+    role,
+  } = relatedData ?? {};
   const selectedSubjectId = useWatch({ control, name: "subjectId" });
+  const selectedTeacherId = useWatch({ control, name: "teacherId" });
+  const selectedSubject = subjects.find(
+    (subject: { id: number; name: string }) =>
+      Number(subject.id) === Number(selectedSubjectId),
+  );
+  const [subjectSearch, setSubjectSearch] = useState(
+    data?.subjectName ?? selectedSubject?.name ?? "",
+  );
+  const [showSubjectDropdown, setShowSubjectDropdown] = useState(false);
   const watchedClassIds = useWatch({ control, name: "classIds" });
   const classIdsRegister = register("classIds");
   const selectedClassIds = useMemo(
@@ -91,28 +246,30 @@ const AssignmentForm = ({
   );
   const selectedSubjectIdNumber = Number(selectedSubjectId);
 
+  const filteredSubjects = useMemo(() => {
+    const search = subjectSearch.trim().toLowerCase();
+    if (!search) return subjects;
+
+    return subjects.filter((subject: { id: number; name: string }) =>
+      subject.name.toLowerCase().includes(search),
+    );
+  }, [subjects, subjectSearch]);
+
   const availableClassIds = useMemo(() => {
     if (!selectedSubjectId || Number.isNaN(selectedSubjectIdNumber)) {
       return new Set<number>();
     }
-
     return new Set<number>(
       lessons
-        .filter((lesson: { subjectId: number; classId: number }) => {
-          return lesson.subjectId === selectedSubjectIdNumber;
-        })
-        .map(
-          (lesson: { subjectId: number; classId: number }) => lesson.classId,
-        ),
+        .filter((lesson: { subjectId: number; classId: number }) => lesson.subjectId === selectedSubjectIdNumber)
+        .map((lesson: { subjectId: number; classId: number }) => lesson.classId),
     );
   }, [lessons, selectedSubjectId, selectedSubjectIdNumber]);
 
   const filteredClasses =
     selectedSubjectId && !Number.isNaN(selectedSubjectIdNumber)
-      ? classes.filter((cls: { id: number; name: string }) =>
-          availableClassIds.has(cls.id),
-        )
-      : classes;
+      ? classes.filter((cls: { id: number; name: string }) => availableClassIds.has(cls.id))
+      : [];
 
   const selectedClassIdsAsNumbers = useMemo(
     () =>
@@ -133,63 +290,42 @@ const AssignmentForm = ({
 
   const toggleAllFilteredClasses = (checked: boolean) => {
     const selectedSet = new Set<number>(selectedClassIdsAsNumbers);
-
     if (checked) {
-      for (const classId of filteredClassIds) {
-        selectedSet.add(classId);
-      }
+      for (const classId of filteredClassIds) selectedSet.add(classId);
     } else {
-      for (const classId of filteredClassIds) {
-        selectedSet.delete(classId);
-      }
+      for (const classId of filteredClassIds) selectedSet.delete(classId);
     }
-
-    setValue("classIds", Array.from(selectedSet), {
-      shouldDirty: true,
-      shouldValidate: true,
-    });
+    setValue("classIds", Array.from(selectedSet), { shouldDirty: true, shouldValidate: true });
   };
 
   const toggleSingleClass = (classId: number, checked: boolean) => {
     const selectedSet = new Set<number>(selectedClassIdsAsNumbers);
-
-    if (checked) {
-      selectedSet.add(classId);
-    } else {
-      selectedSet.delete(classId);
-    }
-
-    setValue("classIds", Array.from(selectedSet), {
-      shouldDirty: true,
-      shouldValidate: true,
-    });
+    if (checked) selectedSet.add(classId);
+    else selectedSet.delete(classId);
+    setValue("classIds", Array.from(selectedSet), { shouldDirty: true, shouldValidate: true });
   };
 
   const nowDefault = toDatetimeLocalValue(new Date());
-  const startDefaultValue =
-    type === "create" ? nowDefault : toDatetimeLocalValue(data?.startDate);
-  const endDefaultValue =
-    type === "create" ? nowDefault : toDatetimeLocalValue(data?.endDate);
+  const startDefaultValue = type === "create" ? nowDefault : toDatetimeLocalValue(data?.startDate);
+  const endDefaultValue = type === "create" ? nowDefault : toDatetimeLocalValue(data?.endDate);
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create"
-          ? "Create a new assignment"
-          : "Update the assignment"}
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
 
-      <div className="flex flex-wrap justify-between gap-4">
+      <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
         <InputField
-          label="Assignment Title"
+          label={t("title")}
           name="title"
           defaultValue={data?.title}
           register={register}
           error={errors?.title}
-          inputProps={{ placeholder: "e.g. Chapter 4 Homework" }}
+          inputProps={{ placeholder: t("titlePlaceholder") }}
         />
         <InputField
-          label="Start Date"
+          label={commonT("startDate")}
           name="startDate"
           type="datetime-local"
           defaultValue={startDefaultValue}
@@ -197,40 +333,163 @@ const AssignmentForm = ({
           error={errors?.startDate}
         />
         <InputField
-          label="End Date"
+          label={commonT("endDate")}
           name="endDate"
           type="datetime-local"
           defaultValue={endDefaultValue}
           register={register}
           error={errors?.endDate}
         />
+        <InputField
+          label={t("marks")}
+          name="maxScore"
+          type="number"
+          defaultValue={data?.maxScore ?? 10}
+          register={register}
+          error={errors?.maxScore}
+          inputProps={{ min: 1, step: 0.5 }}
+        />
+        {role === "admin" && (
+          <div className="xl:col-span-2">
+            <input type="hidden" {...register("teacherId")} />
+            <TeacherSearchInput
+              label={t("assignedTeacher")}
+              teachers={teachers}
+              value={selectedTeacherId}
+              onChange={(teacherId) =>
+                setValue("teacherId", teacherId ?? "", {
+                  shouldDirty: true,
+                  shouldValidate: true,
+                })
+              }
+            />
+            <p className="mt-1 text-gray-400 text-xs">
+              {t("assignedTeacherHelp")}
+            </p>
+          </div>
+        )}
         {type === "update" && (
           <input type="hidden" {...register("id")} defaultValue={data?.id} />
         )}
 
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Subject</label>
-          <select
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            {...register("subjectId")}
-            defaultValue={data?.subjectId}
-          >
-            <option value="">Select subject</option>
-            {subjects.map((subject: { id: number; name: string }) => (
-              <option value={subject.id} key={subject.id}>
-                {subject.name}
-              </option>
-            ))}
-          </select>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {t("subject")}
+          </label>
+          {isSubjectLocked ? (
+            <>
+              <input type="hidden" {...register("subjectId")} value={data.subjectId} />
+              <div className="bg-gray-50 px-4 py-3 border-2 border-gray-200 rounded-lg text-gray-700 text-sm">
+                {data?.subjectName ?? t("subjectFallback", { id: data.subjectId })}
+              </div>
+            </>
+          ) : (
+            <div className="relative">
+              <input type="hidden" {...register("subjectId")} />
+              <div className="flex items-center gap-2 bg-white focus-within:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus-within:border-academixPurpleDark rounded-lg transition-all">
+                <Search className="w-4 h-4 text-gray-400" />
+                <input
+                  type="text"
+                  value={subjectSearch}
+                  placeholder={t("searchSubject")}
+                  onFocus={() => setShowSubjectDropdown(true)}
+                  onBlur={() => {
+                    window.setTimeout(() => setShowSubjectDropdown(false), 120);
+                  }}
+                  onChange={(e) => {
+                    setSubjectSearch(e.target.value);
+                    setShowSubjectDropdown(true);
+                    if (selectedSubjectId) {
+                      setValue("subjectId", undefined as any, {
+                        shouldDirty: true,
+                        shouldValidate: true,
+                      });
+                      setValue("classIds", [], {
+                        shouldDirty: true,
+                        shouldValidate: true,
+                      });
+                    }
+                  }}
+                  className="bg-transparent outline-none w-full text-sm"
+                />
+                {subjectSearch && (
+                  <button
+                    type="button"
+                    onClick={() => {
+                      setSubjectSearch("");
+                      setValue("subjectId", undefined as any, {
+                        shouldDirty: true,
+                        shouldValidate: true,
+                      });
+                      setValue("classIds", [], {
+                        shouldDirty: true,
+                        shouldValidate: true,
+                      });
+                      setShowSubjectDropdown(true);
+                    }}
+                    className="text-gray-400 hover:text-gray-600"
+                    aria-label={t("clearSubject")}
+                  >
+                    <X className="w-4 h-4" />
+                  </button>
+                )}
+              </div>
+              {showSubjectDropdown && (
+                <div className="top-full inset-x-0 z-20 absolute bg-white shadow-xl mt-2 border border-gray-200 rounded-lg max-h-48 overflow-y-auto">
+                  {filteredSubjects.length > 0 ? (
+                    filteredSubjects.map(
+                      (subject: { id: number; name: string }) => {
+                        const isSelected =
+                          Number(subject.id) === Number(selectedSubjectId);
+
+                        return (
+                          <button
+                            type="button"
+                            key={subject.id}
+                            onMouseDown={(event) => event.preventDefault()}
+                            onClick={() => {
+                              setValue("subjectId", subject.id, {
+                                shouldDirty: true,
+                                shouldValidate: true,
+                              });
+                              setValue("classIds", [], {
+                                shouldDirty: true,
+                                shouldValidate: true,
+                              });
+                              setSubjectSearch(subject.name);
+                              setShowSubjectDropdown(false);
+                            }}
+                            className={`px-4 py-3 w-full text-sm text-start transition-colors ${
+                              isSelected
+                                ? "bg-academixPurpleLight text-academixPurpleDark font-medium"
+                                : "hover:bg-academixPurpleLight hover:text-academixPurpleDark"
+                            }`}
+                          >
+                            {subject.name}
+                          </button>
+                        );
+                      },
+                    )
+                  ) : (
+                    <div className="px-4 py-3 text-gray-500 text-sm">
+                      {commonT("noSubjectsFound")}
+                    </div>
+                  )}
+                </div>
+              )}
+            </div>
+          )}
           {errors.subjectId?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.subjectId.message.toString()}
             </p>
           )}
         </div>
 
-        <div className="flex flex-col gap-2 w-full md:w-1/3">
-          <label className="text-gray-500 text-xs">Classes</label>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {commonT("classes")}
+          </label>
           <div className="flex flex-col gap-2 p-3 rounded-md ring-[1.5px] ring-gray-300 max-h-[220px] overflow-y-auto">
             <label className="flex items-center gap-2 mb-4 text-gray-700 text-sm">
               <input
@@ -240,13 +499,10 @@ const AssignmentForm = ({
                 disabled={filteredClassIds.length === 0}
                 className="border-gray-300 rounded focus:ring-blue-500 w-4 h-4 text-blue-500"
               />
-              <span className="font-medium">Select all</span>
+              <span className="font-medium">{commonT("selectAll")}</span>
             </label>
             {filteredClasses.map((cls: { id: number; name: string }) => (
-              <label
-                key={cls.id}
-                className="flex items-center gap-2 text-gray-700 text-sm"
-              >
+              <label key={cls.id} className="flex items-center gap-2 text-gray-700 text-sm">
                 <input
                   {...classIdsRegister}
                   type="checkbox"
@@ -259,27 +515,101 @@ const AssignmentForm = ({
               </label>
             ))}
             {filteredClasses.length === 0 && (
-              <p className="text-gray-400 text-xs">No classes available.</p>
+              <p className="text-gray-400 text-xs">
+                {selectedSubjectId
+                  ? t("noClassesForSubject")
+                  : t("selectSubjectFirst")}
+              </p>
             )}
           </div>
           {selectedClassIds.length > 0 && (
             <p className="text-gray-400 text-xs">
-              {selectedClassIds.length} class
-              {selectedClassIds.length === 1 ? " is" : "es are"} selected
+              {commonT("selectedClasses", {
+                count: selectedClassIds.length,
+              })}
             </p>
           )}
           {errors.classIds?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.classIds.message.toString()}
             </p>
           )}
         </div>
       </div>
+
+      {/* ── قسم رفع الملفات ── */}
+      <div className="flex flex-col gap-2">
+        <label className="font-medium text-gray-700 text-sm">
+          {t("rubric")}
+        </label>
+        <textarea
+          {...register("rubric")}
+          defaultValue={data?.rubric ?? ""}
+          placeholder={t("rubricPlaceholder")}
+          className="w-full min-h-[110px] rounded-lg border-2 border-gray-200 p-3 text-sm outline-none transition-all focus:border-academixPurpleDark focus:bg-academixPurpleLight"
+        />
+        <p className="text-xs text-gray-400">
+          {t("rubricHelp")}
+        </p>
+        {errors.rubric?.message && (
+          <p className="font-medium text-red-500 text-xs">
+            {errors.rubric.message.toString()}
+          </p>
+        )}
+      </div>
+
+      <div className="col-span-full">
+        <FileUploadSection
+          assignmentId={data?.id}
+          currentFileUrl={data?.fileUrl}
+          currentFileName={data?.fileName}
+          onFileSelect={setSelectedFile}
+          onRemoveExisting={() => setShouldRemoveFile(true)}
+        />
+      </div>
+
+      {/* ── خيار السماح بالتسليم المتأخر ── */}
+      <div className="flex items-center justify-between p-4 border rounded-lg bg-gray-50">
+        <div className="flex items-center gap-3">
+          <div className={`p-2 rounded-lg ${allowLateSubmission ? "bg-amber-100" : "bg-gray-100"}`}>
+            <Clock className={`w-4 h-4 ${allowLateSubmission ? "text-amber-600" : "text-gray-400"}`} />
+          </div>
+          <div>
+            <p className="text-sm font-medium text-gray-700">
+              {t("allowLateSubmission")}
+            </p>
+            <p className="text-xs text-gray-400">
+              {allowLateSubmission
+                ? t("lateAllowed")
+                : t("lateNotAllowed")}
+            </p>
+          </div>
+        </div>
+        {/* Toggle Switch */}
+        <label className="relative inline-flex items-center cursor-pointer">
+          <input
+            type="checkbox"
+            className="sr-only peer"
+            {...register("allowLateSubmission")}
+          />
+          <div className="w-11 h-6 bg-gray-200 peer-focus:outline-none rounded-full peer
+                          peer-checked:after:translate-x-full peer-checked:after:border-white
+                          after:content-[''] after:absolute after:top-[2px] after:left-[2px]
+                          after:bg-white after:border-gray-300 after:border after:rounded-full
+                          after:h-5 after:w-5 after:transition-all
+                          peer-checked:bg-amber-500" />
+        </label>
+      </div>
+
       <button
-        className="bg-blue-400 disabled:opacity-60 p-2 rounded-md text-white"
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
         disabled={isSubmitting}
       >
-        {type === "create" ? "Create" : "Update"}
+        {isSubmitting
+          ? commonT("submitting")
+          : type === "create"
+            ? actionsT("create")
+            : actionsT("update")}
       </button>
     </form>
   );
diff --git a/src/components/forms/ClassDeleteForm.tsx b/src/components/forms/ClassDeleteForm.tsx
index 1a89326..a3e6e8c 100644
--- a/src/components/forms/ClassDeleteForm.tsx
+++ b/src/components/forms/ClassDeleteForm.tsx
@@ -15,6 +15,7 @@ import {
 } from "react";
 import { useRouter } from "next/navigation";
 import { toast } from "react-toastify";
+import { useTranslations } from "next-intl";
 
 type ClassDeleteFormProps = {
   data: {
@@ -56,6 +57,9 @@ const ClassDeleteForm = ({
   relatedData,
   setOpen,
 }: ClassDeleteFormProps) => {
+  const t = useTranslations("forms.classDelete");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const router = useRouter();
   const [state, formAction] = useActionState<FormState, ClassDeletePayload>(
     deleteClass,
@@ -103,8 +107,8 @@ const ClassDeleteForm = ({
     if (state.success) {
       toast(
         studentCount > 0
-          ? "Class deleted and students reassigned successfully!"
-          : "Class deleted successfully!",
+          ? t("deletedAndReassigned")
+          : t("deleted"),
       );
       setOpen(false);
       router.refresh();
@@ -122,7 +126,7 @@ const ClassDeleteForm = ({
     } else if (mode === "existing") {
       const parsedTargetClassId = Number(effectiveSelectedClassId);
       if (!parsedTargetClassId || Number.isNaN(parsedTargetClassId)) {
-        setError("Please select a class to move the students to.");
+        setError(t("selectTargetError"));
         return;
       }
 
@@ -136,7 +140,7 @@ const ClassDeleteForm = ({
       const parsedGradeId = Number(newClassGradeId);
 
       if (!newClassName.trim()) {
-        setError("New class name is required.");
+        setError(t("nameRequired"));
         return;
       }
 
@@ -145,12 +149,12 @@ const ClassDeleteForm = ({
         Number.isNaN(parsedCapacity) ||
         parsedCapacity < 1
       ) {
-        setError("New class capacity must be at least 1.");
+        setError(t("capacityRequired"));
         return;
       }
 
       if (!parsedGradeId || Number.isNaN(parsedGradeId)) {
-        setError("Please select a grade for the new class.");
+        setError(t("gradeRequired"));
         return;
       }
 
@@ -176,11 +180,11 @@ const ClassDeleteForm = ({
   return (
     <form className="flex flex-col gap-6 p-4" onSubmit={onSubmit}>
       <div className="flex flex-col gap-2">
-        <h1 className="font-semibold text-xl">Delete class</h1>
+        <h1 className="font-bold text-gray-900 text-2xl">{t("title")}</h1>
         <p className="text-gray-500 text-sm">
           {studentCount > 0
-            ? `This class has ${studentCount} student${studentCount === 1 ? "" : "s"}. Move them to another class or create a new class before deleting this one.`
-            : "This class has no students, so it can be deleted now."}
+            ? t("hasStudents", { count: studentCount })
+            : t("noStudents")}
         </p>
       </div>
 
@@ -192,30 +196,35 @@ const ClassDeleteForm = ({
               onClick={() => setMode("existing")}
               className={`rounded-md px-4 py-2 text-sm border ${mode === "existing" ? "bg-academixSky border-academixSky" : "bg-white border-gray-300"}`}
             >
-              Move to existing class
+              {t("moveExisting")}
             </button>
             <button
               type="button"
               onClick={() => setMode("new")}
               className={`rounded-md px-4 py-2 text-sm border ${mode === "new" ? "bg-academixSky border-academixSky" : "bg-white border-gray-300"}`}
             >
-              Create new class
+              {t("createNew")}
             </button>
           </div>
 
           {mode === "existing" ? (
             <div className="flex flex-col gap-2">
-              <label className="text-gray-500 text-xs">Target class</label>
+              <label className="font-medium text-gray-700 text-sm">
+                {t("targetClass")}
+              </label>
               <select
-                className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+                className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
                 value={effectiveSelectedClassId}
                 onChange={(e) => setSelectedClassId(e.target.value)}
               >
-                <option value="">Select an existing class</option>
+                <option value="">{t("selectExisting")}</option>
                 {availableClasses.map((classItem) => (
                   <option key={classItem.id} value={classItem.id}>
-                    {classItem.name} - Grade{" "}
-                    {classItem.grade?.level ?? classItem.gradeId} (
+                    {classItem.name} -{" "}
+                    {commonT("gradeLevel", {
+                      level: classItem.grade?.level ?? classItem.gradeId,
+                    })}{" "}
+                    (
                     {classItem._count?.students ?? 0}/{classItem.capacity})
                   </option>
                 ))}
@@ -224,50 +233,58 @@ const ClassDeleteForm = ({
           ) : (
             <div className="gap-4 grid grid-cols-1 md:grid-cols-2">
               <label className="flex flex-col gap-2">
-                <span className="text-gray-500 text-xs">New class name</span>
+                <span className="font-medium text-gray-700 text-sm">
+                  {t("newClassName")}
+                </span>
                 <input
                   type="text"
                   value={newClassName}
                   onChange={(e) => setNewClassName(e.target.value)}
-                  className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-                  placeholder="e.g. 3B"
+                  className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
+                  placeholder={t("newClassPlaceholder")}
                 />
               </label>
 
               <label className="flex flex-col gap-2">
-                <span className="text-gray-500 text-xs">Capacity</span>
+                <span className="font-medium text-gray-700 text-sm">
+                  {t("capacity")}
+                </span>
                 <input
                   type="number"
                   min={1}
                   value={newClassCapacity}
                   onChange={(e) => setNewClassCapacity(e.target.value)}
-                  className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+                  className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
                 />
               </label>
 
               <label className="flex flex-col gap-2">
-                <span className="text-gray-500 text-xs">Grade</span>
+                <span className="font-medium text-gray-700 text-sm">
+                  {t("grade")}
+                </span>
                 <select
                   value={newClassGradeId}
                   onChange={(e) => setNewClassGradeId(e.target.value)}
-                  className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+                  className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
                 >
                   {grades.map((grade) => (
                     <option key={grade.id} value={grade.id}>
-                      Grade {grade.level}
+                      {commonT("gradeLevel", { level: grade.level })}
                     </option>
                   ))}
                 </select>
               </label>
 
               <label className="flex flex-col gap-2">
-                <span className="text-gray-500 text-xs">Supervisor</span>
+                <span className="font-medium text-gray-700 text-sm">
+                  {t("supervisor")}
+                </span>
                 <select
                   value={newClassSupervisorId}
                   onChange={(e) => setNewClassSupervisorId(e.target.value)}
-                  className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+                  className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
                 >
-                  <option value="">No supervisor</option>
+                  <option value="">{t("noSupervisor")}</option>
                   {teachers.map((teacher) => (
                     <option key={teacher.id} value={teacher.id}>
                       {teacher.name}
@@ -280,14 +297,14 @@ const ClassDeleteForm = ({
         </>
       ) : (
         <div className="bg-gray-50 p-3 rounded-md text-gray-600 text-sm">
-          No students are assigned to this class, so it can be deleted now.
+          {t("noStudents")}
         </div>
       )}
 
       {error && <p className="text-red-500 text-sm">{error}</p>}
       {state.error && (
         <p className="text-red-500 text-sm">
-          {state.message || "Something went wrong!"}
+          {state.message || commonT("somethingWentWrong")}
         </p>
       )}
 
@@ -297,14 +314,14 @@ const ClassDeleteForm = ({
           onClick={() => setOpen(false)}
           className="hover:bg-gray-50 px-4 py-2 border border-gray-300 rounded-md text-sm"
         >
-          Cancel
+          {actionsT("close")}
         </button>
         <button
           type="submit"
           disabled={isSubmitting}
-          className="bg-red-700 disabled:opacity-60 px-4 py-2 rounded-md text-white text-sm"
+          className="bg-red-700 disabled:opacity-60 hover:brightness-90 px-4 py-2 rounded-md text-white text-sm transition-all"
         >
-          {isSubmitting ? "Deleting..." : "Delete class"}
+          {isSubmitting ? actionsT("deleting") : t("delete")}
         </button>
       </div>
     </form>
@@ -312,3 +329,5 @@ const ClassDeleteForm = ({
 };
 
 export default ClassDeleteForm;
+
+
diff --git a/src/components/forms/ClassForm.tsx b/src/components/forms/ClassForm.tsx
index 323745b..2650eca 100644
--- a/src/components/forms/ClassForm.tsx
+++ b/src/components/forms/ClassForm.tsx
@@ -8,13 +8,14 @@ import { createClass, updateClass } from "@/lib/actions";
 import {
   Dispatch,
   SetStateAction,
-  startTransition,
   useEffect,
+  useTransition,
   useState,
 } from "react";
 import { toast } from "react-toastify";
 import { useRouter } from "next/navigation";
 import { Search } from "lucide-react";
+import { useTranslations } from "next-intl";
 
 const ClassForm = ({
   type,
@@ -27,6 +28,9 @@ const ClassForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.class");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const teacherOptions = relatedData?.teachers ?? [];
   const gradeOptions = relatedData?.grades ?? [];
   const defaultGradeId = data?.gradeId ?? data?.grade?.id ?? "";
@@ -47,6 +51,7 @@ const ClassForm = ({
     },
   });
 
+  const [isSubmitting, startTransition] = useTransition();
   const action = type === "create" ? createClass : updateClass;
   const [searchInput, setSearchInput] = useState(
     teacherOptions.find(
@@ -67,15 +72,13 @@ const ClassForm = ({
         const result = await action({ success: false, error: false }, data);
 
         if (result.success) {
-          toast(
-            `${type === "create" ? "Class created" : "Class updated"} successfully!`,
-          );
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       })();
     });
   });
@@ -99,63 +102,65 @@ const ClassForm = ({
   }, []);
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create" ? "Create a new class" : "Update the class"}
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
       {type === "update" && (
         <input type="hidden" {...register("id")} defaultValue={data?.id} />
       )}
-      <div className="flex flex-wrap justify-between gap-4">
+      <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
         <InputField
-          label="Class Name"
+          label={t("name")}
           name="name"
           defaultValue={data?.name}
           register={register}
           error={errors?.name}
         />
         <InputField
-          label="Capacity"
+          label={t("capacity")}
           name="capacity"
           defaultValue={data?.capacity}
           register={register}
           error={errors?.capacity}
         />
-        <div className="flex flex-col gap-2 w-full md:w-3/5">
-          <label className="text-gray-500 text-xs" htmlFor="gradeId">
-            Grade
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm" htmlFor="gradeId">
+            {t("grade")}
           </label>
           <select
             id="gradeId"
             {...register("gradeId")}
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+            className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
             defaultValue={defaultGradeId}
           >
-            <option value="">Select a grade</option>
+            <option value="">{commonT("selectGrade")}</option>
             {gradeOptions.map((grade: { id: number; level: number }) => (
               <option
                 key={grade.id}
                 value={grade.id}
                 defaultValue={data && grade.id === data.gradeId}
               >
-                Grade {grade.level}
+                {commonT("gradeLevel", { level: grade.level })}
               </option>
             ))}
           </select>
           {errors.gradeId?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.gradeId.message.toString()}
             </p>
           )}
         </div>
-        <div className="flex flex-col gap-2 w-full md:w-3/5 supervisor-search">
-          <label className="text-gray-500 text-xs">Supervisor</label>
+        <div className="flex flex-col gap-2 w-full supervisor-search">
+          <label className="font-medium text-gray-700 text-sm">
+            {t("supervisor")}
+          </label>
           <input type="hidden" {...register("supervisorId")} />
           <div className="relative">
-            <div className="flex items-center gap-2 px-3 py-2 rounded-md ring-[1.5px] ring-gray-300 w-full">
+            <div className="flex items-center gap-2 bg-white focus-within:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus-within:border-academixPurpleDark rounded-lg focus-within:ring-0 transition-all">
               <input
                 type="text"
-                placeholder="Search teachers..."
+                placeholder={commonT("searchTeachers")}
                 value={searchInput}
                 onChange={(e) => {
                   setSearchInput(e.target.value);
@@ -184,7 +189,7 @@ const ClassForm = ({
               </button>
             </div>
             {showSupervisorDropdown && (
-              <div className="top-full right-0 left-0 z-10 absolute bg-white shadow-lg mt-1 border border-gray-300 rounded-md max-h-40 overflow-y-auto">
+              <div className="top-full inset-x-0 z-10 absolute bg-white shadow-xl mt-2 border border-gray-200 rounded-lg max-h-56 overflow-y-auto">
                 {filteredTeachers.length > 0 ? (
                   filteredTeachers.map(
                     (teacher: { id: string; name: string }) => (
@@ -196,7 +201,7 @@ const ClassForm = ({
                           setShowSupervisorDropdown(false);
                           setFilteredTeachers([]);
                         }}
-                        className="hover:bg-blue-100 px-3 py-2 text-sm cursor-pointer"
+                        className="hover:bg-academixPurpleLight px-4 py-3 w-full hover:text-academixPurpleDark text-sm text-start transition-colors cursor-pointer"
                       >
                         {teacher.name}
                       </div>
@@ -204,24 +209,33 @@ const ClassForm = ({
                   )
                 ) : (
                   <div className="px-3 py-2 text-gray-500 text-sm">
-                    No teachers found
+                    {commonT("noTeachersFound")}
                   </div>
                 )}
               </div>
             )}
           </div>
           {errors.supervisorId?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.supervisorId.message.toString()}
             </p>
           )}
         </div>
       </div>
-      <button className="bg-blue-400 p-2 rounded-md text-white">
-        {type === "create" ? "Create" : "Update"}
+      <button
+        disabled={isSubmitting}
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
+      >
+        {isSubmitting
+          ? commonT("submitting")
+          : type === "create"
+            ? actionsT("create")
+            : actionsT("update")}
       </button>
     </form>
   );
 };
 
 export default ClassForm;
+
+
diff --git a/src/components/forms/EventForm.tsx b/src/components/forms/EventForm.tsx
index c59fe55..ca49745 100644
--- a/src/components/forms/EventForm.tsx
+++ b/src/components/forms/EventForm.tsx
@@ -8,6 +8,7 @@ import { useRouter } from "next/navigation";
 import { createEvent, updateEvent } from "@/lib/actions";
 import { eventSchema } from "@/lib/formValidationSchemas";
 import InputField from "../InputField";
+import { useTranslations } from "next-intl";
 
 const toDatetimeLocalValue = (value: unknown) => {
   if (!value) return "";
@@ -44,6 +45,9 @@ const EventForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.event");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const nowDefault = toDatetimeLocalValue(new Date());
   const startDefaultValue =
     type === "create" ? nowDefault : toDatetimeLocalValue(data?.startDate);
@@ -81,15 +85,15 @@ const EventForm = ({
         const result = await action({ success: false, error: false }, parsed);
 
         if (result.success) {
-          toast(`Event has been ${type === "create" ? "created" : "updated"}!`);
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       } catch {
-        toast.error("Something went wrong!");
+        toast.error(commonT("somethingWentWrong"));
       }
     });
   });
@@ -150,27 +154,27 @@ const EventForm = ({
   };
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create" ? "Create a new event" : "Update the event"}
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
 
       {type === "update" && (
         <input type="hidden" {...register("id")} defaultValue={data?.id} />
       )}
 
-      <div className="flex flex-wrap justify-between gap-4">
+      <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
         <InputField
-          label="Event Title"
+          label={t("title")}
           name="title"
           defaultValue={data?.title}
           register={register}
           error={errors?.title}
-          inputProps={{ placeholder: "e.g. Sports Day" }}
+          inputProps={{ placeholder: t("titlePlaceholder") }}
         />
 
         <InputField
-          label="Start Date"
+          label={commonT("startDate")}
           name="startDate"
           type="datetime-local"
           defaultValue={startDefaultValue}
@@ -179,7 +183,7 @@ const EventForm = ({
         />
 
         <InputField
-          label="End Date"
+          label={commonT("endDate")}
           name="endDate"
           type="datetime-local"
           defaultValue={endDefaultValue}
@@ -187,8 +191,10 @@ const EventForm = ({
           error={errors?.endDate}
         />
 
-        <div className="flex flex-col gap-2 w-full md:w-1/3">
-          <label className="text-gray-500 text-xs">Classes</label>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {commonT("classes")}
+          </label>
           <div className="flex flex-col gap-2 p-3 rounded-md ring-[1.5px] ring-gray-300 max-h-[220px] overflow-y-auto">
             <label className="flex items-center gap-2 mb-4 text-gray-700 text-sm">
               <input
@@ -198,7 +204,7 @@ const EventForm = ({
                 disabled={classIds.length === 0}
                 className="border-gray-300 rounded focus:ring-blue-500 w-4 h-4 text-blue-500"
               />
-              <span className="font-medium">Select all</span>
+              <span className="font-medium">{commonT("selectAll")}</span>
             </label>
             {classes.map((cls: { id: number; name: string }) => (
               <label
@@ -219,29 +225,31 @@ const EventForm = ({
           </div>
           {selectedClassIdsAsNumbers.length > 0 && (
             <p className="text-gray-400 text-xs">
-              {selectedClassIdsAsNumbers.length} class
-              {selectedClassIdsAsNumbers.length === 1 ? " is" : "es are"}{" "}
-              selected
+              {commonT("selectedClasses", {
+                count: selectedClassIdsAsNumbers.length,
+              })}
             </p>
           )}
           {errors.classIds?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.classIds.message.toString()}
             </p>
           )}
         </div>
 
         <div className="flex flex-col gap-2 w-full">
-          <label className="text-gray-500 text-xs">Description</label>
+          <label className="font-medium text-gray-700 text-sm">
+            {commonT("description")}
+          </label>
           <textarea
             {...register("description")}
             defaultValue={data?.description}
             rows={4}
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            placeholder="Event description"
+            className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
+            placeholder={t("descriptionPlaceholder")}
           />
           {errors.description?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.description.message.toString()}
             </p>
           )}
@@ -249,13 +257,19 @@ const EventForm = ({
       </div>
 
       <button
-        className="bg-blue-400 disabled:opacity-60 p-2 rounded-md text-white"
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
         disabled={isSubmitting}
       >
-        {type === "create" ? "Create" : "Update"}
+        {isSubmitting
+          ? commonT("submitting")
+          : type === "create"
+            ? actionsT("create")
+            : actionsT("update")}
       </button>
     </form>
   );
 };
 
 export default EventForm;
+
+
diff --git a/src/components/forms/ExamForm.tsx b/src/components/forms/ExamForm.tsx
index 925c7c1..66a269b 100644
--- a/src/components/forms/ExamForm.tsx
+++ b/src/components/forms/ExamForm.tsx
@@ -8,6 +8,7 @@ import { createExam, updateExam } from "@/lib/actions";
 import { Dispatch, SetStateAction, useMemo, useTransition } from "react";
 import { toast } from "react-toastify";
 import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
 
 const toDatetimeLocalValue = (value: unknown) => {
   if (!value) return "";
@@ -35,6 +36,9 @@ const ExamForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.exam");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const {
     register,
     handleSubmit,
@@ -63,15 +67,15 @@ const ExamForm = ({
         );
 
         if (result.success) {
-          toast(`Exam has been ${type === "create" ? "created" : "updated"}!`);
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       } catch {
-        toast.error("Something went wrong!");
+        toast.error(commonT("somethingWentWrong"));
       }
     });
   });
@@ -167,22 +171,22 @@ const ExamForm = ({
     type === "create" ? nowDefault : toDatetimeLocalValue(data?.endTime);
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create" ? "Create a new exam" : "Update the exam"}
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
 
-      <div className="flex flex-wrap justify-between gap-4">
+      <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
         <InputField
-          label="Exam Title"
+          label={t("title")}
           name="title"
           defaultValue={data?.title}
           register={register}
           error={errors?.title}
-          inputProps={{ placeholder: "e.g. Midterm Quiz" }}
+          inputProps={{ placeholder: t("titlePlaceholder") }}
         />
         <InputField
-          label="Start Date"
+          label={commonT("startDate")}
           name="startTime"
           type="datetime-local"
           defaultValue={startDefaultValue}
@@ -190,7 +194,7 @@ const ExamForm = ({
           error={errors?.startTime}
         />
         <InputField
-          label="End Date"
+          label={commonT("endDate")}
           name="endTime"
           type="datetime-local"
           defaultValue={endDefaultValue}
@@ -201,14 +205,16 @@ const ExamForm = ({
           <input type="hidden" {...register("id")} defaultValue={data?.id} />
         )}
 
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Subject</label>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {t("subject")}
+          </label>
           <select
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+            className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
             {...register("subjectId")}
             defaultValue={data?.subjectId}
           >
-            <option value="">Select subject</option>
+            <option value="">{t("selectSubject")}</option>
             {subjects.map((subject: { id: number; name: string }) => (
               <option value={subject.id} key={subject.id}>
                 {subject.name}
@@ -216,14 +222,16 @@ const ExamForm = ({
             ))}
           </select>
           {errors.subjectId?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.subjectId.message.toString()}
             </p>
           )}
         </div>
 
-        <div className="flex flex-col gap-2 w-full md:w-1/3">
-          <label className="text-gray-500 text-xs">Classes</label>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {commonT("classes")}
+          </label>
           <div className="flex flex-col gap-2 p-3 rounded-md ring-[1.5px] ring-gray-300 max-h-[220px] overflow-y-auto">
             <label className="flex items-center gap-2 mb-4 text-gray-700 text-sm">
               <input
@@ -233,7 +241,7 @@ const ExamForm = ({
                 disabled={filteredClassIds.length === 0}
                 className="border-gray-300 rounded focus:ring-blue-500 w-4 h-4 text-blue-500"
               />
-              <span className="font-medium">Select all</span>
+              <span className="font-medium">{commonT("selectAll")}</span>
             </label>
             {filteredClasses.map((cls: { id: number; name: string }) => (
               <label
@@ -252,30 +260,39 @@ const ExamForm = ({
               </label>
             ))}
             {filteredClasses.length === 0 && (
-              <p className="text-gray-400 text-xs">No classes available.</p>
+              <p className="text-gray-400 text-xs">
+                {t("noClassesAvailable")}
+              </p>
             )}
           </div>
           {selectedClassIds.length > 0 && (
             <p className="text-gray-400 text-xs">
-              {selectedClassIds.length} class
-              {selectedClassIds.length === 1 ? " is" : "es are"} selected
+              {commonT("selectedClasses", {
+                count: selectedClassIds.length,
+              })}
             </p>
           )}
           {errors.classIds?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.classIds.message.toString()}
             </p>
           )}
         </div>
       </div>
       <button
-        className="bg-blue-400 disabled:opacity-60 p-2 rounded-md text-white"
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
         disabled={isSubmitting}
       >
-        {type === "create" ? "Create" : "Update"}
+        {isSubmitting
+          ? commonT("submitting")
+          : type === "create"
+            ? actionsT("create")
+            : actionsT("update")}
       </button>
     </form>
   );
 };
 
 export default ExamForm;
+
+
diff --git a/src/components/forms/ExamWorkflowForm.tsx b/src/components/forms/ExamWorkflowForm.tsx
index d20939e..f9aa4f4 100644
--- a/src/components/forms/ExamWorkflowForm.tsx
+++ b/src/components/forms/ExamWorkflowForm.tsx
@@ -12,15 +12,24 @@ import {
   createExamWorkflow,
   updateExamWorkflow,
 } from "@/lib/actions/examWorkflow.actions";
-import { useEffect, useMemo, useState } from "react";
+import { useMemo, useRef, useState } from "react";
 import InputField from "../InputField";
+import { FileText } from "lucide-react";
+import TeacherSearchInput from "./TeacherSearchInput";
+import { useTranslations } from "next-intl";
 
 type ExamWorkflowFormProps = {
   subjects: { id: number; name: string }[];
   classes: { id: number; name: string }[];
+  teachers?: { id: string; name: string }[];
+  canSelectTeacher?: boolean;
   mode?: "create" | "update";
   examId?: number;
-  initialData?: Omit<Partial<CreateExamWorkflowSchema>, "startTime" | "endTime"> & {
+  teacherLessons: { subjectId: number; classId: number }[];
+  initialData?: Omit<
+    Partial<CreateExamWorkflowSchema>,
+    "startTime" | "endTime"
+  > & {
     startTime?: string | Date;
     endTime?: string | Date;
   };
@@ -40,6 +49,7 @@ function QuestionEditor({
   register,
   setValue,
   errors,
+  isSubmitted,
   removeQuestion,
 }: {
   index: number;
@@ -47,64 +57,116 @@ function QuestionEditor({
   register: any;
   setValue: any;
   errors: any;
+  isSubmitted: boolean;
   removeQuestion: () => void;
 }) {
+  const t = useTranslations("forms.examWorkflow.question");
+  const containerRef = useRef<HTMLDivElement>(null);
+
   const optionsPath = `questions.${index}.options` as const;
   const correctPath = `questions.${index}.correctAnswer` as const;
   const allowMultiplePath = `questions.${index}.allowMultiple` as const;
   const typePath = `questions.${index}.type` as const;
-  const qType =
-    useWatch({ control, name: typePath }) ?? "TEXT";
+  const fileConfigPath = `questions.${index}.fileConfig` as const;
+
+  const qType = useWatch({ control, name: typePath }) ?? "TEXT";
   const typeField = register(typePath);
   const allowMultiple =
     useWatch({ control, name: `questions.${index}.allowMultiple` }) ?? false;
-  const correctAnswers = useWatch({
-    control,
-    name: correctPath,
-    defaultValue: [],
-  });
-  const currentOptions = useWatch({
-    control,
-    name: optionsPath,
-    defaultValue: [],
-  });
-  const selectedOptionIndexes = useMemo(
-    () =>
-      (currentOptions ?? [])
-        .map((option: string, indexValue: number) =>
-          (correctAnswers ?? []).includes(option) ? indexValue : -1,
-        )
-        .filter((indexValue: number) => indexValue >= 0),
-    [currentOptions, correctAnswers],
-  );
+  const correctAnswers: string[] =
+    useWatch({
+      control,
+      name: correctPath,
+      defaultValue: [],
+    } as any) ?? [];
+  const currentOptions: string[] =
+    useWatch({
+      control,
+      name: optionsPath,
+      defaultValue: [],
+    } as any) ?? [];
+
+  // Derived reactively — always in sync with form values (fixes edit mode bug)
+  const selectedIndexes = useMemo(() => {
+    if (!currentOptions.length || !correctAnswers.length) return [];
+    return currentOptions
+      .map((opt: string, i: number) => (correctAnswers.includes(opt) ? i : -1))
+      .filter((i: number) => i >= 0);
+  }, [currentOptions, correctAnswers]);
+
   const selectedTrueFalse = useMemo<"TRUE" | "FALSE" | null>(() => {
     if ((correctAnswers ?? [])[0] === "FALSE") return "FALSE";
     if ((correctAnswers ?? [])[0] === "TRUE") return "TRUE";
     return null;
   }, [correctAnswers]);
-  const {
-    fields: optionFields,
-    append: appendOption,
-    remove: removeOption,
-    replace: replaceOptions,
-  } = useFieldArray({
-    control,
-    name: optionsPath,
-  });
+
+  const lockScroll = () => {
+    const currentScrollY = window.scrollY;
+    const mainContentContainer =
+      containerRef.current?.closest(".overflow-auto");
+    const containerScrollTop = mainContentContainer
+      ? mainContentContainer.scrollTop
+      : 0;
+
+    window.scrollTo(0, currentScrollY);
+    if (mainContentContainer) {
+      mainContentContainer.scrollTop = containerScrollTop;
+    }
+
+    requestAnimationFrame(() => {
+      window.scrollTo(0, currentScrollY);
+      if (mainContentContainer) {
+        mainContentContainer.scrollTop = containerScrollTop;
+      }
+      containerRef.current?.scrollIntoView({
+        behavior: "auto",
+        block: "nearest",
+      });
+    });
+  };
+
+  const setOptions = (next: string[]) => {
+    setValue(optionsPath, next, { shouldDirty: true });
+  };
+
+  const appendOption = () => {
+    lockScroll();
+    setOptions([...currentOptions, ""]);
+  };
+
+  const removeOptionAt = (idx: number) => {
+    lockScroll();
+
+    const nextSelected = selectedIndexes
+      .filter((si) => si !== idx)
+      .map((si) => (si > idx ? si - 1 : si));
+
+    const next = currentOptions.filter((_: string, i: number) => i !== idx);
+    setOptions(next);
+
+    // Compute and write correct answers directly (selectedIndexes is now derived/read-only)
+    const nextCorrect = nextSelected
+      .map((si) => next[si])
+      .filter((v): v is string => Boolean(v?.trim()));
+    setValue(correctPath, nextCorrect, {
+      shouldDirty: true,
+      shouldValidate: true,
+    });
+  };
 
   const handleQuestionTypeChange = (nextType: string) => {
+    lockScroll();
+
     if (nextType === "MCQ") {
-      replaceOptions(["", "", "", ""]);
+      setOptions(["", "", "", ""]);
       setValue(correctPath, [], { shouldDirty: true, shouldValidate: true });
       setValue(allowMultiplePath, false, {
         shouldDirty: true,
         shouldValidate: true,
       });
-      return;
-    }
-
-    if (nextType === "TRUE_FALSE") {
-      replaceOptions(["True", "False"]);
+      setValue(fileConfigPath, undefined, { shouldDirty: true });
+    } else if (nextType === "TRUE_FALSE") {
+      setOptions(["True", "False"]);
       setValue(correctPath, ["TRUE"], {
         shouldDirty: true,
         shouldValidate: true,
@@ -113,120 +175,116 @@ function QuestionEditor({
         shouldDirty: true,
         shouldValidate: true,
       });
-      return;
-    }
-
-    replaceOptions([]);
-    setValue(correctPath, [], { shouldDirty: true, shouldValidate: true });
-    setValue(allowMultiplePath, false, {
-      shouldDirty: true,
-      shouldValidate: true,
-    });
-  };
-
-  useEffect(() => {
-    if (qType !== "MCQ") return;
-
-    const nextCorrectAnswers = selectedOptionIndexes
-      .map((optionIndex) => currentOptions[optionIndex])
-      .filter((value): value is string => Boolean(value?.trim()));
-
-    if (JSON.stringify(nextCorrectAnswers) !== JSON.stringify(correctAnswers)) {
-      setValue(correctPath, nextCorrectAnswers, {
+      setValue(fileConfigPath, undefined, { shouldDirty: true });
+    } else if (nextType === "FILE") {
+      setOptions([]);
+      setValue(correctPath, [], { shouldDirty: true, shouldValidate: true });
+      setValue(allowMultiplePath, false, {
+        shouldDirty: true,
+        shouldValidate: true,
+      });
+      setValue(
+        fileConfigPath,
+        {
+          allowedExtensions: [],
+          minFileSizeMb: 0,
+          maxFileSizeMb: 10,
+          instructions: "",
+        },
+        { shouldDirty: true },
+      );
+    } else {
+      setOptions([]);
+      setValue(correctPath, [], { shouldDirty: true, shouldValidate: true });
+      setValue(allowMultiplePath, false, {
         shouldDirty: true,
         shouldValidate: true,
       });
+      setValue(fileConfigPath, undefined, { shouldDirty: true });
     }
-  }, [
-    correctAnswers,
-    correctPath,
-    currentOptions,
-    qType,
-    selectedOptionIndexes,
-    setValue,
-  ]);
-
-  const syncSelectionAfterRemoval = (removedIndex: number) => {
-    const removedOption = currentOptions[removedIndex];
-    const nextCorrectAnswers = correctAnswers
-      .filter((answer) => answer !== removedOption)
-      .map((value) => value.trim())
-      .filter(Boolean);
-
-    setValue(correctPath, nextCorrectAnswers, {
-      shouldDirty: true,
-      shouldValidate: true,
-    });
   };
 
   const toggleMcqAnswer = (optionIndex: number, checked: boolean) => {
+    const optionValue = currentOptions[optionIndex];
+    if (checked && (!optionValue || !optionValue.trim())) {
+      toast.error(t("optionTextRequired"));
+      return;
+    }
+
+    lockScroll();
+
+    let nextSelected: number[];
+
     if (allowMultiple) {
-      const nextSelectedIndexes = checked
-        ? Array.from(new Set([...selectedOptionIndexes, optionIndex])).sort(
+      nextSelected = checked
+        ? Array.from(new Set([...selectedIndexes, optionIndex])).sort(
             (a, b) => a - b,
           )
-        : selectedOptionIndexes.filter(
-            (indexValue) => indexValue !== optionIndex,
-          );
-
-      setValue(
-        correctPath,
-        nextSelectedIndexes
-          .map((indexValue) => currentOptions[indexValue])
-          .filter((value): value is string => Boolean(value?.trim())),
-        { shouldDirty: true, shouldValidate: true },
-      );
-      return;
+        : selectedIndexes.filter((i) => i !== optionIndex);
+    } else {
+      nextSelected = checked ? [optionIndex] : [];
     }
 
-    setValue(
-      correctPath,
-      checked && currentOptions[optionIndex] ? [currentOptions[optionIndex]] : [],
-      { shouldDirty: true, shouldValidate: true },
-    );
+    // Write directly to correctAnswers (selectedIndexes is derived from it)
+    const nextCorrect = nextSelected
+      .map((si) => currentOptions[si])
+      .filter((v): v is string => Boolean(v?.trim()));
+    setValue(correctPath, nextCorrect, {
+      shouldDirty: true,
+      shouldValidate: true,
+    });
   };
 
   const toggleTrueFalse = (value: "TRUE" | "FALSE") => {
+    lockScroll();
     setValue(correctPath, [value], { shouldDirty: true, shouldValidate: true });
   };
 
+  // فحص ما إذا كان هناك أي خيار فارغ داخل السؤال الحالي
+  const hasEmptyOption = currentOptions.some((opt) => !opt || !opt.trim());
+
   return (
-    <div className="p-4 border bg-white rounded-md space-y-4 relative">
+    <div
+      ref={containerRef}
+      className="relative space-y-4 bg-white p-4 border rounded-md"
+    >
       <button
         type="button"
         onClick={removeQuestion}
-        className="absolute top-4 right-4 text-red-500 font-bold"
+        className="top-4 absolute font-bold text-red-500 end-4"
       >
         X
       </button>
 
-      <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+      <div className="gap-4 grid grid-cols-1 md:grid-cols-3">
         <InputField
-          label="Question Text"
+          label={t("text")}
           name={`questions.${index}.text`}
           register={register}
           error={errors?.questions?.[index]?.text}
         />
 
         <div className="flex flex-col gap-2 w-full">
-          <label className="text-xs text-gray-500">Type</label>
+          <label className="font-medium text-gray-700 text-sm">
+            {t("type")}
+          </label>
           <select
             {...typeField}
             onChange={(e) => {
               typeField.onChange(e);
               handleQuestionTypeChange(e.target.value);
             }}
-            className="ring-[1.5px] ring-gray-300 p-2 rounded-md text-sm w-full"
+            className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
           >
-            <option value="TEXT">Text Answer</option>
-            <option value="MCQ">Multiple Choice</option>
-            <option value="TRUE_FALSE">True / False</option>
-            <option value="FILE">File Upload</option>
+            <option value="TEXT">{t("textAnswer")}</option>
+            <option value="MCQ">{t("mcq")}</option>
+            <option value="TRUE_FALSE">{t("trueFalse")}</option>
+            <option value="FILE">{t("file")}</option>
           </select>
         </div>
 
         <InputField
-          label="Points"
+          label={t("points")}
           name={`questions.${index}.points`}
           type="number"
           register={register}
@@ -235,37 +293,39 @@ function QuestionEditor({
       </div>
 
       {qType === "MCQ" && (
-        <div className="space-y-4 rounded-md border border-dashed border-gray-300 p-4">
+        <div className="space-y-4 p-4 border border-gray-300 border-dashed rounded-md">
           <div className="flex items-center gap-2">
             <input type="checkbox" {...register(allowMultiplePath)} />
-            <span className="text-sm text-gray-700">
-              Allow multiple correct answers
-            </span>
+            <span className="text-gray-700 text-sm">{t("allowMultiple")}</span>
           </div>
 
           <div className="space-y-3">
-            <div className="flex items-center justify-between">
-              <h3 className="text-sm font-medium text-gray-700">Options</h3>
+            <div className="flex justify-between items-center">
+              <h3 className="font-medium text-gray-700 text-sm">
+                {t("options")}
+              </h3>
               <button
                 type="button"
-                onClick={() => appendOption("")}
-                className="text-sm text-blue-600 hover:underline"
+                onClick={() => appendOption()}
+                className="text-blue-600 text-sm hover:underline"
               >
-                + Add Option
+                {t("addOption")}
               </button>
             </div>
 
-            {optionFields.map((field, optionIndex) => {
-              const isSelected = selectedOptionIndexes.includes(optionIndex);
+            {currentOptions.map((_optValue: string, optionIndex: number) => {
+              const isSelected = selectedIndexes.includes(optionIndex);
 
               return (
-                <div key={field.id} className="flex items-center gap-3">
+                <div key={optionIndex} className="flex items-center gap-3">
                   <input
                     {...register(`questions.${index}.options.${optionIndex}`)}
-                    className="flex-1 ring-[1.5px] ring-gray-300 p-2 rounded-md text-sm"
-                    placeholder={`Option ${optionIndex + 1}`}
+                    className="flex-1 p-2 rounded-md ring-[1.5px] ring-gray-300 text-sm"
+                    placeholder={t("optionPlaceholder", {
+                      number: optionIndex + 1,
+                    })}
                   />
-                  <label className="flex items-center gap-2 text-xs text-gray-600">
+                  <label className="flex items-center gap-2 text-gray-600 text-xs">
                     <input
                       type={allowMultiple ? "checkbox" : "radio"}
                       name={`questions.${index}.correctAnswer`}
@@ -274,60 +334,191 @@ function QuestionEditor({
                         toggleMcqAnswer(optionIndex, e.target.checked)
                       }
                     />
-                    Correct
+                    {t("correct")}
                   </label>
                   <button
                     type="button"
-                    onClick={() => {
-                      syncSelectionAfterRemoval(optionIndex);
-                      removeOption(optionIndex);
-                    }}
-                    className="text-sm text-red-500 hover:underline"
+                    onClick={() => removeOptionAt(optionIndex)}
+                    className="text-red-500 text-sm hover:underline"
                   >
-                    Remove
+                    {t("remove")}
                   </button>
                 </div>
               );
             })}
 
-            {errors?.questions?.[index]?.options?.message && (
-              <p className="text-xs text-red-400">
-                {errors.questions[index]?.options?.message?.toString()}
+            {/* إظهار الخطأ فوراً في حال حاول المعلم إنشاء الاختبار وهناك خيارات فارغة */}
+            {(errors?.questions?.[index]?.options?.message ||
+              (isSubmitted && hasEmptyOption)) && (
+              <p className="mt-1 font-medium text-red-500 text-xs">
+                {errors?.questions?.[index]?.options?.message?.toString() ||
+                  t("emptyOptions")}
               </p>
             )}
           </div>
 
-          <div className="text-xs text-gray-500">
-            Select one correct answer, or more if multiple answers are allowed.
+          <div className="font-medium text-gray-700 text-sm">
+            {t("answerHelp")}
           </div>
         </div>
       )}
 
       {qType === "TRUE_FALSE" && (
-        <div className="space-y-3 rounded-md border border-dashed border-gray-300 p-4">
-          <h3 className="text-sm font-medium text-gray-700">Correct Answer</h3>
+        <div className="space-y-3 p-4 border border-gray-300 border-dashed rounded-md">
+          <h3 className="font-medium text-gray-700 text-sm">
+            {t("correctAnswer")}
+          </h3>
           <div className="flex flex-wrap gap-6">
             {["TRUE", "FALSE"].map((value) => (
-              <label key={value} className="flex items-center gap-2 cursor-pointer">
+              <label
+                key={value}
+                className="flex items-center gap-2 cursor-pointer"
+              >
                 <input
                   type="radio"
                   name={`questions.${index}.correctAnswer`}
                   checked={selectedTrueFalse === value}
                   onChange={() => toggleTrueFalse(value as "TRUE" | "FALSE")}
                 />
-                <span className="text-sm text-gray-700">
-                  {value === "TRUE" ? "True" : "False"}
+                <span className="text-gray-700 text-sm">
+                  {value === "TRUE" ? t("true") : t("false")}
                 </span>
               </label>
             ))}
           </div>
           {errors?.questions?.[index]?.correctAnswer?.message && (
-            <p className="text-xs text-red-400">
+            <p className="font-medium text-red-500 text-xs">
               {errors.questions[index]?.correctAnswer?.message?.toString()}
             </p>
           )}
         </div>
       )}
+
+      {(qType === "TEXT" || qType === "FILE") && (
+        <div className="space-y-3 p-4 border border-gray-300 border-dashed rounded-md">
+          <h3 className="font-medium text-gray-700 text-sm">{t("rubric")}</h3>
+          <textarea
+            {...register(`questions.${index}.textAnswer`)}
+            className="p-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none w-full min-h-[100px] text-sm transition-all"
+            placeholder={t("rubricPlaceholder")}
+          />
+          <p className="text-gray-400 text-xs">{t("rubricHelp")}</p>
+          {errors?.questions?.[index]?.textAnswer?.message && (
+            <p className="font-medium text-red-500 text-xs">
+              {errors.questions[index]?.textAnswer?.message?.toString()}
+            </p>
+          )}
+        </div>
+      )}
+
+      {qType === "FILE" && (
+        <div className="space-y-4 p-4 border border-gray-300 border-dashed rounded-md">
+          <div className="flex items-center gap-2">
+            <FileText className="w-4 h-4 text-academixPurpleDark" />
+            <h3 className="font-medium text-gray-700 text-sm">
+              {t("fileSettings")}
+            </h3>
+          </div>
+
+          <div className="space-y-2">
+            <label className="font-medium text-gray-700 text-xs">
+              {t("allowedExtensions")}
+            </label>
+            <input
+              type="text"
+              className="p-2 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none w-full text-sm transition-all"
+              placeholder={t("allowedExtensionsPlaceholder")}
+              {...register(`questions.${index}.fileConfig.allowedExtensions`, {
+                setValueAs: (v: any) => {
+                  if (Array.isArray(v)) return v;
+                  if (typeof v === "string") {
+                    if (!v.trim()) return [];
+                    return v
+                      .split(",")
+                      .map((s) => s.trim().toLowerCase().replace(/^\./, ""))
+                      .filter(Boolean);
+                  }
+                  return [];
+                },
+              })}
+              defaultValue={(() => {
+                const currentVal =
+                  control._formValues.questions?.[index]?.fileConfig
+                    ?.allowedExtensions;
+                return Array.isArray(currentVal)
+                  ? currentVal.join(", ")
+                  : (currentVal ?? "");
+              })()}
+              onBlur={(e) => {
+                setValue(
+                  `questions.${index}.fileConfig.allowedExtensions`,
+                  e.target.value,
+                  {
+                    shouldDirty: true,
+                    shouldValidate: true,
+                  },
+                );
+              }}
+            />
+            <p className="text-gray-400 text-xs">
+              {t("allowedExtensionsHelp")}
+            </p>
+          </div>
+
+          <div className="gap-4 grid grid-cols-2">
+            <div className="space-y-2">
+              <label className="font-medium text-gray-700 text-xs">
+                {t("minFileSize")}
+              </label>
+              <input
+                type="number"
+                min={0}
+                step={0.1}
+                {...register(`questions.${index}.fileConfig.minFileSizeMb`, {
+                  valueAsNumber: true,
+                })}
+                className="p-2 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none w-full text-sm transition-all"
+              />
+            </div>
+            <div className="space-y-2">
+              <label className="font-medium text-gray-700 text-xs">
+                {t("maxFileSize")}
+              </label>
+              <input
+                type="number"
+                min={1}
+                max={10}
+                step={0.1}
+                {...register(`questions.${index}.fileConfig.maxFileSizeMb`, {
+                  valueAsNumber: true,
+                })}
+                className="p-2 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none w-full text-sm transition-all"
+              />
+              <p className="text-gray-400 text-xs">{t("systemMax")}</p>
+            </div>
+          </div>
+
+          <div className="space-y-2">
+            <label className="font-medium text-gray-700 text-xs">
+              {t("fileInstructions")}
+            </label>
+            <textarea
+              rows={3}
+              {...register(`questions.${index}.fileConfig.instructions`)}
+              className="p-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none w-full min-h-[60px] text-sm transition-all"
+              placeholder={t("fileInstructionsPlaceholder")}
+            />
+          </div>
+
+          <p className="text-gray-400 text-xs italic">{t("pdfAiHelp")}</p>
+
+          {errors?.questions?.[index]?.fileConfig?.message && (
+            <p className="font-medium text-red-500 text-xs">
+              {errors.questions[index]?.fileConfig?.message?.toString()}
+            </p>
+          )}
+        </div>
+      )}
     </div>
   );
 }
@@ -335,12 +526,19 @@ function QuestionEditor({
 export default function ExamWorkflowForm({
   subjects,
   classes,
+  teachers = [],
+  canSelectTeacher = false,
   mode = "create",
   examId,
   initialData,
+  teacherLessons,
 }: ExamWorkflowFormProps) {
+  const t = useTranslations("forms.examWorkflow");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const router = useRouter();
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const createDateTimeDefault = toDateTimeLocalValue(new Date());
 
   const {
     register,
@@ -348,13 +546,17 @@ export default function ExamWorkflowForm({
     handleSubmit,
     setValue,
     watch,
-    formState: { errors },
+    formState: { errors, isSubmitted },
   } = useForm<CreateExamWorkflowSchema>({
     resolver: zodResolver(createExamWorkflowSchema),
     defaultValues: {
       title: initialData?.title ?? "",
-      startTime: toDateTimeLocalValue(initialData?.startTime) as any,
-      endTime: toDateTimeLocalValue(initialData?.endTime) as any,
+      instructions: initialData?.instructions ?? "",
+      teacherId: initialData?.teacherId ?? "",
+      startTime: (toDateTimeLocalValue(initialData?.startTime) ||
+        (mode === "create" ? createDateTimeDefault : "")) as any,
+      endTime: (toDateTimeLocalValue(initialData?.endTime) ||
+        (mode === "create" ? createDateTimeDefault : "")) as any,
       subjectId: initialData?.subjectId,
       classIds: (initialData?.classIds ?? []).map(String) as any,
       enableTimer: initialData?.enableTimer ?? true,
@@ -364,7 +566,7 @@ export default function ExamWorkflowForm({
       autoSaveInterval: initialData?.autoSaveInterval ?? 30,
       enableAutoSubmit: initialData?.enableAutoSubmit ?? true,
       questionsPerPage: initialData?.questionsPerPage ?? 1,
-      questions:
+      questions: (
         initialData?.questions ?? [
           {
             type: "TEXT",
@@ -374,8 +576,13 @@ export default function ExamWorkflowForm({
             allowMultiple: false,
             options: [],
             correctAnswer: [],
+            textAnswer: "",
           },
-        ],
+        ]
+      ).map((q) => ({
+        ...q,
+        textAnswer: q.textAnswer ?? "",
+      })),
     },
   });
 
@@ -385,145 +592,278 @@ export default function ExamWorkflowForm({
   });
 
   const watchEnableTimer = watch("enableTimer");
+  const watchSubjectId = watch("subjectId");
+  const watchTeacherId = watch("teacherId");
+  const watchClassIds = watch("classIds");
+
+  const filteredClasses = useMemo(() => {
+    if (!watchSubjectId) {
+      return [];
+    }
+
+    const subjectId = Number(watchSubjectId);
+    const validClassIds = new Set(
+      teacherLessons
+        .filter((l) => l.subjectId === subjectId)
+        .map((l) => l.classId),
+    );
+    return classes.filter((c) => validClassIds.has(c.id));
+  }, [classes, teacherLessons, watchSubjectId]);
+
+  const filteredClassIdStrings = useMemo(
+    () => filteredClasses.map((classItem) => String(classItem.id)),
+    [filteredClasses],
+  );
+  const selectedClassIds = useMemo(
+    () => new Set((watchClassIds ?? []).map(String)),
+    [watchClassIds],
+  );
+  const allFilteredClassesSelected =
+    filteredClassIdStrings.length > 0 &&
+    filteredClassIdStrings.every((classId) => selectedClassIds.has(classId));
+  const someFilteredClassesSelected = filteredClassIdStrings.some((classId) =>
+    selectedClassIds.has(classId),
+  );
+
+  const toggleAllClasses = (checked: boolean) => {
+    setValue("classIds", (checked ? filteredClassIdStrings : []) as any, {
+      shouldDirty: true,
+      shouldValidate: true,
+    });
+  };
 
   const onSubmit = async (data: CreateExamWorkflowSchema) => {
+    if (data.questions && data.questions.length > 0) {
+      for (let i = 0; i < data.questions.length; i++) {
+        const q = data.questions[i];
+        if (q.type === "MCQ") {
+          const hasEmptyOption = q.options?.some((opt) => !opt || !opt.trim());
+          if (hasEmptyOption) {
+            toast.error(t("emptyOptionsForQuestion", { number: i + 1 }));
+            return;
+          }
+          if (!q.correctAnswer || q.correctAnswer.length === 0) {
+            toast.error(t("selectCorrectForQuestion", { number: i + 1 }));
+            return;
+          }
+        }
+      }
+    }
+
     setIsSubmitting(true);
     try {
       const res =
         mode === "update" && examId
-          ? await updateExamWorkflow({ success: true, error: false }, examId, data)
+          ? await updateExamWorkflow(
+              { success: true, error: false },
+              examId,
+              data,
+            )
           : await createExamWorkflow({ success: true, error: false }, data);
       if (res.error) {
         toast.error(res.message);
       } else {
-        toast.success(
-          mode === "update" ? "Exam updated successfully!" : "Exam created successfully!",
-        );
+        toast.success(mode === "update" ? t("updated") : t("created"));
         router.push("/list/exams");
       }
     } catch (err) {
-      toast.error("An unexpected error occurred.");
+      toast.error(t("unexpectedError"));
     } finally {
       setIsSubmitting(false);
     }
   };
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={handleSubmit(onSubmit)}>
-      <section className="space-y-4 border p-4 rounded-md bg-gray-50">
-        <h2 className="text-xl font-semibold">1. Basic Information</h2>
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <InputField
-            label="Exam Title"
-            name="title"
-            register={register}
-            error={errors.title}
-          />
-          <InputField
-            label="Start Time"
-            name="startTime"
-            type="datetime-local"
-            register={register}
-            error={errors.startTime}
-          />
-          <InputField
-            label="End Time"
-            name="endTime"
-            type="datetime-local"
-            register={register}
-            error={errors.endTime}
-          />
-          
-          <div className="flex flex-col gap-2 w-full">
-            <label className="text-xs text-gray-500">Subject</label>
-            <select
-              {...register("subjectId")}
-              className="ring-[1.5px] ring-gray-300 p-2 rounded-md text-sm w-full"
-            >
-              <option value="">Select a subject...</option>
-              {subjects.map((s) => (
-                <option key={s.id} value={s.id}>{s.name}</option>
-              ))}
-            </select>
-            {errors.subjectId?.message && (
-              <p className="text-xs text-red-400">{errors.subjectId.message}</p>
+    <form className="flex flex-col gap-6" onSubmit={handleSubmit(onSubmit)}>
+      <div className="gap-6 grid grid-cols-1 lg:grid-cols-2">
+        <section className="space-y-4 bg-academixPurpleLight p-4 border border-academixPurpleDark/10 rounded-md">
+          <h2 className="font-bold text-gray-900 text-2xl">{t("basicInfo")}</h2>
+          <div className="gap-4 grid grid-cols-1 md:grid-cols-2">
+            <InputField
+              label={t("examTitle")}
+              name="title"
+              register={register}
+              error={errors.title}
+            />
+            <InputField
+              label={t("startTime")}
+              name="startTime"
+              type="datetime-local"
+              register={register}
+              error={errors.startTime}
+            />
+            <InputField
+              label={t("endTime")}
+              name="endTime"
+              type="datetime-local"
+              register={register}
+              error={errors.endTime}
+            />
+
+            {canSelectTeacher && (
+              <div className="md:col-span-2">
+                <input type="hidden" {...register("teacherId")} />
+                <TeacherSearchInput
+                  label={t("assignedTeacher")}
+                  teachers={teachers}
+                  value={watchTeacherId}
+                  onChange={(teacherId) =>
+                    setValue("teacherId", teacherId ?? "", {
+                      shouldDirty: true,
+                      shouldValidate: true,
+                    })
+                  }
+                />
+                <p className="mt-1 text-gray-400 text-xs">
+                  {t("assignedTeacherHelp")}
+                </p>
+              </div>
             )}
-          </div>
-          
-          <div className="flex flex-col gap-2 w-full md:col-span-2">
-            <label className="text-xs text-gray-500">Classes</label>
-            <div className="flex flex-wrap gap-4">
-              {classes.map((c) => (
-                <label key={c.id} className="flex items-center gap-2">
+
+            <div className="flex flex-col gap-2 w-full">
+              <label className="font-medium text-gray-700 text-sm">
+                {t("subject")}
+              </label>
+              <select
+                {...register("subjectId")}
+                className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
+              >
+                <option value="">{t("selectSubject")}</option>
+                {subjects.map((s) => (
+                  <option key={s.id} value={s.id}>
+                    {s.name}
+                  </option>
+                ))}
+              </select>
+              {errors.subjectId?.message && (
+                <p className="font-medium text-red-500 text-xs">
+                  {errors.subjectId.message}
+                </p>
+              )}
+            </div>
+
+            <div className="flex flex-col gap-2 md:col-span-2 w-full">
+              <label className="font-medium text-gray-700 text-sm">
+                {t("classes")}
+              </label>
+              {filteredClasses.length > 0 && (
+                <label className="flex items-center gap-2 w-fit font-medium text-sm">
                   <input
                     type="checkbox"
-                    value={String(c.id)}
-                    {...register("classIds")}
+                    checked={allFilteredClassesSelected}
+                    ref={(element) => {
+                      if (element) {
+                        element.indeterminate =
+                          someFilteredClassesSelected &&
+                          !allFilteredClassesSelected;
+                      }
+                    }}
+                    onChange={(event) => toggleAllClasses(event.target.checked)}
                   />
-                  <span>{c.name}</span>
+                  <span>{commonT("selectAll")}</span>
                 </label>
-              ))}
+              )}
+              <div className="flex flex-wrap gap-4">
+                {filteredClasses.length > 0 ? (
+                  filteredClasses.map((c) => (
+                    <label key={c.id} className="flex items-center gap-2">
+                      <input
+                        type="checkbox"
+                        value={String(c.id)}
+                        {...register("classIds")}
+                      />
+                      <span>{c.name}</span>
+                    </label>
+                  ))
+                ) : (
+                  <p className="text-gray-400 text-sm italic">
+                    {watchSubjectId
+                      ? t("noClassesForSubject")
+                      : t("selectSubjectFirst")}
+                  </p>
+                )}
+              </div>
+              {errors.classIds?.message && (
+                <p className="font-medium text-red-500 text-xs">
+                  {errors.classIds.message}
+                </p>
+              )}
             </div>
-            {errors.classIds?.message && (
-              <p className="text-xs text-red-400">{errors.classIds.message}</p>
-            )}
           </div>
-        </div>
-      </section>
-
-      <section className="space-y-4 border p-4 rounded-md bg-gray-50">
-        <h2 className="text-xl font-semibold">2. Settings</h2>
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <label className="flex items-center gap-2">
-            <input type="checkbox" {...register("enableTimer")} />
-            <span>Enable Timer</span>
-          </label>
-          
-          {watchEnableTimer && (
-            <InputField
-              label="Duration (minutes)"
-              name="duration"
-              type="number"
-              register={register}
-              error={errors.duration}
-            />
-          )}
+        </section>
+
+        <section className="space-y-4 bg-academixPurpleLight p-4 border border-academixPurpleDark/10 rounded-md">
+          <h2 className="font-bold text-gray-900 text-2xl">{t("settings")}</h2>
+          <div className="gap-4 grid grid-cols-1 md:grid-cols-2">
+            <label className="flex items-center gap-2">
+              <input type="checkbox" {...register("enableTimer")} />
+              <span>{t("showTimer")}</span>
+            </label>
+            <label className="flex items-center gap-2">
+              <input type="checkbox" {...register("enableAutoSave")} />
+              <span>{t("autoSave")}</span>
+            </label>
+
+            <label className="flex items-center gap-2">
+              <input type="checkbox" {...register("enableNavigation")} />
+              <span>{t("navigation")}</span>
+            </label>
+
+            <label className="flex items-center gap-2">
+              <input type="checkbox" {...register("enableAutoSubmit")} />
+              <span>{t("autoSubmit")}</span>
+            </label>
+            <div className="space-y-2">
+              {watchEnableTimer && (
+                <InputField
+                  label={t("duration")}
+                  name="duration"
+                  type="number"
+                  register={register}
+                  error={errors.duration}
+                />
+              )}
+
+              <InputField
+                label={t("questionsPerPage")}
+                name="questionsPerPage"
+                type="number"
+                register={register}
+                error={errors.questionsPerPage}
+              />
+            </div>
+          </div>
+        </section>
+      </div>
 
-          <label className="flex items-center gap-2">
-            <input type="checkbox" {...register("enableNavigation")} />
-            <span>Allow Previous Page Navigation</span>
-          </label>
-          <label className="flex items-center gap-2">
-            <input type="checkbox" {...register("enableAutoSave")} />
-            <span>Enable Auto-Save</span>
-          </label>
-          <label className="flex items-center gap-2">
-            <input type="checkbox" {...register("enableAutoSubmit")} />
-            <span>Enable Auto-Submit when time is up</span>
+      <section className="flex flex-col space-y-4 bg-academixPurpleLight p-4 border border-academixPurpleDark/10 rounded-md">
+        <h2 className="font-bold text-gray-900 text-2xl">
+          {t("instructions")}
+        </h2>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {t("studentInstructions")}
+            <span className="ms-1 font-normal text-gray-400">
+              ({commonT("optional")})
+            </span>
           </label>
-          
-          <InputField
-            label="Questions Per Page"
-            name="questionsPerPage"
-            type="number"
-            register={register}
-            error={errors.questionsPerPage}
+          <textarea
+            {...register("instructions")}
+            rows={4}
+            placeholder={t("instructionsPlaceholder")}
+            className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all resize-none placeholder-gray-400"
           />
+          {errors.instructions?.message && (
+            <p className="font-medium text-red-500 text-xs">
+              {errors.instructions.message}
+            </p>
+          )}
         </div>
       </section>
 
-      <section className="space-y-4 border p-4 rounded-md bg-gray-50">
+      <section className="flex flex-col space-y-4 bg-academixPurpleLight p-4 border border-academixPurpleDark/10 rounded-md">
         <div className="flex justify-between items-center">
-          <h2 className="text-xl font-semibold">3. Questions</h2>
-          <button
-            type="button"
-            onClick={() =>
-              append({ type: "TEXT", text: "", points: 1, order: fields.length + 1, allowMultiple: false, options: [], correctAnswer: [] })
-            }
-            className="bg-blue-500 text-white px-4 py-2 rounded-md text-sm"
-          >
-            + Add Question
-          </button>
+          <h2 className="font-bold text-gray-900 text-2xl">{t("questions")}</h2>
         </div>
 
         {fields.map((field, index) => {
@@ -535,6 +875,7 @@ export default function ExamWorkflowForm({
               register={register}
               setValue={setValue}
               errors={errors}
+              isSubmitted={isSubmitted}
               removeQuestion={() => remove(index)}
             />
           );
@@ -542,20 +883,38 @@ export default function ExamWorkflowForm({
         {errors.questions?.root?.message && (
           <p className="text-red-500">{errors.questions.root.message}</p>
         )}
+        <button
+          type="button"
+          onClick={() =>
+            append({
+              type: "TEXT",
+              text: "",
+              points: 1,
+              order: fields.length + 1,
+              allowMultiple: false,
+              options: [],
+              correctAnswer: [],
+              textAnswer: "",
+            })
+          }
+          className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 ms-auto px-4 py-2 rounded-md w-fit text-white transition-all"
+        >
+          {t("addQuestion")}
+        </button>
       </section>
 
       <button
         type="submit"
         disabled={isSubmitting}
-        className="bg-academixPurpleDark text-white p-3 rounded-md font-bold hover:bg-academixPurple"
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-4 py-2 rounded-md w-fit text-white transition-all"
       >
         {isSubmitting
           ? mode === "update"
-            ? "Updating..."
-            : "Creating..."
+            ? actionsT("updating")
+            : actionsT("creating")
           : mode === "update"
-            ? "Update Exam Workflow"
-            : "Create Exam Workflow"}
+            ? t("updateExam")
+            : t("createExam")}
       </button>
     </form>
   );
diff --git a/src/components/forms/GradeDeleteForm.tsx b/src/components/forms/GradeDeleteForm.tsx
new file mode 100644
index 0000000..853790e
--- /dev/null
+++ b/src/components/forms/GradeDeleteForm.tsx
@@ -0,0 +1,123 @@
+"use client";
+
+import { Dispatch, SetStateAction, useState, useTransition } from "react";
+import { deleteGrade } from "@/lib/actions/grade.actions";
+import { useRouter } from "next/navigation";
+import { toast } from "react-toastify";
+import { useTranslations } from "next-intl";
+
+type GradeDeleteFormProps = {
+  data: {
+    id: number;
+    level: number;
+    _count?: {
+      classes?: number;
+    };
+  };
+  relatedData?: {
+    classes?: Array<{
+      id: number;
+      name: string;
+    }>;
+  };
+  setOpen: Dispatch<SetStateAction<boolean>>;
+};
+
+type FormState = {
+  success: boolean;
+  error: boolean;
+  message?: string;
+};
+
+const GradeDeleteForm = ({ data, relatedData, setOpen }: GradeDeleteFormProps) => {
+  const t = useTranslations("forms.gradeDelete");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
+  const router = useRouter();
+  const [state, setState] = useState<FormState>({ success: false, error: false });
+  const [isSubmitting, startTransition] = useTransition();
+
+  const classCount = data?._count?.classes ?? 0;
+
+  const handleDelete = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    setState({ success: false, error: false });
+
+    const payload = new FormData();
+    payload.set("id", String(data.id));
+
+    startTransition(() => {
+      void (async () => {
+        const result = await deleteGrade({ success: false, error: false }, payload);
+        setState(result);
+
+        if (result.success) {
+          toast.success(t("deleted"));
+          setOpen(false);
+          router.refresh();
+        } else {
+          toast.error(result.message ?? commonT("somethingWentWrong"));
+        }
+      })();
+    });
+  };
+
+  return (
+    <form onSubmit={handleDelete} className="flex flex-col gap-4 p-4">
+
+      <h1 className="font-bold text-gray-900 text-2xl">{t("title")}</h1>
+
+      {classCount > 0 ? (
+        <div className="bg-red-50 p-3 border border-red-200 rounded-md text-sm">
+          <p className="font-medium text-red-700">
+            {t("warning", { count: classCount })}
+          </p>
+          <p className="mt-1 text-red-600">
+            {t("cascadeWarning")}
+          </p>
+          {relatedData?.classes && relatedData.classes.length > 0 && (
+            <p className="mt-2 text-red-700">
+              {t("classes", {
+                classes: relatedData.classes.map((item) => item.name).join(", "),
+              })}
+            </p>
+          )}
+        </div>
+      ) : (
+        <p className="text-gray-600 text-sm">
+          {t("noClasses", { level: data.level })}
+        </p>
+      )}
+
+      <p className="font-medium text-center">
+        {t("confirm", { level: data.level })}
+      </p>
+
+      {state.error && (
+        <p className="text-red-500 text-sm">
+          {state.message ?? commonT("somethingWentWrong")}
+        </p>
+      )}
+
+      <div className="flex justify-end gap-3">
+        <button
+          type="button"
+          disabled={isSubmitting}
+          onClick={() => setOpen(false)}
+          className="hover:bg-gray-50 disabled:opacity-60 px-4 py-2 border border-gray-300 rounded-md text-sm"
+        >
+          {actionsT("close")}
+        </button>
+        <button
+          type="submit"
+          disabled={isSubmitting}
+          className="bg-red-700 disabled:opacity-60 hover:brightness-90 px-4 py-2 rounded-md text-white text-sm transition-all"
+        >
+          {isSubmitting ? actionsT("deleting") : t("delete")}
+        </button>
+      </div>
+    </form>
+  );
+};
+
+export default GradeDeleteForm;
diff --git a/src/components/forms/GradeForm.tsx b/src/components/forms/GradeForm.tsx
new file mode 100644
index 0000000..78375fc
--- /dev/null
+++ b/src/components/forms/GradeForm.tsx
@@ -0,0 +1,80 @@
+"use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm } from "react-hook-form";
+import { gradeSchema, GradeSchema } from "@/lib/formValidationSchemas";
+import { createGrade } from "@/lib/actions";
+import { Dispatch, SetStateAction, useTransition } from "react";
+import { toast } from "react-toastify";
+import { useRouter } from "next/navigation";
+import InputField from "../InputField";
+import { useTranslations } from "next-intl";
+
+const GradeForm = ({
+  setOpen,
+}: {
+  type: "create" | "update";
+  data?: any;
+  setOpen: Dispatch<SetStateAction<boolean>>;
+  relatedData?: any;
+}) => {
+  const t = useTranslations("forms.grade");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+  } = useForm<GradeSchema>({
+    resolver: zodResolver(gradeSchema),
+    defaultValues: {
+      level: undefined,
+    },
+  });
+
+  const router = useRouter();
+  const [isSubmitting, startTransition] = useTransition();
+
+  const onSubmit = handleSubmit((formData) => {
+    startTransition(() => {
+      void (async () => {
+        const result = await createGrade({ success: false, error: false }, formData);
+
+        if (result.success) {
+          toast(t("created"));
+          setOpen(false);
+          router.refresh();
+          return;
+        }
+
+        toast.error(result.message ?? commonT("somethingWentWrong"));
+      })();
+    });
+  });
+
+  return (
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">{t("createTitle")}</h1>
+
+      <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
+        <InputField
+          label={t("level")}
+          name="level"
+          type="number"
+          register={register}
+          error={errors?.level}
+          inputProps={{ min: 1 }}
+        />
+      </div>
+
+      <button
+        disabled={isSubmitting}
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
+      >
+        {isSubmitting ? commonT("submitting") : actionsT("create")}
+      </button>
+    </form>
+  );
+};
+
+export default GradeForm;
diff --git a/src/components/forms/LessonForm.tsx b/src/components/forms/LessonForm.tsx
index d8a4ab2..94d01a2 100644
--- a/src/components/forms/LessonForm.tsx
+++ b/src/components/forms/LessonForm.tsx
@@ -7,6 +7,7 @@ import {
   type LessonScheduleSchema,
 } from "@/lib/formValidationSchemas";
 import { saveLessonSchedule } from "@/lib/actions";
+import type { SchoolWeekDay } from "@/lib/schoolCalendar";
 import {
   Dispatch,
   SetStateAction,
@@ -19,6 +20,7 @@ import {
 import { useForm, useWatch } from "react-hook-form";
 import { toast } from "react-toastify";
 import { useRouter } from "next/navigation";
+import { useTranslations } from "next-intl";
 
 type DayValue = (typeof lessonDays)[number];
 
@@ -47,18 +49,10 @@ type RelatedData = {
     workDayStartMinute: number;
     workDayEndHour: number;
     workDayEndMinute: number;
+    workingDays?: SchoolWeekDay[];
   };
 };
 
-const dayLabels: Record<DayValue, string> = {
-  SATURDAY: "SAT",
-  SUNDAY: "SUN",
-  MONDAY: "MON",
-  TUESDAY: "TUE",
-  WEDNESDAY: "WED",
-  THURSDAY: "THU",
-};
-
 const buildSlotNumbers = (lessonsPerDay: number) =>
   Array.from({ length: lessonsPerDay }, (_, index) => index + 1);
 
@@ -96,6 +90,7 @@ const mapLessonsToSlots = (
     teacherId?: string;
   }>,
   slotNumbers: number[],
+  activeDays: readonly DayValue[],
 ) => {
   const byDay = new Map<DayValue, typeof classLessons>();
 
@@ -112,7 +107,7 @@ const mapLessonsToSlots = (
     teacherId?: string;
   }> = [];
 
-  for (const day of lessonDays) {
+  for (const day of activeDays) {
     const dayLessons = (byDay.get(day) ?? []).sort((a, b) => {
       const minutesA =
         getMinutesFromDate(a.startTime) ?? Number.MAX_SAFE_INTEGER;
@@ -185,9 +180,11 @@ const LessonForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: RelatedData;
 }) => {
+  const t = useTranslations("forms.lesson");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const router = useRouter();
   const [isSubmitting, startTransition] = useTransition();
-  const [activeDay, setActiveDay] = useState<DayValue>(data?.day ?? "SATURDAY");
 
   const {
     classes = [],
@@ -198,6 +195,21 @@ const LessonForm = ({
   } = relatedData ?? {};
 
   const lessonsPerDay = schoolSettings?.lessonsPerDay ?? 6;
+  const activeDays = useMemo(() => {
+    const configured = schoolSettings?.workingDays ?? [];
+    const supported = lessonDays.filter((day): day is DayValue =>
+      configured.includes(day),
+    );
+
+    return supported.length > 0 ? supported : lessonDays;
+  }, [schoolSettings?.workingDays]);
+  const [activeDay, setActiveDay] = useState<DayValue>(
+    data?.day && activeDays.includes(data.day) ? data.day : activeDays[0],
+  );
+  const selectedDay = activeDays.includes(activeDay)
+    ? activeDay
+    : activeDays[0];
+
   const slotNumbers = useMemo(
     () => buildSlotNumbers(lessonsPerDay),
     [lessonsPerDay],
@@ -267,11 +279,11 @@ const LessonForm = ({
   const activeRows = useMemo(() => {
     return slotNumbers.map((slot) => {
       const index =
-        lessonDays.findIndex((day) => day === activeDay) * slotsPerDay +
+        lessonDays.findIndex((day) => day === selectedDay) * slotsPerDay +
         (slot - 1);
       return { slot, index };
     });
-  }, [activeDay, slotNumbers, slotsPerDay]);
+  }, [selectedDay, slotNumbers, slotsPerDay]);
 
   const applyClassSchedule = useCallback(
     (classIdValue?: number) => {
@@ -289,9 +301,16 @@ const LessonForm = ({
       const classLessons = lessons.filter(
         (lesson) => lesson.classId === classId,
       );
-      const slottedLessons = mapLessonsToSlots(classLessons, slotNumbers);
+      const slottedLessons = mapLessonsToSlots(
+        classLessons,
+        slotNumbers,
+        activeDays,
+      );
+      const filteredByWorkingDays = slottedLessons.filter((lesson) =>
+        activeDays.includes(lesson.day),
+      );
 
-      for (const lesson of slottedLessons) {
+      for (const lesson of filteredByWorkingDays) {
         const dayIndex = lessonDays.findIndex((day) => day === lesson.day);
         if (dayIndex < 0) continue;
 
@@ -311,7 +330,7 @@ const LessonForm = ({
         shouldValidate: true,
       });
     },
-    [lessons, setValue, slotNumbers, slotsPerDay],
+    [activeDays, lessons, setValue, slotNumbers, slotsPerDay],
   );
 
   useEffect(() => {
@@ -384,63 +403,64 @@ const LessonForm = ({
         );
 
         if (result.success) {
-          toast("Weekly lesson schedule has been saved.");
+          toast(t("saved"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       } catch {
-        toast.error("Something went wrong!");
+        toast.error(commonT("somethingWentWrong"));
       }
     });
   });
 
   return (
     <form className="flex flex-col gap-6" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create"
-          ? "Create weekly lesson schedule"
-          : "Update weekly lesson schedule"}
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
-
-      <div className="flex flex-col gap-2 w-full md:w-1/3">
-        <label className="text-gray-500 text-xs">Class</label>
-        <select
-          className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-          value={selectedClassId ?? ""}
-          onChange={(e) => onClassChange(e.target.value)}
-        >
-          <option value="">Select class</option>
-          {classes.map((classItem) => (
-            <option key={classItem.id} value={classItem.id}>
-              {classItem.name}
-            </option>
-          ))}
-        </select>
-        {errors.classId?.message && (
-          <p className="text-red-400 text-xs">
-            {errors.classId.message.toString()}
-          </p>
-        )}
-      </div>
-
-      <div className="flex flex-wrap gap-2">
-        {lessonDays.map((day) => (
-          <button
-            key={day}
-            type="button"
-            onClick={() => setActiveDay(day)}
-            className={`px-3 py-2 rounded-md text-sm font-medium border ${
-              activeDay === day
-                ? "bg-blue-500 text-white border-blue-500"
-                : "bg-white text-gray-700 border-gray-300"
-            }`}
+      <div className="flex flex-wrap justify-between items-start gap-4">
+        <div className="flex gap-2">
+          <label className="font-medium text-gray-700 text-sm">
+            {t("class")}
+          </label>
+          <select
+            className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
+            value={selectedClassId ?? ""}
+            onChange={(e) => onClassChange(e.target.value)}
           >
-            {dayLabels[day]}
-          </button>
-        ))}
+            <option value="">{t("selectClass")}</option>
+            {classes.map((classItem) => (
+              <option key={classItem.id} value={classItem.id}>
+                {classItem.name}
+              </option>
+            ))}
+          </select>
+          {errors.classId?.message && (
+            <p className="font-medium text-red-500 text-xs">
+              {errors.classId.message.toString()}
+            </p>
+          )}
+        </div>
+
+        <div className="flex flex-wrap gap-2">
+          {activeDays.map((day) => (
+            <button
+              key={day}
+              type="button"
+              onClick={() => setActiveDay(day)}
+              className={`px-3 py-2 rounded-md text-sm font-medium border ${
+                selectedDay === day
+                  ? "bg-academixPurpleDark text-white border-academixPurpleDark"
+                  : "bg-white text-gray-700 border-gray-300"
+              }`}
+            >
+              {t(`days.${day}`)}
+            </button>
+          ))}
+        </div>
       </div>
 
       <div className="gap-4 grid grid-cols-1 md:grid-cols-2">
@@ -455,25 +475,25 @@ const LessonForm = ({
 
           return (
             <div
-              key={`${activeDay}-${slot}`}
+              key={`${selectedDay}-${slot}`}
               className="flex flex-col gap-2 p-3 rounded-md ring-1 ring-gray-200"
             >
               <p className="font-medium text-sm">
-                Lesson {slot}
+                {t("lesson", { slot })}
                 {teacherName ? (
-                  <span className="ml-2 font-normal text-gray-500 text-xs">
+                  <span className="ms-2 font-medium text-gray-700 text-sm">
                     - {teacherName}
                   </span>
                 ) : null}
               </p>
               <div className="gap-2 grid md:grid-cols-2">
                 <select
-                  className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+                  className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
                   value={currentSubjectId ?? ""}
                   onChange={(e) => setSlotSubject(index, e.target.value)}
                   disabled={!selectedClassId}
                 >
-                  <option value="">No subject</option>
+                  <option value="">{t("noSubject")}</option>
                   {filteredSubjects.map((subject) => (
                     <option key={subject.id} value={subject.id}>
                       {subject.name}
@@ -482,12 +502,12 @@ const LessonForm = ({
                 </select>
 
                 <select
-                  className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+                  className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
                   value={currentTeacherId ?? ""}
                   onChange={(e) => setSlotTeacher(index, e.target.value)}
                   disabled={!currentSubjectId}
                 >
-                  <option value="">Select teacher</option>
+                  <option value="">{t("selectTeacher")}</option>
                   {teacherOptions.map((teacher) => (
                     <option key={teacher.id} value={teacher.id}>
                       {teacher.name}
@@ -496,7 +516,9 @@ const LessonForm = ({
                 </select>
               </div>
               {submitCount > 0 && teacherError && (
-                <p className="text-amber-700 text-xs">Select a teacher</p>
+                <p className="text-amber-700 text-xs">
+                  {t("teacherRequired")}
+                </p>
               )}
             </div>
           );
@@ -537,16 +559,16 @@ const LessonForm = ({
       })}
 
       {errors.entries?.message && (
-        <p className="text-red-400 text-xs">
+        <p className="font-medium text-red-500 text-xs">
           {errors.entries.message.toString()}
         </p>
       )}
 
       <button
-        className="bg-blue-400 disabled:opacity-60 p-2 rounded-md text-white"
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
         disabled={isSubmitting}
       >
-        Save Weekly Schedule
+        {isSubmitting ? actionsT("saving") : t("save")}
       </button>
     </form>
   );
diff --git a/src/components/forms/MessageForm.tsx b/src/components/forms/MessageForm.tsx
index 8a54d57..27921f8 100644
--- a/src/components/forms/MessageForm.tsx
+++ b/src/components/forms/MessageForm.tsx
@@ -10,6 +10,7 @@ import { messageSchema, MessageSchema } from "@/lib/formValidationSchemas";
 import InputField from "../InputField";
 import MessageClassSelector from "./message/MessageClassSelector";
 import RecipientPicker from "./message/RecipientPicker";
+import { useTranslations } from "next-intl";
 
 const EMPTY_STRING_ARRAY: string[] = [];
 const EMPTY_CLASS_ARRAY: Array<string | number> = [];
@@ -25,6 +26,9 @@ const MessageForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.message");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const {
     register,
     handleSubmit,
@@ -64,17 +68,15 @@ const MessageForm = ({
         );
 
         if (result.success) {
-          toast(
-            `Message has been ${type === "create" ? "created" : "updated"}!`,
-          );
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       } catch {
-        toast.error("Something went wrong!");
+        toast.error(commonT("somethingWentWrong"));
       }
     });
   });
@@ -146,33 +148,39 @@ const MessageForm = ({
   }, [selectedClassIdsAsNumbers, teachers]);
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create" ? "Create a new message" : "Update the message"}
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
 
       {type === "update" && (
         <input type="hidden" {...register("id")} defaultValue={data?.id} />
       )}
 
-      <div className="flex flex-wrap justify-between gap-4">
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
         {type === "create" && (
           <>
             <input type="hidden" {...register("classIds")} />
-            <MessageClassSelector
-              classes={classes}
-              selectedClassIds={selectedClassIdsAsNumbers}
-              onChange={(nextClassIds) =>
-                setValue("classIds", nextClassIds, {
-                  shouldDirty: true,
-                  shouldValidate: true,
-                })
-              }
-            />
+            <span className="block font-semibold text-gray-700 text-sm">
+              {t("recipients")}
+            </span>
+
+            <div className="gap-4 grid grid-cols-1 lg:grid-cols-3">
+              <div className="lg:col-span-3">
+                <MessageClassSelector
+                  classes={classes}
+                  selectedClassIds={selectedClassIdsAsNumbers}
+                  onChange={(nextClassIds) =>
+                    setValue("classIds", nextClassIds, {
+                      shouldDirty: true,
+                      shouldValidate: true,
+                    })
+                  }
+                />
+              </div>
 
-            <div className="flex flex-wrap justify-between items-center gap-2 w-full">
               <RecipientPicker
-                label="Student recipients"
+                label={t("studentRecipients")}
                 items={eligibleStudents}
                 selectedIds={selectedStudentIds}
                 onChange={(nextIds) =>
@@ -184,7 +192,7 @@ const MessageForm = ({
               />
 
               <RecipientPicker
-                label="Parent recipients"
+                label={t("parentRecipients")}
                 items={eligibleParents}
                 selectedIds={selectedParentIds}
                 onChange={(nextIds) =>
@@ -196,7 +204,7 @@ const MessageForm = ({
               />
 
               <RecipientPicker
-                label="Teacher recipients"
+                label={t("teacherRecipients")}
                 items={eligibleTeachers}
                 selectedIds={selectedTeacherIds}
                 onChange={(nextIds) =>
@@ -219,43 +227,58 @@ const MessageForm = ({
           </>
         )}
 
-        <InputField
-          label="Message Title"
-          name="title"
-          defaultValue={data?.title}
-          register={register}
-          error={errors?.title}
-          inputProps={{ placeholder: "e.g. Reminder" }}
-        />
+        <span className="block font-semibold text-gray-700 text-sm">
+          {t("content")}
+        </span>
+        <div className="flex items-center gap-4">
+          <div className="lg:col-span-1">
+            <InputField
+              label={t("title")}
+              name="title"
+              defaultValue={data?.title}
+              register={register}
+              error={errors?.title}
+              inputProps={{ placeholder: t("titlePlaceholder") }}
+            />
+          </div>
 
-        <div className="flex flex-col gap-2 w-full">
-          <label className="text-gray-500 text-xs">Description</label>
-          <textarea
-            {...register("description")}
-            defaultValue={data?.description}
-            rows={4}
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            placeholder="Message details"
-          />
-          {errors.description?.message && (
-            <p className="text-red-400 text-xs">
-              {errors.description.message.toString()}
-            </p>
-          )}
-          {errors.studentIds?.message && (
-            <p className="text-red-400 text-xs">
-              {errors.studentIds.message.toString()}
-            </p>
-          )}
+          <div className="flex flex-col gap-2 lg:col-span-2 w-full">
+            <label className="font-medium text-gray-700 text-sm">
+              {commonT("description")}
+            </label>
+            <textarea
+              {...register("description")}
+              defaultValue={data?.description}
+              rows={4}
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
+              placeholder={t("descriptionPlaceholder")}
+            />
+            {errors.description?.message && (
+              <p className="font-medium text-red-500 text-xs">
+                {errors.description.message.toString()}
+              </p>
+            )}
+            {errors.studentIds?.message && (
+              <p className="font-medium text-red-500 text-xs">
+                {errors.studentIds.message.toString()}
+              </p>
+            )}
+          </div>
         </div>
       </div>
 
-      <button
-        className="bg-blue-400 disabled:opacity-60 p-2 rounded-md text-white"
-        disabled={isSubmitting}
-      >
-        {type === "create" ? "Create" : "Update"}
-      </button>
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <button
+          className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
+          disabled={isSubmitting}
+        >
+          {isSubmitting
+            ? commonT("submitting")
+            : type === "create"
+              ? actionsT("create")
+              : actionsT("update")}
+        </button>
+      </div>
     </form>
   );
 };
diff --git a/src/components/forms/ParentForm.tsx b/src/components/forms/ParentForm.tsx
index f76b623..e7f0529 100644
--- a/src/components/forms/ParentForm.tsx
+++ b/src/components/forms/ParentForm.tsx
@@ -6,7 +6,7 @@ import InputField from "../InputField";
 import {
   Dispatch,
   SetStateAction,
-  startTransition,
+  useTransition,
   useEffect,
   useState,
 } from "react";
@@ -14,7 +14,16 @@ import { parentSchema, ParentSchema } from "@/lib/formValidationSchemas";
 import { createParent, updateParent } from "@/lib/actions";
 import { useRouter } from "next/navigation";
 import { toast } from "react-toastify";
-import { Eye, EyeOff, X, Search } from "lucide-react";
+import {
+  Eye,
+  EyeOff,
+  Search,
+  ShieldCheck,
+  UserRound,
+  Users,
+  X,
+} from "lucide-react";
+import { useTranslations } from "next-intl";
 
 type ParentFormState = {
   success: boolean;
@@ -33,6 +42,8 @@ const ParentForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.parent");
+  const commonT = useTranslations("forms.common");
   const {
     register,
     handleSubmit,
@@ -53,11 +64,12 @@ const ParentForm = ({
     { id: string; name: string }[]
   >([]);
   const [studentsError, setStudentsError] = useState("");
+  const [isSubmitting, startTransition] = useTransition();
 
   const onSubmit = handleSubmit((data) => {
     if (type === "create" && selectedStudentIds.length === 0) {
-      setStudentsError("Select at least one student.");
-      toast.error("Select at least one student before creating a parent.");
+      setStudentsError(t("selectStudentRequired"));
+      toast.error(t("selectStudentBeforeCreate"));
       return;
     }
 
@@ -70,15 +82,13 @@ const ParentForm = ({
         } as any);
 
         if (result.success) {
-          toast(
-            `Parent has been ${type === "create" ? "created" : "updated"}!`,
-          );
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message || "Something went wrong!");
+        toast.error(result.message || commonT("somethingWentWrong"));
       })();
     });
   });
@@ -99,72 +109,84 @@ const ParentForm = ({
   const { students } = relatedData;
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create" ? "Create a new Parent" : "Update the Parent"}
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
-      <span className="font-medium text-gray-400 text-xs">
-        Authentication Information
-      </span>
-      <div className="flex flex-wrap justify-between gap-4">
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <span className="inline-flex items-center gap-2 font-semibold text-gray-700 text-sm">
+          <ShieldCheck size={16} />
+          {commonT("authenticationInfo")}
+        </span>
+        <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
         <InputField
-          label="Username"
+          label={commonT("username")}
           name="username"
           defaultValue={data?.username}
           register={register}
           error={errors?.username}
         />
         <InputField
-          label="Email"
+          label={commonT("email")}
           name="email"
           defaultValue={data?.email}
           register={register}
           error={errors?.email}
         />
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Password</label>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {commonT("password")}
+          </label>
           <div className="relative">
             <input
               type={showPassword ? "text" : "password"}
               {...register("password")}
-              className="p-2 pr-10 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+              className="focus:bg-academixPurpleLight px-4 py-3 pe-10 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
             />
             <button
               type="button"
               onClick={() => setShowPassword((prev) => !prev)}
-              aria-label={showPassword ? "Hide password" : "Show password"}
-              className="top-1/2 right-3 absolute text-gray-500 hover:text-gray-700 -translate-y-1/2"
+              aria-label={
+                showPassword
+                  ? commonT("hidePassword")
+                  : commonT("showPassword")
+              }
+              className="top-1/2 end-3 absolute text-gray-500 hover:text-gray-700 -translate-y-1/2"
             >
               {showPassword ? <EyeOff size={16} /> : <Eye size={16} />}
             </button>
           </div>
           {errors?.password?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.password.message.toString()}
             </p>
           )}
         </div>
       </div>
-      <span className="font-medium text-gray-400 text-xs">
-        Personal Information
-      </span>
-      <div className="flex flex-wrap justify-between gap-4">
+      </div>
+
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <span className="inline-flex items-center gap-2 font-semibold text-gray-700 text-sm">
+          <UserRound size={16} />
+          {commonT("personalInfo")}
+        </span>
+        <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
         <InputField
-          label="Full Name"
+          label={commonT("fullName")}
           name="name"
           defaultValue={data?.name}
           register={register}
           error={errors.name}
         />
         <InputField
-          label="Phone"
+          label={commonT("phone")}
           name="phone"
           defaultValue={data?.phone}
           register={register}
           error={errors.phone}
         />
         <InputField
-          label="Address"
+          label={commonT("address")}
           name="address"
           defaultValue={data?.address}
           register={register}
@@ -174,13 +196,19 @@ const ParentForm = ({
           <input type="hidden" {...register("id")} defaultValue={data?.id} />
         )}
       </div>
-      <div className="flex flex-col gap-2 w-full student-search">
-        <label className="text-gray-500 text-xs">Students</label>
+      </div>
+
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <div className="flex flex-col gap-2 w-full student-search">
+        <label className="inline-flex items-center gap-2 font-medium text-gray-700 text-sm">
+          <Users size={16} />
+          {t("students")}
+        </label>
         <div className="relative">
-          <div className="flex items-center gap-2 px-3 py-2 rounded-md ring-[1.5px] ring-gray-300 w-full">
+          <div className="flex items-center gap-2 bg-white focus-within:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus-within:border-academixPurpleDark rounded-lg focus-within:ring-0 transition-all">
             <input
               type="text"
-              placeholder="Search students..."
+              placeholder={commonT("searchStudents")}
               value={searchInput}
               onChange={(e) => setSearchInput(e.target.value)}
               className="bg-transparent outline-none w-full text-sm"
@@ -204,7 +232,7 @@ const ParentForm = ({
             </button>
           </div>
           {showDropdown && (
-            <div className="top-full right-0 left-0 z-10 absolute bg-white shadow-lg mt-1 border border-gray-300 rounded-md max-h-40 overflow-y-auto">
+            <div className="top-full inset-x-0 z-10 absolute bg-white shadow-xl mt-2 border border-gray-200 rounded-lg max-h-56 overflow-y-auto">
               {filteredStudents.length > 0 ? (
                 filteredStudents.map(
                   (student: { id: string; name: string }) => (
@@ -220,7 +248,7 @@ const ParentForm = ({
                         setShowDropdown(false);
                         setFilteredStudents([]);
                       }}
-                      className="hover:bg-blue-100 px-3 py-2 text-sm cursor-pointer"
+                      className="hover:bg-academixPurpleLight px-4 py-3 w-full hover:text-academixPurpleDark text-sm text-start transition-colors cursor-pointer"
                     >
                       {student.name}
                     </div>
@@ -228,7 +256,7 @@ const ParentForm = ({
                 )
               ) : (
                 <div className="px-3 py-2 text-gray-500 text-sm">
-                  No students found
+                  {commonT("noStudentsFound")}
                 </div>
               )}
             </div>
@@ -243,7 +271,7 @@ const ParentForm = ({
               return (
                 <div
                   key={studentId}
-                  className="flex items-center gap-2 bg-blue-100 px-3 py-1 rounded-full text-blue-800 text-sm"
+                  className="flex items-center gap-2 bg-academixPurpleLight px-4 py-2 rounded-full font-medium text-academixPurpleDark text-sm"
                 >
                   <span>{student?.name}</span>
                   <button
@@ -253,7 +281,7 @@ const ParentForm = ({
                         selectedStudentIds.filter((id) => id !== studentId),
                       )
                     }
-                    className="text-blue-600 hover:text-blue-900"
+                    className="text-academixPurpleDark hover:text-red-500 transition-colors"
                   >
                     <X size={16} />
                   </button>
@@ -263,19 +291,30 @@ const ParentForm = ({
           </div>
         )}
         {errors.students?.message && (
-          <p className="text-red-400 text-xs">
+          <p className="font-medium text-red-500 text-xs">
             {errors.students.message.toString()}
           </p>
         )}
         {studentsError && (
-          <p className="text-red-400 text-xs">{studentsError}</p>
+          <p className="font-medium text-red-500 text-xs">{studentsError}</p>
         )}
       </div>
-      <button type="submit" className="bg-blue-400 p-2 rounded-md text-white">
-        {type === "create" ? "Create" : "Update"}
+      </div>
+      <button
+        type="submit"
+        disabled={isSubmitting}
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
+      >
+        {isSubmitting
+          ? commonT("submitting")
+          : type === "create"
+            ? t("create")
+            : t("update")}
       </button>
     </form>
   );
 };
 
 export default ParentForm;
+
+
diff --git a/src/components/forms/ProfileImageUpload.tsx b/src/components/forms/ProfileImageUpload.tsx
new file mode 100644
index 0000000..e1f5ef8
--- /dev/null
+++ b/src/components/forms/ProfileImageUpload.tsx
@@ -0,0 +1,222 @@
+"use client";
+
+import Image from "next/image";
+import { useRef, useState } from "react";
+import { toast } from "react-toastify";
+import { Camera, CheckCircle, Loader2 } from "lucide-react";
+import { getProfileImageUploadSignature } from "@/lib/actions";
+
+type SignatureResponse = {
+  signature: string;
+  timestamp: number;
+  folder: string;
+  apiKey: string;
+  cloudName: string;
+};
+
+const MAX_IMAGE_SIZE_BYTES = 5 * 1024 * 1024;
+
+const uploadImageToCloudinary = (
+  file: File,
+  sig: SignatureResponse,
+  onProgress: (progress: number) => void,
+): Promise<string> => {
+  return new Promise((resolve, reject) => {
+    const formData = new FormData();
+    formData.append("file", file);
+    formData.append("api_key", sig.apiKey);
+    formData.append("signature", sig.signature);
+    formData.append("timestamp", String(sig.timestamp));
+    formData.append("folder", sig.folder);
+
+    const xhr = new XMLHttpRequest();
+
+    xhr.upload.addEventListener("progress", (event) => {
+      if (!event.lengthComputable) return;
+      onProgress(Math.round((event.loaded / event.total) * 100));
+    });
+
+    xhr.addEventListener("load", () => {
+      if (xhr.status === 200) {
+        try {
+          const response = JSON.parse(xhr.responseText);
+          if (typeof response.secure_url === "string") {
+            resolve(response.secure_url);
+            return;
+          }
+          reject(new Error("Upload response did not include an image URL."));
+        } catch {
+          reject(new Error("Failed to parse upload response."));
+        }
+        return;
+      }
+
+      try {
+        const response = JSON.parse(xhr.responseText);
+        reject(new Error(response.error?.message ?? "Upload failed."));
+      } catch {
+        reject(new Error("Upload failed."));
+      }
+    });
+
+    xhr.addEventListener("error", () => reject(new Error("Network error.")));
+    xhr.open(
+      "POST",
+      `https://api.cloudinary.com/v1_1/${sig.cloudName}/image/upload`,
+    );
+    xhr.send(formData);
+  });
+};
+
+const isAllowedImage = (file: File) =>
+  ["image/jpeg", "image/png", "image/webp"].includes(file.type);
+
+const ProfileImageUpload = ({
+  value,
+  onChange,
+  uploadLabel,
+  previewAlt,
+  photoUploadedLabel,
+  removePhotoLabel,
+  errorMessage,
+}: {
+  value: string;
+  onChange: (url: string) => void;
+  uploadLabel: string;
+  previewAlt: string;
+  photoUploadedLabel: string;
+  removePhotoLabel: string;
+  errorMessage: string;
+}) => {
+  const inputRef = useRef<HTMLInputElement>(null);
+  const [isUploading, setIsUploading] = useState(false);
+  const [uploadProgress, setUploadProgress] = useState(0);
+  const [uploadSucceeded, setUploadSucceeded] = useState(false);
+
+  const handleFileChange = async (
+    event: React.ChangeEvent<HTMLInputElement>,
+  ) => {
+    const file = event.target.files?.[0];
+    event.target.value = "";
+
+    if (!file) return;
+
+    if (!isAllowedImage(file) || file.size > MAX_IMAGE_SIZE_BYTES) {
+      toast.error(errorMessage);
+      return;
+    }
+
+    setIsUploading(true);
+    setUploadProgress(0);
+    setUploadSucceeded(false);
+    try {
+      const signature = await getProfileImageUploadSignature();
+      if ("error" in signature) {
+        throw new Error(signature.error);
+      }
+
+      const secureUrl = await uploadImageToCloudinary(
+        file,
+        signature,
+        setUploadProgress,
+      );
+      setUploadProgress(100);
+      setUploadSucceeded(true);
+      onChange(secureUrl);
+    } catch (err) {
+      console.error("[ProfileImageUpload]", err);
+      toast.error(errorMessage);
+      setUploadProgress(0);
+      setUploadSucceeded(false);
+    } finally {
+      setIsUploading(false);
+    }
+  };
+
+  return (
+    <div className="flex flex-col gap-4">
+      <button
+        type="button"
+        disabled={isUploading}
+        onClick={() => inputRef.current?.click()}
+        className="group flex items-center gap-3 hover:bg-academixPurpleLight disabled:opacity-60 p-4 border-2 border-gray-300 hover:border-academixPurpleDark border-dashed rounded-lg transition-all cursor-pointer"
+      >
+        <Image
+          src="/upload.png"
+          alt=""
+          width={32}
+          height={32}
+          className="group-hover:scale-110 transition-transform"
+        />
+        <span className="inline-flex items-center gap-2 font-medium text-gray-700 text-sm">
+          {isUploading ? (
+            <Loader2 size={16} className="animate-spin" />
+          ) : (
+            <Camera size={16} />
+          )}
+          {uploadLabel}
+          {isUploading && (
+            <span className="font-semibold text-academixPurpleDark text-xs">
+              {uploadProgress}%
+            </span>
+          )}
+        </span>
+      </button>
+
+      {isUploading && (
+        <div className="space-y-1">
+          <div className="flex justify-between items-center text-gray-500 text-xs">
+            <span>{uploadProgress}%</span>
+          </div>
+          <div className="bg-gray-200 rounded-full w-full h-2 overflow-hidden">
+            <div
+              className="bg-academixPurpleDark rounded-full h-full transition-all duration-200"
+              style={{ width: `${uploadProgress}%` }}
+            />
+          </div>
+        </div>
+      )}
+
+      <input
+        ref={inputRef}
+        type="file"
+        accept="image/jpeg,image/png,image/webp"
+        className="hidden"
+        onChange={handleFileChange}
+      />
+
+      {value && (
+        <div className="flex items-start gap-4 bg-white p-4 border border-gray-200 rounded-lg">
+          <Image
+            src={value}
+            alt={previewAlt}
+            width={80}
+            height={80}
+            className="border border-gray-200 rounded-lg w-20 h-20 object-cover"
+          />
+          <div className="flex flex-col gap-2">
+            <p className="inline-flex items-center gap-2 mb-2 font-medium text-gray-700 text-sm">
+              {uploadSucceeded && (
+                <CheckCircle className="w-4 h-4 text-green-600" />
+              )}
+              {photoUploadedLabel}
+            </p>
+            <button
+              type="button"
+              onClick={() => {
+                setUploadSucceeded(false);
+                setUploadProgress(0);
+                onChange("");
+              }}
+              className="font-medium text-red-500 hover:text-red-700 text-sm transition-colors"
+            >
+              {removePhotoLabel}
+            </button>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default ProfileImageUpload;
diff --git a/src/components/forms/ResultForm.tsx b/src/components/forms/ResultForm.tsx
index f57fa37..40e10ff 100644
--- a/src/components/forms/ResultForm.tsx
+++ b/src/components/forms/ResultForm.tsx
@@ -15,6 +15,7 @@ import { useRouter } from "next/navigation";
 import { createResult, updateResult } from "@/lib/actions";
 import { resultSchema, ResultSchema } from "@/lib/formValidationSchemas";
 import { Search } from "lucide-react";
+import { useTranslations } from "next-intl";
 
 const ResultForm = ({
   type,
@@ -27,8 +28,15 @@ const ResultForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.result");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const initialAssessmentType =
-    data?.examId != null ? "exam" : data?.assignmentId != null ? "assignment" : "exam";
+    data?.examId != null
+      ? "exam"
+      : data?.assignmentId != null
+        ? "assignment"
+        : "exam";
 
   const {
     register,
@@ -69,15 +77,15 @@ const ResultForm = ({
         );
 
         if (result.success) {
-          toast(`Result has been ${type === "create" ? "created" : "updated"}!`);
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       } catch {
-        toast.error("Something went wrong!");
+        toast.error(commonT("somethingWentWrong"));
       }
     });
   });
@@ -148,20 +156,22 @@ const ResultForm = ({
   ]);
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create" ? "Create a new result" : "Update the result"}
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
 
-      <div className="flex flex-wrap justify-between gap-4">
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Student</label>
+      <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {t("student")}
+          </label>
           <input type="hidden" {...register("studentId")} />
           <div className="relative student-search">
-            <div className="flex items-center gap-2 px-3 py-2 rounded-md ring-[1.5px] ring-gray-300 w-full">
+            <div className="flex items-center gap-2 bg-white focus-within:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus-within:border-academixPurpleDark rounded-lg focus-within:ring-0 transition-all">
               <input
                 type="text"
-                placeholder="Search students..."
+                placeholder={commonT("searchStudents")}
                 value={searchInput}
                 onChange={(e) => {
                   setSearchInput(e.target.value);
@@ -189,60 +199,68 @@ const ResultForm = ({
               </button>
             </div>
             {showDropdown && (
-              <div className="top-full right-0 left-0 z-10 absolute bg-white shadow-lg mt-1 border border-gray-300 rounded-md max-h-40 overflow-y-auto">
+              <div className="top-full inset-x-0 z-10 absolute bg-white shadow-xl mt-2 border border-gray-200 rounded-lg max-h-56 overflow-y-auto">
                 {filteredStudents.length > 0 ? (
-                  filteredStudents.map((student: { id: string; name: string }) => (
-                    <div
-                      key={student.id}
-                      onClick={() => {
-                        setSelectedStudentId(student.id);
-                        setSearchInput(student.name);
-                        setShowDropdown(false);
-                        setFilteredStudents([]);
-                      }}
-                      className="hover:bg-blue-100 px-3 py-2 text-sm cursor-pointer"
-                    >
-                      {student.name}
-                    </div>
-                  ))
+                  filteredStudents.map(
+                    (student: { id: string; name: string }) => (
+                      <div
+                        key={student.id}
+                        onClick={() => {
+                          setSelectedStudentId(student.id);
+                          setSearchInput(student.name);
+                          setShowDropdown(false);
+                          setFilteredStudents([]);
+                        }}
+                        className="hover:bg-academixPurpleLight px-4 py-3 w-full hover:text-academixPurpleDark text-sm text-start transition-colors cursor-pointer"
+                      >
+                        {student.name}
+                      </div>
+                    ),
+                  )
                 ) : (
                   <div className="px-3 py-2 text-gray-500 text-sm">
-                    No students found
+                    {commonT("noStudentsFound")}
                   </div>
                 )}
               </div>
             )}
           </div>
           {errors.studentId?.message && (
-            <p className="text-red-400 text-xs">{errors.studentId.message.toString()}</p>
+            <p className="font-medium text-red-500 text-xs">
+              {errors.studentId.message.toString()}
+            </p>
           )}
         </div>
 
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Assessment Type</label>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {t("assessmentType")}
+          </label>
           <select
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+            className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
             {...register("assessmentType")}
             defaultValue={initialAssessmentType}
           >
-            <option value="exam">Exam</option>
-            <option value="assignment">Assignment</option>
+            <option value="exam">{t("exam")}</option>
+            <option value="assignment">{t("assignment")}</option>
           </select>
           {errors.assessmentType?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.assessmentType.message.toString()}
             </p>
           )}
         </div>
 
-        <div className="flex flex-col gap-2 w-full md:w-1/3">
-          <label className="text-gray-500 text-xs">Assessment</label>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {t("assessment")}
+          </label>
           <select
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+            className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
             {...register("assessmentId")}
             defaultValue={data?.examId ?? data?.assignmentId}
           >
-            <option value="">Select assessment</option>
+            <option value="">{t("selectAssessment")}</option>
             {currentAssessments.map(
               (assessment: {
                 id: number;
@@ -251,44 +269,57 @@ const ResultForm = ({
                 className: string;
               }) => (
                 <option key={assessment.id} value={assessment.id}>
-                  {assessment.title} ({assessment.subjectName} - {assessment.className})
+                  {assessment.title} ({assessment.subjectName} -{" "}
+                  {assessment.className})
                 </option>
               ),
             )}
           </select>
           {errors.assessmentId?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.assessmentId.message.toString()}
             </p>
           )}
         </div>
 
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Score</label>
+        <div className="flex flex-col gap-2 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {t("score")}
+          </label>
           <input
             type="number"
             min={0}
             max={100}
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
+            className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
             {...register("score")}
             defaultValue={data?.score}
           />
           {errors.score?.message && (
-            <p className="text-red-400 text-xs">{errors.score.message.toString()}</p>
+            <p className="font-medium text-red-500 text-xs">
+              {errors.score.message.toString()}
+            </p>
           )}
         </div>
       </div>
 
-      {type === "update" && <input type="hidden" {...register("id")} defaultValue={data?.id} />}
+      {type === "update" && (
+        <input type="hidden" {...register("id")} defaultValue={data?.id} />
+      )}
 
       <button
-        className="bg-blue-400 disabled:opacity-60 p-2 rounded-md text-white"
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
         disabled={isSubmitting}
       >
-        {type === "create" ? "Create" : "Update"}
+        {isSubmitting
+          ? commonT("submitting")
+          : type === "create"
+            ? actionsT("create")
+            : actionsT("update")}
       </button>
     </form>
   );
 };
 
 export default ResultForm;
+
+
diff --git a/src/components/forms/StudentDeleteForm.tsx b/src/components/forms/StudentDeleteForm.tsx
index 58c2c0f..978fd21 100644
--- a/src/components/forms/StudentDeleteForm.tsx
+++ b/src/components/forms/StudentDeleteForm.tsx
@@ -4,6 +4,7 @@ import { Dispatch, SetStateAction, startTransition, useState } from "react";
 import { useRouter } from "next/navigation";
 import { toast } from "react-toastify";
 import { deleteStudent } from "@/lib/actions";
+import { useTranslations } from "next-intl";
 
 type StudentDeleteFormProps = {
   data?: { id: string; name?: string };
@@ -22,6 +23,8 @@ const StudentDeleteForm = ({
   relatedData,
   setOpen,
 }: StudentDeleteFormProps) => {
+  const t = useTranslations("forms.studentDelete");
+  const commonT = useTranslations("forms.common");
   const router = useRouter();
   const [isDeleting, setIsDeleting] = useState(false);
 
@@ -49,42 +52,35 @@ const StudentDeleteForm = ({
         if (result.success) {
           toast(
             deleteParent && parent
-              ? "Student and parent deleted successfully"
-              : "Student deleted successfully",
+              ? t("studentAndParentDeleted")
+              : t("studentDeleted"),
           );
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       })();
     });
   };
 
   return (
     <div className="flex flex-col gap-5 p-4">
-      <h1 className="font-semibold text-xl text-center">Delete student</h1>
+      <h1 className="font-semibold text-xl text-center">{t("title")}</h1>
       <p className="text-gray-600 text-sm text-center">
-        Are you sure you want to delete {data?.name ?? "this student"}?
+        {t("confirm", { name: data?.name ?? t("fallbackName") })}
       </p>
 
       {parent ? (
         <div className="bg-amber-50 p-3 border border-amber-200 rounded-md text-amber-900 text-sm">
           <p>
-            This student is linked to parent{" "}
-            <span className="font-semibold">{parent.name}</span>.
+            {t("linkedParent", { parent: parent.name })}
           </p>
           {canDeleteBoth ? (
-            <p className="mt-1">
-              You can delete the student only, or delete both the student and
-              the parent.
-            </p>
+            <p className="mt-1">{t("canDeleteBoth")}</p>
           ) : (
-            <p className="mt-1">
-              The parent has more than one student, so only the student can be
-              deleted.
-            </p>
+            <p className="mt-1">{t("parentHasMoreStudents")}</p>
           )}
         </div>
       ) : null}
@@ -96,7 +92,7 @@ const StudentDeleteForm = ({
           onClick={() => handleDelete(false)}
           className="bg-red-700 disabled:opacity-50 px-4 py-2 rounded-md w-max text-white"
         >
-          Delete Student
+          {t("deleteStudent")}
         </button>
 
         {parent ? (
@@ -106,7 +102,7 @@ const StudentDeleteForm = ({
             onClick={() => handleDelete(true)}
             className="bg-red-400 disabled:opacity-50 px-4 py-2 rounded-md w-max text-white"
           >
-            Delete both
+            {t("deleteBoth")}
           </button>
         ) : null}
       </div>
@@ -115,3 +111,5 @@ const StudentDeleteForm = ({
 };
 
 export default StudentDeleteForm;
+
+
diff --git a/src/components/forms/StudentForm.tsx b/src/components/forms/StudentForm.tsx
index 358108e..1e9df55 100644
--- a/src/components/forms/StudentForm.tsx
+++ b/src/components/forms/StudentForm.tsx
@@ -3,11 +3,10 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 import InputField from "../InputField";
-import Image from "next/image";
 import {
   Dispatch,
   SetStateAction,
-  startTransition,
+  useTransition,
   useEffect,
   useState,
 } from "react";
@@ -15,8 +14,15 @@ import { studentSchema, StudentSchema } from "@/lib/formValidationSchemas";
 import { createStudent, updateStudent } from "@/lib/actions";
 import { useRouter } from "next/navigation";
 import { toast } from "react-toastify";
-import { CldUploadWidget } from "next-cloudinary";
-import { Eye, EyeOff, Search } from "lucide-react";
+import {
+  Eye,
+  EyeOff,
+  Search,
+  ShieldCheck,
+  UserRound,
+} from "lucide-react";
+import { useTranslations } from "next-intl";
+import ProfileImageUpload from "./ProfileImageUpload";
 
 type StudentFormState = {
   success: boolean;
@@ -35,6 +41,8 @@ const StudentForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.student");
+  const commonT = useTranslations("forms.common");
   const {
     register,
     handleSubmit,
@@ -42,6 +50,11 @@ const StudentForm = ({
     formState: { errors },
   } = useForm<StudentSchema>({
     resolver: zodResolver(studentSchema),
+    defaultValues: {
+      img: data?.img ?? "",
+      parentId: data?.parentId ?? "",
+      status: data?.status ?? "ACTIVE",
+    },
   });
 
   const [img, setImg] = useState<string>(data?.img ?? "");
@@ -54,26 +67,30 @@ const StudentForm = ({
   const [filteredParents, setFilteredParents] = useState<
     { id: string; name: string }[]
   >([]);
+  const [isSubmitting, startTransition] = useTransition();
+
+  const onSubmit = handleSubmit((formValues) => {
+    const payload = {
+      ...formValues,
+      img: img || formValues.img || "",
+    };
 
-  const onSubmit = handleSubmit((data) => {
     startTransition(() => {
       void (async () => {
         const action = type === "create" ? createStudent : updateStudent;
         const result = await action(
           { success: false, error: false },
-          data as any,
+          payload as any,
         );
 
         if (result.success) {
-          toast(
-            `Student has been ${type === "create" ? "created" : "updated"}!`,
-          );
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       })();
     });
   });
@@ -98,293 +115,301 @@ const StudentForm = ({
   }, [selectedParentId, setValue]);
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create" ? "Create a new student" : "Update the student"}
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
-      <span className="font-medium text-gray-400 text-xs">
-        Authentication Information
-      </span>
-      <div className="flex flex-wrap justify-between gap-4">
-        <InputField
-          label="Username"
-          name="username"
-          defaultValue={data?.username}
-          register={register}
-          error={errors?.username}
-        />
-        <InputField
-          label="Email"
-          name="email"
-          defaultValue={data?.email}
-          register={register}
-          error={errors?.email}
-        />
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Password</label>
-          <div className="relative">
-            <input
-              type={showPassword ? "text" : "password"}
-              {...register("password")}
-              className="p-2 pr-10 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            />
-            <button
-              type="button"
-              onClick={() => setShowPassword((prev) => !prev)}
-              aria-label={showPassword ? "Hide password" : "Show password"}
-              className="top-1/2 right-3 absolute text-gray-500 hover:text-gray-700 -translate-y-1/2"
-            >
-              {showPassword ? <EyeOff size={16} /> : <Eye size={16} />}
-            </button>
-          </div>
-          {errors?.password?.message && (
-            <p className="text-red-400 text-xs">
-              {errors.password.message.toString()}
-            </p>
-          )}
-        </div>
-      </div>
-      <span className="font-medium text-gray-400 text-xs">
-        Personal Information
-      </span>
-      <div className="flex flex-wrap justify-between gap-4">
-        <InputField
-          label="Full Name"
-          name="name"
-          defaultValue={data?.name}
-          register={register}
-          error={errors.name}
-        />
-        <InputField
-          label="Phone"
-          name="phone"
-          defaultValue={data?.phone}
-          register={register}
-          error={errors.phone}
-        />
-        <InputField
-          label="Address"
-          name="address"
-          defaultValue={data?.address}
-          register={register}
-          error={errors.address}
-        />
-        <InputField
-          label="Blood Type"
-          name="bloodType"
-          defaultValue={data?.bloodType}
-          register={register}
-          error={errors.bloodType}
-        />
-        <InputField
-          label="Birthday"
-          name="birthday"
-          defaultValue={data?.birthday?.toISOString?.().split("T")[0]}
-          register={register}
-          error={errors.birthday}
-          type="date"
-        />
-        <div className="flex flex-col gap-2 w-full md:w-1/4 parent-search">
-          <label className="text-gray-500 text-xs">Parent (optional)</label>
-          <input type="hidden" {...register("parentId")} />
-          <div className="relative">
-            <div className="flex items-center gap-2 px-3 py-2 rounded-md ring-[1.5px] ring-gray-300 w-full">
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <span className="inline-flex items-center gap-2 font-semibold text-gray-700 text-sm">
+          <ShieldCheck size={16} />
+          {commonT("authenticationInfo")}
+        </span>
+        <div className="gap-4 grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3">
+          <InputField
+            label={commonT("username")}
+            name="username"
+            defaultValue={data?.username}
+            register={register}
+            error={errors?.username}
+          />
+          <InputField
+            label={commonT("email")}
+            name="email"
+            defaultValue={data?.email}
+            register={register}
+            error={errors?.email}
+          />
+          <div className="flex flex-col gap-2 w-full">
+            <label className="font-medium text-gray-700 text-sm">
+              {commonT("password")}
+            </label>
+            <div className="relative">
               <input
-                type="text"
-                placeholder="Search parents..."
-                value={searchInput}
-                onChange={(e) => {
-                  setSearchInput(e.target.value);
-                  if (selectedParentId) {
-                    setSelectedParentId("");
-                    setValue("parentId", "");
-                  }
-                }}
-                className="bg-transparent outline-none w-full text-sm"
+                type={showPassword ? "text" : "password"}
+                {...register("password")}
+                className="focus:bg-academixPurpleLight px-4 py-3 pe-10 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
               />
               <button
                 type="button"
-                onClick={() => {
-                  const results = parents?.filter(
-                    (parent: { id: string; name: string }) =>
-                      parent.name
-                        .toLowerCase()
-                        .includes(searchInput.toLowerCase()),
-                  );
-                  setFilteredParents(results || []);
-                  setShowDropdown(true);
-                }}
-                className="text-gray-500 hover:text-gray-700"
+                onClick={() => setShowPassword((prev) => !prev)}
+                aria-label={
+                  showPassword
+                    ? commonT("hidePassword")
+                    : commonT("showPassword")
+                }
+                className="top-1/2 end-3 absolute text-gray-500 hover:text-gray-700 -translate-y-1/2"
               >
-                <Search className="w-4 h-4" />
+                {showPassword ? <EyeOff size={16} /> : <Eye size={16} />}
               </button>
             </div>
-            {showDropdown && (
-              <div className="top-full right-0 left-0 z-10 absolute bg-white shadow-lg mt-1 border border-gray-300 rounded-md max-h-40 overflow-y-auto">
-                {filteredParents.length > 0 ? (
-                  filteredParents.map(
-                    (parent: { id: string; name: string }) => (
-                      <div
-                        key={parent.id}
-                        onClick={() => {
-                          setSelectedParentId(String(parent.id));
-                          setSearchInput(parent.name);
-                          setShowDropdown(false);
-                          setFilteredParents([]);
-                        }}
-                        className="hover:bg-blue-100 px-3 py-2 text-sm cursor-pointer"
-                      >
-                        {parent.name}
-                      </div>
-                    ),
-                  )
-                ) : (
-                  <div className="px-3 py-2 text-gray-500 text-sm">
-                    No parents found
-                  </div>
-                )}
-              </div>
+            {errors?.password?.message && (
+              <p className="font-medium text-red-500 text-xs">
+                {errors.password.message.toString()}
+              </p>
             )}
           </div>
-          {errors.parentId?.message && (
-            <p className="text-red-400 text-xs">
-              {errors.parentId.message.toString()}
-            </p>
-          )}
-        </div>
-        {type === "update" && (
-          <input type="hidden" {...register("id")} defaultValue={data?.id} />
-        )}
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Sex</label>
-          <select
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            {...register("sex")}
-            defaultValue={data?.sex}
-          >
-            <option value="MALE">Male</option>
-            <option value="FEMALE">Female</option>
-          </select>
-          {errors.sex?.message && (
-            <p className="text-red-400 text-xs">
-              {errors.sex.message.toString()}
-            </p>
-          )}
-        </div>
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Status</label>
-          <select
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            {...register("status")}
-            defaultValue={data?.status || "ACTIVE"}
-          >
-            <option value="ACTIVE">Regular</option>
-            <option value="REPEATED">Repeated</option>
-            <option value="GRADUATED">Graduated</option>
-            <option value="LEFT">Left</option>
-          </select>
-          {errors.status?.message && (
-            <p className="text-red-400 text-xs">
-              {errors.status.message.toString()}
-            </p>
-          )}
         </div>
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Grade</label>
-          <select
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            {...register("gradeId")}
-            defaultValue={data?.gradeId}
-          >
-            {grades.map((grade: { id: number; level: number }) => (
-              <option value={grade.id} key={grade.id}>
-                {grade.level}
-              </option>
-            ))}
-          </select>
-          {errors.gradeId?.message && (
-            <p className="text-red-400 text-xs">
-              {errors.gradeId.message.toString()}
-            </p>
+      </div>
+
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <span className="inline-flex items-center gap-2 font-semibold text-gray-700 text-sm">
+          <UserRound size={16} />
+          {commonT("personalInfo")}
+        </span>
+        <div className="gap-4 grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3">
+          <InputField
+            label={commonT("fullName")}
+            name="name"
+            defaultValue={data?.name}
+            register={register}
+            error={errors.name}
+          />
+          <InputField
+            label={commonT("phone")}
+            name="phone"
+            defaultValue={data?.phone}
+            register={register}
+            error={errors.phone}
+          />
+          <InputField
+            label={commonT("address")}
+            name="address"
+            defaultValue={data?.address}
+            register={register}
+            error={errors.address}
+          />
+          <InputField
+            label={commonT("bloodType")}
+            name="bloodType"
+            defaultValue={data?.bloodType}
+            register={register}
+            error={errors.bloodType}
+          />
+          <InputField
+            label={commonT("birthday")}
+            name="birthday"
+            defaultValue={data?.birthday?.toISOString?.().split("T")[0]}
+            register={register}
+            error={errors.birthday}
+            type="date"
+          />
+          <div className="flex flex-col gap-2 w-full parent-search">
+            <label className="font-medium text-gray-700 text-sm">
+              {t("parent")} ({commonT("optional")})
+            </label>
+            <input type="hidden" {...register("parentId")} />
+            <div className="relative">
+              <div className="flex items-center gap-2 bg-white focus-within:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus-within:border-academixPurpleDark rounded-lg focus-within:ring-0 transition-all">
+                <input
+                  type="text"
+                  placeholder={commonT("searchParents")}
+                  value={searchInput}
+                  onChange={(e) => {
+                    setSearchInput(e.target.value);
+                    if (selectedParentId) {
+                      setSelectedParentId("");
+                      setValue("parentId", "");
+                    }
+                  }}
+                  className="bg-transparent outline-none w-full text-sm"
+                />
+                <button
+                  type="button"
+                  onClick={() => {
+                    const results = parents?.filter(
+                      (parent: { id: string; name: string }) =>
+                        parent.name
+                          .toLowerCase()
+                          .includes(searchInput.toLowerCase()),
+                    );
+                    setFilteredParents(results || []);
+                    setShowDropdown(true);
+                  }}
+                  className="text-gray-500 hover:text-gray-700"
+                >
+                  <Search className="w-4 h-4" />
+                </button>
+              </div>
+              {showDropdown && (
+                <div className="top-full inset-x-0 z-10 absolute bg-white shadow-xl mt-2 border border-gray-200 rounded-lg max-h-56 overflow-y-auto">
+                  {filteredParents.length > 0 ? (
+                    filteredParents.map(
+                      (parent: { id: string; name: string }) => (
+                        <div
+                          key={parent.id}
+                          onClick={() => {
+                            setSelectedParentId(String(parent.id));
+                            setSearchInput(parent.name);
+                            setShowDropdown(false);
+                            setFilteredParents([]);
+                          }}
+                          className="hover:bg-academixPurpleLight px-4 py-3 w-full hover:text-academixPurpleDark text-sm text-start transition-colors cursor-pointer"
+                        >
+                          {parent.name}
+                        </div>
+                      ),
+                    )
+                  ) : (
+                    <div className="px-3 py-2 text-gray-500 text-sm">
+                      {commonT("noParentsFound")}
+                    </div>
+                  )}
+                </div>
+              )}
+            </div>
+            {errors.parentId?.message && (
+              <p className="font-medium text-red-500 text-xs">
+                {errors.parentId.message.toString()}
+              </p>
+            )}
+          </div>
+          {type === "update" && (
+            <input type="hidden" {...register("id")} defaultValue={data?.id} />
           )}
-        </div>
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Class</label>
-          <select
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            {...register("classId")}
-            defaultValue={data?.classId}
-          >
-            {classes.map(
-              (classItem: {
-                id: number;
-                name: string;
-                capacity: number;
-                _count: { students: number };
-              }) => (
-                <option value={classItem.id} key={classItem.id}>
-                  ({classItem.name} -{" "}
-                  {classItem._count.students + "/" + classItem.capacity}{" "}
-                  Capacity)
+          <div className="flex flex-col gap-2 w-full">
+            <label className="font-medium text-gray-700 text-sm">
+              {commonT("sex")}
+            </label>
+            <select
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
+              {...register("sex")}
+              defaultValue={data?.sex}
+            >
+              <option value="MALE">{commonT("male")}</option>
+              <option value="FEMALE">{commonT("female")}</option>
+            </select>
+            {errors.sex?.message && (
+              <p className="font-medium text-red-500 text-xs">
+                {errors.sex.message.toString()}
+              </p>
+            )}
+          </div>
+          <div className="flex flex-col gap-2 w-full">
+            <label className="font-medium text-gray-700 text-sm">
+              {commonT("status")}
+            </label>
+            <select
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
+              {...register("status")}
+              defaultValue={data?.status || "ACTIVE"}
+            >
+              <option value="ACTIVE">{commonT("regular")}</option>
+              <option value="REPEATED">{commonT("repeated")}</option>
+              <option value="GRADUATED">{commonT("graduated")}</option>
+              <option value="LEFT">{commonT("left")}</option>
+            </select>
+            {errors.status?.message && (
+              <p className="font-medium text-red-500 text-xs">
+                {errors.status.message.toString()}
+              </p>
+            )}
+          </div>
+          <div className="flex flex-col gap-2 w-full">
+            <label className="font-medium text-gray-700 text-sm">
+              {t("grade")}
+            </label>
+            <select
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
+              {...register("gradeId")}
+              defaultValue={data?.gradeId}
+            >
+              {grades.map((grade: { id: number; level: number }) => (
+                <option value={grade.id} key={grade.id}>
+                  {grade.level}
                 </option>
-              ),
+              ))}
+            </select>
+            {errors.gradeId?.message && (
+              <p className="font-medium text-red-500 text-xs">
+                {errors.gradeId.message.toString()}
+              </p>
             )}
-          </select>
-          {errors.classId?.message && (
-            <p className="text-red-400 text-xs">
-              {errors.classId.message.toString()}
-            </p>
-          )}
+          </div>
+          <div className="flex flex-col gap-2 w-full">
+            <label className="font-medium text-gray-700 text-sm">
+              {t("class")}
+            </label>
+            <select
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all"
+              {...register("classId")}
+              defaultValue={data?.classId}
+            >
+              {classes.map(
+                (classItem: {
+                  id: number;
+                  name: string;
+                  capacity: number;
+                  _count: { students: number };
+                }) => (
+                  <option value={classItem.id} key={classItem.id}>
+                    {t("classCapacity", {
+                      className: classItem.name,
+                      students: classItem._count.students,
+                      capacity: classItem.capacity,
+                    })}
+                  </option>
+                ),
+              )}
+            </select>
+            {errors.classId?.message && (
+              <p className="font-medium text-red-500 text-xs">
+                {errors.classId.message.toString()}
+              </p>
+            )}
+          </div>
+        </div>
+      </div>
+
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <div className="pt-0">
+          <input type="hidden" {...register("img")} defaultValue={img} />
+          <ProfileImageUpload
+            value={img}
+            uploadLabel={t("uploadPhoto")}
+            previewAlt={t("previewAlt")}
+            photoUploadedLabel={commonT("photoUploaded")}
+            removePhotoLabel={commonT("removePhoto")}
+            errorMessage={commonT("somethingWentWrong")}
+            onChange={(secureUrl) => {
+              setImg(secureUrl);
+              setValue("img", secureUrl, {
+                shouldDirty: true,
+                shouldValidate: true,
+              });
+            }}
+          />
         </div>
       </div>
-      <input type="hidden" {...register("img")} defaultValue={img} />
-      <CldUploadWidget
-        uploadPreset="school"
-        onSuccess={(result, widget) => {
-          const secureUrl =
-            (result.info as { secure_url?: string })?.secure_url ?? "";
-          setImg(secureUrl);
-          setValue("img", secureUrl, { shouldDirty: true });
-          widget.close();
-        }}
+      <button
+        type="submit"
+        disabled={isSubmitting}
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
       >
-        {({ open }) => {
-          return (
-            <div className="flex flex-col gap-2 text-gray-500 text-xs">
-              <div
-                onClick={() => open()}
-                className="flex items-center gap-2 cursor-pointer"
-              >
-                <Image src="/upload.png" alt="" width={28} height={28} />
-                <span>Upload a photo</span>
-              </div>
-              {img && (
-                <div className="flex items-end gap-3">
-                  <Image
-                    src={img}
-                    alt="Teacher preview"
-                    width={64}
-                    height={64}
-                    className="border border-gray-200 rounded-md w-16 h-16 object-cover"
-                  />
-                  <button
-                    type="button"
-                    onClick={() => {
-                      setImg("");
-                      setValue("img", "", { shouldDirty: true });
-                    }}
-                    className="text-red-400 hover:text-red-600"
-                  >
-                    Remove
-                  </button>
-                </div>
-              )}
-            </div>
-          );
-        }}
-      </CldUploadWidget>
-      <button type="submit" className="bg-blue-400 p-2 rounded-md text-white">
-        {type === "create" ? "Create" : "Update"}
+        {isSubmitting
+          ? commonT("submitting")
+          : type === "create"
+            ? t("create")
+            : t("update")}
       </button>
     </form>
   );
diff --git a/src/components/forms/SubjectForm.tsx b/src/components/forms/SubjectForm.tsx
index 1fe282c..5c6b005 100644
--- a/src/components/forms/SubjectForm.tsx
+++ b/src/components/forms/SubjectForm.tsx
@@ -8,13 +8,14 @@ import { createSubject, updateSubject } from "@/lib/actions";
 import {
   Dispatch,
   SetStateAction,
-  startTransition,
   useEffect,
+  useTransition,
   useState,
 } from "react";
 import { toast } from "react-toastify";
 import { useRouter } from "next/navigation";
 import { Search, X } from "lucide-react";
+import { useTranslations } from "next-intl";
 
 const SubjectForm = ({
   type,
@@ -27,6 +28,9 @@ const SubjectForm = ({
   setOpen: Dispatch<SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.subject");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const teacherOptions = relatedData?.teachers ?? [];
   const defaultTeacherIds =
     data?.teachers?.map((teacher: { id: string }) => teacher.id) ?? [];
@@ -59,6 +63,7 @@ const SubjectForm = ({
 
   const action = type === "create" ? createSubject : updateSubject;
   const router = useRouter();
+  const [isSubmitting, startTransition] = useTransition();
 
   const onSubmit = handleSubmit((data) => {
     startTransition(() => {
@@ -66,15 +71,13 @@ const SubjectForm = ({
         const result = await action({ success: false, error: false }, data);
 
         if (result.success) {
-          toast(
-            `${type === "create" ? "Subject created" : "Subject updated"} successfully!`,
-          );
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       })();
     });
   });
@@ -92,29 +95,31 @@ const SubjectForm = ({
   }, []);
 
   return (
-    <form className="flex flex-col gap-8" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">
-        {type === "create" ? "Create a new subject" : "Update the subject"}
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <h1 className="font-bold text-gray-900 text-2xl">
+        {type === "create" ? t("createTitle") : t("updateTitle")}
       </h1>
       {type === "update" && (
         <input type="hidden" {...register("id")} defaultValue={data?.id} />
       )}
-      <div className="flex flex-wrap justify-between gap-4">
+      <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
         <InputField
-          label="Subject Name"
+          label={t("name")}
           name="name"
           defaultValue={data?.name}
           register={register}
           error={errors?.name}
         />
-        <div className="flex flex-col gap-1 w-full md:w-1/5">
-          <label className="text-gray-500 text-xs">Grade</label>
+        <div className="flex flex-col gap-1 w-full">
+          <label className="font-medium text-gray-700 text-sm">
+            {t("grade")}
+          </label>
           <select
             className="bg-white px-3 py-2 border border-gray-200 rounded-xl"
             {...register("gradeId")}
             defaultValue={data?.grade?.id ?? data?.gradeId ?? ""}
           >
-            <option value="">Select grade</option>
+            <option value="">{commonT("selectGrade")}</option>
             {(relatedData?.grades ?? []).map((g: any) => (
               <option key={g.id} value={g.id}>
                 {g.level}
@@ -122,22 +127,23 @@ const SubjectForm = ({
             ))}
           </select>
           {errors.gradeId?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.gradeId.message.toString()}
             </p>
           )}
         </div>
-        <div className="flex flex-col gap-3 w-full md:w-3/5 teacher-search">
+        <div className="flex flex-col gap-3 w-full teacher-search">
           <div className="flex justify-between items-end gap-4">
             <div>
-              <label className="text-gray-500 text-xs">Teachers</label>
+              <label className="font-medium text-gray-700 text-sm">
+                {t("teachers")}
+              </label>
               <p className="text-[11px] text-gray-400">
-                Choose one or more teachers who will be assigned to this
-                subject.
+                {t("teachersHelp")}
               </p>
             </div>
             <span className="bg-slate-100 px-3 py-1 rounded-full font-medium text-[11px] text-gray-600 text-center">
-              {selectedTeachers.length} selected
+              {commonT("selected", { count: selectedTeachers.length })}
             </span>
           </div>
           <div className="relative">
@@ -146,8 +152,8 @@ const SubjectForm = ({
                 type="search"
                 value={teacherSearch}
                 onChange={(event) => setTeacherSearch(event.target.value)}
-                placeholder="Search teachers..."
-                aria-label="Search teachers"
+                placeholder={commonT("searchTeachers")}
+                aria-label={commonT("searchTeachers")}
                 className="bg-transparent outline-none w-full text-sm"
               />
               <button
@@ -163,14 +169,14 @@ const SubjectForm = ({
                   setShowTeacherDropdown(true);
                 }}
                 className="text-gray-500 hover:text-gray-700"
-                aria-label="Search teachers"
+                aria-label={commonT("searchTeachers")}
               >
                 <Search className="w-4 h-4" />
               </button>
             </div>
 
             {showTeacherDropdown && (
-              <div className="top-full right-0 left-0 z-10 absolute bg-white shadow-lg mt-1 border border-gray-300 rounded-md max-h-56 overflow-y-auto">
+              <div className="top-full inset-x-0 z-10 absolute bg-white shadow-xl mt-2 border border-gray-200 rounded-lg max-h-56 overflow-y-auto">
                 {filteredTeacherOptions.length > 0 ? (
                   filteredTeacherOptions.map(
                     (teacher: { id: string; name: string }) => (
@@ -186,7 +192,7 @@ const SubjectForm = ({
                           setShowTeacherDropdown(false);
                           setFilteredTeacherOptions([]);
                         }}
-                        className="hover:bg-blue-100 px-3 py-2 text-sm cursor-pointer"
+                        className="hover:bg-academixPurpleLight px-4 py-3 w-full hover:text-academixPurpleDark text-sm text-start transition-colors cursor-pointer"
                       >
                         {teacher.name}
                       </div>
@@ -194,7 +200,7 @@ const SubjectForm = ({
                   )
                 ) : (
                   <div className="px-3 py-2 text-gray-500 text-sm">
-                    No teachers found
+                    {commonT("noTeachersFound")}
                   </div>
                 )}
               </div>
@@ -211,7 +217,7 @@ const SubjectForm = ({
                 return (
                   <div
                     key={teacherId}
-                    className="flex items-center gap-2 bg-blue-100 px-3 py-1 rounded-full text-blue-800 text-sm"
+                    className="flex items-center gap-2 bg-academixPurpleLight px-4 py-2 rounded-full font-medium text-academixPurpleDark text-sm"
                   >
                     <span>{teacher?.name ?? teacherId}</span>
                     <button
@@ -225,7 +231,7 @@ const SubjectForm = ({
                           { shouldDirty: true, shouldValidate: true },
                         );
                       }}
-                      className="text-blue-600 hover:text-blue-900"
+                      className="text-academixPurpleDark hover:text-red-500 transition-colors"
                     >
                       <X size={16} />
                     </button>
@@ -234,22 +240,31 @@ const SubjectForm = ({
               })
             ) : (
               <div className="bg-gray-50 px-4 py-3 border border-gray-300 border-dashed rounded-xl text-gray-500 text-sm">
-                No teachers selected yet.
+                {t("noTeachersSelected")}
               </div>
             )}
           </div>
           {errors.teachers?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.teachers.message.toString()}
             </p>
           )}
         </div>
       </div>
-      <button className="bg-blue-400 p-2 rounded-md text-white">
-        {type === "create" ? "Create" : "Update"}
+      <button
+        disabled={isSubmitting}
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
+      >
+        {isSubmitting
+          ? commonT("submitting")
+          : type === "create"
+            ? actionsT("create")
+            : actionsT("update")}
       </button>
     </form>
   );
 };
 
 export default SubjectForm;
+
+
diff --git a/src/components/forms/TeacherForm.tsx b/src/components/forms/TeacherForm.tsx
index 3d7487f..4f38e1e 100644
--- a/src/components/forms/TeacherForm.tsx
+++ b/src/components/forms/TeacherForm.tsx
@@ -3,14 +3,22 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useFieldArray, useForm, useWatch } from "react-hook-form";
 import InputField from "../InputField";
-import Image from "next/image";
 import { teacherSchema, TeacherSchema } from "@/lib/formValidationSchemas";
-import { startTransition, useEffect, useState } from "react";
+import { useEffect, useTransition, useState } from "react";
 import { createTeacher, updateTeacher } from "@/lib/actions";
 import { useRouter } from "next/navigation";
 import { toast } from "react-toastify";
-import { CldUploadWidget } from "next-cloudinary";
-import { Eye, EyeOff, Search, X } from "lucide-react";
+import {
+  BookOpen,
+  Eye,
+  EyeOff,
+  Search,
+  ShieldCheck,
+  UserRound,
+  X,
+} from "lucide-react";
+import { useTranslations } from "next-intl";
+import ProfileImageUpload from "./ProfileImageUpload";
 
 type TeacherFormState = {
   success: boolean;
@@ -40,6 +48,8 @@ const TeacherForm = ({
   setOpen: React.Dispatch<React.SetStateAction<boolean>>;
   relatedData?: any;
 }) => {
+  const t = useTranslations("forms.teacher");
+  const commonT = useTranslations("forms.common");
   const subjects: SubjectOption[] = relatedData?.subjects ?? [];
 
   const buildInitialPairs: SubjectClassPair[] =
@@ -79,9 +89,12 @@ const TeacherForm = ({
     name: "subjectClassPairs",
   }) as SubjectClassPair[] | undefined;
 
+  const [isSubmitting, startTransition] = useTransition();
+
   const onSubmit = handleSubmit((formValues) => {
     const payload = {
       ...formValues,
+      img: img || formValues.img || "",
       password:
         formValues.password === PASSWORD_MASK ? "" : formValues.password,
     };
@@ -95,15 +108,13 @@ const TeacherForm = ({
         );
 
         if (result.success) {
-          toast(
-            `${type === "create" ? "Teacher created" : "Teacher updated"} successfully!`,
-          );
+          toast(type === "create" ? t("created") : t("updated"));
           setOpen(false);
           router.refresh();
           return;
         }
 
-        toast.error(result.message ?? "Something went wrong!");
+        toast.error(result.message ?? commonT("somethingWentWrong"));
       })();
     });
   });
@@ -142,132 +153,160 @@ const TeacherForm = ({
   };
 
   return (
-    <form className="flex flex-col gap-4" onSubmit={onSubmit}>
-      <h1 className="font-semibold text-xl">{`${type === "create" ? "Create" : "Update"} Teacher`}</h1>
-      <span className="font-medium text-gray-400 text-xs">
-        Authentication Information
-      </span>
-      <div className="flex flex-wrap justify-between gap-4">
-        <InputField
-          label="Username"
-          name="username"
-          defaultValue={data?.username}
-          register={register}
-          error={errors?.username}
-        />
-        <InputField
-          label="Email"
-          name="email"
-          defaultValue={data?.email}
-          register={register}
-          error={errors?.email}
-        />
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Password</label>
-          <div className="relative">
-            <input
-              type={showPassword ? "text" : "password"}
-              {...register("password")}
-              className="p-2 pr-10 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            />
-            <button
-              type="button"
-              onClick={() => setShowPassword((prev) => !prev)}
-              aria-label={showPassword ? "Hide password" : "Show password"}
-              className="top-1/2 right-3 absolute text-gray-500 hover:text-gray-700 -translate-y-1/2"
-            >
-              {showPassword ? <EyeOff size={16} /> : <Eye size={16} />}
-            </button>
+    <form className="flex flex-col gap-6" onSubmit={onSubmit}>
+      <div>
+        <h1 className="font-bold text-gray-900 text-2xl">
+          {type === "create" ? t("createTitle") : t("updateTitle")}
+        </h1>
+      </div>
+
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <span className="inline-flex items-center gap-2 font-semibold text-gray-700 text-sm">
+          <ShieldCheck size={16} />
+          {commonT("authenticationInfo")}
+        </span>
+        <div className="gap-4 grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3">
+          <InputField
+            label={commonT("username")}
+            name="username"
+            defaultValue={data?.username}
+            register={register}
+            error={errors?.username}
+          />
+          <InputField
+            label={commonT("email")}
+            name="email"
+            defaultValue={data?.email}
+            register={register}
+            error={errors?.email}
+          />
+          <div className="flex flex-col gap-2 w-full">
+            <label className="font-medium text-gray-700 text-sm">
+              {commonT("password")}
+            </label>
+            <div className="relative">
+              <input
+                type={showPassword ? "text" : "password"}
+                {...register("password")}
+                className="focus:bg-academixPurpleLight px-4 py-3 pe-10 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 w-full text-sm transition-all placeholder-gray-400"
+              />
+              <button
+                type="button"
+                onClick={() => setShowPassword((prev) => !prev)}
+                aria-label={
+                  showPassword
+                    ? commonT("hidePassword")
+                    : commonT("showPassword")
+                }
+                className="top-1/2 end-3 absolute text-gray-400 hover:text-academixPurpleDark transition-colors -translate-y-1/2"
+              >
+                {showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
+              </button>
+            </div>
+            {errors?.password?.message && (
+              <p className="font-medium text-red-500 text-xs">
+                {errors.password.message.toString()}
+              </p>
+            )}
           </div>
-          {errors?.password?.message && (
-            <p className="text-red-400 text-xs">
-              {errors.password.message.toString()}
-            </p>
-          )}
         </div>
       </div>
-      <span className="font-medium text-gray-400 text-xs">
-        Personal Information
-      </span>
-      <div className="flex flex-wrap justify-between gap-4">
-        <InputField
-          label="Name"
-          name="name"
-          defaultValue={data?.name}
-          register={register}
-          error={errors.name}
-        />
-        <InputField
-          label="Phone"
-          name="phone"
-          defaultValue={data?.phone}
-          register={register}
-          error={errors.phone}
-        />
-        <InputField
-          label="Address"
-          name="address"
-          defaultValue={data?.address}
-          register={register}
-          error={errors.address}
-        />
-        <InputField
-          label="Blood Type"
-          name="bloodType"
-          defaultValue={data?.bloodType}
-          register={register}
-          error={errors.bloodType}
-        />
-        <InputField
-          label="Birthday"
-          name="birthday"
-          defaultValue={data?.birthday?.toISOString?.().split("T")[0]}
-          register={register}
-          error={errors.birthday}
-          type="date"
-        />
-        {type === "update" && (
-          <input type="hidden" {...register("id")} defaultValue={data?.id} />
-        )}
-        <div className="flex flex-col gap-2 w-full md:w-1/4">
-          <label className="text-gray-500 text-xs">Sex</label>
-          <select
-            className="p-2 rounded-md ring-[1.5px] ring-gray-300 w-full text-sm"
-            {...register("sex")}
-            defaultValue={data?.sex}
-          >
-            <option value="MALE">Male</option>
-            <option value="FEMALE">Female</option>
-          </select>
-          {errors.sex?.message && (
-            <p className="text-red-400 text-xs">
-              {errors.sex.message.toString()}
-            </p>
+
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <span className="inline-flex items-center gap-2 font-semibold text-gray-700 text-sm">
+          <UserRound size={16} />
+          {commonT("personalInfo")}
+        </span>
+        <div className="gap-4 grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3">
+          <InputField
+            label={commonT("name")}
+            name="name"
+            defaultValue={data?.name}
+            register={register}
+            error={errors.name}
+          />
+          <InputField
+            label={commonT("phone")}
+            name="phone"
+            defaultValue={data?.phone}
+            register={register}
+            error={errors.phone}
+          />
+          <InputField
+            label={commonT("address")}
+            name="address"
+            defaultValue={data?.address}
+            register={register}
+            error={errors.address}
+          />
+          <InputField
+            label={commonT("bloodType")}
+            name="bloodType"
+            defaultValue={data?.bloodType}
+            register={register}
+            error={errors.bloodType}
+          />
+          <InputField
+            label={commonT("birthday")}
+            name="birthday"
+            defaultValue={data?.birthday?.toISOString?.().split("T")[0]}
+            register={register}
+            error={errors.birthday}
+            type="date"
+          />
+          {type === "update" && (
+            <input type="hidden" {...register("id")} defaultValue={data?.id} />
           )}
+          <div className="flex flex-col gap-2 w-full">
+            <label className="font-medium text-gray-700 text-sm">
+              {commonT("sex")}
+            </label>
+            <select
+              className="bg-white focus:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus:border-academixPurpleDark rounded-lg focus:outline-none focus:ring-0 text-sm transition-all"
+              {...register("sex")}
+              defaultValue={data?.sex}
+            >
+              <option value="">{commonT("selectSex")}</option>
+              <option value="MALE">{commonT("male")}</option>
+              <option value="FEMALE">{commonT("female")}</option>
+            </select>
+            {errors.sex?.message && (
+              <p className="font-medium text-red-500 text-xs">
+                {errors.sex.message.toString()}
+              </p>
+            )}
+          </div>
         </div>
+      </div>
 
-        <div className="flex flex-col gap-3 w-full md:w-3/5 subject-search">
+      <div className="space-y-4 bg-gray-50 p-6 rounded-xl">
+        <div className="flex flex-col gap-3 w-full subject-search">
           <div className="flex justify-between items-end gap-4">
             <div>
-              <label className="text-gray-500 text-xs">Subjects</label>
-              <p className="text-[11px] text-gray-400">
-                Choose one or more subjects this teacher will teach.
+              <label className="inline-flex items-center gap-2 font-medium text-gray-700 text-sm">
+                <BookOpen size={16} />
+                {t("subjects")}
+              </label>
+              <p className="mt-1 font-medium text-gray-700 text-sm">
+                {t("subjectsHelp")}
               </p>
             </div>
-            <span className="bg-slate-100 px-3 py-1 rounded-full font-medium text-[11px] text-gray-600 text-center">
-              {(subjectClassPairsWatch ?? []).length} selected
+            <span className="bg-academixPurpleLight px-4 py-2 rounded-full font-semibold text-academixPurpleDark text-xs">
+              {commonT("selected", {
+                count: (subjectClassPairsWatch ?? []).length,
+              })}
             </span>
           </div>
 
           <div className="relative">
-            <div className="flex items-center gap-2 bg-white px-4 py-2 border border-gray-200 focus-within:border-blue-400 rounded-xl focus-within:ring-2 focus-within:ring-blue-100">
+            <div className="flex items-center gap-2 bg-white focus-within:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus-within:border-academixPurpleDark rounded-lg focus-within:ring-0 transition-all">
               <input
                 type="search"
                 value={subjectSearch}
                 onChange={(event) => setSubjectSearch(event.target.value)}
-                placeholder="Search subjects..."
-                aria-label="Search subjects"
-                className="bg-transparent outline-none w-full text-sm"
+                placeholder={commonT("searchSubjects")}
+                aria-label={commonT("searchSubjects")}
+                className="bg-transparent outline-none w-full text-sm placeholder-gray-400"
               />
               <button
                 type="button"
@@ -284,36 +323,36 @@ const TeacherForm = ({
                   setFilteredSubjectOptions(results);
                   setShowSubjectDropdown(true);
                 }}
-                className="text-gray-500 hover:text-gray-700"
-                aria-label="Search subjects"
+                className="text-gray-400 hover:text-academixPurpleDark transition-colors"
+                aria-label={commonT("searchSubjects")}
               >
-                <Search className="w-4 h-4" />
+                <Search className="w-5 h-5" />
               </button>
             </div>
 
             {showSubjectDropdown && (
-              <div className="top-full right-0 left-0 z-10 absolute bg-white shadow-lg mt-1 border border-gray-300 rounded-md max-h-56 overflow-y-auto">
+              <div className="top-full inset-x-0 z-10 absolute bg-white shadow-xl mt-2 border border-gray-200 rounded-lg max-h-56 overflow-y-auto">
                 {filteredSubjectOptions.length > 0 ? (
                   filteredSubjectOptions.map((subject) => (
                     <button
                       key={subject.id}
                       type="button"
-                      className="hover:bg-blue-100 px-3 py-2 w-full text-sm text-left"
+                      className="hover:bg-academixPurpleLight px-4 py-3 w-full hover:text-academixPurpleDark text-sm text-start transition-colors"
                       onClick={() => handleSubjectSelect(String(subject.id))}
                     >
                       {subject.name}
                     </button>
                   ))
                 ) : (
-                  <div className="px-3 py-2 text-gray-500 text-sm">
-                    No subjects found
+                  <div className="px-4 py-3 text-gray-500 text-sm">
+                    {commonT("noSubjectsFound")}
                   </div>
                 )}
               </div>
             )}
           </div>
 
-          <div className="flex flex-wrap gap-2">
+          <div className="flex flex-wrap gap-3">
             {(subjectClassPairsWatch ?? []).length > 0 ? (
               (subjectClassPairsWatch ?? []).map(
                 (pair: SubjectClassPair, index: number) => {
@@ -322,14 +361,16 @@ const TeacherForm = ({
                   return (
                     <div
                       key={fields[index]?.id ?? pair.subjectId}
-                      className="flex items-center gap-2 bg-blue-100 px-3 py-1 rounded-full text-blue-800 text-sm"
+                      className="flex items-center gap-2 bg-academixPurpleLight px-4 py-2 rounded-full font-medium text-academixPurpleDark text-sm"
                     >
                       <span>{subject?.name ?? pair.subjectId}</span>
                       <button
                         type="button"
                         onClick={() => remove(index)}
-                        className="text-blue-600 hover:text-blue-900"
-                        aria-label={`Remove ${subject?.name ?? "subject"}`}
+                        className="text-academixPurpleDark hover:text-red-500 transition-colors"
+                        aria-label={t("removeSubject", {
+                          subject: subject?.name ?? t("subjects"),
+                        })}
                       >
                         <X size={16} />
                       </button>
@@ -338,68 +379,48 @@ const TeacherForm = ({
                 },
               )
             ) : (
-              <div className="bg-gray-50 px-4 py-3 border border-gray-300 border-dashed rounded-xl text-gray-500 text-sm">
-                No subjects selected yet.
+              <div className="bg-white px-4 py-3 border-2 border-gray-300 border-dashed rounded-lg w-full text-gray-500 text-sm">
+                {t("noSubjectsSelected")}
               </div>
             )}
           </div>
 
           {errors.subjectClassPairs?.message && (
-            <p className="text-red-400 text-xs">
+            <p className="font-medium text-red-500 text-xs">
               {errors.subjectClassPairs.message.toString()}
             </p>
           )}
         </div>
 
-        <input type="hidden" {...register("img")} defaultValue={img} />
-        <CldUploadWidget
-          uploadPreset="school"
-          onSuccess={(result, widget) => {
-            const secureUrl =
-              (result.info as { secure_url?: string })?.secure_url ?? "";
-            setImg(secureUrl);
-            setValue("img", secureUrl, { shouldDirty: true });
-            widget.close();
-          }}
-        >
-          {({ open }) => {
-            return (
-              <div className="flex flex-col gap-2 text-gray-500 text-xs">
-                <div
-                  onClick={() => open()}
-                  className="flex items-center gap-2 cursor-pointer"
-                >
-                  <Image src="/upload.png" alt="" width={28} height={28} />
-                  <span>Upload a photo</span>
-                </div>
-                {img && (
-                  <div className="flex items-end gap-3">
-                    <Image
-                      src={img}
-                      alt="Teacher preview"
-                      width={64}
-                      height={64}
-                      className="border border-gray-200 rounded-md w-16 h-16 object-cover"
-                    />
-                    <button
-                      type="button"
-                      onClick={() => {
-                        setImg("");
-                        setValue("img", "", { shouldDirty: true });
-                      }}
-                      className="text-red-400 hover:text-red-600"
-                    >
-                      Remove
-                    </button>
-                  </div>
-                )}
-              </div>
-            );
-          }}
-        </CldUploadWidget>
+        <div className="pt-6 border-gray-200 border-t">
+          <input type="hidden" {...register("img")} defaultValue={img} />
+          <ProfileImageUpload
+            value={img}
+            uploadLabel={t("uploadPhoto")}
+            previewAlt={t("previewAlt")}
+            photoUploadedLabel={commonT("photoUploaded")}
+            removePhotoLabel={commonT("removePhoto")}
+            errorMessage={commonT("somethingWentWrong")}
+            onChange={(secureUrl) => {
+              setImg(secureUrl);
+              setValue("img", secureUrl, {
+                shouldDirty: true,
+                shouldValidate: true,
+              });
+            }}
+          />
+        </div>
       </div>
-      <button className="bg-blue-400 p-2 rounded-md text-white">
-        {type === "create" ? "Create" : "Update"}
+
+      <button
+        disabled={isSubmitting}
+        className="bg-academixPurpleDark disabled:opacity-60 hover:brightness-90 px-6 py-3 rounded-lg w-full font-semibold text-white text-base transition-all"
+      >
+        {isSubmitting
+          ? commonT("submitting")
+          : type === "create"
+            ? t("create")
+            : t("update")}
       </button>
     </form>
   );
diff --git a/src/components/forms/TeacherSearchInput.tsx b/src/components/forms/TeacherSearchInput.tsx
new file mode 100644
index 0000000..99087e8
--- /dev/null
+++ b/src/components/forms/TeacherSearchInput.tsx
@@ -0,0 +1,117 @@
+"use client";
+
+import { Search, X } from "lucide-react";
+import { useTranslations } from "next-intl";
+import { useMemo, useState } from "react";
+
+type TeacherOption = {
+  id: string;
+  name: string;
+};
+
+type TeacherSearchInputProps = {
+  teachers: TeacherOption[];
+  value?: string | null;
+  onChange: (teacherId: string | null) => void;
+  label?: string;
+};
+
+export default function TeacherSearchInput({
+  teachers,
+  value,
+  onChange,
+  label,
+}: TeacherSearchInputProps) {
+  const tableT = useTranslations("tableHeaders");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
+  const selectedTeacher = teachers.find((teacher) => teacher.id === value);
+  const [search, setSearch] = useState(selectedTeacher?.name ?? "");
+  const [open, setOpen] = useState(false);
+
+  const filteredTeachers = useMemo(() => {
+    const keyword = search.trim().toLowerCase();
+    if (!keyword) return teachers;
+
+    return teachers.filter((teacher) =>
+      teacher.name.toLowerCase().includes(keyword),
+    );
+  }, [search, teachers]);
+
+  return (
+    <div className="flex flex-col gap-2 w-full">
+      <label className="font-medium text-gray-700 text-sm">
+        {label ?? tableT("teacher")}
+        <span className="ms-1 font-normal text-gray-400">
+          ({commonT("optional")})
+        </span>
+      </label>
+      <div className="relative">
+        <div className="flex items-center gap-2 bg-white focus-within:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus-within:border-academixPurpleDark rounded-lg transition-all">
+          <Search className="w-4 h-4 text-gray-400" />
+          <input
+            type="text"
+            value={search}
+            placeholder={commonT("searchTeachers")}
+            onFocus={() => setOpen(true)}
+            onBlur={() => window.setTimeout(() => setOpen(false), 120)}
+            onChange={(event) => {
+              setSearch(event.target.value);
+              setOpen(true);
+              if (value) onChange(null);
+            }}
+            className="bg-transparent outline-none w-full text-sm"
+          />
+          {search && (
+            <button
+              type="button"
+              onClick={() => {
+                setSearch("");
+                onChange(null);
+                setOpen(true);
+              }}
+              className="text-gray-400 hover:text-gray-600"
+              aria-label={actionsT("clear")}
+            >
+              <X className="w-4 h-4" />
+            </button>
+          )}
+        </div>
+
+        {open && (
+          <div className="top-full inset-x-0 z-20 absolute bg-white shadow-xl mt-2 border border-gray-200 rounded-lg max-h-48 overflow-y-auto">
+            {filteredTeachers.length > 0 ? (
+              filteredTeachers.map((teacher) => {
+                const isSelected = teacher.id === value;
+
+                return (
+                  <button
+                    type="button"
+                    key={teacher.id}
+                    onMouseDown={(event) => event.preventDefault()}
+                    onClick={() => {
+                      onChange(teacher.id);
+                      setSearch(teacher.name);
+                      setOpen(false);
+                    }}
+                    className={`px-4 py-3 w-full text-sm text-start transition-colors ${
+                      isSelected
+                        ? "bg-academixPurpleLight text-academixPurpleDark font-medium"
+                        : "hover:bg-academixPurpleLight hover:text-academixPurpleDark"
+                    }`}
+                  >
+                    {teacher.name}
+                  </button>
+                );
+              })
+            ) : (
+              <div className="px-4 py-3 text-gray-500 text-sm">
+                {commonT("noTeachersFound")}
+              </div>
+            )}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/forms/message/MessageClassSelector.tsx b/src/components/forms/message/MessageClassSelector.tsx
index e3152d5..3ca0e73 100644
--- a/src/components/forms/message/MessageClassSelector.tsx
+++ b/src/components/forms/message/MessageClassSelector.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import { useTranslations } from "next-intl";
+
 type ClassOption = {
   id: number;
   name: string;
@@ -16,6 +18,9 @@ const MessageClassSelector = ({
   selectedClassIds,
   onChange,
 }: MessageClassSelectorProps) => {
+  const t = useTranslations("forms.message");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const allSelected =
     classes.length > 0 && selectedClassIds.length === classes.length;
 
@@ -28,30 +33,32 @@ const MessageClassSelector = ({
   };
 
   return (
-    <div className="flex flex-col gap-2 w-full md:w-1/3">
+    <div className="flex flex-col gap-2 w-full">
       <div className="flex justify-between items-center">
-        <label className="text-gray-500 text-xs">Classes (optional)</label>
+        <label className="font-medium text-gray-700 text-sm">
+          {t("classesOptional")}
+        </label>
         <div className="flex items-center gap-3">
           <button
             type="button"
             onClick={() => onChange(classes.map((cls) => cls.id))}
-            className="text-blue-600 text-xs hover:underline"
+            className="font-medium text-academixPurpleDark text-xs hover:underline"
           >
-            Select all
+            {commonT("selectAll")}
           </button>
           {selectedClassIds.length > 0 && (
             <button
               type="button"
               onClick={() => onChange([])}
-              className="text-blue-600 text-xs hover:underline"
+              className="font-medium text-academixPurpleDark text-xs hover:underline"
             >
-              Clear
+              {actionsT("clear")}
             </button>
           )}
         </div>
       </div>
 
-      <div className="flex flex-col gap-2 p-3 rounded-md ring-[1.5px] ring-gray-300 max-h-[170px] overflow-y-auto">
+      <div className="flex flex-col gap-2 bg-white p-4 border-2 border-gray-200 rounded-lg max-h-[220px] overflow-y-auto">
         <label className="flex items-center gap-2 mb-2 text-gray-700 text-sm">
           <input
             type="checkbox"
@@ -61,9 +68,9 @@ const MessageClassSelector = ({
                 ? onChange(classes.map((cls) => cls.id))
                 : onChange([])
             }
-            className="border-gray-300 rounded focus:ring-blue-500 w-4 h-4 text-blue-500"
+            className="border-gray-300 rounded focus:ring-academixPurpleDark w-4 h-4 text-academixPurpleDark"
           />
-          <span className="font-medium">Select all</span>
+          <span className="font-medium">{commonT("selectAll")}</span>
         </label>
 
         {classes.map((cls) => (
@@ -75,7 +82,7 @@ const MessageClassSelector = ({
               type="checkbox"
               checked={selectedClassIds.includes(cls.id)}
               onChange={(event) => toggleClass(cls.id, event.target.checked)}
-              className="border-gray-300 rounded focus:ring-blue-500 w-4 h-4 text-blue-500"
+              className="border-gray-300 rounded focus:ring-academixPurpleDark w-4 h-4 text-academixPurpleDark"
             />
             <span>{cls.name}</span>
           </label>
@@ -86,3 +93,5 @@ const MessageClassSelector = ({
 };
 
 export default MessageClassSelector;
+
+
diff --git a/src/components/forms/message/RecipientPicker.tsx b/src/components/forms/message/RecipientPicker.tsx
index 8349f8e..d80da09 100644
--- a/src/components/forms/message/RecipientPicker.tsx
+++ b/src/components/forms/message/RecipientPicker.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Search } from "lucide-react";
+import { useTranslations } from "next-intl";
 import { useEffect, useMemo, useRef, useState } from "react";
 
 type RecipientOption = {
@@ -21,6 +22,9 @@ const RecipientPicker = ({
   selectedIds,
   onChange,
 }: RecipientPickerProps) => {
+  const t = useTranslations("forms.message");
+  const commonT = useTranslations("forms.common");
+  const actionsT = useTranslations("actions");
   const containerRef = useRef<HTMLDivElement | null>(null);
   const [searchValue, setSearchValue] = useState("");
   const [showDropdown, setShowDropdown] = useState(false);
@@ -64,46 +68,46 @@ const RecipientPicker = ({
   };
 
   return (
-    <div className="w-full md:w-[48%]">
+    <div className="flex flex-col gap-2 w-full">
       <div className="flex justify-between items-center">
-        <label className="text-gray-500 text-xs">{label}</label>
+        <label className="font-medium text-gray-700 text-sm">{label}</label>
         <button
           type="button"
           onClick={selectAll}
-          className="text-blue-600 text-xs hover:underline"
+          className="font-medium text-academixPurpleDark text-xs hover:underline"
         >
-          Select all
+          {commonT("selectAll")}
         </button>
       </div>
 
       <div ref={containerRef}>
         <div className="relative">
-          <div className="flex items-center gap-2 bg-white px-4 py-2 border border-gray-200 focus-within:border-blue-400 rounded-xl focus-within:ring-2 focus-within:ring-blue-100">
+          <div className="flex items-center gap-2 bg-white focus-within:bg-academixPurpleLight px-4 py-3 border-2 border-gray-200 focus-within:border-academixPurpleDark rounded-lg focus-within:ring-0 transition-all">
             <input
               type="search"
               value={searchValue}
               onChange={(event) => setSearchValue(event.target.value)}
-              placeholder={`Search ${label.toLowerCase()}...`}
-              aria-label={`Search ${label.toLowerCase()}`}
-              className="bg-transparent outline-none w-full text-sm"
+              placeholder={t("searchRecipients", { label })}
+              aria-label={t("searchRecipients", { label })}
+              className="bg-transparent outline-none w-full text-sm placeholder-gray-400"
             />
             <button
               type="button"
               onClick={() => setShowDropdown(true)}
-              className="text-gray-500 hover:text-gray-700"
-              aria-label={`Open ${label.toLowerCase()} search results`}
+              className="text-gray-400 hover:text-academixPurpleDark transition-colors"
+              aria-label={t("openRecipientSearch", { label })}
             >
-              <Search className="w-4 h-4" />
+              <Search className="w-5 h-5" />
             </button>
           </div>
 
           {showDropdown && (
-            <div className="top-full right-0 left-0 z-10 absolute bg-white shadow-lg mt-1 border border-gray-300 rounded-md max-h-56 overflow-y-auto">
+            <div className="top-full inset-x-0 z-10 absolute bg-white shadow-xl mt-2 border border-gray-200 rounded-lg max-h-56 overflow-y-auto">
               {filteredItems.length > 0 ? (
                 filteredItems.map((item) => (
                   <label
                     key={item.id}
-                    className="flex items-center gap-2 hover:bg-blue-100 px-3 py-2 text-sm cursor-pointer"
+                    className="flex items-center gap-2 hover:bg-academixPurpleLight px-4 py-3 w-full hover:text-academixPurpleDark text-sm text-start transition-colors cursor-pointer"
                   >
                     <input
                       type="checkbox"
@@ -111,31 +115,31 @@ const RecipientPicker = ({
                       onChange={(event) =>
                         toggleRecipient(item.id, event.target.checked)
                       }
-                      className="border-gray-300 rounded focus:ring-blue-500 w-4 h-4 text-blue-500"
+                      className="border-gray-300 rounded focus:ring-academixPurpleDark w-4 h-4 text-academixPurpleDark"
                     />
                     {item.name}
                   </label>
                 ))
               ) : (
-                <div className="px-3 py-2 text-gray-500 text-sm">
-                  No results found
+                <div className="px-4 py-3 text-gray-500 text-sm">
+                  {commonT("noResultsFound")}
                 </div>
               )}
             </div>
           )}
         </div>
 
-        <div className="flex justify-between items-center bg-gray-50 mt-3 px-4 py-3 border border-gray-300 border-dashed rounded-xl">
+        <div className="flex justify-between items-center bg-white mt-3 px-4 py-3 border-2 border-gray-300 border-dashed rounded-lg">
           <span className="text-gray-600 text-sm">
-            {selectedIds.length} selected
+            {commonT("selected", { count: selectedIds.length })}
           </span>
           {selectedIds.length > 0 && (
             <button
               type="button"
               onClick={clear}
-              className="text-blue-600 text-xs hover:underline"
+              className="font-medium text-academixPurpleDark text-xs hover:underline"
             >
-              Clear
+              {actionsT("clear")}
             </button>
           )}
         </div>
@@ -145,3 +149,5 @@ const RecipientPicker = ({
 };
 
 export default RecipientPicker;
+
+
diff --git a/src/components/home/AboutSection.tsx b/src/components/home/AboutSection.tsx
new file mode 100644
index 0000000..c565fed
--- /dev/null
+++ b/src/components/home/AboutSection.tsx
@@ -0,0 +1,54 @@
+import { BarChart3, Globe2, Shield } from "lucide-react";
+import { getTranslations } from "next-intl/server";
+
+const highlights = [
+  {
+    key: "multilingual",
+    icon: Globe2,
+  },
+  {
+    key: "roleAccess",
+    icon: Shield,
+  },
+  {
+    key: "insights",
+    icon: BarChart3,
+  },
+];
+
+const AboutSection = async () => {
+  const t = await getTranslations("home.about");
+
+  return (
+    <section id="about" className="mx-auto px-6 py-20 max-w-6xl">
+      <div className="mx-auto max-w-3xl text-center">
+        <h2 className="font-semibold text-3xl md:text-4xl tracking-tight">
+          {t("title")}
+        </h2>
+        <p className="mt-4 text-purple-50">
+          {t("description")}
+        </p>
+      </div>
+      <div className="gap-6 grid md:grid-cols-3 mt-14">
+        {highlights.map((item) => (
+          <article
+            key={item.key}
+            className="bg-academixPurpleDeep/65 p-6 border border-purple-200/25 rounded-xl text-center"
+          >
+            <div className="inline-flex justify-center items-center bg-academixPurple/10 mb-4 rounded-lg w-12 h-12 text-academixPurpleDark">
+              <item.icon className="w-5 h-5" />
+            </div>
+            <h3 className="font-semibold text-xl">
+              {t(`highlights.${item.key}.title`)}
+            </h3>
+            <p className="mt-2 text-purple-100 text-sm">
+              {t(`highlights.${item.key}.description`)}
+            </p>
+          </article>
+        ))}
+      </div>
+    </section>
+  );
+};
+
+export default AboutSection;
diff --git a/src/components/home/AnimatedTitle.tsx b/src/components/home/AnimatedTitle.tsx
new file mode 100644
index 0000000..7a10f88
--- /dev/null
+++ b/src/components/home/AnimatedTitle.tsx
@@ -0,0 +1,68 @@
+interface AnimatedTitleProps {
+  children: string;
+  className?: string;
+  highlightColor?: string;
+  highlightWord?: string;
+}
+
+const AnimatedTitle = ({
+  children,
+  className = "",
+  highlightColor = "text-academixPurple",
+  highlightWord,
+}: AnimatedTitleProps) => {
+  const containsArabic = /[\u0600-\u06FF]/.test(children);
+  const startIndex = highlightWord ? children.indexOf(highlightWord) : -1;
+  const endIndex = startIndex !== -1 ? startIndex + highlightWord!.length : -1;
+  const arabicParts = containsArabic ? children.split(/(\s+)/) : [];
+
+  return (
+    <h1 className={`${className} overflow-hidden`}>
+      {containsArabic
+        ? arabicParts.map((part, index) => {
+            const isSpace = /^\s+$/.test(part);
+            const isHighlighted =
+              !!highlightWord && part.includes(highlightWord);
+
+            return isSpace ? (
+              <span key={index}> </span>
+            ) : (
+              <span
+                key={index}
+                className={`
+                  inline-block translate-y-8 opacity-0
+                  animate-[titleReveal_0.5s_ease-out_forwards]
+                  ${isHighlighted ? highlightColor : ""}
+                `}
+                style={{
+                  animationDelay: `${index * 90}ms`,
+                }}
+              >
+                {part}
+              </span>
+            );
+          })
+        : children.split("").map((char, index) => {
+            const isHighlighted = index >= startIndex && index < endIndex;
+
+            return (
+              <span
+                key={index}
+                className={`
+                  inline-block translate-y-8 opacity-0
+                  animate-[titleReveal_0.5s_ease-out_forwards]
+                  ${isHighlighted ? highlightColor : ""}
+                `}
+                style={{
+                  animationDelay: `${index * 50}ms`,
+                }}
+              >
+                {char === " " ? "\u00A0" : char}
+              </span>
+            );
+          })}
+    </h1>
+  );
+};
+
+export default AnimatedTitle;
diff --git a/src/components/home/CtaSection.tsx b/src/components/home/CtaSection.tsx
new file mode 100644
index 0000000..99230df
--- /dev/null
+++ b/src/components/home/CtaSection.tsx
@@ -0,0 +1,36 @@
+"use client";
+
+import Link from "next/link";
+import { ArrowRight } from "lucide-react";
+import RevealSection from "./RevealSection";
+import { useTranslations } from "next-intl";
+
+const CtaSection = () => {
+  const t = useTranslations("home.cta");
+
+  return (
+    <RevealSection>
+      <section id="cta" className="mx-auto px-6 py-20 max-w-6xl">
+        <div className="bg-[linear-gradient(135deg,rgba(36,16,79,0.98),rgba(76,29,149,0.82),rgba(124,58,237,0.45))] p-8 md:p-14 border border-purple-200/30 rounded-2xl text-center">
+          <h2 className="font-semibold text-3xl md:text-5xl tracking-tight">
+            {t("title")}
+          </h2>
+          <p className="mx-auto mt-4 max-w-xl text-purple-50">
+            {t("description")}
+          </p>
+          <div className="flex justify-center gap-4 mt-9">
+            <Link
+              href="/school-signup"
+              className="group inline-flex justify-center items-center gap-2 bg-academixInk hover:bg-academixPurpleMuted hover:shadow-[0_12px_30px_rgba(124,58,237,0.35)] px-4 sm:px-7 py-2 sm:py-3 border hover:border border-academixInk hover:border-academixPurple rounded-md font-medium text-white active:scale-[0.98] transition-all hover:-translate-y-0.5 duration-300"
+            >
+              {t("button")}
+              <ArrowRight className="w-4 h-4 transition-transform group-hover:translate-x-1 rtl:group-hover:-translate-x-1 rtl:rotate-180 duration-300" />
+            </Link>
+          </div>
+        </div>
+      </section>
+    </RevealSection>
+  );
+};
+
+export default CtaSection;
diff --git a/src/components/home/FeaturesSection.tsx b/src/components/home/FeaturesSection.tsx
new file mode 100644
index 0000000..9d984dc
--- /dev/null
+++ b/src/components/home/FeaturesSection.tsx
@@ -0,0 +1,83 @@
+"use client";
+
+import {
+  BarChart3,
+  BookOpen,
+  CalendarCheck2,
+  ClipboardList,
+  GraduationCap,
+  Users,
+} from "lucide-react";
+import RevealSection from "./RevealSection";
+import { useTranslations } from "next-intl";
+
+const features = [
+  {
+    key: "students",
+    icon: Users,
+  },
+  {
+    key: "courses",
+    icon: BookOpen,
+  },
+  {
+    key: "assessments",
+    icon: ClipboardList,
+  },
+  {
+    key: "attendance",
+    icon: CalendarCheck2,
+  },
+  {
+    key: "reports",
+    icon: BarChart3,
+  },
+  {
+    key: "learning",
+    icon: GraduationCap,
+  },
+];
+
+const FeaturesSection = () => {
+  const t = useTranslations("home.features");
+
+  return (
+    <RevealSection>
+      <section
+        id="features"
+        className="bg-[var(--academix-ink)] border-purple-200/25 border-y"
+      >
+        <div className="mx-auto px-6 py-20 max-w-6xl">
+          <div className="mx-auto max-w-3xl text-center">
+            <h2 className="font-semibold text-3xl md:text-4xl tracking-tight">
+              {t("title")}
+            </h2>
+            <p className="mt-4 text-purple-50">
+              {t("description")}
+            </p>
+          </div>
+          <div className="gap-5 grid md:grid-cols-2 lg:grid-cols-3 mt-14">
+            {features.map((feature) => (
+              <article
+                key={feature.key}
+                className="bg-academixPurpleDeep/65 p-6 border border-purple-200/25 rounded-xl"
+              >
+                <div className="inline-flex justify-center items-center bg-academixPurple/10 mb-4 rounded-lg w-11 h-11 text-academixPurpleDark">
+                  <feature.icon className="w-5 h-5" />
+                </div>
+                <h3 className="font-semibold text-lg">
+                  {t(`items.${feature.key}.title`)}
+                </h3>
+                <p className="mt-2 text-purple-100 text-sm">
+                  {t(`items.${feature.key}.description`)}
+                </p>
+              </article>
+            ))}
+          </div>
+        </div>
+      </section>
+    </RevealSection>
+  );
+};
+
+export default FeaturesSection;
diff --git a/src/components/home/Footer.tsx b/src/components/home/Footer.tsx
new file mode 100644
index 0000000..670e666
--- /dev/null
+++ b/src/components/home/Footer.tsx
@@ -0,0 +1,27 @@
+import Image from "next/image";
+import { getTranslations } from "next-intl/server";
+
+const Footer = async () => {
+  const commonT = await getTranslations("common");
+  const t = await getTranslations("home.footer");
+
+  return (
+    <footer className="border-purple-200/20 border-t">
+      <div className="flex sm:flex-row flex-col justify-between items-center gap-4 mx-auto px-24 py-8 text-purple-100 text-sm">
+        <a href="#" className="flex items-center gap-2">
+          <Image
+            src="/logo-white.png"
+            alt="Academix logo"
+            className="w-[25px] h-[20px] rotate-[-15deg]"
+            width={25}
+            height={20}
+          />
+          <p className="font-semibold text-purple-100">{commonT("brand")}</p>
+        </a>
+        <p>{t("copyright")}</p>
+      </div>
+    </footer>
+  );
+};
+
+export default Footer;
diff --git a/src/components/home/HeroSection.tsx b/src/components/home/HeroSection.tsx
new file mode 100644
index 0000000..90b96a0
--- /dev/null
+++ b/src/components/home/HeroSection.tsx
@@ -0,0 +1,53 @@
+"use client";
+
+import Link from "next/link";
+import { ArrowRight, Sparkles } from "lucide-react";
+import AnimatedTitle from "./AnimatedTitle";
+import { useTranslations } from "next-intl";
+
+const HeroSection = () => {
+  const t = useTranslations("home.hero");
+
+  return (
+    <section
+      id="hero"
+      className="relative pt-16 border-purple-300/20 border-b overflow-hidden"
+    >
+      <div className="absolute inset-0 bg-[radial-gradient(circle_at_top,_rgba(207,206,255,0.18),_transparent_50%)] pointer-events-none" />
+      <div className="absolute inset-0 pointer-events-none" />
+      <div className="z-10 relative mx-auto px-6 py-20 md:py-24 max-w-6xl text-center">
+        <div className="inline-flex items-center gap-2 mb-6 px-4 py-2 border border-purple-200/30 rounded-full text-white text-sm">
+          <Sparkles className="w-4 h-4 text-amber-400" />
+          {t("badge")}
+        </div>
+        <AnimatedTitle
+          className="mx-auto py-2 max-w-3xl font-bold text-3xl sm:text-4xl md:text-5xl lg:text-6xl leading-tight tracking-tight"
+          highlightWord={t("highlight")}
+          highlightColor="text-amber-400"
+        >
+          {t("title")}
+        </AnimatedTitle>
+        <p className="mx-auto mt-6 max-w-2xl text-purple-50 md:text-[16px] text-sm lg:text-lg">
+          {t("description")}
+        </p>
+        <div className="flex justify-center gap-4 mt-10">
+          <Link
+            href="/sign-in"
+            className="inline-flex justify-center items-center gap-2 bg-academixInk hover:bg-academixPurpleMuted hover:shadow-[0_8px_30px_rgba(124,58,237,0.35)] px-4 sm:px-7 py-2 sm:py-3 rounded-md font-medium text-white hover:scale-[1.03] active:scale-[0.98] transition-all duration-300"
+          >
+            {t("signIn")}
+            <ArrowRight className="w-4 h-4 rtl:rotate-180" />
+          </Link>
+          <Link
+            href="/school-signup"
+            className="inline-flex justify-center items-center hover:bg-white/10 hover:shadow-[0_8px_25px_rgba(124,58,237,0.12)] px-4 sm:px-7 py-2 sm:py-3 border border-purple-200/25 hover:border-academixPurple/60 rounded-md font-medium text-white hover:scale-[1.03] active:scale-[0.98] transition-all duration-300"
+          >
+            {t("signUp")}
+          </Link>
+        </div>
+      </div>
+    </section>
+  );
+};
+
+export default HeroSection;
diff --git a/src/components/home/HomeNavbar.tsx b/src/components/home/HomeNavbar.tsx
new file mode 100644
index 0000000..9d56d26
--- /dev/null
+++ b/src/components/home/HomeNavbar.tsx
@@ -0,0 +1,160 @@
+"use client";
+
+import { Menu, X } from "lucide-react";
+import Image from "next/image";
+import Link from "next/link";
+import { useState } from "react";
+import { useLocale, useTranslations } from "next-intl";
+import LanguageSwitcher from "@/components/LanguageSwitcher";
+
+const HomeNavbar = () => {
+  const locale = useLocale();
+  const commonT = useTranslations("common");
+  const t = useTranslations("home.nav");
+  const [isOpen, setIsOpen] = useState(false);
+  const isArabic = locale === "ar";
+
+  const navLinks = [
+    { label: t("home"), href: "#" },
+    { label: t("about"), href: "#about" },
+    { label: t("features"), href: "#features" },
+    { label: t("users"), href: "#roles" },
+    { label: t("howItWorks"), href: "#how-it-works" },
+  ];
+
+  const toggleMenu = () => setIsOpen(!isOpen);
+  const closeMenu = () => setIsOpen(false);
+
+  return (
+    <>
+      {/* Navbar */}
+      <nav className="top-0 right-0 left-0 z-50 fixed backdrop-blur-sm">
+        <div className="mx-auto px-12 lg:px-24 py-5">
+          <div className="relative flex justify-between items-center">
+            <a
+              href="#"
+              className="relative inline-flex shrink-0 justify-center items-center font-bold text-xl"
+            >
+              <h1 className="flex items-center gap-2 font-bold text-white text-xl">
+                <Image
+                  src="/logo-white.png"
+                  alt="Academix logo"
+                  className="w-[44px] h-[34px] rotate-[-15deg]"
+                  width={40}
+                  height={40}
+                />
+                {commonT("brand")}
+              </h1>
+              <div
+                className={`hidden xl:block absolute top-1/2 -translate-y-1/2 ${
+                  isArabic
+                    ? "right-[calc(100%+18px)]"
+                    : "left-[calc(100%+18px)]"
+                }`}
+              >
+                <LanguageSwitcher variant="compact" />
+              </div>
+            </a>
+
+            <div className="hidden lg:flex items-center gap-8">
+              {navLinks.slice(1).map((link) => (
+                <a
+                  key={link.label}
+                  href={link.href}
+                  className="text-slate-300 hover:text-white transition-colors duration-200"
+                >
+                  {link.label}
+                </a>
+              ))}
+            </div>
+            <div className="hidden lg:flex items-center gap-4">
+              <Link
+                href="/sign-in"
+                className="text-slate-300 hover:text-white transition-colors duration-200"
+              >
+                {t("signIn")}
+              </Link>
+              <Link
+                href="/school-signup"
+                className="bg-academixInk hover:bg-academixPurpleMuted hover:shadow-[0_10px_25px_rgba(124,58,237,0.35)] px-4 py-2 rounded-md font-medium text-white transition-all duration-300"
+              >
+                {t("signUp")}
+              </Link>
+            </div>
+
+            {/* Mobile menu button */}
+            <div className="relative flex items-center gap-3 lg:hidden">
+              <button
+                onClick={toggleMenu}
+                aria-label={t("openMenu")}
+                className="text-white hover:text-slate-300 transition-colors"
+              >
+                <Menu className="w-6 h-6" />
+              </button>
+            </div>
+          </div>
+        </div>
+      </nav>
+
+      {/* Backdrop */}
+      {isOpen && (
+        <div
+          className="z-40 fixed inset-0 bg-black/50 transition-opacity duration-300"
+          onClick={closeMenu}
+        />
+      )}
+
+      {/* Mobile Sidebar */}
+      <div
+        className={`fixed top-0 right-0 h-full w-64 backdrop-blur-md z-50 transform transition-transform duration-300 ease-in-out ${
+          isOpen ? "translate-x-0" : "translate-x-full"
+        }`}
+      >
+        {/* Close button */}
+        <button
+          onClick={closeMenu}
+          aria-label={t("closeMenu")}
+          className="top-4 right-4 absolute text-slate-300 hover:text-white transition-colors"
+        >
+          <X className="w-6 h-6" />
+        </button>
+
+        {/* Sidebar content */}
+        <div className="space-y-4 px-4 pt-16">
+          {navLinks.map((link) => (
+            <a
+              key={link.label}
+              href={link.href}
+              onClick={closeMenu}
+              className="block hover:bg-slate-800/50 px-4 py-3 rounded-lg text-slate-300 hover:text-white transition-colors duration-200"
+            >
+              {link.label}
+            </a>
+          ))}
+
+          <div className="space-y-3 pt-4 border-amber-400 border-t">
+            <div className="px-4">
+              <LanguageSwitcher variant="compact" />
+            </div>
+            <Link
+              href="/sign-in"
+              onClick={closeMenu}
+              className="block hover:bg-slate-800/50 px-4 py-3 rounded-lg text-slate-300 hover:text-white transition-colors duration-200"
+            >
+              {t("signIn")}
+            </Link>
+            <Link
+              href="/school-signup"
+              onClick={closeMenu}
+              className="block hover:bg-slate-800/50 px-4 py-3 rounded-lg text-slate-300 hover:text-white transition-colors duration-200"
+            >
+              {t("signUp")}
+            </Link>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default HomeNavbar;
diff --git a/src/components/home/HowItWorksSection.tsx b/src/components/home/HowItWorksSection.tsx
new file mode 100644
index 0000000..6d26cb1
--- /dev/null
+++ b/src/components/home/HowItWorksSection.tsx
@@ -0,0 +1,60 @@
+"use client";
+
+const steps = [
+  {
+    key: "account",
+  },
+  {
+    key: "setup",
+  },
+  {
+    key: "operations",
+  },
+  {
+    key: "outcomes",
+  },
+];
+
+import RevealSection from "./RevealSection";
+import { useTranslations } from "next-intl";
+
+const HowItWorksSection = () => {
+  const t = useTranslations("home.howItWorks");
+
+  return (
+    <RevealSection>
+      <section
+        id="how-it-works"
+        className="bg-[var(--academix-ink)] border-purple-200/25 border-y"
+      >
+        <div className="mx-auto px-6 py-20 max-w-6xl">
+          <div className="mx-auto max-w-3xl text-center">
+            <h2 className="font-semibold text-3xl md:text-4xl tracking-tight">
+              {t("title")}
+            </h2>
+            <p className="mt-4 text-purple-50">
+              {t("description")}
+            </p>
+          </div>
+          <div className="gap-8 grid sm:grid-cols-2 lg:grid-cols-4 mt-14">
+            {steps.map((step, index) => (
+              <article key={step.key} className="text-center">
+                <div className="inline-flex justify-center items-center bg-white mb-4 rounded-full w-10 h-10 font-semibold text-academixPurpleDeep">
+                  {index + 1}
+                </div>
+                <h3 className="font-semibold text-lg">
+                  {t(`steps.${step.key}.title`)}
+                </h3>
+                <p className="mt-2 text-purple-100 text-sm">
+                  {t(`steps.${step.key}.description`)}
+                </p>
+              </article>
+            ))}
+          </div>
+        </div>
+      </section>
+    </RevealSection>
+  );
+};
+
+export default HowItWorksSection;
diff --git a/src/components/home/RevealSection.tsx b/src/components/home/RevealSection.tsx
new file mode 100644
index 0000000..fd65d31
--- /dev/null
+++ b/src/components/home/RevealSection.tsx
@@ -0,0 +1,29 @@
+"use client";
+
+import { useRevealOnScroll } from "@/hooks/useRevealOnScroll";
+import { ReactNode } from "react";
+
+interface RevealSectionProps {
+  children: ReactNode;
+  delay?: number;
+}
+
+const RevealSection = ({ children, delay = 0 }: RevealSectionProps) => {
+  const { ref, isVisible } = useRevealOnScroll();
+
+  return (
+    <div
+      ref={ref}
+      className={`transition-all duration-1000 ${
+        isVisible ? "opacity-100 translate-y-0" : "opacity-0 translate-y-8"
+      }`}
+      style={{
+        transitionDelay: isVisible ? `${delay}ms` : "0ms",
+      }}
+    >
+      {children}
+    </div>
+  );
+};
+
+export default RevealSection;
diff --git a/src/components/home/RolesSection.tsx b/src/components/home/RolesSection.tsx
new file mode 100644
index 0000000..36dc9e2
--- /dev/null
+++ b/src/components/home/RolesSection.tsx
@@ -0,0 +1,70 @@
+"use client";
+import { CheckCircle2, GraduationCap, ShieldCheck, Users } from "lucide-react";
+import RevealSection from "./RevealSection";
+import { useTranslations } from "next-intl";
+
+const roles = [
+  {
+    key: "administrator",
+    icon: ShieldCheck,
+    actions: ["users", "settings", "reports", "operations"],
+  },
+  {
+    key: "teacher",
+    icon: GraduationCap,
+    actions: ["assessments", "attendance", "grading", "resources"],
+  },
+  {
+    key: "student",
+    icon: Users,
+    actions: ["courses", "assignments", "grades", "attendance"],
+  },
+];
+
+const RolesSection = () => {
+  const t = useTranslations("home.roles");
+
+  return (
+    <RevealSection>
+      <section id="roles" className="mx-auto px-6 py-20 max-w-6xl">
+        <div className="mx-auto max-w-3xl text-center">
+          <h2 className="font-semibold text-3xl md:text-4xl tracking-tight">
+            {t("title")}
+          </h2>
+          <p className="mt-4 text-purple-50">{t("description")}</p>
+        </div>
+        <div className="gap-5 grid md:grid-cols-3 mt-14">
+          {roles.map((role) => (
+            <article
+              key={role.key}
+              className="bg-academixPurpleDeep/65 p-6 border border-purple-200/25 rounded-xl"
+            >
+              <div className="inline-flex justify-center items-center bg-academixPurple/10 mb-4 rounded-lg w-12 h-12 text-academixPurpleDark">
+                <role.icon className="w-5 h-5" />
+              </div>
+              <h3 className="font-semibold text-2xl">
+                {t(`items.${role.key}.title`)}
+              </h3>
+              <p className="mt-3 text-purple-100 text-sm">
+                {t(`items.${role.key}.description`)}
+              </p>
+              <ul className="space-y-2 mt-5">
+                {role.actions.map((action) => (
+                  <li
+                    key={action}
+                    className="flex items-center gap-2 text-purple-100 text-sm"
+                  >
+                    <CheckCircle2 className="flex-shrink-0 w-4 h-4 text-green-500" />
+                    {t(`items.${role.key}.actions.${action}`)}
+                  </li>
+                ))}
+              </ul>
+            </article>
+          ))}
+        </div>
+      </section>
+    </RevealSection>
+  );
+};
+
+export default RolesSection;
diff --git a/src/components/loaders/LoadingIndicator.tsx b/src/components/loaders/LoadingIndicator.tsx
new file mode 100644
index 0000000..99585b1
--- /dev/null
+++ b/src/components/loaders/LoadingIndicator.tsx
@@ -0,0 +1,36 @@
+"use client";
+
+import { useTranslations } from "next-intl";
+
+type LoadingIndicatorProps = {
+  label?: string;
+  className?: string;
+};
+
+const LoadingIndicator = ({
+  label,
+  className = "",
+}: LoadingIndicatorProps) => {
+  const t = useTranslations("states");
+  const resolvedLabel = label ?? t("loading");
+
+  return (
+    <div
+      className={`flex min-h-[calc(100vh-96px)] items-center justify-center p-6 ${className}`}
+      role="status"
+      aria-live="polite"
+    >
+      <div className="flex flex-col items-center gap-4">
+        <span
+          className="block w-10 h-10 border-4 border-academixPurple/35 border-t-academixPurpleDark rounded-full animate-spin"
+          aria-hidden="true"
+        />
+        <span className="font-medium text-gray-600 text-lg">
+          {resolvedLabel}
+        </span>
+      </div>
+    </div>
+  );
+};
+
+export default LoadingIndicator;
diff --git a/src/components/states/EmptyState.tsx b/src/components/states/EmptyState.tsx
new file mode 100644
index 0000000..4cbb119
--- /dev/null
+++ b/src/components/states/EmptyState.tsx
@@ -0,0 +1,47 @@
+"use client";
+
+import Link from "next/link";
+import { Inbox } from "lucide-react";
+import { useTranslations } from "next-intl";
+
+type EmptyStateProps = {
+  title?: string;
+  description?: string;
+  actionLabel?: string;
+  actionHref?: string;
+  className?: string;
+};
+
+const EmptyState = ({
+  title,
+  description,
+  actionLabel,
+  actionHref,
+  className = "",
+}: EmptyStateProps) => {
+  const t = useTranslations("emptyStates");
+  const resolvedTitle = title ?? t("defaultTitle");
+  const resolvedDescription = description ?? t("defaultDescription");
+
+  return (
+    <div
+      className={`flex flex-col items-center justify-center gap-2 py-10 text-center ${className}`}
+    >
+      <div className="flex justify-center items-center bg-gray-100 rounded-full w-12 h-12">
+        <Inbox className="w-6 h-6 text-gray-500" />
+      </div>
+      <h2 className="font-semibold text-gray-800 text-lg">{resolvedTitle}</h2>
+      <p className="max-w-md text-gray-500 text-sm">{resolvedDescription}</p>
+      {actionLabel && actionHref && (
+        <Link
+          href={actionHref}
+          className="bg-academixPurpleDark hover:opacity-90 mt-2 px-4 py-2 rounded-md text-white text-sm transition"
+        >
+          {actionLabel}
+        </Link>
+      )}
+    </div>
+  );
+};
+
+export default EmptyState;
diff --git a/src/components/states/ErrorState.tsx b/src/components/states/ErrorState.tsx
new file mode 100644
index 0000000..072a3c1
--- /dev/null
+++ b/src/components/states/ErrorState.tsx
@@ -0,0 +1,47 @@
+"use client";
+
+import { AlertTriangle } from "lucide-react";
+import { useTranslations } from "next-intl";
+
+type ErrorStateProps = {
+  title?: string;
+  description?: string;
+  onRetry?: () => void;
+  retryLabel?: string;
+  className?: string;
+};
+
+const ErrorState = ({
+  title,
+  description,
+  onRetry,
+  retryLabel,
+  className = "",
+}: ErrorStateProps) => {
+  const t = useTranslations("states");
+  const resolvedTitle = title ?? t("errorTitle");
+  const resolvedDescription = description ?? t("errorDescription");
+  const resolvedRetryLabel = retryLabel ?? t("tryAgain");
+
+  return (
+    <div
+      className={`flex flex-col items-center justify-center gap-2 py-10 text-center ${className}`}
+    >
+      <div className="flex justify-center items-center bg-red-100 rounded-full w-12 h-12">
+        <AlertTriangle className="w-6 h-6 text-red-600" />
+      </div>
+      <h2 className="font-semibold text-red-700 text-lg">{resolvedTitle}</h2>
+      <p className="max-w-md text-gray-500 text-sm">{resolvedDescription}</p>
+      {onRetry && (
+        <button
+          onClick={onRetry}
+          className="bg-red-600 hover:bg-red-700 mt-2 px-4 py-2 rounded-md text-white text-sm transition"
+        >
+          {resolvedRetryLabel}
+        </button>
+      )}
+    </div>
+  );
+};
+
+export default ErrorState;
diff --git a/src/hooks/useRevealOnScroll.ts b/src/hooks/useRevealOnScroll.ts
new file mode 100644
index 0000000..299a89f
--- /dev/null
+++ b/src/hooks/useRevealOnScroll.ts
@@ -0,0 +1,41 @@
+"use client";
+
+import { useEffect, useRef, useState } from "react";
+
+interface UseRevealOptions {
+  threshold?: number;
+  rootMargin?: string;
+}
+
+export const useRevealOnScroll = (options: UseRevealOptions = {}) => {
+  const { threshold = 0.1, rootMargin = "0px 0px -50px 0px" } = options;
+  const ref = useRef<HTMLDivElement>(null);
+  const [isVisible, setIsVisible] = useState(false);
+
+  useEffect(() => {
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        if (entry.isIntersecting) {
+          setIsVisible(true);
+          observer.unobserve(entry.target);
+        }
+      },
+      {
+        threshold,
+        rootMargin,
+      },
+    );
+
+    if (ref.current) {
+      observer.observe(ref.current);
+    }
+
+    return () => {
+      if (ref.current) {
+        observer.unobserve(ref.current);
+      }
+    };
+  }, [threshold, rootMargin]);
+
+  return { ref, isVisible };
+};
diff --git a/src/i18n/navigation.ts b/src/i18n/navigation.ts
new file mode 100644
index 0000000..ddff85d
--- /dev/null
+++ b/src/i18n/navigation.ts
@@ -0,0 +1,7 @@
+// src/i18n/navigation.ts
+
+import { createNavigation } from "next-intl/navigation";
+import { routing } from "./routing";
+
+export const { Link, redirect, usePathname, useRouter, getPathname } =
+  createNavigation(routing);
diff --git a/src/i18n/request.ts b/src/i18n/request.ts
new file mode 100644
index 0000000..d584ce4
--- /dev/null
+++ b/src/i18n/request.ts
@@ -0,0 +1,19 @@
+import { getRequestConfig } from "next-intl/server";
+import { hasLocale } from "next-intl";
+import { cookies } from "next/headers";
+import { routing } from "./routing";
+
+export default getRequestConfig(async ({ requestLocale }) => {
+  const requested = await requestLocale;
+  const cookieLocale = (await cookies()).get("NEXT_LOCALE")?.value;
+  const locale = hasLocale(routing.locales, requested)
+    ? requested
+    : hasLocale(routing.locales, cookieLocale)
+    ? cookieLocale
+    : routing.defaultLocale;
+
+  return {
+    locale,
+    messages: (await import(`../../messages/${locale}.json`)).default,
+  };
+});
diff --git a/src/i18n/routing.ts b/src/i18n/routing.ts
new file mode 100644
index 0000000..8651584
--- /dev/null
+++ b/src/i18n/routing.ts
@@ -0,0 +1,7 @@
+import { defineRouting } from "next-intl/routing";
+
+export const routing = defineRouting({
+  locales: ["en", "ar"],
+  defaultLocale: "en",
+  localePrefix: "never",
+});
diff --git a/src/lib/actions/aiEvaluation.actions.ts b/src/lib/actions/aiEvaluation.actions.ts
new file mode 100644
index 0000000..587f9ab
--- /dev/null
+++ b/src/lib/actions/aiEvaluation.actions.ts
@@ -0,0 +1,482 @@
+"use server";
+
+import { revalidatePath } from "next/cache";
+import { AiEvaluationStatus } from "@prisma/client";
+import {
+  downloadCloudinaryUrlToBuffer,
+  downloadPrivateCloudinaryFileToBuffer,
+} from "@/lib/ai/cloudinaryFile";
+import { evaluatePdfWithGemini, evaluateWithGemini } from "@/lib/ai/geminiEvaluation";
+import prisma from "@/lib/prisma";
+import { requireActionAccess } from "./helpers";
+
+type AiActionResult = {
+  success: boolean;
+  error: boolean;
+  message: string;
+};
+
+const getFileExtension = (fileName?: string | null) =>
+  fileName?.split(".").pop()?.toLowerCase() ?? "";
+
+const failEvaluation = async ({
+  schoolId,
+  answerId,
+  assignmentSubmissionId,
+  maxScore,
+  model = process.env.GEMINI_MODEL || "gemini-3.5-flash",
+  error,
+}: {
+  schoolId: number;
+  answerId?: number;
+  assignmentSubmissionId?: number;
+  maxScore: number;
+  model?: string;
+  error: string;
+}) => {
+  const data = {
+    schoolId,
+    model,
+    status: AiEvaluationStatus.FAILED,
+    score: null,
+    maxScore,
+    feedback: null,
+    strengths: [],
+    weaknesses: [],
+    needsReview: true,
+    error,
+  };
+
+  if (answerId) {
+    await prisma.aiEvaluation.upsert({
+      where: { answerId },
+      create: { ...data, answerId },
+      update: data,
+    });
+  }
+
+  if (assignmentSubmissionId) {
+    await prisma.aiEvaluation.upsert({
+      where: { assignmentSubmissionId },
+      create: { ...data, assignmentSubmissionId },
+      update: data,
+    });
+  }
+};
+
+const saveEvaluation = async ({
+  schoolId,
+  answerId,
+  assignmentSubmissionId,
+  maxScore,
+  model,
+  suggestion,
+}: {
+  schoolId: number;
+  answerId?: number;
+  assignmentSubmissionId?: number;
+  maxScore: number;
+  model: string;
+  suggestion: {
+    score: number;
+    feedback: string;
+    strengths: string[];
+    weaknesses: string[];
+    needsReview: boolean;
+  };
+}) => {
+  const data = {
+    schoolId,
+    model,
+    status: AiEvaluationStatus.SUGGESTED,
+    score: suggestion.score,
+    maxScore,
+    feedback: suggestion.feedback,
+    strengths: suggestion.strengths,
+    weaknesses: suggestion.weaknesses,
+    needsReview: suggestion.needsReview,
+    error: null,
+    approvedScore: null,
+    approvedFeedback: null,
+    approvedBy: null,
+    approvedAt: null,
+  };
+
+  if (answerId) {
+    return prisma.aiEvaluation.upsert({
+      where: { answerId },
+      create: { ...data, answerId },
+      update: data,
+    });
+  }
+
+  if (assignmentSubmissionId) {
+    return prisma.aiEvaluation.upsert({
+      where: { assignmentSubmissionId },
+      create: { ...data, assignmentSubmissionId },
+      update: data,
+    });
+  }
+};
+
+const ensurePdf = (fileName?: string | null) => {
+  if (getFileExtension(fileName) !== "pdf") {
+    throw new Error("AI evaluation currently supports PDF files only.");
+  }
+};
+
+const finalizeExamIfAllGraded = async (submissionId: number) => {
+  const answers = await prisma.answer.findMany({ where: { submissionId } });
+  if (!answers.every((answer) => answer.score !== null)) return;
+
+  const totalScore = answers.reduce((sum, answer) => sum + (answer.score ?? 0), 0);
+  await prisma.submission.update({
+    where: { id: submissionId },
+    data: { totalScore, status: "GRADED", gradePublished: false },
+  });
+};
+
+export async function evaluateExamAnswerWithAi(
+  answerId: number,
+): Promise<AiActionResult> {
+  const access = await requireActionAccess(["admin", "teacher"]);
+  if ("error" in access) {
+    return { success: false, error: true, message: access.message };
+  }
+
+  const answer = await prisma.answer.findFirst({
+    where: {
+      id: answerId,
+      schoolId: access.schoolId,
+      submission: {
+        exam:
+          access.role === "teacher"
+            ? { OR: [{ teacherId: access.userId }, { lesson: { teacherId: access.userId } }] }
+            : undefined,
+      },
+    },
+    include: {
+      question: true,
+      submission: { select: { examId: true } },
+    },
+  });
+
+  if (!answer) {
+    return { success: false, error: true, message: "Answer not found." };
+  }
+
+  if (answer.question.type !== "TEXT" && answer.question.type !== "FILE") {
+    return {
+      success: false,
+      error: true,
+      message: "AI evaluation is only available for text and file answers.",
+    };
+  }
+
+  try {
+    let evaluationResult: Awaited<ReturnType<typeof evaluateWithGemini>>;
+
+    if (answer.question.type === "FILE") {
+      ensurePdf(answer.fileOriginalName);
+      if (!answer.filePublicId) throw new Error("No file was uploaded.");
+      const buffer = await downloadPrivateCloudinaryFileToBuffer(
+        answer.filePublicId,
+        getFileExtension(answer.fileOriginalName) || "pdf",
+      );
+
+      evaluationResult = await evaluatePdfWithGemini({
+        questionText: answer.question.text,
+        modelAnswer:
+          answer.question.textAnswer ||
+          answer.question.correctAnswer?.join(", ") ||
+          null,
+        pdfBuffer: buffer,
+        fileName: answer.fileOriginalName,
+        maxScore: answer.question.points,
+      });
+    } else {
+      const studentAnswer = answer.textAnswer ?? "";
+      if (!studentAnswer.trim()) {
+        throw new Error("Student answer is empty.");
+      }
+
+      evaluationResult = await evaluateWithGemini({
+        questionText: answer.question.text,
+        modelAnswer:
+          answer.question.textAnswer ||
+          answer.question.correctAnswer?.join(", ") ||
+          null,
+        studentAnswer,
+        maxScore: answer.question.points,
+      });
+    }
+
+    const { suggestion, model } = evaluationResult;
+
+    await saveEvaluation({
+      schoolId: access.schoolId,
+      answerId,
+      maxScore: answer.question.points,
+      model,
+      suggestion,
+    });
+
+    await prisma.answer.update({
+      where: { id: answerId },
+      data: { score: suggestion.score, isOverridden: false },
+    });
+    await prisma.submission.update({
+      where: { id: answer.submissionId },
+      data: { gradePublished: false },
+    });
+    await finalizeExamIfAllGraded(answer.submissionId);
+
+    revalidatePath(`/list/exams/${answer.submission.examId}/submissions`);
+    return {
+      success: true,
+      error: false,
+      message: "AI evaluation saved and applied as a draft score.",
+    };
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message : "AI evaluation failed.";
+    await failEvaluation({
+      schoolId: access.schoolId,
+      answerId,
+      maxScore: answer.question.points,
+      error: message,
+    });
+    revalidatePath(`/list/exams/${answer.submission.examId}/submissions`);
+    return { success: false, error: true, message };
+  }
+}
+
+export async function approveExamAnswerAiEvaluation(
+  evaluationId: number,
+  score: number,
+  feedback?: string,
+): Promise<AiActionResult> {
+  const access = await requireActionAccess(["admin", "teacher"]);
+  if ("error" in access) {
+    return { success: false, error: true, message: access.message };
+  }
+
+  const evaluation = await prisma.aiEvaluation.findFirst({
+    where: {
+      id: evaluationId,
+      schoolId: access.schoolId,
+      answer: {
+        submission: {
+          exam:
+            access.role === "teacher"
+              ? { OR: [{ teacherId: access.userId }, { lesson: { teacherId: access.userId } }] }
+              : undefined,
+        },
+      },
+    },
+    include: {
+      answer: { include: { submission: true, question: true } },
+    },
+  });
+
+  if (!evaluation?.answer) {
+    return { success: false, error: true, message: "AI evaluation not found." };
+  }
+
+  if (!Number.isFinite(score) || score < 0 || score > evaluation.maxScore) {
+    return {
+      success: false,
+      error: true,
+      message: `Score must be between 0 and ${evaluation.maxScore}.`,
+    };
+  }
+
+  await prisma.$transaction(async (tx) => {
+    await tx.answer.update({
+      where: { id: evaluation.answerId! },
+      data: {
+        score,
+        isOverridden:
+          evaluation.answer!.question.type === "MCQ" ||
+          evaluation.answer!.question.type === "TRUE_FALSE",
+      },
+    });
+
+    await tx.aiEvaluation.update({
+      where: { id: evaluationId },
+      data: {
+        status: AiEvaluationStatus.APPROVED,
+        approvedScore: score,
+        approvedFeedback: feedback?.trim() || evaluation.feedback,
+        approvedBy: access.userId,
+        approvedAt: new Date(),
+        needsReview: false,
+      },
+    });
+
+    await tx.submission.update({
+      where: { id: evaluation.answer!.submissionId },
+      data: { gradePublished: false },
+    });
+  });
+
+  await finalizeExamIfAllGraded(evaluation.answer.submissionId);
+  revalidatePath(`/list/exams/${evaluation.answer.submission.examId}/submissions`);
+  return { success: true, error: false, message: "AI score approved." };
+}
+
+export async function evaluateAssignmentSubmissionWithAi(
+  submissionId: number,
+): Promise<AiActionResult> {
+  const access = await requireActionAccess(["admin", "teacher"]);
+  if ("error" in access) {
+    return { success: false, error: true, message: access.message };
+  }
+
+  const submission = await prisma.assignmentSubmission.findFirst({
+    where: {
+      id: submissionId,
+      schoolId: access.schoolId,
+      assignment:
+        access.role === "teacher"
+          ? { OR: [{ teacherId: access.userId }, { lesson: { teacherId: access.userId } }] }
+          : undefined,
+    },
+    include: {
+      assignment: {
+        select: {
+          id: true,
+          title: true,
+          description: true,
+          rubric: true,
+          maxScore: true,
+        },
+      },
+    },
+  });
+
+  if (!submission) {
+    return { success: false, error: true, message: "Submission not found." };
+  }
+
+  try {
+    ensurePdf(submission.fileName);
+    const buffer = await downloadCloudinaryUrlToBuffer(submission.fileUrl);
+
+    const { suggestion, model } = await evaluatePdfWithGemini({
+      questionText: submission.assignment.title,
+      modelAnswer: submission.assignment.rubric || submission.assignment.description,
+      pdfBuffer: buffer,
+      fileName: submission.fileName,
+      maxScore: submission.assignment.maxScore,
+    });
+
+    await saveEvaluation({
+      schoolId: access.schoolId,
+      assignmentSubmissionId: submissionId,
+      maxScore: submission.assignment.maxScore,
+      model,
+      suggestion,
+    });
+
+    await prisma.assignmentSubmission.update({
+      where: { id: submissionId },
+      data: {
+        score: suggestion.score,
+        teacherFeedback: suggestion.feedback,
+        gradePublished: false,
+        gradedAt: new Date(),
+        gradedBy: access.userId,
+      },
+    });
+
+    revalidatePath(`/list/assignments/${submission.assignmentId}/submissions`);
+    revalidatePath("/list/assignments");
+    return {
+      success: true,
+      error: false,
+      message: "AI evaluation saved and applied as a draft score.",
+    };
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message : "AI evaluation failed.";
+    await failEvaluation({
+      schoolId: access.schoolId,
+      assignmentSubmissionId: submissionId,
+      maxScore: submission.assignment.maxScore,
+      error: message,
+    });
+    revalidatePath(`/list/assignments/${submission.assignmentId}/submissions`);
+    return { success: false, error: true, message };
+  }
+}
+
+export async function approveAssignmentSubmissionAiEvaluation(
+  evaluationId: number,
+  score: number,
+  feedback?: string,
+): Promise<AiActionResult> {
+  const access = await requireActionAccess(["admin", "teacher"]);
+  if ("error" in access) {
+    return { success: false, error: true, message: access.message };
+  }
+
+  const evaluation = await prisma.aiEvaluation.findFirst({
+    where: {
+      id: evaluationId,
+      schoolId: access.schoolId,
+      assignmentSubmission: {
+        assignment:
+          access.role === "teacher"
+            ? { OR: [{ teacherId: access.userId }, { lesson: { teacherId: access.userId } }] }
+            : undefined,
+      },
+    },
+    include: {
+      assignmentSubmission: true,
+    },
+  });
+
+  if (!evaluation?.assignmentSubmission) {
+    return { success: false, error: true, message: "AI evaluation not found." };
+  }
+
+  if (!Number.isFinite(score) || score < 0 || score > evaluation.maxScore) {
+    return {
+      success: false,
+      error: true,
+      message: `Score must be between 0 and ${evaluation.maxScore}.`,
+    };
+  }
+
+  await prisma.$transaction(async (tx) => {
+    await tx.assignmentSubmission.update({
+      where: { id: evaluation.assignmentSubmissionId! },
+      data: {
+        score,
+        teacherFeedback: feedback?.trim() || evaluation.feedback,
+        gradePublished: false,
+        gradedAt: new Date(),
+        gradedBy: access.userId,
+      },
+    });
+
+    await tx.aiEvaluation.update({
+      where: { id: evaluationId },
+      data: {
+        status: AiEvaluationStatus.APPROVED,
+        approvedScore: score,
+        approvedFeedback: feedback?.trim() || evaluation.feedback,
+        approvedBy: access.userId,
+        approvedAt: new Date(),
+        needsReview: false,
+      },
+    });
+  });
+
+  revalidatePath(
+    `/list/assignments/${evaluation.assignmentSubmission.assignmentId}/submissions`,
+  );
+  revalidatePath("/list/assignments");
+  return { success: true, error: false, message: "AI score approved." };
+}
diff --git a/src/lib/actions/announcement.actions.ts b/src/lib/actions/announcement.actions.ts
index 1021697..268e529 100644
--- a/src/lib/actions/announcement.actions.ts
+++ b/src/lib/actions/announcement.actions.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import { notifyNewAnnouncement, notifyParentsNewAnnouncement } from "./notification.actions";
 import { AnnouncementSchema } from "../formValidationSchemas";
 import prisma from "../prisma";
 import {
@@ -34,6 +35,20 @@ export const createAnnouncement = async (
       },
     });
 
+    // ✅ إشعار الطلاب والمعلمين بالإعلان الجديد
+    await notifyNewAnnouncement({
+      schoolId: access.schoolId,
+      announcementTitle: data.title,
+      targetClassIds: data.classIds.length > 0 ? data.classIds : undefined,
+    }).catch(() => {});
+
+    // ✅ إشعار الأولياء بالإعلان الجديد
+    await notifyParentsNewAnnouncement({
+      schoolId: access.schoolId,
+      announcementTitle: data.title,
+      targetClassIds: data.classIds.length > 0 ? data.classIds : undefined,
+    }).catch(() => {});
+
     return successResult(["/list/announcements"]);
   } catch (err) {
     return errorResult(err);
@@ -105,4 +120,4 @@ export const deleteAnnouncement = async (
   } catch (err) {
     return errorResult(err);
   }
-};
+};
\ No newline at end of file
diff --git a/src/lib/actions/assignment.actions.ts b/src/lib/actions/assignment.actions.ts
index 396e6e5..4776cb9 100644
--- a/src/lib/actions/assignment.actions.ts
+++ b/src/lib/actions/assignment.actions.ts
@@ -1,6 +1,7 @@
+// src/lib/actions/assignment.actions.ts
 "use server";
 
-import { AssignmentSchema } from "../formValidationSchemas";
+import { assignmentSchema } from "../formValidationSchemas";
 import prisma from "../prisma";
 import {
   CurrentState,
@@ -10,64 +11,316 @@ import {
   requireActionAccess,
   successResult,
 } from "./helpers";
+import cloudinary from "@/lib/cloudinary";
+import { notifyNewAssignment, notifyAssignmentUpdated } from "./notification.actions";
+
+async function uploadAssignmentFile(file: File, folder = "assignments"): Promise<{ url: string; name: string }> {
+  const arrayBuffer = await file.arrayBuffer();
+  const buffer = Buffer.from(arrayBuffer);
+
+  return new Promise((resolve, reject) => {
+    const uploadStream = cloudinary.uploader.upload_stream(
+      { folder, resource_type: "auto", filename_override: file.name },
+      (error, result) => {
+        if (error || !result) reject(error || new Error("Upload failed"));
+        else resolve({ url: result.secure_url, name: file.name });
+      }
+    );
+    uploadStream.end(buffer);
+  });
+}
+
+async function deleteAssignmentFile(fileUrl: string) {
+  if (!fileUrl.includes("cloudinary")) return;
+  try {
+    const parts = fileUrl.split('/');
+    const publicIdWithExt = parts.slice(7).join('/');
+    const publicId = publicIdWithExt.substring(0, publicIdWithExt.lastIndexOf('.'));
+    await cloudinary.uploader.destroy(publicId);
+  } catch (error) {
+    console.error("Failed to delete file from Cloudinary:", error);
+  }
+}
+
+type AssignmentAccess = {
+  userId: string;
+  role: string;
+  schoolId: number;
+};
+
+const assignmentTeacherAccessWhere = (teacherId: string) => ({
+  OR: [{ teacherId }, { lesson: { teacherId } }],
+});
+
+const getAssignmentClassAssignments = async (
+  access: AssignmentAccess,
+  academicYearId: number,
+  subjectId: number,
+  classIds: number[],
+) => {
+  const subject = await prisma.subject.findFirst({
+    where: { id: subjectId, schoolId: access.schoolId },
+    select: {
+      id: true,
+      gradeId: true,
+      teachers: { select: { id: true } },
+    },
+  });
+
+  if (!subject) {
+    return {
+      error: true as const,
+      message: "Selected subject was not found.",
+    };
+  }
+
+  const classes = await prisma.class.findMany({
+    where: { id: { in: classIds }, schoolId: access.schoolId },
+    select: {
+      id: true,
+      gradeId: true,
+      teachers: { select: { id: true } },
+    },
+  });
+
+  if (classes.length !== classIds.length) {
+    return {
+      error: true as const,
+      message: "One or more selected classes were not found.",
+    };
+  }
+
+  const lessons = await prisma.lesson.findMany({
+    where: {
+      academicYearId,
+      schoolId: access.schoolId,
+      subjectId,
+      classId: { in: classIds },
+      ...(access.role === "teacher" ? { teacherId: access.userId } : {}),
+    },
+    select: { id: true, classId: true, teacherId: true },
+  });
+
+  const lessonsByClass = new Map<number, (typeof lessons)[number]>();
+  for (const lesson of lessons) {
+    if (!lessonsByClass.has(lesson.classId)) {
+      lessonsByClass.set(lesson.classId, lesson);
+    }
+  }
+
+  const subjectTeacherIds = new Set(
+    subject.teachers.map((teacher) => teacher.id),
+  );
+  const assignments = [];
+
+  for (const selectedClass of classes) {
+    const lesson = lessonsByClass.get(selectedClass.id);
+    const classTeacherIds = new Set(
+      selectedClass.teachers.map((teacher) => teacher.id),
+    );
+    const sharedTeacherId =
+      [...subjectTeacherIds].find((teacherId) =>
+        classTeacherIds.has(teacherId),
+      ) ??
+      lesson?.teacherId ??
+      null;
+
+    if (!lesson && selectedClass.gradeId !== subject.gradeId) {
+      return {
+        error: true as const,
+        message: "One or more classes do not match the selected subject grade.",
+      };
+    }
+
+    if (access.role === "teacher") {
+      const teacherHasSubjectGrade =
+        subjectTeacherIds.has(access.userId) &&
+        selectedClass.gradeId === subject.gradeId;
+      const teacherHasClassSubject =
+        subjectTeacherIds.has(access.userId) &&
+        classTeacherIds.has(access.userId);
+      const teacherHasLesson = lesson?.teacherId === access.userId;
+
+      if (!teacherHasSubjectGrade && !teacherHasClassSubject && !teacherHasLesson) {
+        return {
+          error: true as const,
+          message:
+            "You are not assigned to teach this subject for one or more selected classes.",
+        };
+      }
+    }
+
+    assignments.push({
+      classId: selectedClass.id,
+      lessonId: lesson?.id ?? null,
+      teacherId: access.role === "teacher" ? access.userId : sharedTeacherId,
+    });
+  }
+
+  return { error: false as const, assignments };
+};
+
+function extractAssignmentData(formData: FormData): {
+  id?: number;
+  title: string;
+  rubric: string | null;
+  startDate: Date;
+  endDate: Date;
+  subjectId: number;
+  teacherId: string | null;
+  maxScore: number;
+  classIds: number[];
+  file: File | null;
+  removeFile: boolean;
+  allowLateSubmission: boolean; // ✅ حقل جديد
+} {
+  const idRaw = formData.get("id");
+  const id = idRaw ? Number(idRaw) : undefined;
+  const title = formData.get("title") as string;
+  const rubricRaw = formData.get("rubric");
+  const rubric =
+    typeof rubricRaw === "string" && rubricRaw.trim() ? rubricRaw.trim() : null;
+  const startDateRaw = formData.get("startDate") as string;
+  const endDateRaw = formData.get("endDate") as string;
+  const subjectId = Number(formData.get("subjectId"));
+  const teacherIdRaw = formData.get("teacherId");
+  const teacherId =
+    typeof teacherIdRaw === "string" && teacherIdRaw.trim()
+      ? teacherIdRaw.trim()
+      : null;
+  const maxScoreRaw = Number(formData.get("maxScore") ?? 10);
+  const classIdsRaw = formData.getAll("classIds");
+  const classIds = classIdsRaw.map(c => Number(c)).filter(id => !isNaN(id));
+  const file = formData.get("file") as File | null;
+  const removeFile = formData.get("removeFile") === "true";
+  // ✅ boolean يُرسَل كـ string "true"/"false" من FormData
+  const allowLateSubmission = formData.get("allowLateSubmission") === "true";
+
+  return {
+    id,
+    title,
+    rubric,
+    startDate: new Date(startDateRaw),
+    endDate: new Date(endDateRaw),
+    subjectId,
+    teacherId,
+    maxScore: Number.isFinite(maxScoreRaw) && maxScoreRaw > 0 ? maxScoreRaw : 10,
+    classIds,
+    file,
+    removeFile,
+    allowLateSubmission,
+  };
+}
 
 export const createAssignment = async (
   currentState: CurrentState,
-  data: AssignmentSchema,
+  formData: FormData,
 ) => {
   const access = await requireActionAccess(["admin", "teacher"]);
   if ("error" in access) return access;
   const role = access.role;
   const userId = access.userId;
+
+  const { title, rubric, startDate, endDate, subjectId, teacherId, maxScore, classIds, file, removeFile, allowLateSubmission } =
+    extractAssignmentData(formData);
+
+  const validation = assignmentSchema.safeParse({
+    title,
+    rubric,
+    startDate,
+    endDate,
+    maxScore,
+    subjectId,
+    teacherId,
+    classIds,
+    allowLateSubmission,
+  });
+  if (!validation.success) {
+    return { success: false, error: true, message: validation.error.errors[0].message };
+  }
+
   try {
     const academicYearId = await getRequiredAcademicYearId(access.schoolId);
+    const selectedTeacherId =
+      access.role === "admin" && teacherId ? teacherId : null;
 
-    const lessons = await prisma.lesson.findMany({
-      where: {
-        academicYearId,
-        schoolId: access.schoolId,
-        subjectId: data.subjectId,
-        classId: { in: data.classIds },
-        ...(role === "teacher" ? { teacherId: userId! } : {}),
-      },
-      select: { id: true, classId: true },
-    });
+    if (selectedTeacherId) {
+      const teacherExists = await prisma.teacher.count({
+        where: { id: selectedTeacherId, schoolId: access.schoolId },
+      });
 
-    const matchedClassIds = new Set(lessons.map((lesson) => lesson.classId));
-    if (lessons.length === 0) {
-      return {
-        success: false,
-        error: true,
-        message: "No lessons were found for the selected subject and classes.",
-      };
+      if (!teacherExists) {
+        return {
+          success: false,
+          error: true,
+          message: "Selected teacher was not found.",
+        };
+      }
     }
 
-    if (matchedClassIds.size !== data.classIds.length) {
+    const assignmentResult = await getAssignmentClassAssignments(
+      access,
+      academicYearId,
+      subjectId,
+      classIds,
+    );
+
+    if (assignmentResult.error) {
       return {
         success: false,
         error: true,
-        message:
-          "One or more selected classes do not have a lesson for that subject.",
+        message: assignmentResult.message,
       };
     }
 
-    await prisma.$transaction(
-      lessons.map((lesson) =>
+    let fileUrl: string | null = null;
+    let fileName: string | null = null;
+    if (file && file.size > 0 && !removeFile) {
+      try {
+        const upload = await uploadAssignmentFile(file);
+        fileUrl = upload.url;
+        fileName = upload.name;
+      } catch (err) {
+        console.error("❌ Upload failed:", err);
+        return { success: false, error: true, message: "File upload failed." };
+      }
+    }
+
+    const createdAssignments = await prisma.$transaction(
+      assignmentResult.assignments.map((assignment) =>
         prisma.assignment.create({
           data: {
-            title: data.title,
-            startDate: data.startDate,
-            endDate: data.endDate,
-            lessonId: lesson.id,
-            classId: lesson.classId,
-            subjectId: data.subjectId,
+            title,
+            rubric,
+            startDate,
+            endDate,
+            lessonId: assignment.lessonId,
+            teacherId: selectedTeacherId ?? assignment.teacherId,
+            classId: assignment.classId,
+            subjectId,
+            maxScore,
             academicYearId,
             schoolId: access.schoolId,
+            fileUrl,
+            fileName,
+            allowLateSubmission, // ✅ حفظ الخيار
           },
         }),
       ),
     );
 
+    // ✅ إشعار الطلاب بالواجب الجديد
+    for (const assignment of createdAssignments) {
+      if (assignment.classId) {
+        await notifyNewAssignment({
+          schoolId: access.schoolId,
+          assignmentId: assignment.id,
+          assignmentTitle: title,
+          classId: assignment.classId,
+        }).catch(() => {}); // لا نوقف العملية إذا فشل الإشعار
+      }
+    }
+
     return successResult(["/list/assignments"]);
   } catch (err) {
     return errorResult(err);
@@ -76,14 +329,13 @@ export const createAssignment = async (
 
 export const updateAssignment = async (
   currentState: CurrentState,
-  data: AssignmentSchema,
+  formData: FormData,
 ) => {
-  if (!data.id) {
-    return {
-      success: false,
-      error: true,
-      message: "Assignment id is required.",
-    };
+  const { id, title, rubric, startDate, endDate, subjectId, teacherId, maxScore, classIds, file, removeFile, allowLateSubmission } =
+    extractAssignmentData(formData);
+
+  if (!id) {
+    return { success: false, error: true, message: "Assignment id is required." };
   }
 
   const access = await requireActionAccess(["admin", "teacher"]);
@@ -91,54 +343,79 @@ export const updateAssignment = async (
   const role = access.role;
   const userId = access.userId;
 
+  const validation = assignmentSchema.safeParse({
+    title,
+    rubric,
+    startDate,
+    endDate,
+    maxScore,
+    subjectId,
+    teacherId,
+    classIds,
+    allowLateSubmission,
+  });
+  if (!validation.success) {
+    return { success: false, error: true, message: validation.error.errors[0].message };
+  }
+
   try {
     const academicYearId = await getRequiredAcademicYearId(access.schoolId);
+    const selectedTeacherId =
+      access.role === "admin" && teacherId ? teacherId : null;
+
+    if (selectedTeacherId) {
+      const teacherExists = await prisma.teacher.count({
+        where: { id: selectedTeacherId, schoolId: access.schoolId },
+      });
+
+      if (!teacherExists) {
+        return {
+          success: false,
+          error: true,
+          message: "Selected teacher was not found.",
+        };
+      }
+    }
 
     const existingAssignment = await prisma.assignment.findUnique({
-      where: { id: data.id, schoolId: access.schoolId },
-      select: {
-        id: true,
-        title: true,
-        startDate: true,
-        endDate: true,
-        subjectId: true,
-      },
+      where: { id, schoolId: access.schoolId },
+      select: { fileUrl: true, fileName: true, title: true, startDate: true, endDate: true, subjectId: true },
     });
-
     if (!existingAssignment) {
-      return {
-        success: false,
-        error: true,
-        message: "The assignment you are trying to update was not found.",
-      };
+      return { success: false, error: true, message: "Assignment not found." };
     }
 
-    const lessons = await prisma.lesson.findMany({
-      where: {
-        academicYearId,
-        subjectId: data.subjectId,
-        classId: { in: data.classIds },
-        ...(role === "teacher" ? { teacherId: userId! } : {}),
-      },
-      select: { id: true, classId: true },
-    });
+    const assignmentResult = await getAssignmentClassAssignments(
+      access,
+      academicYearId,
+      subjectId,
+      classIds,
+    );
 
-    const matchedClassIds = new Set(lessons.map((lesson) => lesson.classId));
-    if (lessons.length === 0) {
+    if (assignmentResult.error) {
       return {
         success: false,
         error: true,
-        message: "No lessons were found for the selected subject and classes.",
+        message: assignmentResult.message,
       };
     }
 
-    if (matchedClassIds.size !== data.classIds.length) {
-      return {
-        success: false,
-        error: true,
-        message:
-          "One or more selected classes do not have a lesson for that subject.",
-      };
+    let fileUrl = existingAssignment.fileUrl;
+    let fileName = existingAssignment.fileName;
+
+    if (removeFile && existingAssignment.fileUrl) {
+      await deleteAssignmentFile(existingAssignment.fileUrl);
+      fileUrl = null;
+      fileName = null;
+    }
+
+    if (file && file.size > 0) {
+      if (existingAssignment.fileUrl && !removeFile) {
+        await deleteAssignmentFile(existingAssignment.fileUrl);
+      }
+      const upload = await uploadAssignmentFile(file);
+      fileUrl = upload.url;
+      fileName = upload.name;
     }
 
     const groupAssignments = await prisma.assignment.findMany({
@@ -149,67 +426,69 @@ export const updateAssignment = async (
         academicYearId,
         schoolId: access.schoolId,
         subjectId: existingAssignment.subjectId,
-        ...(role === "teacher" ? { lesson: { teacherId: userId! } } : {}),
+        ...(role === "teacher" ? assignmentTeacherAccessWhere(userId!) : {}),
       },
-      select: { id: true, classId: true },
+      select: { id: true, classId: true, teacherId: true },
     });
 
-    const selectedLessonsByClass = new Map<
+    const selectedAssignmentsByClass = new Map<
       number,
-      { id: number; classId: number }
+      (typeof assignmentResult.assignments)[number]
     >();
-    for (const lesson of lessons) {
-      selectedLessonsByClass.set(lesson.classId, lesson);
+    for (const assignment of assignmentResult.assignments) {
+      selectedAssignmentsByClass.set(assignment.classId, assignment);
     }
 
     await prisma.$transaction(async (tx) => {
       for (const assignment of groupAssignments) {
-        if (
-          assignment.classId &&
-          !selectedLessonsByClass.has(assignment.classId)
-        ) {
+        if (assignment.classId && !selectedAssignmentsByClass.has(assignment.classId)) {
           await tx.assignment.delete({ where: { id: assignment.id } });
         }
       }
 
-      for (const [classId, lesson] of selectedLessonsByClass) {
-        const existingClassAssignment = groupAssignments.find(
-          (assignment) => assignment.classId === classId,
-        );
-
+      for (const [classId, assignment] of selectedAssignmentsByClass) {
+        const existingClassAssignment = groupAssignments.find((a) => a.classId === classId);
+        const teacherId =
+          selectedTeacherId ??
+          existingClassAssignment?.teacherId ??
+          assignment.teacherId ??
+          null;
+        const data = {
+          title,
+          rubric,
+          startDate,
+          endDate,
+          lessonId: assignment.lessonId,
+          teacherId,
+          classId,
+          subjectId,
+          maxScore,
+          academicYearId,
+          schoolId: access.schoolId,
+          fileUrl,
+          fileName,
+          allowLateSubmission, // ✅ حفظ الخيار عند التحديث
+        };
         if (existingClassAssignment) {
-          await tx.assignment.update({
-            where: { id: existingClassAssignment.id },
-            data: {
-              title: data.title,
-              startDate: data.startDate,
-              endDate: data.endDate,
-              lessonId: lesson.id,
-              classId,
-              subjectId: data.subjectId,
-              academicYearId,
-              schoolId: access.schoolId,
-            },
-          });
+          await tx.assignment.update({ where: { id: existingClassAssignment.id }, data });
         } else {
-          await tx.assignment.create({
-            data: {
-              title: data.title,
-              startDate: data.startDate,
-              endDate: data.endDate,
-              lessonId: lesson.id,
-              classId,
-              subjectId: data.subjectId,
-              academicYearId,
-              schoolId: access.schoolId,
-            },
-          });
+          await tx.assignment.create({ data });
         }
       }
     });
 
+    // ✅ إشعار الطلاب بتحديث الواجب
+    for (const [classId] of selectedAssignmentsByClass) {
+      await notifyAssignmentUpdated({
+        schoolId: access.schoolId,
+        assignmentTitle: title,
+        classId,
+      }).catch(() => {});
+    }
+
     return successResult(["/list/assignments"]);
   } catch (err) {
+    console.error("Update error:", err);
     return errorResult(err);
   }
 };
@@ -227,13 +506,17 @@ export const deleteAssignment = async (
   if ("error" in access) return access;
   const role = access.role;
   const userId = access.userId;
+
   try {
     if (role === "teacher") {
       const teacherAssignment = await prisma.assignment.findFirst({
-        where: { id, schoolId: access.schoolId, lesson: { teacherId: userId } },
-        select: { id: true },
+        where: {
+          id,
+          schoolId: access.schoolId,
+          ...assignmentTeacherAccessWhere(userId),
+        },
+        select: { id: true, fileUrl: true },
       });
-
       if (!teacherAssignment) {
         return {
           success: false,
@@ -241,16 +524,21 @@ export const deleteAssignment = async (
           message: "You are not allowed to delete this assignment.",
         };
       }
+      if (teacherAssignment.fileUrl) {
+        await deleteAssignmentFile(teacherAssignment.fileUrl);
+      }
+    } else {
+      const assignment = await prisma.assignment.findUnique({
+        where: { id, schoolId: access.schoolId },
+        select: { fileUrl: true },
+      });
+      if (assignment?.fileUrl) {
+        await deleteAssignmentFile(assignment.fileUrl);
+      }
     }
 
-    const deleted = await prisma.assignment.deleteMany({
-      where: { id, schoolId: access.schoolId },
-    });
-    if (deleted.count === 0) {
-      return { success: false, error: true, message: "Assignment not found." };
-    }
-
-    return successResult();
+    await prisma.assignment.deleteMany({ where: { id, schoolId: access.schoolId } });
+    return successResult(["/list/assignments"]);
   } catch (err) {
     return errorResult(err);
   }
diff --git a/src/lib/actions/assignmentFile.actions.ts b/src/lib/actions/assignmentFile.actions.ts
new file mode 100644
index 0000000..c3cce68
--- /dev/null
+++ b/src/lib/actions/assignmentFile.actions.ts
@@ -0,0 +1,92 @@
+"use server";
+
+import { auth } from "@clerk/nextjs/server";
+import { revalidatePath } from "next/cache";
+import prisma from "@/lib/prisma";
+import { v2 as cloudinary } from "cloudinary";
+
+cloudinary.config({
+  cloud_name: process.env.NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME!,
+  api_key: process.env.CLOUDINARY_API_KEY!,
+  api_secret: process.env.CLOUDINARY_API_SECRET!,
+});
+
+export type AssignmentFileState = {
+  success: boolean;
+  error: boolean;
+  message: string;
+};
+
+// ─── رفع ملف لواجب موجود ──────────────────────────────────────────────────────
+export async function uploadAssignmentFile(
+  _state: AssignmentFileState,
+  formData: FormData
+): Promise<AssignmentFileState> {
+  try {
+    const { userId, sessionClaims } = await auth();
+    const role = (sessionClaims?.metadata as { role?: string })?.role;
+
+    if (!userId || role !== "teacher") {
+      return { success: false, error: true, message: "Unauthorized" };
+    }
+
+    const assignmentId = Number(formData.get("assignmentId"));
+    if (!assignmentId) {
+      return { success: false, error: true, message: "Assignment ID is required" };
+    }
+
+    // التحقق أن الواجب يخص هذا المعلم
+    const assignment = await prisma.assignment.findFirst({
+      where: {
+        id: assignmentId,
+        OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }],
+      },
+      select: { id: true, title: true },
+    });
+    if (!assignment) {
+      return { success: false, error: true, message: "Assignment not found" };
+    }
+
+    const file = formData.get("file") as File | null;
+    if (!file || file.size === 0) {
+      return { success: false, error: true, message: "File is required" };
+    }
+    if (file.size > 20 * 1024 * 1024) {
+      return { success: false, error: true, message: "File must be under 20MB" };
+    }
+
+    // رفع إلى Cloudinary
+    const bytes = await file.arrayBuffer();
+    const buffer = Buffer.from(bytes);
+    const base64 = buffer.toString("base64");
+    const dataUri = `data:${file.type};base64,${base64}`;
+    const ext = file.name.split(".").pop()?.toLowerCase() ?? "bin";
+    const isImage = ["jpg", "jpeg", "png", "gif", "webp"].includes(ext);
+
+    const result = await cloudinary.uploader.upload(dataUri, {
+      folder: "assignments",
+      resource_type: isImage ? "image" : "raw",
+      type: "upload",           // ← هذا يجعل الملف public دائماً
+      use_filename: true,
+      unique_filename: true,
+    });
+
+    // تحديث كل الواجبات التي لها نفس العنوان (لأن createAssignment ينشئ نسخة لكل صف)
+    await prisma.assignment.updateMany({
+      where: {
+        title: assignment.title,
+        OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }],
+      },
+      data: {
+        fileUrl: result.secure_url,
+        fileName: file.name,
+      },
+    });
+
+    revalidatePath("/list/assignments");
+    return { success: true, error: false, message: "File uploaded successfully!" };
+  } catch (err) {
+    console.error("[uploadAssignmentFile]", err);
+    return { success: false, error: true, message: "Something went wrong" };
+  }
+}
diff --git a/src/lib/actions/attendance.actions.ts b/src/lib/actions/attendance.actions.ts
index 53f5da0..29e8349 100644
--- a/src/lib/actions/attendance.actions.ts
+++ b/src/lib/actions/attendance.actions.ts
@@ -1,6 +1,7 @@
 // lib/actions.ts
 "use server";
 
+import { notifyAttendanceSaved } from "./notification.actions";
 import prisma from "../prisma";
 import { getRequiredAcademicYearId, requireActionAccess } from "./helpers";
 
@@ -75,9 +76,17 @@ export const saveDailyAttendance = async (
       }),
     );
 
+    // ✅ إشعار الأدمن بحفظ الحضور
+    await notifyAttendanceSaved({
+      schoolId: access.schoolId,
+      scope: scope as "students" | "teachers",
+      date: rawDate,
+      count: records.length,
+    }).catch(() => {});
+
     return { success: true, error: false };
   } catch (err: any) {
     console.error(err);
     return { success: false, error: true, message: err.message };
   }
-};
+};
\ No newline at end of file
diff --git a/src/lib/actions/class.actions.ts b/src/lib/actions/class.actions.ts
index bc202dd..afa21a5 100644
--- a/src/lib/actions/class.actions.ts
+++ b/src/lib/actions/class.actions.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import { notifyTeacherAssignedSupervisor } from "./notification.actions";
 import { ClassSchema, classSchema } from "../formValidationSchemas";
 import prisma from "../prisma";
 import {
@@ -58,6 +59,12 @@ export const updateClass = async (
   }
 
   try {
+    // جلب البيانات القديمة للمقارنة
+    const existingClass = await prisma.class.findUnique({
+      where: { id: data.id, schoolId: access.schoolId },
+      select: { supervisorId: true, name: true },
+    });
+
     const updated = await prisma.class.updateMany({
       where: { id: data.id, schoolId: access.schoolId },
       data,
@@ -66,6 +73,18 @@ export const updateClass = async (
       return { success: false, error: true, message: "Class not found." };
     }
 
+    // ✅ إشعار المعلم إذا تغير المشرف
+    if (
+      data.supervisorId &&
+      existingClass?.supervisorId !== data.supervisorId
+    ) {
+      await notifyTeacherAssignedSupervisor({
+        schoolId: access.schoolId,
+        teacherId: data.supervisorId,
+        className: data.name ?? existingClass?.name ?? "Unknown",
+      }).catch(() => {});
+    }
+
     return successResult(["/list/classes"]);
   } catch (err) {
     return errorResult(err);
@@ -285,4 +304,4 @@ export const deleteClass = async (
   } catch (err) {
     return errorResult(err);
   }
-};
+};
\ No newline at end of file
diff --git a/src/lib/actions/event.actions.ts b/src/lib/actions/event.actions.ts
index 16f901c..5ffbb23 100644
--- a/src/lib/actions/event.actions.ts
+++ b/src/lib/actions/event.actions.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import { notifyNewEvent, notifyParentsNewEvent } from "./notification.actions";
 import { EventSchema } from "../formValidationSchemas";
 import prisma from "../prisma";
 import {
@@ -35,6 +36,20 @@ export const createEvent = async (
       },
     });
 
+    // ✅ إشعار الطلاب والمعلمين بالحدث الجديد
+    await notifyNewEvent({
+      schoolId: access.schoolId,
+      eventTitle: data.title,
+      targetClassIds: data.classIds.length > 0 ? data.classIds : undefined,
+    }).catch(() => {});
+
+    // ✅ إشعار الأولياء بالحدث الجديد
+    await notifyParentsNewEvent({
+      schoolId: access.schoolId,
+      eventTitle: data.title,
+      targetClassIds: data.classIds.length > 0 ? data.classIds : undefined,
+    }).catch(() => {});
+
     return successResult(["/list/events"]);
   } catch (err) {
     return errorResult(err);
@@ -101,4 +116,4 @@ export const deleteEvent = async (
   } catch (err) {
     return errorResult(err);
   }
-};
+};
\ No newline at end of file
diff --git a/src/lib/actions/exam.actions.ts b/src/lib/actions/exam.actions.ts
index e41380a..238b0d0 100644
--- a/src/lib/actions/exam.actions.ts
+++ b/src/lib/actions/exam.actions.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import { notifyNewExam } from "./notification.actions";
 import { ExamSchema } from "../formValidationSchemas";
 import prisma from "../prisma";
 import {
@@ -10,6 +11,7 @@ import {
   requireActionAccess,
   successResult,
 } from "./helpers";
+import { deleteExamFileFromCloudinary } from "../cloudinary";
 
 export const createExam = async (
   currentState: CurrentState,
@@ -52,8 +54,17 @@ export const createExam = async (
       };
     }
 
-    await prisma.$transaction(
-      lessons.map((lesson) =>
+    const uniqueClassLessons = Array.from(
+      lessons.reduce((map, lesson) => {
+        if (!map.has(lesson.classId)) {
+          map.set(lesson.classId, lesson);
+        }
+        return map;
+      }, new Map<number, (typeof lessons)[number]>()).values(),
+    );
+
+    const createdExams = await prisma.$transaction(
+      uniqueClassLessons.map((lesson) =>
         prisma.exam.create({
           data: {
             title: data.title,
@@ -69,6 +80,18 @@ export const createExam = async (
       ),
     );
 
+    // ✅ إشعار الطلاب بالاختبار الجديد
+    for (const exam of createdExams) {
+      if (exam.classId) {
+        await notifyNewExam({
+          schoolId: access.schoolId,
+          examId: exam.id,
+          examTitle: data.title,
+          classId: exam.classId,
+        }).catch(() => {});
+      }
+    }
+
     return successResult(["/list/exams"]);
   } catch (err) {
     return errorResult(err);
@@ -235,14 +258,52 @@ export const deleteExam = async (
       }
     }
 
-    const deleted = await prisma.exam.deleteMany({
-      where: { id, schoolId: access.schoolId },
+    await prisma.$transaction(async (tx) => {
+      // 1. Get all submissions for this exam to delete files from Cloudinary
+      const submissions = await tx.submission.findMany({
+        where: { examId: id, schoolId: access.schoolId },
+        include: {
+          answers: {
+            where: { filePublicId: { not: null } },
+            select: { filePublicId: true },
+          },
+        },
+      });
+
+      // Extract filePublicIds
+      const filePublicIds = submissions
+        .flatMap((s) => s.answers)
+        .map((a) => a.filePublicId)
+        .filter((pid): pid is string => !!pid);
+
+      // Delete files from Cloudinary (non-blocking)
+      for (const publicId of filePublicIds) {
+        await deleteExamFileFromCloudinary(publicId).catch((err) => {
+          console.error(`[deleteExam] Failed to delete file ${publicId} from Cloudinary:`, err);
+        });
+      }
+
+      // 2. Delete all results associated with this exam
+      await tx.result.deleteMany({
+        where: { examId: id, schoolId: access.schoolId },
+      });
+
+      // 3. Delete all submissions (cascades to Answers and AiEvaluations)
+      await tx.submission.deleteMany({
+        where: { examId: id, schoolId: access.schoolId },
+      });
+
+      // 4. Delete the exam (cascades to Questions)
+      const deleted = await tx.exam.deleteMany({
+        where: { id, schoolId: access.schoolId },
+      });
+
+      if (deleted.count === 0) {
+        throw new Error("Exam not found.");
+      }
     });
-    if (deleted.count === 0) {
-      return { success: false, error: true, message: "Exam not found." };
-    }
 
-    return successResult();
+    return successResult(["/list/exams", "/list/results"]);
   } catch (err) {
     return errorResult(err);
   }
diff --git a/src/lib/actions/examWorkflow.actions.ts b/src/lib/actions/examWorkflow.actions.ts
index 7ea86ff..14a6679 100644
--- a/src/lib/actions/examWorkflow.actions.ts
+++ b/src/lib/actions/examWorkflow.actions.ts
@@ -17,7 +17,15 @@ import {
   SaveAnswerSchema,
   GradeAnswerSchema,
   ExtendTimeSchema,
+  isFileConfig,
+  EXAM_FILE_MAX_SIZE_MB,
 } from "../formValidationSchemas";
+import {
+  deleteExamFileFromCloudinary,
+  generateExamUploadSignature,
+} from "../cloudinary";
+import { Prisma } from "@prisma/client";
+import { notifyNewExam } from "./notification.actions";
 
 // ============================================================
 // HELPERS
@@ -34,6 +42,45 @@ const getExamEndsAt = (submission: {
   );
 };
 
+const fillUnansweredQuestions = async (
+  tx: Prisma.TransactionClient,
+  submissionId: number,
+  examId: number,
+  schoolId: number
+) => {
+  const allQuestions = await tx.question.findMany({
+    where: { examId },
+    select: { id: true },
+  });
+
+  const existingAnswers = await tx.answer.findMany({
+    where: { submissionId },
+    select: { questionId: true },
+  });
+
+  const answeredQuestionIds = new Set(
+    existingAnswers.map((a) => a.questionId)
+  );
+
+  const unanswered = allQuestions.filter(
+    (q) => !answeredQuestionIds.has(q.id)
+  );
+
+  if (unanswered.length > 0) {
+    await tx.answer.createMany({
+      data: unanswered.map((q) => ({
+        submissionId,
+        questionId: q.id,
+        schoolId,
+        textAnswer: null,
+        fileUrl: null,
+        score: 0,
+        isDraft: false,
+      })),
+    });
+  }
+};
+
 const validateSubmissionOwnership = async (
   submissionId: number,
   studentId: string,
@@ -55,6 +102,7 @@ const applyAutoGrades = async (submissionId: number) => {
   });
 
   for (const answer of answers) {
+    if (answer.isOverridden) continue;
     if (
       answer.question.type === "TRUE_FALSE" ||
       answer.question.type === "MCQ"
@@ -85,6 +133,119 @@ const applyAutoGrades = async (submissionId: number) => {
   return { updatedAnswers, totalScore };
 };
 
+type ExamAccess = {
+  userId: string;
+  role: string;
+  schoolId: number;
+};
+
+const getExamClassAssignments = async (
+  access: ExamAccess,
+  academicYearId: number,
+  subjectId: number,
+  classIds: number[]
+) => {
+  const subject = await prisma.subject.findFirst({
+    where: { id: subjectId, schoolId: access.schoolId },
+    select: {
+      id: true,
+      gradeId: true,
+      teachers: { select: { id: true } },
+    },
+  });
+
+  if (!subject) {
+    return {
+      error: true as const,
+      message: "Selected subject was not found.",
+    };
+  }
+
+  const classes = await prisma.class.findMany({
+    where: { id: { in: classIds }, schoolId: access.schoolId },
+    select: {
+      id: true,
+      gradeId: true,
+      teachers: { select: { id: true } },
+    },
+  });
+
+  if (classes.length !== classIds.length) {
+    return {
+      error: true as const,
+      message: "One or more selected classes were not found.",
+    };
+  }
+
+  const lessons = await prisma.lesson.findMany({
+    where: {
+      academicYearId,
+      schoolId: access.schoolId,
+      subjectId,
+      classId: { in: classIds },
+      ...(access.role === "teacher" ? { teacherId: access.userId } : {}),
+    },
+    select: { id: true, classId: true, teacherId: true },
+  });
+
+  const lessonsByClass = new Map<number, (typeof lessons)[number]>();
+  for (const lesson of lessons) {
+    if (!lessonsByClass.has(lesson.classId)) {
+      lessonsByClass.set(lesson.classId, lesson);
+    }
+  }
+
+  const subjectTeacherIds = new Set(subject.teachers.map((teacher) => teacher.id));
+  const assignments = [];
+
+  for (const selectedClass of classes) {
+    const lesson = lessonsByClass.get(selectedClass.id);
+    const classTeacherIds = new Set(
+      selectedClass.teachers.map((teacher) => teacher.id)
+    );
+    const sharedTeacherId =
+      [...subjectTeacherIds].find((teacherId) => classTeacherIds.has(teacherId)) ??
+      lesson?.teacherId ??
+      null;
+
+    if (!lesson && selectedClass.gradeId !== subject.gradeId) {
+      return {
+        error: true as const,
+        message: "One or more classes do not match the selected subject grade.",
+      };
+    }
+
+    if (access.role === "teacher") {
+      const teacherHasSubjectGrade =
+        subjectTeacherIds.has(access.userId) &&
+        selectedClass.gradeId === subject.gradeId;
+      const teacherHasClassSubject =
+        subjectTeacherIds.has(access.userId) &&
+        classTeacherIds.has(access.userId);
+      const teacherHasLesson = lesson?.teacherId === access.userId;
+
+      if (!teacherHasSubjectGrade && !teacherHasClassSubject && !teacherHasLesson) {
+        return {
+          error: true as const,
+          message: "You are not assigned to teach this subject for one or more selected classes.",
+        };
+      }
+    }
+
+    assignments.push({
+      classId: selectedClass.id,
+      lessonId: lesson?.id ?? null,
+      teacherId: access.role === "teacher" ? access.userId : sharedTeacherId,
+    });
+  }
+
+  return { error: false as const, assignments };
+};
+
+const teacherExamAccessWhere = (teacherId: string) => ({
+  OR: [{ teacherId }, { lesson: { teacherId } }],
+});
+
 // ============================================================
 // 1. createExamWorkflow
 // ============================================================
@@ -99,48 +260,54 @@ export const createExamWorkflow = async (
   try {
     const academicYearId = await getRequiredAcademicYearId(access.schoolId);
 
-    // Verify the lessons
-    const lessons = await prisma.lesson.findMany({
-      where: {
-        academicYearId,
-        schoolId: access.schoolId,
-        subjectId: data.subjectId,
-        classId: { in: data.classIds },
-        ...(access.role === "teacher" ? { teacherId: access.userId } : {}),
-      },
-      select: { id: true, classId: true },
-    });
+    const assignmentResult = await getExamClassAssignments(
+      access,
+      academicYearId,
+      data.subjectId,
+      data.classIds
+    );
 
-    if (lessons.length === 0) {
+    if (assignmentResult.error) {
       return {
         success: false,
         error: true,
-        message: "No lessons found for the selected subject and classes.",
+        message: assignmentResult.message,
       };
     }
 
-    const matchedClassIds = new Set(lessons.map((l) => l.classId));
-    if (matchedClassIds.size !== data.classIds.length) {
-      return {
-        success: false,
-        error: true,
-        message: "One or more classes don't have a lesson for this subject.",
-      };
+    const selectedTeacherId =
+      access.role === "admin" && data.teacherId?.trim()
+        ? data.teacherId.trim()
+        : null;
+
+    if (selectedTeacherId) {
+      const teacherExists = await prisma.teacher.count({
+        where: { id: selectedTeacherId, schoolId: access.schoolId },
+      });
+
+      if (!teacherExists) {
+        return {
+          success: false,
+          error: true,
+          message: "Selected teacher was not found.",
+        };
+      }
     }
 
-    // Create an exam for each class with its questions
-    await prisma.$transaction(
-      lessons.map((lesson) =>
+    const createdExams = await prisma.$transaction(
+      assignmentResult.assignments.map((assignment) =>
         prisma.exam.create({
           data: {
             title: data.title,
             startTime: data.startTime,
             endTime: data.endTime,
-            lessonId: lesson.id,
-            classId: lesson.classId,
+            lessonId: assignment.lessonId,
+            teacherId: selectedTeacherId ?? assignment.teacherId,
+            classId: assignment.classId,
             subjectId: data.subjectId,
             academicYearId,
             schoolId: access.schoolId,
+            instructions: data.instructions,
             // Feature toggles
             enableTimer: data.enableTimer,
             duration: data.duration,
@@ -157,9 +324,12 @@ export const createExamWorkflow = async (
                   type: q.type,
                   points: q.points,
                   order: q.order,
-                  options: q.options ?? [],
+                  options: q.type === "FILE"
+                    ? (q.fileConfig ?? { allowedExtensions: [], minFileSizeMb: 0, maxFileSizeMb: EXAM_FILE_MAX_SIZE_MB, instructions: "" })
+                    : (q.options ?? []),
                   correctAnswer: q.correctAnswer ?? [],
                   allowMultiple: q.allowMultiple,
+                  textAnswer: q.textAnswer,
                   schoolId: access.schoolId,
                 })),
               },
@@ -169,6 +339,17 @@ export const createExamWorkflow = async (
       )
     );
 
+    for (const exam of createdExams) {
+      if (exam.classId) {
+        await notifyNewExam({
+          schoolId: access.schoolId,
+          examId: exam.id,
+          examTitle: data.title,
+          classId: exam.classId,
+        }).catch(() => {});
+      }
+    }
+
     return successResult(["/list/exams"]);
   } catch (err) {
     return errorResult(err);
@@ -195,7 +376,7 @@ export const updateExamWorkflow = async (
         id: examId,
         schoolId: access.schoolId,
         academicYearId,
-        ...(access.role === "teacher" ? { lesson: { teacherId: access.userId } } : {}),
+        ...(access.role === "teacher" ? teacherExamAccessWhere(access.userId) : {}),
       },
       select: {
         id: true,
@@ -214,32 +395,38 @@ export const updateExamWorkflow = async (
       };
     }
 
-    const lessons = await prisma.lesson.findMany({
-      where: {
-        academicYearId,
-        schoolId: access.schoolId,
-        subjectId: data.subjectId,
-        classId: { in: data.classIds },
-        ...(access.role === "teacher" ? { teacherId: access.userId } : {}),
-      },
-      select: { id: true, classId: true },
-    });
+    const assignmentResult = await getExamClassAssignments(
+      access,
+      academicYearId,
+      data.subjectId,
+      data.classIds
+    );
 
-    if (lessons.length === 0) {
+    if (assignmentResult.error) {
       return {
         success: false,
         error: true,
-        message: "No lessons found for the selected subject and classes.",
+        message: assignmentResult.message,
       };
     }
 
-    const matchedClassIds = new Set(lessons.map((l) => l.classId));
-    if (matchedClassIds.size !== data.classIds.length) {
-      return {
-        success: false,
-        error: true,
-        message: "One or more classes don't have a lesson for this subject.",
-      };
+    const selectedTeacherId =
+      access.role === "admin" && data.teacherId?.trim()
+        ? data.teacherId.trim()
+        : null;
+
+    if (selectedTeacherId) {
+      const teacherExists = await prisma.teacher.count({
+        where: { id: selectedTeacherId, schoolId: access.schoolId },
+      });
+
+      if (!teacherExists) {
+        return {
+          success: false,
+          error: true,
+          message: "Selected teacher was not found.",
+        };
+      }
     }
 
     const groupExams = await prisma.exam.findMany({
@@ -250,39 +437,89 @@ export const updateExamWorkflow = async (
         academicYearId,
         schoolId: access.schoolId,
         subjectId: existingExam.subjectId,
-        ...(access.role === "teacher" ? { lesson: { teacherId: access.userId } } : {}),
+        ...(access.role === "teacher" ? teacherExamAccessWhere(access.userId) : {}),
+      },
+      select: { id: true, classId: true, teacherId: true },
+    });
+
+    const selectedAssignmentsByClass = new Map<
+      number,
+      (typeof assignmentResult.assignments)[number]
+    >();
+    for (const assignment of assignmentResult.assignments) {
+      selectedAssignmentsByClass.set(assignment.classId, assignment);
+    }
+
+    const groupExamIds = groupExams.map((exam) => exam.id);
+    const submissionCount = await prisma.submission.count({
+      where: {
+        examId: { in: groupExamIds },
+        schoolId: access.schoolId,
       },
-      select: { id: true, classId: true },
     });
 
-    const selectedLessonsByClass = new Map<number, { id: number; classId: number }>();
-    for (const lesson of lessons) {
-      selectedLessonsByClass.set(lesson.classId, lesson);
+    const examStarted = new Date() > existingExam.startTime;
+    const isLocked = examStarted && submissionCount > 0;
+
+    if (isLocked) {
+      await prisma.$transaction(async (tx) => {
+        for (const exam of groupExams) {
+          await tx.exam.update({
+            where: { id: exam.id },
+            data: {
+              title: data.title,
+              startTime: data.startTime,
+              endTime: data.endTime,
+              instructions: data.instructions,
+              teacherId: selectedTeacherId ?? exam.teacherId,
+              enableTimer: data.enableTimer,
+              duration: data.duration,
+              enableNavigation: data.enableNavigation,
+              enableAutoSave: data.enableAutoSave,
+              autoSaveInterval: data.autoSaveInterval,
+              enableAutoSubmit: data.enableAutoSubmit,
+              questionsPerPage: data.questionsPerPage,
+            },
+          });
+        }
+      });
+
+      return successResult(["/list/exams"]);
     }
 
+    const createdExamsToNotify: { id: number; classId: number | null }[] = [];
+
     await prisma.$transaction(async (tx) => {
       for (const exam of groupExams) {
-        if (exam.classId && !selectedLessonsByClass.has(exam.classId)) {
+        if (exam.classId && !selectedAssignmentsByClass.has(exam.classId)) {
           await tx.question.deleteMany({ where: { examId: exam.id } });
           await tx.exam.delete({ where: { id: exam.id } });
         }
       }
 
-      for (const [classId, lesson] of selectedLessonsByClass) {
+      for (const [classId, assignment] of selectedAssignmentsByClass) {
         const existingClassExam = groupExams.find((exam) => exam.classId === classId);
 
         if (existingClassExam) {
+          const teacherId =
+            selectedTeacherId ??
+            existingClassExam.teacherId ??
+            assignment.teacherId ??
+            null;
+
           await tx.exam.update({
             where: { id: existingClassExam.id },
             data: {
               title: data.title,
               startTime: data.startTime,
               endTime: data.endTime,
-              lessonId: lesson.id,
+              lessonId: assignment.lessonId,
+              teacherId,
               classId,
               subjectId: data.subjectId,
               academicYearId,
               schoolId: access.schoolId,
+              instructions: data.instructions,
               enableTimer: data.enableTimer,
               duration: data.duration,
               enableNavigation: data.enableNavigation,
@@ -304,23 +541,28 @@ export const updateExamWorkflow = async (
               type: q.type,
               points: q.points,
               order: q.order,
-              options: q.options ?? [],
+              options: q.type === "FILE"
+                ? (q.fileConfig ?? { allowedExtensions: [], minFileSizeMb: 0, maxFileSizeMb: EXAM_FILE_MAX_SIZE_MB, instructions: "" })
+                : (q.options ?? []),
               correctAnswer: q.correctAnswer ?? [],
               allowMultiple: q.allowMultiple,
+              textAnswer: q.textAnswer,
               schoolId: access.schoolId,
             })),
           });
         } else {
-          await tx.exam.create({
+          const createdExam = await tx.exam.create({
             data: {
               title: data.title,
               startTime: data.startTime,
               endTime: data.endTime,
-              lessonId: lesson.id,
+              lessonId: assignment.lessonId,
+              teacherId: selectedTeacherId ?? assignment.teacherId,
               classId,
               subjectId: data.subjectId,
               academicYearId,
               schoolId: access.schoolId,
+              instructions: data.instructions,
               enableTimer: data.enableTimer,
               duration: data.duration,
               enableNavigation: data.enableNavigation,
@@ -335,19 +577,38 @@ export const updateExamWorkflow = async (
                     type: q.type,
                     points: q.points,
                     order: q.order,
-                    options: q.options ?? [],
+                    options: q.type === "FILE"
+                      ? (q.fileConfig ?? { allowedExtensions: [], minFileSizeMb: 0, maxFileSizeMb: EXAM_FILE_MAX_SIZE_MB, instructions: "" })
+                      : (q.options ?? []),
                     correctAnswer: q.correctAnswer ?? [],
                     allowMultiple: q.allowMultiple,
+                    textAnswer: q.textAnswer,
                     schoolId: access.schoolId,
                   })),
                 },
               },
             },
           });
+
+          createdExamsToNotify.push({
+            id: createdExam.id,
+            classId: createdExam.classId,
+          });
         }
       }
     });
 
+    for (const exam of createdExamsToNotify) {
+      if (exam.classId) {
+        await notifyNewExam({
+          schoolId: access.schoolId,
+          examId: exam.id,
+          examTitle: data.title,
+          classId: exam.classId,
+        }).catch(() => {});
+      }
+    }
+
     return successResult(["/list/exams"]);
   } catch (err) {
     return errorResult(err);
@@ -377,7 +638,6 @@ export const startExam = async (examId: number) => {
 
     const now = new Date();
     if (now < exam.startTime) return { error: "Exam has not started yet." };
-    if (now > exam.endTime) return { error: "Exam has already ended." };
 
     // Find an existing submission or create a new one
     let submission = await prisma.submission.findUnique({
@@ -392,6 +652,8 @@ export const startExam = async (examId: number) => {
     }
 
     if (!submission) {
+      if (now > exam.endTime) return { error: "Exam has already ended." };
+
       submission = await prisma.submission.create({
         data: {
           examId,
@@ -493,13 +755,14 @@ export const getExamPage = async (submissionId: number, page: number) => {
       where: { submissionId, questionId: { in: questionIds } },
     });
 
-    // Update currentPage
-    if (page > submission.currentPage) {
-      await prisma.submission.update({
-        where: { id: submissionId },
-        data: { currentPage: page },
-      });
-    }
+    // Update currentPage and lastSyncedAt
+    await prisma.submission.update({
+      where: { id: submissionId },
+      data: {
+        ...(page > submission.currentPage ? { currentPage: page } : {}),
+        lastSyncedAt: new Date(),
+      },
+    });
 
     return {
       questions,
@@ -586,15 +849,23 @@ export const saveAnswer = async (
       },
       update: {
         textAnswer: normalizedTextAnswer,
-        fileUrl: data.fileUrl,
-        savedAt: new Date(), // The server always sets the time
+        fileUrl: data.fileUrl ?? undefined,
+        filePublicId: data.filePublicId ?? undefined,
+        fileOriginalName: data.fileOriginalName ?? undefined,
+        fileMimeType: data.fileMimeType ?? undefined,
+        fileSizeBytes: data.fileSizeBytes ?? undefined,
+        savedAt: new Date(),
       },
       create: {
         submissionId: data.submissionId,
         questionId: data.questionId,
         schoolId: access.schoolId,
         textAnswer: normalizedTextAnswer,
-        fileUrl: data.fileUrl,
+        fileUrl: data.fileUrl ?? null,
+        filePublicId: data.filePublicId ?? null,
+        fileOriginalName: data.fileOriginalName ?? null,
+        fileMimeType: data.fileMimeType ?? null,
+        fileSizeBytes: data.fileSizeBytes ?? null,
         isDraft: true,
         savedAt: new Date(),
       },
@@ -640,6 +911,13 @@ export const submitExam = async (submissionId: number) => {
 
     // Submit
     await prisma.$transaction(async (tx) => {
+      await fillUnansweredQuestions(
+        tx,
+        submissionId,
+        submission.examId,
+        access.schoolId
+      );
+
       await tx.answer.updateMany({
         where: { submissionId, isDraft: true },
         data: { isDraft: false },
@@ -719,12 +997,25 @@ export const gradeAnswer = async (
       return { success: false, error: true, message: "Answer not found." };
     }
 
-    // Check that the teacher owns the exam
-    if (
-      access.role === "teacher" &&
-      answer.submission.exam.lesson.teacherId !== access.userId
-    ) {
-      return { success: false, error: true, message: "Not authorized." };
+    // Check that the teacher owns the exam or any exam in the group
+    if (access.role === "teacher") {
+      const exam = answer.submission.exam;
+      const isAuthorized = await prisma.exam.findFirst({
+        where: {
+          title: exam.title,
+          startTime: exam.startTime,
+          endTime: exam.endTime,
+          subjectId: exam.subjectId,
+          schoolId: access.schoolId,
+          academicYearId: exam.academicYearId,
+          ...teacherExamAccessWhere(access.userId),
+        },
+        select: { id: true },
+      });
+
+      if (!isAuthorized) {
+        return { success: false, error: true, message: "Not authorized." };
+      }
     }
 
     // Ensure the score does not exceed the points value
@@ -736,9 +1027,22 @@ export const gradeAnswer = async (
       };
     }
 
+    const isAutoGradedType =
+      answer.question.type === "MCQ" ||
+      answer.question.type === "TRUE_FALSE";
+
     await prisma.answer.update({
       where: { id: data.answerId },
-      data: { score: data.score },
+      data: {
+        score: data.score,
+        ...(isAutoGradedType ? { isOverridden: true } : {}),
+      },
+    });
+
+    // Mark as unpublished since the grade changed
+    await prisma.submission.update({
+      where: { id: answer.submissionId },
+      data: { gradePublished: false },
     });
 
     // Try to finalize grading if all answers are graded
@@ -766,7 +1070,7 @@ export const finalizeGrade = async (submissionId: number) => {
 
   await prisma.submission.update({
     where: { id: submissionId },
-    data: { totalScore, status: "GRADED" },
+    data: { totalScore, status: "GRADED", gradePublished: false },
   });
 };
 
@@ -799,7 +1103,8 @@ export const extendTime = async (
     // Check that the teacher owns the exam
     if (
       access.role === "teacher" &&
-      submission.exam.lesson.teacherId !== access.userId
+      submission.exam.teacherId !== access.userId &&
+      submission.exam.lesson?.teacherId !== access.userId
     ) {
       return { success: false, error: true, message: "Not authorized." };
     }
@@ -815,7 +1120,7 @@ export const extendTime = async (
     await prisma.submission.update({
       where: { id: data.submissionId },
       data: {
-        extraTime: { increment: data.extraMinutes },
+        extraTime: (submission.extraTime ?? 0) + data.extraMinutes,
         extendedBy: access.userId,
         extendedAt: new Date(),
       },
@@ -856,3 +1161,479 @@ export const recordDisconnection = async (
   }
 };
 
+// ============================================================
+// 11. approveAndFinalizeGrading
+// ============================================================
+
+export const approveAndFinalizeGrading = async (submissionId: number) => {
+  const access = await requireActionAccess(["admin", "teacher"]);
+  if ("error" in access) return access;
+
+  try {
+    const submission = await prisma.submission.findFirst({
+      where: { id: submissionId, schoolId: access.schoolId },
+      include: {
+        exam: {
+          include: { lesson: true },
+        },
+        answers: {
+          include: { question: true },
+        },
+      },
+    });
+
+    if (!submission) {
+      return { success: false, error: true, message: "Submission not found." };
+    }
+
+    // Check that the teacher owns the exam or any exam in the group
+    if (access.role === "teacher") {
+      const exam = submission.exam;
+      const isAuthorized = await prisma.exam.findFirst({
+        where: {
+          title: exam.title,
+          startTime: exam.startTime,
+          endTime: exam.endTime,
+          subjectId: exam.subjectId,
+          schoolId: access.schoolId,
+          academicYearId: exam.academicYearId,
+          ...teacherExamAccessWhere(access.userId),
+        },
+        select: { id: true },
+      });
+
+      if (!isAuthorized) {
+        return { success: false, error: true, message: "Not authorized." };
+      }
+    }
+
+    // Checks for any TEXT or FILE answers where score is null
+    const ungradedOpenEnded = submission.answers.filter(
+      (a) =>
+        (a.question.type === "TEXT" || a.question.type === "FILE") &&
+        a.score === null
+    );
+
+    if (ungradedOpenEnded.length > 0) {
+      return {
+        success: false,
+        warning: `There are ${ungradedOpenEnded.length} question(s) that haven't been graded yet.`,
+      };
+    }
+
+    // Sums up all answer scores and updates Submission.totalScore and Submission.status to GRADED
+    const totalScore = submission.answers.reduce(
+      (sum, a) => sum + (a.score ?? 0),
+      0
+    );
+
+    await prisma.submission.update({
+      where: { id: submissionId },
+      data: {
+        totalScore,
+        status: "GRADED",
+        gradePublished: false,
+      },
+    });
+
+    return successResult([`/list/exams/${submission.examId}/submissions`]);
+  } catch (err) {
+    return errorResult(err);
+  }
+};
+
+// ============================================================
+// 12. publishExamGrades
+// ============================================================
+
+export const publishExamGrades = async (examId: number) => {
+  const access = await requireActionAccess(["admin", "teacher"]);
+  if ("error" in access) return access;
+
+  try {
+    const exam = await prisma.exam.findFirst({
+      where: {
+        id: examId,
+        schoolId: access.schoolId,
+        ...(access.role === "teacher"
+          ? teacherExamAccessWhere(access.userId)
+          : {}),
+      },
+      select: {
+        id: true,
+        title: true,
+        startTime: true,
+        endTime: true,
+        subjectId: true,
+        academicYearId: true,
+      },
+    });
+
+    if (!exam) {
+      return { success: false, error: true, message: "Exam not found." };
+    }
+
+    const groupExams = await prisma.exam.findMany({
+      where: {
+        title: exam.title,
+        startTime: exam.startTime,
+        endTime: exam.endTime,
+        subjectId: exam.subjectId,
+        schoolId: access.schoolId,
+        academicYearId: exam.academicYearId,
+        ...(access.role === "teacher"
+          ? teacherExamAccessWhere(access.userId)
+          : {}),
+      },
+      select: { id: true },
+    });
+
+    const examIds = groupExams.map((item) => item.id);
+
+    const gradedSubmissions = await prisma.submission.findMany({
+      where: {
+        examId: { in: examIds },
+        schoolId: access.schoolId,
+        status: "GRADED",
+        totalScore: { not: null },
+      },
+      select: {
+        examId: true,
+        studentId: true,
+        totalScore: true,
+        exam: {
+          select: {
+            academicYearId: true,
+          },
+        },
+      },
+    });
+
+    await prisma.$transaction(async (tx) => {
+      for (const submission of gradedSubmissions) {
+        if (submission.totalScore === null) continue;
+
+        const existingResult = await tx.result.findFirst({
+          where: {
+            schoolId: access.schoolId,
+            examId: submission.examId,
+            studentId: submission.studentId,
+            academicYearId: submission.exam.academicYearId,
+          },
+          select: { id: true },
+        });
+
+        const resultData = {
+          score: Math.round(submission.totalScore),
+          schoolId: access.schoolId,
+          studentId: submission.studentId,
+          examId: submission.examId,
+          assignmentId: null,
+          academicYearId: submission.exam.academicYearId,
+        };
+
+        if (existingResult) {
+          await tx.result.update({
+            where: { id: existingResult.id },
+            data: resultData,
+          });
+        } else {
+          await tx.result.create({
+            data: resultData,
+          });
+        }
+      }
+
+      await tx.submission.updateMany({
+        where: {
+          examId: { in: examIds },
+          schoolId: access.schoolId,
+          status: "GRADED",
+        },
+        data: { gradePublished: true },
+      });
+    });
+
+    return successResult([
+      "/list/exams",
+      "/list/results",
+      `/list/exams/${examId}/submissions`,
+    ]);
+  } catch (err) {
+    return errorResult(err);
+  }
+};
+
+// ============================================================
+// 13. deleteExamFile
+// ============================================================
+
+export const deleteExamFile = async (answerId: number) => {
+  const access = await requireActionAccess(["student"]);
+  if ("error" in access) return { success: false, error: "Unauthorized" };
+
+  try {
+    const answer = await prisma.answer.findUnique({
+      where: { id: answerId },
+      include: {
+        submission: { select: { studentId: true, schoolId: true, status: true } },
+      },
+    });
+
+    if (!answer) {
+      return { success: false, error: "Answer not found." };
+    }
+
+    if (answer.submission.studentId !== access.userId) {
+      return { success: false, error: "Not authorized." };
+    }
+
+    if (answer.submission.status !== "IN_PROGRESS") {
+      return { success: false, error: "Exam already submitted." };
+    }
+
+    if (answer.filePublicId) {
+      await deleteExamFileFromCloudinary(answer.filePublicId);
+    }
+
+    await prisma.answer.update({
+      where: { id: answerId },
+      data: {
+        fileUrl: null,
+        filePublicId: null,
+        fileOriginalName: null,
+        fileMimeType: null,
+        fileSizeBytes: null,
+        savedAt: new Date(),
+      },
+    });
+
+    return { success: true };
+  } catch (err) {
+    console.error("[deleteExamFile]", err);
+    return { success: false, error: "Something went wrong." };
+  }
+};
+
+// ============================================================
+// 14. deleteOldExamFileOnReplace
+// ============================================================
+
+export const deleteOldExamFileOnReplace = async (
+  publicId: string,
+  submissionId: number,
+  questionId: number
+) => {
+  const access = await requireActionAccess(["student"]);
+  if ("error" in access) return { success: false, error: "Unauthorized" };
+
+  try {
+    const submission = await prisma.submission.findUnique({
+      where: { id: submissionId },
+      select: { studentId: true, status: true },
+    });
+
+    if (!submission) {
+      return { success: false, error: "Submission not found." };
+    }
+
+    if (submission.studentId !== access.userId) {
+      return { success: false, error: "Not authorized." };
+    }
+
+    if (submission.status !== "IN_PROGRESS") {
+      return { success: false, error: "Exam already submitted." };
+    }
+
+    await deleteExamFileFromCloudinary(publicId);
+
+    return { success: true };
+  } catch (err) {
+    console.error("[deleteOldExamFileOnReplace]", err);
+    return { success: false, error: "Something went wrong." };
+  }
+};
+
+// ============================================================
+// 15. autoSubmitExpiredSubmissions
+// ============================================================
+
+export const autoSubmitExpiredSubmissions = async (
+  examId?: number
+): Promise<{ processed: number; submitted: number }> => {
+  try {
+    const now = new Date();
+
+    const whereClause: Prisma.SubmissionWhereInput = {
+      status: "IN_PROGRESS",
+    };
+    if (examId !== undefined) {
+      whereClause.examId = examId;
+    }
+
+    const submissions = await prisma.submission.findMany({
+      where: whereClause,
+      include: {
+        exam: { select: { duration: true, endTime: true } },
+        answers: {
+          select: {
+            textAnswer: true,
+            fileUrl: true,
+            id: true,
+            filePublicId: true,
+          },
+        },
+      },
+    });
+
+    let submitted = 0;
+
+    for (const submission of submissions) {
+      const examEndsAt = new Date(
+        submission.startedAt.getTime() +
+        ((submission.exam.duration ?? 0) + (submission.extraTime ?? 0)) * 60000
+      );
+
+      if (now <= examEndsAt) continue;
+
+      const hasContent = submission.answers.some(
+        (a) => (a.textAnswer && a.textAnswer.trim().length > 0) || a.fileUrl
+      );
+
+      if (hasContent) {
+        await prisma.$transaction(async (tx) => {
+          await fillUnansweredQuestions(
+            tx,
+            submission.id,
+            submission.examId,
+            submission.schoolId
+          );
+
+          await tx.answer.updateMany({
+            where: { submissionId: submission.id, isDraft: true },
+            data: { isDraft: false },
+          });
+
+          await tx.submission.update({
+            where: { id: submission.id },
+            data: {
+              status: "SUBMITTED",
+              submittedAt: now,
+              autoSubmitted: true,
+            },
+          });
+        });
+
+        try {
+          await autoGrade(submission.id);
+        } catch {
+          // Non-critical — grade what we can
+        }
+
+        submitted++;
+      } else {
+        // Empty abandoned submission: clean up Cloudinary files
+        for (const answer of submission.answers) {
+          if (answer.filePublicId) {
+            await deleteExamFileFromCloudinary(answer.filePublicId).catch(() => {});
+          }
+        }
+
+        await prisma.$transaction(async (tx) => {
+          await tx.answer.updateMany({
+            where: { submissionId: submission.id },
+            data: {
+              fileUrl: null,
+              filePublicId: null,
+              fileOriginalName: null,
+              fileMimeType: null,
+              fileSizeBytes: null,
+            },
+          });
+
+          await fillUnansweredQuestions(
+            tx,
+            submission.id,
+            submission.examId,
+            submission.schoolId
+          );
+
+          await tx.submission.update({
+            where: { id: submission.id },
+            data: {
+              status: "SUBMITTED",
+              submittedAt: now,
+              autoSubmitted: true,
+              totalScore: 0,
+            },
+          });
+        });
+
+        submitted++;
+      }
+    }
+
+    return { processed: submissions.length, submitted };
+  } catch (err) {
+    console.error("[autoSubmitExpiredSubmissions]", err);
+    return { processed: 0, submitted: 0 };
+  }
+};
+
+// ============================================================
+// 15. getExamUploadSignature (server action)
+// ============================================================
+
+export const getExamUploadSignature = async (
+  examId: number,
+  submissionId: number,
+  questionId: number
+) => {
+  const access = await requireActionAccess(["student"]);
+  if ("error" in access) return { error: "Unauthorized" };
+
+  try {
+    const submission = await prisma.submission.findFirst({
+      where: {
+        id: submissionId,
+        studentId: access.userId,
+        schoolId: access.schoolId,
+        status: "IN_PROGRESS",
+      },
+      include: { exam: true },
+    });
+
+    if (!submission) {
+      return { error: "Submission not found or not in progress" };
+    }
+
+    if (submission.examId !== examId) {
+      return { error: "Submission does not belong to this exam" };
+    }
+
+    if (new Date() > getExamEndsAt(submission)) {
+      return { error: "Exam time has expired" };
+    }
+
+    const question = await prisma.question.findFirst({
+      where: { id: questionId, examId, type: "FILE" },
+    });
+
+    if (!question) {
+      return { error: "Question not found or not a FILE type" };
+    }
+
+    return generateExamUploadSignature(
+      access.schoolId,
+      examId,
+      submissionId,
+      questionId
+    );
+  } catch (err) {
+    console.error("[getExamUploadSignature]", err);
+    return { error: "Something went wrong." };
+  }
+};
+
+export const publishAllGrades = publishExamGrades;
+
diff --git a/src/lib/actions/feedback.ts b/src/lib/actions/feedback.ts
new file mode 100644
index 0000000..a677da2
--- /dev/null
+++ b/src/lib/actions/feedback.ts
@@ -0,0 +1,72 @@
+"use server";
+
+import prisma from "@/lib/prisma";
+import { getAuthUser } from "@/lib/auth";
+import { revalidatePath } from "next/cache";
+
+export async function createFeedback(formData: FormData) {
+  const user = await getAuthUser();
+
+  if (!user) {
+    return { success: false, error: true, message: "Unauthorized." };
+  }
+
+  const type = formData.get("type") as string;
+  const message = formData.get("message") as string;
+
+  if (!type || !message) {
+    return { success: false, error: true, message: "Please fill in all fields." };
+  }
+
+  const { schoolId, userId } = user;
+
+  await prisma.feedback.create({
+    data: {
+      type,
+      message,
+      schoolId,
+      userId,
+    },
+  });
+
+  revalidatePath("/feedback");
+
+  return {
+    success: true,
+    error: false,
+    message: "Feedback submitted successfully.",
+  };
+}
+
+export async function updateFeedbackStatus(formData: FormData) {
+  const user = await getAuthUser();
+
+  if (!user) {
+    throw new Error("Unauthorized");
+  }
+
+  const id = formData.get("id") as string;
+  const status = formData.get("status") as string;
+
+  if (!id || !status) {
+    throw new Error("Missing fields");
+  }
+
+  const allowedStatuses = ["pending", "reviewed", "resolved"];
+
+  if (!allowedStatuses.includes(status)) {
+    throw new Error("Invalid status");
+  }
+
+  await prisma.feedback.updateMany({
+    where: {
+      id,
+      schoolId: user.schoolId,
+    },
+    data: {
+      status,
+    },
+  });
+
+  revalidatePath("/admin/feedbacks");
+}
diff --git a/src/lib/actions/finalResult.actions.ts b/src/lib/actions/finalResult.actions.ts
new file mode 100644
index 0000000..93f299a
--- /dev/null
+++ b/src/lib/actions/finalResult.actions.ts
@@ -0,0 +1,137 @@
+"use server";
+
+import { revalidatePath } from "next/cache";
+import { PASSING_AVERAGE } from "@/lib/finalResults";
+import prisma from "@/lib/prisma";
+import {
+  type CurrentState,
+  errorResult,
+  requireActionAccess,
+} from "./helpers";
+
+type StudentFinalResultDelegate = {
+  upsert: (args: {
+    where: {
+      schoolId_studentId_academicYearId: {
+        schoolId: number;
+        studentId: string;
+        academicYearId: number;
+      };
+    };
+    create: {
+      schoolId: number;
+      studentId: string;
+      academicYearId: number;
+      averageScore: number;
+      assessmentCount: number;
+      status: "PASS" | "FAIL";
+    };
+    update: {
+      averageScore: number;
+      assessmentCount: number;
+      status: "PASS" | "FAIL";
+    };
+  }) => Promise<unknown>;
+};
+
+export const updateStudentFinalGrade = async (
+  currentState: CurrentState,
+  formData: FormData,
+) => {
+  const access = await requireActionAccess(["admin", "teacher"]);
+  if ("error" in access) return access;
+
+  const studentId = String(formData.get("studentId") ?? "");
+  const academicYearId = Number(formData.get("academicYearId"));
+  const averageScore = Number(formData.get("averageScore"));
+
+  if (!studentId || Number.isNaN(academicYearId) || academicYearId < 1) {
+    return {
+      success: false,
+      error: true,
+      message: "Invalid student or academic year.",
+    };
+  }
+
+  if (Number.isNaN(averageScore) || averageScore < 0 || averageScore > 100) {
+    return {
+      success: false,
+      error: true,
+      message: "Final grade must be between 0 and 100.",
+    };
+  }
+
+  try {
+    const student = await prisma.student.findFirst({
+      where: {
+        id: studentId,
+        schoolId: access.schoolId,
+      },
+      select: {
+        id: true,
+        class: {
+          select: {
+            supervisorId: true,
+          },
+        },
+      },
+    });
+
+    if (!student) {
+      return {
+        success: false,
+        error: true,
+        message: "Student was not found.",
+      };
+    }
+
+    if (access.role === "teacher" && student.class.supervisorId !== access.userId) {
+      return {
+        success: false,
+        error: true,
+        message: "You can only edit final grades for classes you supervise.",
+      };
+    }
+
+    const status = averageScore >= PASSING_AVERAGE ? "PASS" : "FAIL";
+    const roundedAverage = Math.round(averageScore * 100) / 100;
+
+    await (
+      prisma as unknown as {
+        studentFinalResult: StudentFinalResultDelegate;
+      }
+    ).studentFinalResult.upsert({
+      where: {
+        schoolId_studentId_academicYearId: {
+          schoolId: access.schoolId,
+          studentId,
+          academicYearId,
+        },
+      },
+      create: {
+        schoolId: access.schoolId,
+        studentId,
+        academicYearId,
+        averageScore: roundedAverage,
+        assessmentCount: 0,
+        status,
+      },
+      update: {
+        averageScore: roundedAverage,
+        assessmentCount: 0,
+        status,
+      },
+    });
+
+    revalidatePath("/list/final-results");
+    revalidatePath("/archive");
+
+    return {
+      success: true,
+      error: false,
+      message: "Final grade updated.",
+    };
+  } catch (err) {
+    return errorResult(err);
+  }
+};
diff --git a/src/lib/actions/grade.actions.ts b/src/lib/actions/grade.actions.ts
new file mode 100644
index 0000000..4fa4f82
--- /dev/null
+++ b/src/lib/actions/grade.actions.ts
@@ -0,0 +1,131 @@
+"use server";
+
+import { GradeSchema } from "../formValidationSchemas";
+import prisma from "../prisma";
+import {
+  CurrentState,
+  deleteLessonGraph,
+  errorResult,
+  requireActionAccess,
+  successResult,
+} from "./helpers";
+
+export const createGrade = async (
+  currentState: CurrentState,
+  data: GradeSchema,
+) => {
+  const access = await requireActionAccess(["admin"]);
+  if ("error" in access) return access;
+
+  try {
+    await prisma.grade.create({
+      data: {
+        level: data.level,
+        schoolId: access.schoolId,
+      },
+    });
+
+    return successResult(["/list/grades"]);
+  } catch (err) {
+    return errorResult(err);
+  }
+};
+
+export const deleteGrade = async (
+  currentState: CurrentState,
+  data: FormData,
+) => {
+  const access = await requireActionAccess(["admin"]);
+  if ("error" in access) return access;
+
+  const rawId = data.get("id");
+  const gradeId =
+    typeof rawId === "string" ? Number.parseInt(rawId, 10) : Number.NaN;
+
+  if (!gradeId || Number.isNaN(gradeId)) {
+    return { success: false, error: true, message: "Invalid grade id." };
+  }
+
+  try {
+    const [grade, studentsCount, historicalCount, classes] = await prisma.$transaction([
+      prisma.grade.findFirst({
+        where: { id: gradeId, schoolId: access.schoolId },
+        select: { id: true },
+      }),
+      prisma.student.count({
+        where: { gradeId, schoolId: access.schoolId },
+      }),
+      prisma.studentAcademicYear.count({
+        where: { gradeId, schoolId: access.schoolId },
+      }),
+      prisma.class.findMany({
+        where: { gradeId, schoolId: access.schoolId },
+        select: { id: true },
+      }),
+    ]);
+
+    if (!grade) {
+      return { success: false, error: true, message: "Grade not found." };
+    }
+
+    if (studentsCount > 0) {
+      return {
+        success: false,
+        error: true,
+        message:
+          "This grade still has students assigned. Move students to another grade before deleting it.",
+      };
+    }
+
+    if (historicalCount > 0) {
+      return {
+        success: false,
+        error: true,
+        message:
+          "This grade is still referenced in academic-year history and cannot be deleted.",
+      };
+    }
+
+    const classIds = classes.map((cls) => cls.id);
+
+    await prisma.$transaction(async (tx) => {
+      if (classIds.length > 0) {
+        const lessonIds = await tx.lesson.findMany({
+          where: { classId: { in: classIds }, schoolId: access.schoolId },
+          select: { id: true },
+        });
+
+        await deleteLessonGraph(
+          tx,
+          lessonIds.map((lesson) => lesson.id),
+        );
+
+        await tx.exam.updateMany({
+          where: { classId: { in: classIds }, schoolId: access.schoolId },
+          data: { classId: null },
+        });
+
+        await tx.assignment.updateMany({
+          where: { classId: { in: classIds }, schoolId: access.schoolId },
+          data: { classId: null },
+        });
+
+        await tx.class.deleteMany({
+          where: { id: { in: classIds }, schoolId: access.schoolId },
+        });
+      }
+
+      await tx.subject.deleteMany({
+        where: { gradeId, schoolId: access.schoolId },
+      });
+
+      await tx.grade.delete({
+        where: { id: gradeId },
+      });
+    });
+
+    return successResult(["/list/grades", "/list/classes", "/list/subjects"]);
+  } catch (err) {
+    return errorResult(err);
+  }
+};
diff --git a/src/lib/actions/helpers.ts b/src/lib/actions/helpers.ts
index 9ea4136..fcb6bf5 100644
--- a/src/lib/actions/helpers.ts
+++ b/src/lib/actions/helpers.ts
@@ -57,6 +57,15 @@ export const ensureAdminAccess = async () => {
     } as ActionResult;
   }
 
+  if (user.schoolStatus !== "ACTIVE") {
+    return {
+      success: false,
+      error: true,
+      message:
+        "Your school is not active yet. Please wait for super admin approval.",
+    } as ActionResult;
+  }
+
   return null;
 };
 
@@ -75,6 +84,17 @@ export const requireActionAccess = async (
     };
   }
 
+  if (user.role === "admin" && user.schoolStatus !== "ACTIVE") {
+    return {
+      success: false,
+      error: true,
+      message:
+        user.schoolStatus === "PAUSED"
+          ? `Your school account is paused. ${user.schoolPauseReason ? `Reason: ${user.schoolPauseReason}` : ""}`
+          : "Your school is pending approval by a super admin.",
+    };
+  }
+
   return {
     userId: user.userId,
     role: user.role,
@@ -205,42 +225,16 @@ export const deleteLessonGraph = async (
 ) => {
   if (lessonIds.length === 0) return;
 
-  const exams = await tx.exam.findMany({
+  await tx.exam.updateMany({
     where: { lessonId: { in: lessonIds } },
-    select: { id: true },
+    data: { lessonId: null },
   });
-  const assignments = await tx.assignment.findMany({
+
+  await tx.assignment.updateMany({
     where: { lessonId: { in: lessonIds } },
-    select: { id: true },
+    data: { lessonId: null },
   });
 
-  const examIds = exams.map((exam) => exam.id);
-  const assignmentIds = assignments.map((assignment) => assignment.id);
-
-  if (examIds.length > 0) {
-    await tx.result.deleteMany({
-      where: { examId: { in: examIds } },
-    });
-  }
-
-  if (assignmentIds.length > 0) {
-    await tx.result.deleteMany({
-      where: { assignmentId: { in: assignmentIds } },
-    });
-  }
-
-  if (examIds.length > 0) {
-    await tx.exam.deleteMany({
-      where: { id: { in: examIds } },
-    });
-  }
-
-  if (assignmentIds.length > 0) {
-    await tx.assignment.deleteMany({
-      where: { id: { in: assignmentIds } },
-    });
-  }
-
   await tx.lesson.deleteMany({
     where: { id: { in: lessonIds } },
   });
@@ -265,20 +259,21 @@ export const canTeacherManageResultAssessment = async ({
   if (role === "admin") return true;
   if (role !== "teacher" || !userId) return false;
 
-  const baseWhere = {
-    id: assessmentId,
-    lesson: { teacherId: userId },
-  };
-
   const checkers = {
     exam: () =>
       prisma.exam.findFirst({
-        where: baseWhere,
+        where: {
+          id: assessmentId,
+          OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }],
+        },
         select: { id: true },
       }),
     assignment: () =>
       prisma.assignment.findFirst({
-        where: baseWhere,
+        where: {
+          id: assessmentId,
+          OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }],
+        },
         select: { id: true },
       }),
   };
diff --git a/src/lib/actions/index.ts b/src/lib/actions/index.ts
index 2f2a033..f180171 100644
--- a/src/lib/actions/index.ts
+++ b/src/lib/actions/index.ts
@@ -3,6 +3,7 @@ export { createSubject, updateSubject, deleteSubject } from "./subject.actions";
 
 // Class actions
 export { createClass, updateClass, deleteClass } from "./class.actions";
+export { createGrade, deleteGrade } from "./grade.actions";
 
 // Teacher actions
 export { createTeacher, updateTeacher, deleteTeacher } from "./teacher.actions";
@@ -11,11 +12,15 @@ export { createTeacher, updateTeacher, deleteTeacher } from "./teacher.actions";
 export { createStudent, updateStudent, deleteStudent } from "./student.actions";
 export { promoteStudentsByPerformance } from "./studentPromotion.actions";
 
+// Profile image actions
+export { getProfileImageUploadSignature } from "./profileImage.actions";
+
 // Parent actions
 export { createParent, updateParent, deleteParent } from "./parent.actions";
 
 // Lesson actions
 export { saveLessonSchedule } from "./lesson.actions";
+
 // Exam actions
 export { createExam, updateExam, deleteExam } from "./exam.actions";
 
@@ -28,6 +33,7 @@ export {
 
 // Result actions
 export { createResult, updateResult, deleteResult } from "./result.actions";
+export { updateStudentFinalGrade } from "./finalResult.actions";
 
 // Attendance actions
 export { saveDailyAttendance } from "./attendance.actions";
@@ -46,7 +52,12 @@ export {
 export { createMessage, updateMessage, deleteMessage } from "./message.actions";
 
 // School settings actions
-export { updateSchoolSettings } from "./schoolSettings.actions";
+export {
+  updateSchoolSettings,
+  updateSchoolWorkingDays,
+  createSchoolDayException,
+  deleteSchoolDayException,
+} from "./schoolSettings.actions";
 
 // Academic year actions
 export { createAcademicYear, updateAcademicYear } from "./academicYear.actions";
@@ -62,4 +73,19 @@ export {
   gradeAnswer,
   extendTime,
   recordDisconnection,
+  approveAndFinalizeGrading,
+  publishAllGrades,
+  publishExamGrades,
 } from "./examWorkflow.actions";
+
+// Study material actions
+export * from "./studyMaterial.actions";
+
+// Assignment submission actions
+export * from "./submission.actions";
+
+// AI evaluation actions
+export * from "./aiEvaluation.actions";
+
+// Subject page settings actions
+export * from "./subjectPageSettings.actions";
diff --git a/src/lib/actions/lesson.actions.ts b/src/lib/actions/lesson.actions.ts
index 260febc..c76ce6f 100644
--- a/src/lib/actions/lesson.actions.ts
+++ b/src/lib/actions/lesson.actions.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import { notifyScheduleUpdated, notifyStudentsScheduleUpdated } from "./notification.actions";
 import { revalidatePath } from "next/cache";
 
 import {
@@ -171,6 +172,7 @@ export const saveLessonSchedule = async (
     const settings =
       (await getSchoolScheduleSettings(access.schoolId)) ??
       getDefaultSchoolScheduleSettings();
+    const allowedDays = new Set(settings.workingDays);
     const academicYearId = await getRequiredAcademicYearId(access.schoolId);
     const selectedEntries = toSelectedEntries(data.entries);
 
@@ -194,9 +196,13 @@ export const saveLessonSchedule = async (
       };
     }
 
+    const filteredSelectedEntries = selectedEntries.filter((entry) =>
+      allowedDays.has(entry.day),
+    );
+
     const conflict = await detectTeacherConflicts({
       classId: data.classId,
-      selectedEntries,
+      selectedEntries: filteredSelectedEntries,
       settings,
       academicYearId,
       schoolId: access.schoolId,
@@ -224,7 +230,7 @@ export const saveLessonSchedule = async (
       });
 
       const selectedByKey = new Map(
-        selectedEntries.map((entry) => [
+        filteredSelectedEntries.map((entry) => [
           scheduleKey(entry.day, entry.slot),
           entry,
         ]),
@@ -271,7 +277,7 @@ export const saveLessonSchedule = async (
         });
       }
 
-      for (const entry of selectedEntries) {
+      for (const entry of filteredSelectedEntries) {
         const key = scheduleKey(entry.day, entry.slot);
         const existing = existingByKey.get(key);
 
@@ -313,9 +319,21 @@ export const saveLessonSchedule = async (
       }
     });
 
+    // ✅ إشعار المعلمين المتأثرين بتغيير الجدول
+    await notifyScheduleUpdated({
+      schoolId: access.schoolId,
+      classId: data.classId,
+    }).catch(() => {});
+
+    // ✅ إشعار الطلاب والأولياء بتغيير الجدول
+    await notifyStudentsScheduleUpdated({
+      schoolId: access.schoolId,
+      classId: data.classId,
+    }).catch(() => {});
+
     revalidatePath("/list/lessons");
     return successResult(["/list/lessons"]);
   } catch (err) {
     return errorResult(err);
   }
-};
+};
\ No newline at end of file
diff --git a/src/lib/actions/message.actions.ts b/src/lib/actions/message.actions.ts
index e456640..bd0c0f4 100644
--- a/src/lib/actions/message.actions.ts
+++ b/src/lib/actions/message.actions.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import { notifyNewMessage, notifyParentsNewMessage } from "./notification.actions";
 import { MessageSchema } from "../formValidationSchemas";
 import prisma from "../prisma";
 import {
@@ -49,6 +50,43 @@ export const createMessage = async (
       },
     });
 
+    // ✅ إشعار المستقبلين بالرسالة الجديدة
+    const allStudentIds = data.studentIds ?? [];
+    const allTeacherIds = data.teacherIds ?? [];
+
+    // إشعار الطلاب
+    if (allStudentIds.length > 0) {
+      await notifyNewMessage({
+        schoolId: access.schoolId,
+        recipientIds: allStudentIds,
+        recipientRole: "student",
+        senderName: "Admin",
+        messageTitle: data.title,
+      }).catch(() => {});
+    }
+
+    // إشعار المعلمين
+    if (allTeacherIds.length > 0) {
+      await notifyNewMessage({
+        schoolId: access.schoolId,
+        recipientIds: allTeacherIds,
+        recipientRole: "teacher",
+        senderName: "Admin",
+        messageTitle: data.title,
+      }).catch(() => {});
+    }
+
+    // ✅ إشعار الأولياء بالرسالة الجديدة
+    const parentIds = data.parentIds ?? [];
+    if (parentIds.length > 0) {
+      await notifyParentsNewMessage({
+        schoolId: access.schoolId,
+        parentIds,
+        senderName: "Admin",
+        messageTitle: data.title,
+      }).catch(() => {});
+    }
+
     return successResult(["/list/messages"]);
   } catch (err) {
     return errorResult(err);
@@ -133,4 +171,4 @@ export const deleteMessage = async (
   } catch (err) {
     return errorResult(err);
   }
-};
+};
\ No newline at end of file
diff --git a/src/lib/actions/notification.actions.ts b/src/lib/actions/notification.actions.ts
new file mode 100644
index 0000000..0907a7c
--- /dev/null
+++ b/src/lib/actions/notification.actions.ts
@@ -0,0 +1,661 @@
+"use server";
+
+import prisma from "@/lib/prisma";
+
+type NotificationType =
+  | "NEW_ASSIGNMENT"
+  | "ASSIGNMENT_UPDATED"
+  | "ASSIGNMENT_SUBMITTED"
+  | "ASSIGNMENT_FEEDBACK"
+  | "NEW_EXAM"
+  | "GRADE_POSTED"
+  | "GRADE_UPDATED"
+  | "NEW_ANNOUNCEMENT"
+  | "NEW_EVENT"
+  | "SCHEDULE_UPDATED"
+  | "ATTENDANCE_SAVED"
+  | "SUPERVISOR_ASSIGNED"
+  | "NEW_MESSAGE";
+
+// ─── دالة مساعدة لإنشاء إشعار مع منع التكرار ────────────────────────────────
+async function createNotification({
+  schoolId,
+  userId,
+  userRole,
+  type,
+  title,
+  body,
+  link,
+  deduplicateMinutes = 60, // منع التكرار خلال ساعة
+}: {
+  schoolId: number;
+  userId: string;
+  userRole: string;
+  type: NotificationType;
+  title: string;
+  body: string;
+  link?: string;
+  deduplicateMinutes?: number;
+}) {
+  // التحقق من وجود إشعار مشابه خلال الفترة المحددة
+  const since = new Date(Date.now() - deduplicateMinutes * 60 * 1000);
+  const existing = await prisma.notification.findFirst({
+    where: {
+      userId,
+      type,
+      title,
+      createdAt: { gte: since },
+    },
+    select: { id: true },
+  });
+
+  if (existing) return; // تجاهل التكرار
+
+  await prisma.notification.create({
+    data: { schoolId, userId, userRole, type, title, body, link: link ?? null },
+  });
+}
+
+// ─── 1. واجب جديد → إشعار لكل طلاب الصف ─────────────────────────────────────
+export async function notifyNewAssignment({
+  schoolId,
+  assignmentId,
+  assignmentTitle,
+  classId,
+}: {
+  schoolId: number;
+  assignmentId: number;
+  assignmentTitle: string;
+  classId: number;
+}) {
+  const students = await prisma.student.findMany({
+    where: { schoolId, classId },
+    select: { id: true, parentId: true },
+  });
+
+  await prisma.notification.createMany({
+    data: students.map((s) => ({
+      schoolId,
+      userId:   s.id,
+      userRole: "student",
+      type:     "NEW_ASSIGNMENT" as NotificationType,
+      title:    "New Assignment",
+      body:     `A new assignment "${assignmentTitle}" has been posted.`,
+      link:     "/list/assignments",
+    })),
+  });
+
+  // ✅ إشعار الأولياء بالواجب الجديد
+  const parentIds = [...new Set(
+    students.map((s) => s.parentId).filter((id): id is string => !!id)
+  )];
+  if (parentIds.length > 0) {
+    await prisma.notification.createMany({
+      data: parentIds.map((id) => ({
+        schoolId,
+        userId:   id,
+        userRole: "parent",
+        type:     "NEW_ASSIGNMENT" as NotificationType,
+        title:    "New Assignment",
+        body:     `A new assignment "${assignmentTitle}" has been posted for your child.`,
+        link:     "/list/assignments",
+      })),
+    });
+  }
+}
+
+// ─── 2. تسليم واجب → إشعار للمعلم ───────────────────────────────────────────
+export async function notifyAssignmentSubmitted({
+  schoolId,
+  assignmentId,
+  assignmentTitle,
+  studentName,
+  teacherId,
+}: {
+  schoolId: number;
+  assignmentId: number;
+  assignmentTitle: string;
+  studentName: string;
+  teacherId: string;
+}) {
+  await createNotification({
+    schoolId,
+    userId:   teacherId,
+    userRole: "teacher",
+    type:     "ASSIGNMENT_SUBMITTED",
+    title:    "Assignment Submitted",
+    body:     `${studentName} submitted "${assignmentTitle}".`,
+    link:     "/list/assignments",
+  });
+}
+
+// ─── 3. Feedback من المعلم → إشعار للطالب ────────────────────────────────────
+export async function notifyAssignmentFeedback({
+  schoolId,
+  studentId,
+  assignmentTitle,
+  teacherName,
+}: {
+  schoolId: number;
+  studentId: string;
+  assignmentTitle: string;
+  teacherName: string;
+}) {
+  await createNotification({
+    schoolId,
+    userId:   studentId,
+    userRole: "student",
+    type:     "ASSIGNMENT_FEEDBACK",
+    title:    "Feedback Received",
+    body:     `${teacherName} left feedback on "${assignmentTitle}".`,
+    link:     "/list/assignments",
+  });
+}
+
+// ─── 4. اختبار جديد → إشعار لكل طلاب الصف ──────────────────────────────────
+export async function notifyNewExam({
+  schoolId,
+  examTitle,
+  classId,
+  examId,
+}: {
+  schoolId: number;
+  examTitle: string;
+  classId: number;
+  examId: number;
+}) {
+  const students = await prisma.student.findMany({
+    where: { schoolId, classId },
+    select: { id: true, parentId: true },
+  });
+
+  await prisma.notification.createMany({
+    data: students.map((s) => ({
+      schoolId,
+      userId:   s.id,
+      userRole: "student",
+      type:     "NEW_EXAM" as NotificationType,
+      title:    "New Exam",
+      body:     `A new exam "${examTitle}" has been scheduled.`,
+      link:     "/list/exams",
+    })),
+  });
+}
+
+// ─── 5. إعلان جديد → إشعار للجميع في المدرسة ────────────────────────────────
+export async function notifyNewAnnouncement({
+  schoolId,
+  announcementTitle,
+  targetClassIds,
+}: {
+  schoolId: number;
+  announcementTitle: string;
+  targetClassIds?: number[];
+}) {
+  const where = {
+    schoolId,
+    ...(targetClassIds?.length ? { classId: { in: targetClassIds } } : {}),
+  };
+
+  const [students, teachers] = await Promise.all([
+    prisma.student.findMany({ where, select: { id: true } }),
+    prisma.teacher.findMany({ where: { schoolId }, select: { id: true } }),
+  ]);
+
+  const notifs = [
+    ...students.map((s) => ({
+      schoolId,
+      userId:   s.id,
+      userRole: "student",
+      type:     "NEW_ANNOUNCEMENT" as NotificationType,
+      title:    "New Announcement",
+      body:     announcementTitle,
+      link:     null,
+    })),
+    ...teachers.map((t) => ({
+      schoolId,
+      userId:   t.id,
+      userRole: "teacher",
+      type:     "NEW_ANNOUNCEMENT" as NotificationType,
+      title:    "New Announcement",
+      body:     announcementTitle,
+      link:     null,
+    })),
+  ];
+
+  await prisma.notification.createMany({ data: notifs });
+}
+
+// ─── 6. رسالة جديدة → إشعار للمستقبل ────────────────────────────────────────
+export async function notifyNewMessage({
+  schoolId,
+  recipientIds,
+  recipientRole,
+  senderName,
+  messageTitle,
+}: {
+  schoolId: number;
+  recipientIds: string[];
+  recipientRole: string;
+  senderName: string;
+  messageTitle: string;
+}) {
+  await prisma.notification.createMany({
+    data: recipientIds.map((id) => ({
+      schoolId,
+      userId:   id,
+      userRole: recipientRole,
+      type:     "NEW_MESSAGE" as NotificationType,
+      title:    "New Message",
+      body:     `${senderName}: ${messageTitle}`,
+      link:     "/list/messages",
+    })),
+  });
+}
+
+// ─── 7. درجة جديدة → إشعار للطالب ───────────────────────────────────────────
+export async function notifyGradePosted({
+  schoolId,
+  studentId,
+  score,
+  assessmentTitle,
+  assessmentType,
+}: {
+  schoolId: number;
+  studentId: string;
+  score: number;
+  assessmentTitle: string;
+  assessmentType: "exam" | "assignment";
+}) {
+  await createNotification({
+    schoolId,
+    userId:   studentId,
+    userRole: "student",
+    type:     "GRADE_POSTED" as NotificationType,
+    title:    "Grade Posted",
+    body:     `Your ${assessmentType} "${assessmentTitle}" has been graded: ${score} points.`,
+    link:     "/list/results",
+  });
+}
+
+// ─── 8. حدث جديد → إشعار للطلاب والمعلمين ───────────────────────────────────
+export async function notifyNewEvent({
+  schoolId,
+  eventTitle,
+  targetClassIds,
+}: {
+  schoolId: number;
+  eventTitle: string;
+  targetClassIds?: number[];
+}) {
+  const where = {
+    schoolId,
+    ...(targetClassIds?.length ? { classId: { in: targetClassIds } } : {}),
+  };
+
+  const [students, teachers] = await Promise.all([
+    prisma.student.findMany({ where, select: { id: true } }),
+    prisma.teacher.findMany({ where: { schoolId }, select: { id: true } }),
+  ]);
+
+  const notifs = [
+    ...students.map((s) => ({
+      schoolId,
+      userId:   s.id,
+      userRole: "student",
+      type:     "NEW_EVENT" as NotificationType,
+      title:    "New Event",
+      body:     `A new event "${eventTitle}" has been added.`,
+      link:     "/list/events",
+    })),
+    ...teachers.map((t) => ({
+      schoolId,
+      userId:   t.id,
+      userRole: "teacher",
+      type:     "NEW_EVENT" as NotificationType,
+      title:    "New Event",
+      body:     `A new event "${eventTitle}" has been added.`,
+      link:     "/list/events",
+    })),
+  ];
+
+  if (notifs.length > 0) {
+    await prisma.notification.createMany({ data: notifs });
+  }
+}
+
+// ─── 9. حفظ الحضور → إشعار للأدمن ───────────────────────────────────────────
+export async function notifyAttendanceSaved({
+  schoolId,
+  scope,
+  date,
+  count,
+}: {
+  schoolId: number;
+  scope: "students" | "teachers";
+  date: string;
+  count: number;
+}) {
+  const admins = await prisma.admin.findMany({
+    where: { schoolId },
+    select: { id: true },
+  });
+
+  await prisma.notification.createMany({
+    data: admins.map((a) => ({
+      schoolId,
+      userId:   a.id,
+      userRole: "admin",
+      type:     "ATTENDANCE_SAVED" as NotificationType,
+      title:    "Attendance Saved",
+      body:     `Attendance for ${count} ${scope} on ${date} has been recorded.`,
+      link:     "/list/attendance",
+    })),
+  });
+}
+
+// ─── 10. تغيير الجدول → إشعار للمعلمين المتأثرين ────────────────────────────
+export async function notifyScheduleUpdated({
+  schoolId,
+  classId,
+}: {
+  schoolId: number;
+  classId: number;
+}) {
+  const lessons = await prisma.lesson.findMany({
+    where: { schoolId, classId },
+    select: { teacherId: true },
+  });
+
+  const teacherIds = [...new Set(lessons.map((l) => l.teacherId))];
+  if (teacherIds.length === 0) return;
+
+  const classInfo = await prisma.class.findUnique({
+    where: { id: classId },
+    select: { name: true },
+  });
+
+  await prisma.notification.createMany({
+    data: teacherIds.map((id) => ({
+      schoolId,
+      userId:   id,
+      userRole: "teacher",
+      type:     "SCHEDULE_UPDATED" as NotificationType,
+      title:    "Schedule Updated",
+      body:     `The schedule for class "${classInfo?.name ?? classId}" has been updated.`,
+      link:     "/list/lessons",
+    })),
+  });
+}
+
+// ─── Helper: جلب parentId من studentId ───────────────────────────────────────
+async function getParentId(studentId: string): Promise<string | null> {
+  const student = await prisma.student.findUnique({
+    where: { id: studentId },
+    select: { parentId: true },
+  });
+  return student?.parentId ?? null;
+}
+
+// ─── 11. درجة جديدة → إشعار للولي ───────────────────────────────────────────
+export async function notifyParentGradePosted({
+  schoolId,
+  studentId,
+  studentName,
+  score,
+  assessmentTitle,
+  assessmentType,
+}: {
+  schoolId: number;
+  studentId: string;
+  studentName: string;
+  score: number;
+  assessmentTitle: string;
+  assessmentType: "exam" | "assignment";
+}) {
+  const parentId = await getParentId(studentId);
+  if (!parentId) return;
+
+  await createNotification({
+    schoolId,
+    userId:   parentId,
+    userRole: "parent",
+    type:     "GRADE_POSTED" as NotificationType,
+    title:    "Grade Posted",
+    body:     `${studentName}'s ${assessmentType} "${assessmentTitle}" has been graded: ${score} points.`,
+    link:     "/list/results",
+  });
+}
+
+// ─── 12. إعلان جديد → إشعار للأولياء ────────────────────────────────────────
+export async function notifyParentsNewAnnouncement({
+  schoolId,
+  announcementTitle,
+  targetClassIds,
+}: {
+  schoolId: number;
+  announcementTitle: string;
+  targetClassIds?: number[];
+}) {
+  const where = {
+    schoolId,
+    ...(targetClassIds?.length ? { classId: { in: targetClassIds } } : {}),
+  };
+
+  const students = await prisma.student.findMany({
+    where,
+    select: { parentId: true },
+  });
+
+  const parentIds = [...new Set(
+    students.map((s) => s.parentId).filter((id): id is string => !!id)
+  )];
+
+  if (parentIds.length === 0) return;
+
+  await prisma.notification.createMany({
+    data: parentIds.map((id) => ({
+      schoolId,
+      userId:   id,
+      userRole: "parent",
+      type:     "NEW_ANNOUNCEMENT" as NotificationType,
+      title:    "New Announcement",
+      body:     announcementTitle,
+      link:     null,
+    })),
+  });
+}
+
+// ─── 13. حدث جديد → إشعار للأولياء ──────────────────────────────────────────
+export async function notifyParentsNewEvent({
+  schoolId,
+  eventTitle,
+  targetClassIds,
+}: {
+  schoolId: number;
+  eventTitle: string;
+  targetClassIds?: number[];
+}) {
+  const where = {
+    schoolId,
+    ...(targetClassIds?.length ? { classId: { in: targetClassIds } } : {}),
+  };
+
+  const students = await prisma.student.findMany({
+    where,
+    select: { parentId: true },
+  });
+
+  const parentIds = [...new Set(
+    students.map((s) => s.parentId).filter((id): id is string => !!id)
+  )];
+
+  if (parentIds.length === 0) return;
+
+  await prisma.notification.createMany({
+    data: parentIds.map((id) => ({
+      schoolId,
+      userId:   id,
+      userRole: "parent",
+      type:     "NEW_EVENT" as NotificationType,
+      title:    "New Event",
+      body:     `A new event "${eventTitle}" has been added.`,
+      link:     "/list/events",
+    })),
+  });
+}
+
+// ─── 14. رسالة جديدة → إشعار للأولياء ───────────────────────────────────────
+export async function notifyParentsNewMessage({
+  schoolId,
+  parentIds,
+  senderName,
+  messageTitle,
+}: {
+  schoolId: number;
+  parentIds: string[];
+  senderName: string;
+  messageTitle: string;
+}) {
+  if (parentIds.length === 0) return;
+
+  await prisma.notification.createMany({
+    data: parentIds.map((id) => ({
+      schoolId,
+      userId:   id,
+      userRole: "parent",
+      type:     "NEW_MESSAGE" as NotificationType,
+      title:    "New Message",
+      body:     `${senderName}: ${messageTitle}`,
+      link:     "/list/messages",
+    })),
+  });
+}
+
+// ─── 15. تعيين معلم مشرفاً على صف ────────────────────────────────────────────
+export async function notifyTeacherAssignedSupervisor({
+  schoolId,
+  teacherId,
+  className,
+}: {
+  schoolId: number;
+  teacherId: string;
+  className: string;
+}) {
+  await createNotification({
+    schoolId,
+    userId:   teacherId,
+    userRole: "teacher",
+    type:     "SUPERVISOR_ASSIGNED" as NotificationType,
+    title:    "Class Supervisor",
+    body:     `You have been assigned as supervisor for class "${className}".`,
+    link:     "/list/classes",
+  });
+}
+
+// ─── 16. تحديث واجب → إشعار للطلاب ──────────────────────────────────────────
+export async function notifyAssignmentUpdated({
+  schoolId,
+  assignmentTitle,
+  classId,
+}: {
+  schoolId: number;
+  assignmentTitle: string;
+  classId: number;
+}) {
+  const students = await prisma.student.findMany({
+    where: { schoolId, classId },
+    select: { id: true, parentId: true },
+  });
+
+  await prisma.notification.createMany({
+    data: students.map((s) => ({
+      schoolId,
+      userId:   s.id,
+      userRole: "student",
+      type:     "ASSIGNMENT_UPDATED" as NotificationType,
+      title:    "Assignment Updated",
+      body:     `The assignment "${assignmentTitle}" has been updated.`,
+      link:     "/list/assignments",
+    })),
+  });
+}
+
+// ─── 17. تحديث درجة → إشعار للطالب ──────────────────────────────────────────
+export async function notifyGradeUpdated({
+  schoolId,
+  studentId,
+  score,
+  assessmentTitle,
+  assessmentType,
+}: {
+  schoolId: number;
+  studentId: string;
+  score: number;
+  assessmentTitle: string;
+  assessmentType: "exam" | "assignment";
+}) {
+  await createNotification({
+    schoolId,
+    userId:   studentId,
+    userRole: "student",
+    type:     "GRADE_UPDATED" as NotificationType,
+    title:    "Grade Updated",
+    body:     `Your ${assessmentType} "${assessmentTitle}" grade has been updated to ${score} points.`,
+    link:     "/list/results",
+  });
+}
+// ─── 18. تغيير الجدول → إشعار للطلاب والأولياء ───────────────────────────────
+export async function notifyStudentsScheduleUpdated({
+  schoolId,
+  classId,
+}: {
+  schoolId: number;
+  classId: number;
+}) {
+  const classInfo = await prisma.class.findUnique({
+    where: { id: classId },
+    select: { name: true },
+  });
+
+  const students = await prisma.student.findMany({
+    where: { schoolId, classId },
+    select: { id: true, parentId: true },
+  });
+
+  if (students.length === 0) return;
+
+  const className = classInfo?.name ?? String(classId);
+
+  // إشعار الطلاب
+  await prisma.notification.createMany({
+    data: students.map((s) => ({
+      schoolId,
+      userId:   s.id,
+      userRole: "student",
+      type:     "SCHEDULE_UPDATED" as NotificationType,
+      title:    "Schedule Updated",
+      body:     `The schedule for your class "${className}" has been updated.`,
+      link:     "/list/lessons",
+    })),
+  });
+
+  // إشعار الأولياء
+  const parentIds = [...new Set(
+    students.map((s) => s.parentId).filter((id): id is string => !!id)
+  )];
+
+  if (parentIds.length > 0) {
+    await prisma.notification.createMany({
+      data: parentIds.map((id) => ({
+        schoolId,
+        userId:   id,
+        userRole: "parent",
+        type:     "SCHEDULE_UPDATED" as NotificationType,
+        title:    "Schedule Updated",
+        body:     `The schedule for class "${className}" has been updated.`,
+        link:     "/list/lessons",
+      })),
+    });
+  }
+}
\ No newline at end of file
diff --git a/src/lib/actions/parent.actions.ts b/src/lib/actions/parent.actions.ts
index a5da34d..9cf9aae 100644
--- a/src/lib/actions/parent.actions.ts
+++ b/src/lib/actions/parent.actions.ts
@@ -1,5 +1,5 @@
 "use server";
-
+import { sendAccountEmail } from "../mail";
 import { ParentSchema } from "../formValidationSchemas";
 import prisma from "../prisma";
 import { clerkClient } from "@clerk/nextjs/server";
@@ -37,23 +37,30 @@ export const createParent = async (
       publicMetadata: { role: "parent" },
     });
     createdUserId = user.id;
-
-    await prisma.parent.create({
-      data: {
-        id: createdUserId,
-        schoolId: access.schoolId,
-        username: data.username,
-        name: data.name,
-        email: data.email || null,
-        phone: data.phone,
-        address: data.address,
-        students: {
-          connect: data.students?.map((studentId: string) => ({
-            id: studentId,
-          })),
-        },
-      },
-    });
+await prisma.parent.create({
+  data: {
+    id: createdUserId,
+    schoolId: access.schoolId,
+    username: data.username,
+    name: data.name,
+    email: data.email || null,
+    phone: data.phone,
+    address: data.address,
+    students: {
+      connect: data.students?.map((studentId: string) => ({
+        id: studentId,
+      })),
+    },
+  },
+});
+
+if (data.email && data.password) {
+  await sendAccountEmail(
+    data.email,
+    data.username,
+    data.password
+  );
+}
 
     return successResult(["/list/parents"]);
   } catch (err) {
diff --git a/src/lib/actions/profileImage.actions.ts b/src/lib/actions/profileImage.actions.ts
new file mode 100644
index 0000000..86c960b
--- /dev/null
+++ b/src/lib/actions/profileImage.actions.ts
@@ -0,0 +1,16 @@
+"use server";
+
+import { generateProfileImageUploadSignature } from "../cloudinary";
+import { requireActionAccess } from "./helpers";
+
+export const getProfileImageUploadSignature = async () => {
+  const access = await requireActionAccess(["admin"]);
+  if ("error" in access) return { error: "Unauthorized" };
+
+  try {
+    return generateProfileImageUploadSignature(access.schoolId);
+  } catch (err) {
+    console.error("[getProfileImageUploadSignature]", err);
+    return { error: "Something went wrong." };
+  }
+};
diff --git a/src/lib/actions/result.actions.ts b/src/lib/actions/result.actions.ts
index 0a4e460..02682b1 100644
--- a/src/lib/actions/result.actions.ts
+++ b/src/lib/actions/result.actions.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import { notifyGradePosted, notifyParentGradePosted, notifyGradeUpdated } from "./notification.actions";
 import { ResultSchema } from "../formValidationSchemas";
 import prisma from "../prisma";
 import {
@@ -39,7 +40,7 @@ export const createResult = async (
       };
     }
 
-    await prisma.result.create({
+    const result = await prisma.result.create({
       data: {
         score: data.score,
         schoolId: access.schoolId,
@@ -49,8 +50,41 @@ export const createResult = async (
           data.assessmentType === "assignment" ? data.assessmentId : null,
         academicYearId,
       },
+      select: {
+        studentId: true,
+        schoolId: true,
+        score: true,
+        exam: { select: { title: true } },
+        assignment: { select: { title: true } },
+      },
     });
 
+    // ✅ إشعار الطالب بالدرجة
+    const assessmentTitle = result.exam?.title ?? result.assignment?.title ?? "Assessment";
+    await notifyGradePosted({
+      schoolId: access.schoolId,
+      studentId: result.studentId,
+      score: result.score,
+      assessmentTitle,
+      assessmentType: data.assessmentType,
+    }).catch(() => {});
+
+    // ✅ إشعار الولي بالدرجة
+    const studentData = await prisma.student.findUnique({
+      where: { id: result.studentId },
+      select: { name: true },
+    });
+    if (studentData) {
+      await notifyParentGradePosted({
+        schoolId: access.schoolId,
+        studentId: result.studentId,
+        studentName: studentData.name,
+        score: result.score,
+        assessmentTitle,
+        assessmentType: data.assessmentType,
+      }).catch(() => {});
+    }
+
     return successResult(["/list/results"]);
   } catch (err) {
     return errorResult(err);
@@ -97,8 +131,18 @@ export const updateResult = async (
     const existingResult = await prisma.result.findUnique({
       where: { id: data.id, schoolId: access.schoolId },
       include: {
-        exam: { select: { lesson: { select: { teacherId: true } } } },
-        assignment: { select: { lesson: { select: { teacherId: true } } } },
+        exam: {
+          select: {
+            teacherId: true,
+            lesson: { select: { teacherId: true } },
+          },
+        },
+        assignment: {
+          select: {
+            teacherId: true,
+            lesson: { select: { teacherId: true } },
+          },
+        },
       },
     });
 
@@ -112,8 +156,10 @@ export const updateResult = async (
 
     if (
       role === "teacher" &&
-      existingResult.exam?.lesson.teacherId !== userId &&
-      existingResult.assignment?.lesson.teacherId !== userId
+      existingResult.exam?.teacherId !== userId &&
+      existingResult.exam?.lesson?.teacherId !== userId &&
+      existingResult.assignment?.teacherId !== userId &&
+      existingResult.assignment?.lesson?.teacherId !== userId
     ) {
       return {
         success: false,
@@ -160,6 +206,42 @@ export const updateResult = async (
       return { success: false, error: true, message: "Result not found." };
     }
 
+    // ✅ إشعار الطالب والولي بتحديث الدرجة
+    const updatedResult = await prisma.result.findUnique({
+      where: { id: data.id },
+      select: {
+        studentId: true,
+        score: true,
+        exam: { select: { title: true } },
+        assignment: { select: { title: true } },
+      },
+    });
+    if (updatedResult) {
+      const assessmentTitle = updatedResult.exam?.title ?? updatedResult.assignment?.title ?? "Assessment";
+      await notifyGradeUpdated({
+        schoolId: access.schoolId,
+        studentId: updatedResult.studentId,
+        score: updatedResult.score,
+        assessmentTitle,
+        assessmentType: data.assessmentType,
+      }).catch(() => {});
+
+      const studentData = await prisma.student.findUnique({
+        where: { id: updatedResult.studentId },
+        select: { name: true },
+      });
+      if (studentData) {
+        await notifyParentGradePosted({
+          schoolId: access.schoolId,
+          studentId: updatedResult.studentId,
+          studentName: studentData.name,
+          score: updatedResult.score,
+          assessmentTitle,
+          assessmentType: data.assessmentType,
+        }).catch(() => {});
+      }
+    }
+
     return successResult(["/list/results"]);
   } catch (err) {
     return errorResult(err);
@@ -183,8 +265,18 @@ export const deleteResult = async (
     const existingResult = await prisma.result.findUnique({
       where: { id, schoolId: access.schoolId },
       include: {
-        exam: { select: { lesson: { select: { teacherId: true } } } },
-        assignment: { select: { lesson: { select: { teacherId: true } } } },
+        exam: {
+          select: {
+            teacherId: true,
+            lesson: { select: { teacherId: true } },
+          },
+        },
+        assignment: {
+          select: {
+            teacherId: true,
+            lesson: { select: { teacherId: true } },
+          },
+        },
       },
     });
 
@@ -206,8 +298,10 @@ export const deleteResult = async (
 
     if (
       role === "teacher" &&
-      existingResult.exam?.lesson.teacherId !== userId &&
-      existingResult.assignment?.lesson.teacherId !== userId
+      existingResult.exam?.teacherId !== userId &&
+      existingResult.exam?.lesson?.teacherId !== userId &&
+      existingResult.assignment?.teacherId !== userId &&
+      existingResult.assignment?.lesson?.teacherId !== userId
     ) {
       return {
         success: false,
@@ -227,4 +321,4 @@ export const deleteResult = async (
   } catch (err) {
     return errorResult(err);
   }
-};
+};
\ No newline at end of file
diff --git a/src/lib/actions/school.actions.ts b/src/lib/actions/school.actions.ts
new file mode 100644
index 0000000..b5fb7db
--- /dev/null
+++ b/src/lib/actions/school.actions.ts
@@ -0,0 +1,191 @@
+"use server";
+import { sendSchoolApprovalEmail } from "@/lib/mail";
+import { clerkClient } from "@clerk/nextjs/server";
+import { revalidatePath } from "next/cache";
+import prisma from "@/lib/prisma";
+import { getAuthUser } from "@/lib/auth";
+import { SchoolStatus } from "@prisma/client";
+import { getReadableActionErrorMessage } from "./helpers";
+
+const normalize = (value: FormDataEntryValue | null) =>
+  typeof value === "string" ? value.trim() : "";
+const generatePassword = () =>
+  Math.random().toString(36).slice(-8) + "A1!";
+export async function createSchoolSignup(formData: FormData) {
+  const schoolName = normalize(formData.get("schoolName"));
+  const contactEmail = normalize(formData.get("contactEmail"));
+  const contactPhone = normalize(formData.get("contactPhone"));
+  const website = normalize(formData.get("website"));
+  const country = normalize(formData.get("country"));
+  const city = normalize(formData.get("city"));
+  const address = normalize(formData.get("address"));
+  const registrationNumber = normalize(formData.get("registrationNumber"));
+  const adminName = normalize(formData.get("adminName"));
+  const adminUsername = normalize(formData.get("adminUsername"));
+  const adminEmail = normalize(formData.get("adminEmail"));
+  const adminPassword = normalize(formData.get("adminPassword"));
+
+  const missingFields: string[] = [];
+  if (!schoolName) missingFields.push("School Name");
+  if (!contactEmail) missingFields.push("School Email");
+  if (!contactPhone) missingFields.push("School Phone");
+  if (!country) missingFields.push("Country");
+  if (!city) missingFields.push("City");
+  if (!address) missingFields.push("School Address");
+  if (!adminName) missingFields.push("Admin Full Name");
+  if (!adminUsername) missingFields.push("Admin Username");
+  if (!adminPassword) missingFields.push("Admin Password");
+
+  if (missingFields.length > 0) {
+    return {
+      success: false,
+      message: `Missing required fields: ${missingFields.join(", ")}.`,
+    };
+  }
+
+  let createdClerkUserId: string | null = null;
+
+  try {
+    const existingSchool = await prisma.school.findUnique({
+      where: { name: schoolName },
+      select: { id: true },
+    });
+
+    if (existingSchool) {
+      return {
+        success: false,
+        message: "A school with this name already exists.",
+      };
+    }
+
+    const existingAdminUsername = await prisma.admin.findFirst({
+      where: { username: adminUsername },
+      select: { id: true },
+    });
+
+    if (existingAdminUsername) {
+      return {
+        success: false,
+        message: "This admin username is already in use.",
+      };
+    }
+
+    const user = await (await clerkClient()).users.createUser({
+      username: adminUsername,
+      password: adminPassword,
+      firstName: adminName,
+      ...(adminEmail ? { emailAddress: [adminEmail] } : {}),
+      publicMetadata: { role: "admin" },
+    });
+    createdClerkUserId = user.id;
+
+    await prisma.$transaction(async (tx) => {
+      const school = await tx.school.create({
+        data: {
+          name: schoolName,
+          contactEmail,
+          contactPhone,
+          website: website || null,
+          country,
+          city,
+          address,
+          registrationNumber: registrationNumber || null,
+          status: "PENDING",
+        },
+      });
+
+      await tx.admin.create({
+        data: {
+          id: user.id,
+          username: adminUsername,
+          schoolId: school.id,
+        },
+      });
+    });
+
+    return {
+      success: true,
+      message:
+        "School request submitted successfully. After approval, your admin can access the dashboard.",
+    };
+  } catch (error) {
+    if (createdClerkUserId) {
+      try {
+        await (await clerkClient()).users.deleteUser(createdClerkUserId);
+      } catch {
+        // Best-effort rollback.
+      }
+    }
+
+    return {
+      success: false,
+      message:
+        getReadableActionErrorMessage(error) ||
+        "Unable to submit school request. Please check your details and try again.",
+    };
+  }
+}
+
+export async function updateSchoolStatus(formData: FormData) {
+  const user = await getAuthUser();
+  if (!user || user.role !== "superAdmin") {
+    return;
+  }
+
+  const schoolIdRaw = normalize(formData.get("schoolId"));
+  const statusRaw = normalize(formData.get("status"));
+  const pauseReason = normalize(formData.get("pauseReason"));
+  const schoolId = Number.parseInt(schoolIdRaw, 10);
+
+  if (Number.isNaN(schoolId)) return;
+  if (!["PENDING", "ACTIVE", "PAUSED"].includes(statusRaw)) return;
+
+  const status = statusRaw as SchoolStatus;
+
+  const schoolBeforeUpdate = await prisma.school.findUnique({
+    where: { id: schoolId },
+    select: {
+      id: true,
+      name: true,
+      contactEmail: true,
+      status: true,
+    },
+  });
+
+  if (!schoolBeforeUpdate) return;
+
+  const updatedSchool = await prisma.school.update({
+    where: { id: schoolId },
+    data: {
+      status,
+      pauseReason: status === "PAUSED" ? pauseReason || "No reason provided." : null,
+    },
+  });
+
+  if (schoolBeforeUpdate.status === "PENDING" && status === "ACTIVE") {
+    const admin = await prisma.admin.findFirst({
+      where: { schoolId },
+      select: {
+        id: true,
+        username: true,
+      },
+    });
+
+    if (admin && schoolBeforeUpdate.contactEmail) {
+      const newPassword = generatePassword();
+
+      await (await clerkClient()).users.updateUser(admin.id, {
+        password: newPassword,
+      });
+
+      await sendSchoolApprovalEmail(
+        schoolBeforeUpdate.contactEmail,
+        updatedSchool.name,
+        admin.username,
+        newPassword
+      );
+    }
+  }
+
+  revalidatePath("/super-admin");
+}
\ No newline at end of file
diff --git a/src/lib/actions/schoolSettings.actions.ts b/src/lib/actions/schoolSettings.actions.ts
index 1b19e54..996aac1 100644
--- a/src/lib/actions/schoolSettings.actions.ts
+++ b/src/lib/actions/schoolSettings.actions.ts
@@ -3,11 +3,20 @@
 import { revalidatePath } from "next/cache";
 
 import {
+  schoolDayExceptionSchema,
   schoolSettingsSchema,
+  schoolWorkingDaysSchema,
+  type SchoolDayExceptionSchema,
   type SchoolSettingsSchema,
+  type SchoolWorkingDaysSchema,
 } from "../formValidationSchemas";
 import prisma from "../prisma";
-import { errorResult, requireActionAccess, successResult } from "./helpers";
+import {
+  errorResult,
+  parseNumericId,
+  requireActionAccess,
+  successResult,
+} from "./helpers";
 import type { CurrentState } from "./helpers";
 
 const parseTime = (value: string) => {
@@ -74,6 +83,7 @@ export const updateSchoolSettings = async (
               workDayEnd: Date;
               lessonDuration: number;
               lessonsPerDay: number;
+              workingDays: string[];
             };
           }) => Promise<unknown>;
         };
@@ -103,6 +113,14 @@ export const updateSchoolSettings = async (
         workDayEnd: toUtcTime(end.hour, end.minute),
         lessonDuration: lessonDurationMinutes,
         lessonsPerDay,
+        workingDays: [
+          "SATURDAY",
+          "SUNDAY",
+          "MONDAY",
+          "TUESDAY",
+          "WEDNESDAY",
+          "THURSDAY",
+        ],
       },
     });
 
@@ -114,3 +132,203 @@ export const updateSchoolSettings = async (
     return errorResult(err);
   }
 };
+
+export const updateSchoolWorkingDays = async (
+  currentState: CurrentState,
+  data: SchoolWorkingDaysSchema,
+) => {
+  const access = await requireActionAccess(["admin"]);
+  if ("error" in access) return access;
+
+  try {
+    const parsed = schoolWorkingDaysSchema.safeParse(data);
+    if (!parsed.success) {
+      return {
+        success: false,
+        error: true,
+        message: parsed.error.issues[0]?.message ?? "Invalid working days payload.",
+      };
+    }
+
+    const schoolSettingsDelegate = (
+      prisma as unknown as {
+        schoolSettings?: {
+          upsert: (args: {
+            where: { schoolId: number };
+            update: { workingDays: string[] };
+            create: {
+              schoolId: number;
+              workDayStart: Date;
+              workDayEnd: Date;
+              lessonDuration: number;
+              lessonsPerDay: number;
+              workingDays: string[];
+            };
+          }) => Promise<unknown>;
+        };
+      }
+    ).schoolSettings;
+
+    if (!schoolSettingsDelegate?.upsert) {
+      return {
+        success: false,
+        error: true,
+        message:
+          "School settings model is not available yet. Restart the dev server after running Prisma generate/migrations.",
+      };
+    }
+
+    await schoolSettingsDelegate.upsert({
+      where: { schoolId: access.schoolId },
+      update: {
+        workingDays: parsed.data.workingDays,
+      },
+      create: {
+        schoolId: access.schoolId,
+        workDayStart: toUtcTime(7, 0),
+        workDayEnd: toUtcTime(11, 30),
+        lessonDuration: 45,
+        lessonsPerDay: 6,
+        workingDays: parsed.data.workingDays,
+      },
+    });
+
+    return successResult(["/settings", "/list/lessons"]);
+  } catch (err) {
+    return errorResult(err);
+  }
+};
+
+export const createSchoolDayException = async (
+  currentState: CurrentState,
+  data: SchoolDayExceptionSchema,
+) => {
+  const access = await requireActionAccess(["admin"]);
+  if ("error" in access) return access;
+
+  try {
+    const parsed = schoolDayExceptionSchema.safeParse(data);
+    if (!parsed.success) {
+      return {
+        success: false,
+        error: true,
+        message: parsed.error.issues[0]?.message ?? "Invalid exception payload.",
+      };
+    }
+
+    const date = new Date(`${parsed.data.date}T00:00:00.000Z`);
+
+    const dayExceptionDelegate = (
+      prisma as unknown as {
+        schoolDayException?: {
+          upsert: (args: {
+            where: {
+              schoolId_date: {
+                schoolId: number;
+                date: Date;
+              };
+            };
+            update: {
+              type: "HOLIDAY" | "OFF_DAY" | "WORKING_OVERRIDE";
+              name: string | null;
+              notes: string | null;
+            };
+            create: {
+              schoolId: number;
+              date: Date;
+              type: "HOLIDAY" | "OFF_DAY" | "WORKING_OVERRIDE";
+              name: string | null;
+              notes: string | null;
+            };
+          }) => Promise<unknown>;
+        };
+      }
+    ).schoolDayException;
+
+    if (!dayExceptionDelegate?.upsert) {
+      return {
+        success: false,
+        error: true,
+        message:
+          "School day exceptions model is not available yet. Restart the dev server after running Prisma generate/migrations.",
+      };
+    }
+
+    await dayExceptionDelegate.upsert({
+      where: {
+        schoolId_date: {
+          schoolId: access.schoolId,
+          date,
+        },
+      },
+      update: {
+        type: parsed.data.type,
+        name: parsed.data.name || null,
+        notes: parsed.data.notes || null,
+      },
+      create: {
+        schoolId: access.schoolId,
+        date,
+        type: parsed.data.type,
+        name: parsed.data.name || null,
+        notes: parsed.data.notes || null,
+      },
+    });
+
+    return successResult(["/settings", "/list/lessons", "/list/events"]);
+  } catch (err) {
+    return errorResult(err);
+  }
+};
+
+export const deleteSchoolDayException = async (
+  currentState: CurrentState,
+  formData: FormData,
+) => {
+  const access = await requireActionAccess(["admin"]);
+  if ("error" in access) return access;
+
+  const id = parseNumericId(formData.get("id"));
+  if (!id) {
+    return {
+      success: false,
+      error: true,
+      message: "Invalid exception id.",
+    };
+  }
+
+  try {
+    const dayExceptionDelegate = (
+      prisma as unknown as {
+        schoolDayException?: {
+          deleteMany: (args: {
+            where: {
+              id: number;
+              schoolId: number;
+            };
+          }) => Promise<unknown>;
+        };
+      }
+    ).schoolDayException;
+
+    if (!dayExceptionDelegate?.deleteMany) {
+      return {
+        success: false,
+        error: true,
+        message:
+          "School day exceptions model is not available yet. Restart the dev server after running Prisma generate/migrations.",
+      };
+    }
+
+    await dayExceptionDelegate.deleteMany({
+      where: {
+        id,
+        schoolId: access.schoolId,
+      },
+    });
+
+    return successResult(["/settings", "/list/lessons", "/list/events"]);
+  } catch (err) {
+    return errorResult(err);
+  }
+};
diff --git a/src/lib/actions/student.actions.ts b/src/lib/actions/student.actions.ts
index b310127..3aaecdf 100644
--- a/src/lib/actions/student.actions.ts
+++ b/src/lib/actions/student.actions.ts
@@ -1,5 +1,5 @@
 "use server";
-
+import { sendAccountEmail } from "../mail";
 import { StudentSchema } from "../formValidationSchemas";
 import prisma from "../prisma";
 import { clerkClient } from "@clerk/nextjs/server";
@@ -43,34 +43,42 @@ export const createStudent = async (
       firstName: data.name,
       publicMetadata: { role: "student" },
     });
+
     createdUserId = user.id;
 
-    await prisma.student.create({
-      data: {
-        id: createdUserId,
-        schoolId: access.schoolId,
-        username: data.username,
-        name: data.name,
-        email: data.email || null,
-        phone: data.phone || null,
-        address: data.address,
-        img: data.img || null,
-        bloodType: data.bloodType,
-        sex: data.sex,
-        birthday: data.birthday,
-        gradeId: data.gradeId,
-        classId: data.classId,
-        ...(data.parentId
-          ? { parent: { connect: { id: data.parentId } } }
-          : {}),
-        status: data.status || "ACTIVE",
-      } as any,
-    });
+   await prisma.student.create({
+  data: {
+    id: createdUserId,
+    schoolId: access.schoolId,
+    username: data.username,
+    name: data.name,
+    email: data.email || null,
+    phone: data.phone || null,
+    address: data.address,
+    img: data.img || null,
+    bloodType: data.bloodType,
+    sex: data.sex,
+    birthday: data.birthday,
+    gradeId: data.gradeId,
+    classId: data.classId,
+    parentId: data.parentId || null,
+    status: data.status || "ACTIVE",
+  } as any,
+});
+
+if (data.email && data.password) {
+  await sendAccountEmail(
+    data.email,
+    data.username,
+    data.password
+  );
+}
 
     // Automatically enroll student in the current academic year
     const currentAcademicYearId = await getRequiredAcademicYearId(
       access.schoolId,
     );
+
     if (currentAcademicYearId) {
       await prisma.studentAcademicYear.create({
         data: {
@@ -93,6 +101,7 @@ export const createStudent = async (
         // Best-effort rollback for partial user creation.
       }
     }
+
     return errorResult(err);
   }
 };
@@ -105,7 +114,11 @@ export const updateStudent = async (
   if ("error" in access) return access;
 
   if (!data.id) {
-    return { success: false, error: true, message: "Student id is required." };
+    return {
+      success: false,
+      error: true,
+      message: "Student id is required.",
+    };
   }
 
   try {
@@ -137,8 +150,13 @@ export const updateStudent = async (
         ...(data.status && { status: data.status }),
       },
     });
+
     if (updated.count === 0) {
-      return { success: false, error: true, message: "Student not found." };
+      return {
+        success: false,
+        error: true,
+        message: "Student not found.",
+      };
     }
 
     return successResult(["/list/students"]);
@@ -156,8 +174,14 @@ export const deleteStudent = async (
 
   const id = data.get("id") as string;
   const deleteParent = data.get("deleteParent") === "true";
-  if (!id)
-    return { success: false, error: true, message: "Invalid student id." };
+
+  if (!id) {
+    return {
+      success: false,
+      error: true,
+      message: "Invalid student id.",
+    };
+  }
 
   try {
     const student = await prisma.student.findUnique({
@@ -186,13 +210,18 @@ export const deleteStudent = async (
       await tx.studentAcademicYear.deleteMany({
         where: { studentId: id, schoolId: access.schoolId },
       });
+
       await tx.attendance.deleteMany({
         where: { studentId: id, schoolId: access.schoolId },
       });
+
       await tx.result.deleteMany({
         where: { studentId: id, schoolId: access.schoolId },
       });
-      await tx.student.deleteMany({ where: { id, schoolId: access.schoolId } });
+
+      await tx.student.deleteMany({
+        where: { id, schoolId: access.schoolId },
+      });
 
       if (deleteParent && parentId) {
         await tx.parent.deleteMany({
@@ -223,4 +252,4 @@ export const deleteStudent = async (
   } catch (err) {
     return errorResult(err);
   }
-};
+};
\ No newline at end of file
diff --git a/src/lib/actions/studentPromotion.actions.ts b/src/lib/actions/studentPromotion.actions.ts
index ecfbea2..2d42d11 100644
--- a/src/lib/actions/studentPromotion.actions.ts
+++ b/src/lib/actions/studentPromotion.actions.ts
@@ -1,6 +1,11 @@
 "use server";
 
 import prisma from "../prisma";
+import {
+  calculateFinalResultSummary,
+  PASSING_AVERAGE,
+  type AssessmentScore,
+} from "../finalResults";
 import {
   errorResult,
   requireActionAccess,
@@ -65,7 +70,6 @@ export const promoteStudentsByPerformance = async (
                 where: {
                   academicYearId: number;
                   schoolId?: number;
-                  performanceStatus: { in: Array<"PASS" | "FAIL"> };
                   student: {
                     schoolId?: number;
                     status: { in: Array<"ACTIVE" | "REPEATED"> };
@@ -93,7 +97,6 @@ export const promoteStudentsByPerformance = async (
           where: {
             academicYearId: currentAcademicYearId,
             schoolId: access.schoolId,
-            performanceStatus: { in: ["PASS", "FAIL"] },
             student: {
               schoolId: access.schoolId,
               status: { in: ["ACTIVE", "REPEATED"] },
@@ -117,7 +120,7 @@ export const promoteStudentsByPerformance = async (
         success: false,
         error: true,
         message:
-          "No active or repeated students with PASS/FAIL performance status were found for the current academic year.",
+          "No active or repeated students were found for the current academic year.",
         promotedCount: 0,
         graduatedCount: 0,
         repeatedCount: 0,
@@ -141,15 +144,119 @@ export const promoteStudentsByPerformance = async (
     let repeatedCount = 0;
     let skippedCount = 0;
 
+    const studentIds = enrollments.map((enrollment) => enrollment.studentId);
+    const results =
+      studentIds.length > 0
+        ? await prisma.result.findMany({
+            where: {
+              schoolId: access.schoolId,
+              academicYearId: currentAcademicYearId,
+              studentId: { in: studentIds },
+            },
+            select: {
+              studentId: true,
+              score: true,
+              assignment: {
+                select: {
+                  maxScore: true,
+                },
+              },
+              exam: {
+                select: {
+                  questions: {
+                    select: {
+                      points: true,
+                    },
+                  },
+                },
+              },
+            },
+          })
+        : [];
+
+    const scoresByStudent = new Map<string, AssessmentScore[]>();
+
+    for (const result of results) {
+      const examMaxScore =
+        result.exam?.questions.reduce(
+          (sum, question) => sum + question.points,
+          0,
+        ) ?? null;
+      const maxScore = result.assignment?.maxScore ?? examMaxScore;
+      const existingScores = scoresByStudent.get(result.studentId) ?? [];
+
+      existingScores.push({
+        score: result.score,
+        maxScore,
+      });
+      scoresByStudent.set(result.studentId, existingScores);
+    }
+
     await prisma.$transaction(async (tx) => {
       for (const enrollment of enrollments) {
         const currentGrade = gradeById.get(enrollment.gradeId);
-        if (!currentGrade || !enrollment.performanceStatus) {
+        const finalSummary = calculateFinalResultSummary(
+          scoresByStudent.get(enrollment.studentId) ?? [],
+        );
+
+        if (!currentGrade || finalSummary.averageScore === null) {
           skippedCount += 1;
           continue;
         }
 
-        if (enrollment.performanceStatus === "FAIL") {
+        await (
+          tx as unknown as {
+            studentFinalResult: {
+              upsert: (args: {
+                where: {
+                  schoolId_studentId_academicYearId: {
+                    schoolId: number;
+                    studentId: string;
+                    academicYearId: number;
+                  };
+                };
+                create: {
+                  schoolId: number;
+                  studentId: string;
+                  academicYearId: number;
+                  averageScore: number;
+                  assessmentCount: number;
+                  status: "PASS" | "FAIL";
+                };
+                update: {
+                  averageScore: number;
+                  assessmentCount: number;
+                  status: "PASS" | "FAIL";
+                };
+              }) => Promise<unknown>;
+            };
+          }
+        ).studentFinalResult.upsert({
+          where: {
+            schoolId_studentId_academicYearId: {
+              schoolId: access.schoolId,
+              studentId: enrollment.studentId,
+              academicYearId: currentAcademicYearId,
+            },
+          },
+          create: {
+            schoolId: access.schoolId,
+            studentId: enrollment.studentId,
+            academicYearId: currentAcademicYearId,
+            averageScore: finalSummary.averageScore,
+            assessmentCount: finalSummary.assessmentCount,
+            status:
+              finalSummary.averageScore >= PASSING_AVERAGE ? "PASS" : "FAIL",
+          },
+          update: {
+            averageScore: finalSummary.averageScore,
+            assessmentCount: finalSummary.assessmentCount,
+            status:
+              finalSummary.averageScore >= PASSING_AVERAGE ? "PASS" : "FAIL",
+          },
+        });
+
+        if (finalSummary.averageScore < PASSING_AVERAGE) {
           await tx.student.update({
             where: { id: enrollment.studentId },
             data: {
diff --git a/src/lib/actions/studyMaterial.actions.ts b/src/lib/actions/studyMaterial.actions.ts
new file mode 100644
index 0000000..2d903d8
--- /dev/null
+++ b/src/lib/actions/studyMaterial.actions.ts
@@ -0,0 +1,214 @@
+"use server";
+
+import { auth } from "@clerk/nextjs/server";
+import { revalidatePath } from "next/cache";
+import { z } from "zod";
+import prisma from "@/lib/prisma";
+import { v2 as cloudinary } from "cloudinary";
+import { getCurrentAcademicYearOrNull } from "@/lib/academicYears";
+
+// ─── Cloudinary config ────────────────────────────────────────────────────────
+cloudinary.config({
+  cloud_name: process.env.NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME!,
+  api_key: process.env.CLOUDINARY_API_KEY!,
+  api_secret: process.env.CLOUDINARY_API_SECRET!,
+});
+
+// ─── Types ────────────────────────────────────────────────────────────────────
+export type StudyMaterialState = {
+  success: boolean;
+  error: boolean;
+  message: string;
+};
+
+// ─── Validation ───────────────────────────────────────────────────────────────
+const CreateSchema = z.object({
+  title: z.string().min(1, "Title is required"),
+  description: z.string().optional(),
+  subjectId: z.coerce.number().int().positive(),
+});
+
+// ─── Upload to Cloudinary ─────────────────────────────────────────────────────
+async function uploadToCloudinary(file: File) {
+  const bytes = await file.arrayBuffer();
+  const buffer = Buffer.from(bytes);
+  const base64 = buffer.toString("base64");
+  const dataUri = `data:${file.type};base64,${base64}`;
+
+  const ext = file.name.split(".").pop()?.toLowerCase() ?? "bin";
+  const isImage = ["jpg", "jpeg", "png", "gif", "webp"].includes(ext);
+
+  const result = await cloudinary.uploader.upload(dataUri, {
+    folder: "study-materials",
+    resource_type: isImage ? "image" : "raw",
+    use_filename: true,
+    unique_filename: true,
+  });
+
+  return {
+    url: result.secure_url,
+    fileType: ext,
+    fileName: file.name,
+  };
+}
+
+// ─── Create StudyMaterial ─────────────────────────────────────────────────────
+export async function createStudyMaterial(
+  _state: StudyMaterialState,
+  formData: FormData
+): Promise<StudyMaterialState> {
+  try {
+    const { userId, sessionClaims } = await auth();
+    const role = (sessionClaims?.metadata as { role?: string })?.role;
+
+    if (!userId || (role !== "teacher" && role !== "admin")) {
+      return { success: false, error: true, message: "Unauthorized" };
+    }
+
+    // الأدمن: نجلب أول معلم مرتبط بالمادة لنسب الملف إليه
+    // المعلم: نستخدم بياناته مباشرة
+    let teacherId: string;
+    let schoolId: number;
+    let academicYearId: number;
+
+    if (role === "admin") {
+      const admin = await prisma.admin.findUnique({
+        where: { id: userId },
+        select: { schoolId: true },
+      });
+      if (!admin) return { success: false, error: true, message: "Admin not found" };
+      schoolId = admin.schoolId;
+      const subjectIdRaw = Number(formData.get("subjectId"));
+      const subjectWithTeacher = await prisma.subject.findFirst({
+        where: { id: subjectIdRaw, schoolId },
+        select: { teachers: { select: { id: true }, take: 1 } },
+      });
+      if (!subjectWithTeacher?.teachers[0]) {
+        return { success: false, error: true, message: "No teacher assigned to this subject" };
+      }
+      teacherId = subjectWithTeacher.teachers[0].id;
+      const academicYear = await getCurrentAcademicYearOrNull(schoolId);
+      if (!academicYear) return { success: false, error: true, message: "No current academic year found" };
+      academicYearId = academicYear.id;
+    } else {
+      const teacher = await prisma.teacher.findUnique({
+        where: { id: userId },
+        select: { id: true, schoolId: true },
+      });
+      if (!teacher) return { success: false, error: true, message: "Teacher not found" };
+      teacherId = teacher.id;
+      schoolId = teacher.schoolId;
+      const academicYear = await getCurrentAcademicYearOrNull(schoolId);
+      if (!academicYear) return { success: false, error: true, message: "No current academic year found" };
+      academicYearId = academicYear.id;
+    }
+
+    // التحقق من البيانات النصية
+    const parsed = CreateSchema.safeParse({
+      title: formData.get("title"),
+      description: formData.get("description"),
+      subjectId: formData.get("subjectId"),
+    });
+    if (!parsed.success) {
+      return {
+        success: false,
+        error: true,
+        message: parsed.error.errors.map((e) => e.message).join(", "),
+      };
+    }
+
+    // التحقق أن المادة الدراسية تنتمي لنفس المدرسة
+    const subject = await prisma.subject.findFirst({
+      where: { id: parsed.data.subjectId, schoolId },
+    });
+    if (!subject) {
+      return { success: false, error: true, message: "Subject not found" };
+    }
+
+    // التحقق من الملف
+    const file = formData.get("file") as File | null;
+    if (!file || file.size === 0) {
+      return { success: false, error: true, message: "File is required" };
+    }
+    if (file.size > 20 * 1024 * 1024) {
+      return { success: false, error: true, message: "File must be under 20MB" };
+    }
+
+    // رفع إلى Cloudinary
+    const { url, fileType, fileName } = await uploadToCloudinary(file);
+
+    // حفظ في قاعدة البيانات
+    await prisma.studyMaterial.create({
+      data: {
+        title: parsed.data.title,
+        description: parsed.data.description ?? null,
+        fileUrl: url,
+        fileName,
+        fileType,
+        subjectId: parsed.data.subjectId,
+        teacherId,
+        schoolId,
+        academicYearId,
+      },
+    });
+
+    revalidatePath(`/list/subjects/${parsed.data.subjectId}`);
+    return { success: true, error: false, message: "Material uploaded successfully!" };
+  } catch (err) {
+    console.error("[createStudyMaterial]", err);
+    return { success: false, error: true, message: "Something went wrong" };
+  }
+}
+
+// ─── Delete StudyMaterial ─────────────────────────────────────────────────────
+export async function deleteStudyMaterial(
+  _state: StudyMaterialState,
+  formData: FormData
+): Promise<StudyMaterialState> {
+  try {
+    const { userId, sessionClaims } = await auth();
+    const role = (sessionClaims?.metadata as { role?: string })?.role;
+
+    if (!userId || (role !== "teacher" && role !== "admin")) {
+      return { success: false, error: true, message: "Unauthorized" };
+    }
+
+    const id = Number(formData.get("id"));
+    const subjectId = Number(formData.get("subjectId"));
+
+    const material = await prisma.studyMaterial.findUnique({ where: { id } });
+    if (!material) {
+      return { success: false, error: true, message: "Material not found" };
+    }
+
+    // المعلم: فقط صاحب الملف يحذفه — الأدمن: يحذف أي ملف
+    if (role === "teacher" && material.teacherId !== userId) {
+      return { success: false, error: true, message: "Forbidden" };
+    }
+
+    // حذف من Cloudinary (non-blocking)
+    try {
+      const urlParts = material.fileUrl.split("/");
+      const fileWithExt = urlParts[urlParts.length - 1];
+      const fileNameOnly = fileWithExt.split(".")[0];
+      const folder = urlParts[urlParts.length - 2];
+      const publicId = `${folder}/${fileNameOnly}`;
+      const isImage = ["jpg", "jpeg", "png", "gif", "webp"].includes(
+        material.fileType
+      );
+      await cloudinary.uploader.destroy(publicId, {
+        resource_type: isImage ? "image" : "raw",
+      });
+    } catch {
+      console.warn("[deleteStudyMaterial] Cloudinary delete failed");
+    }
+
+    await prisma.studyMaterial.delete({ where: { id } });
+
+    revalidatePath(`/list/subjects/${subjectId}`);
+    return { success: true, error: false, message: "Material deleted successfully!" };
+  } catch (err) {
+    console.error("[deleteStudyMaterial]", err);
+    return { success: false, error: true, message: "Something went wrong" };
+  }
+}
\ No newline at end of file
diff --git a/src/lib/actions/subjectPageSettings.actions.ts b/src/lib/actions/subjectPageSettings.actions.ts
new file mode 100644
index 0000000..472a603
--- /dev/null
+++ b/src/lib/actions/subjectPageSettings.actions.ts
@@ -0,0 +1,294 @@
+"use server";
+
+import { auth } from "@clerk/nextjs/server";
+import { revalidatePath } from "next/cache";
+import { z } from "zod";
+import prisma from "@/lib/prisma";
+import { v2 as cloudinary } from "cloudinary";
+
+// ─── Cloudinary config ────────────────────────────────────────────────────────
+cloudinary.config({
+  cloud_name: process.env.NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME!,
+  api_key: process.env.CLOUDINARY_API_KEY!,
+  api_secret: process.env.CLOUDINARY_API_SECRET!,
+});
+
+// ─── Types ────────────────────────────────────────────────────────────────────
+export type SubjectPageSettingsState = {
+  success: boolean;
+  error: boolean;
+  message: string;
+};
+
+export type SubjectPageSettingsData = {
+  announcement: string | null;
+  description: string | null;
+  bannerImage: string | null;
+  sectionsOrder: string[];
+};
+
+// ─── Validation ───────────────────────────────────────────────────────────────
+const VALID_SECTIONS = ["assignments", "exams", "materials"] as const;
+const ANNOUNCEMENT_MAX_WORDS = 12;
+const DESCRIPTION_MAX_WORDS = 24;
+const countWords = (value?: string | null) =>
+  (value ?? "").trim().split(/\s+/).filter(Boolean).length;
+
+const SaveSchema = z.object({
+  subjectId: z.coerce.number().int().positive(),
+  announcement: z
+    .string()
+    .max(500)
+    .optional()
+    .nullable()
+    .refine(
+      (value) => countWords(value) <= ANNOUNCEMENT_MAX_WORDS,
+      `Announcement must be ${ANNOUNCEMENT_MAX_WORDS} words or fewer.`,
+    ),
+  description: z
+    .string()
+    .max(1000)
+    .optional()
+    .nullable()
+    .refine(
+      (value) => countWords(value) <= DESCRIPTION_MAX_WORDS,
+      `Description must be ${DESCRIPTION_MAX_WORDS} words or fewer.`,
+    ),
+  sectionsOrder: z
+    .array(z.enum(VALID_SECTIONS))
+    .length(3)
+    .default(["assignments", "exams", "materials"]),
+  bannerHeight: z.enum(["sm", "md", "lg"]).default("md"),
+});
+
+// ─── Get Settings ─────────────────────────────────────────────────────────────
+export async function getSubjectPageSettings(
+  subjectId: number,
+  teacherId: string
+): Promise<SubjectPageSettingsData | null> {
+  try {
+    const settings = await prisma.subjectPageSettings.findUnique({
+      where: { subjectId_teacherId: { subjectId, teacherId } },
+      select: {
+        announcement: true,
+        description: true,
+        bannerImage: true,
+        sectionsOrder: true,
+      },
+    });
+
+    if (!settings) return null;
+
+    return {
+      announcement: settings.announcement,
+      description: settings.description,
+      bannerImage: settings.bannerImage,
+      sectionsOrder: (settings.sectionsOrder as string[]) ?? [
+        "assignments",
+        "exams",
+        "materials",
+      ],
+    };
+  } catch (err) {
+    console.error("[getSubjectPageSettings]", err);
+    return null;
+  }
+}
+
+// ─── Save Settings ────────────────────────────────────────────────────────────
+export async function saveSubjectPageSettings(
+  _state: SubjectPageSettingsState,
+  formData: FormData
+): Promise<SubjectPageSettingsState> {
+  try {
+    const { userId, sessionClaims } = await auth();
+    const role = (sessionClaims?.metadata as { role?: string })?.role;
+
+    if (!userId || (role !== "teacher" && role !== "admin")) {
+      return { success: false, error: true, message: "Unauthorized" };
+    }
+
+    // الأدمن: نجلب المعلم المرتبط بالمادة (أول معلم)
+    // المعلم: نستخدم userId مباشرة
+    let teacherId = userId;
+    let schoolId: number;
+
+    if (role === "admin") {
+      const admin = await prisma.admin.findUnique({
+        where: { id: userId },
+        select: { schoolId: true },
+      });
+      if (!admin) return { success: false, error: true, message: "Admin not found" };
+      schoolId = admin.schoolId;
+      // الأدمن يحفظ الإعدادات باسم أول معلم في المادة
+      const subjectIdRaw = Number(formData.get("subjectId"));
+      const firstTeacher = await prisma.subject.findFirst({
+        where: { id: subjectIdRaw, schoolId },
+        select: { teachers: { select: { id: true }, take: 1 } },
+      });
+      if (!firstTeacher?.teachers[0]) {
+        return { success: false, error: true, message: "No teacher assigned to this subject" };
+      }
+      teacherId = firstTeacher.teachers[0].id;
+    } else {
+      const teacher = await prisma.teacher.findUnique({
+        where: { id: userId },
+        select: { schoolId: true },
+      });
+      if (!teacher) return { success: false, error: true, message: "Teacher not found" };
+      schoolId = teacher.schoolId;
+    }
+
+    // Parse sectionsOrder from JSON string
+    let sectionsOrderRaw: string[] = ["assignments", "exams", "materials"];
+    try {
+      const raw = formData.get("sectionsOrder");
+      if (raw) sectionsOrderRaw = JSON.parse(raw as string);
+    } catch {
+      // keep default
+    }
+
+    const parsed = SaveSchema.safeParse({
+      subjectId: formData.get("subjectId"),
+      announcement: formData.get("announcement") || null,
+      description: formData.get("description") || null,
+      sectionsOrder: sectionsOrderRaw,
+      bannerHeight: (formData.get("bannerHeight") as string) || "md",
+    });
+
+    if (!parsed.success) {
+      return {
+        success: false,
+        error: true,
+        message: parsed.error.errors.map((e) => e.message).join(", "),
+      };
+    }
+
+    // التحقق أن المادة تنتمي لنفس المدرسة
+    const subject = await prisma.subject.findFirst({
+      where: {
+        id: parsed.data.subjectId,
+        schoolId,
+        ...(role === "teacher" ? { teachers: { some: { id: teacherId } } } : {}),
+      },
+    });
+    if (!subject) {
+      return { success: false, error: true, message: "Subject not found or unauthorized" };
+    }
+
+    // Handle banner image upload (optional)
+    let bannerImageUrl: string | undefined = undefined;
+    const bannerFile = formData.get("bannerImage") as File | null;
+
+    if (bannerFile && bannerFile.size > 0) {
+      if (bannerFile.size > 5 * 1024 * 1024) {
+        return {
+          success: false,
+          error: true,
+          message: "Banner image must be under 5MB",
+        };
+      }
+
+      const bytes = await bannerFile.arrayBuffer();
+      const buffer = Buffer.from(bytes);
+      const base64 = buffer.toString("base64");
+      const dataUri = `data:${bannerFile.type};base64,${base64}`;
+
+      const result = await cloudinary.uploader.upload(dataUri, {
+        folder: "subject-banners",
+        resource_type: "image",
+        use_filename: true,
+        unique_filename: true,
+      });
+      bannerImageUrl = result.secure_url;
+    }
+
+    // Handle banner removal
+    const removeBanner = formData.get("removeBanner") === "true";
+
+    // Upsert settings
+    await prisma.subjectPageSettings.upsert({
+      where: {
+        subjectId_teacherId: {
+          subjectId: parsed.data.subjectId,
+          teacherId,
+        },
+      },
+      create: {
+        subjectId: parsed.data.subjectId,
+        teacherId,
+        schoolId,
+        announcement: parsed.data.announcement ?? null,
+        description: parsed.data.description ?? null,
+        bannerImage: bannerImageUrl ?? null,
+        bannerHeight: parsed.data.bannerHeight,
+        sectionsOrder: parsed.data.sectionsOrder,
+      },
+      update: {
+        announcement: parsed.data.announcement ?? null,
+        description: parsed.data.description ?? null,
+        bannerHeight: parsed.data.bannerHeight,
+        sectionsOrder: parsed.data.sectionsOrder,
+        ...(bannerImageUrl ? { bannerImage: bannerImageUrl } : {}),
+        ...(removeBanner ? { bannerImage: null } : {}),
+      },
+    });
+
+    revalidatePath(`/list/subjects/${parsed.data.subjectId}`);
+    return {
+      success: true,
+      error: false,
+      message: "Page settings saved successfully!",
+    };
+  } catch (err) {
+    console.error("[saveSubjectPageSettings]", err);
+    return { success: false, error: true, message: "Something went wrong" };
+  }
+}
+
+// ─── Delete Banner Image ──────────────────────────────────────────────────────
+export async function deleteSubjectBanner(
+  subjectId: number
+): Promise<SubjectPageSettingsState> {
+  try {
+    const { userId, sessionClaims } = await auth();
+    const role = (sessionClaims?.metadata as { role?: string })?.role;
+
+    if (!userId || role !== "teacher") {
+      return { success: false, error: true, message: "Unauthorized" };
+    }
+
+    const settings = await prisma.subjectPageSettings.findUnique({
+      where: { subjectId_teacherId: { subjectId, teacherId: userId } },
+    });
+
+    if (!settings) {
+      return { success: false, error: true, message: "Settings not found" };
+    }
+
+    // Delete from Cloudinary (non-blocking)
+    if (settings.bannerImage) {
+      try {
+        const urlParts = settings.bannerImage.split("/");
+        const fileWithExt = urlParts[urlParts.length - 1];
+        const fileNameOnly = fileWithExt.split(".")[0];
+        const folder = urlParts[urlParts.length - 2];
+        const publicId = `${folder}/${fileNameOnly}`;
+        await cloudinary.uploader.destroy(publicId, { resource_type: "image" });
+      } catch {
+        console.warn("[deleteSubjectBanner] Cloudinary delete failed");
+      }
+    }
+
+    await prisma.subjectPageSettings.update({
+      where: { subjectId_teacherId: { subjectId, teacherId: userId } },
+      data: { bannerImage: null },
+    });
+
+    revalidatePath(`/list/subjects/${subjectId}`);
+    return { success: true, error: false, message: "Banner removed successfully!" };
+  } catch (err) {
+    console.error("[deleteSubjectBanner]", err);
+    return { success: false, error: true, message: "Something went wrong" };
+  }
+}
diff --git a/src/lib/actions/submission.actions.ts b/src/lib/actions/submission.actions.ts
new file mode 100644
index 0000000..b1b4040
--- /dev/null
+++ b/src/lib/actions/submission.actions.ts
@@ -0,0 +1,723 @@
+// src/lib/actions/submission.actions.ts
+"use server";
+
+import { auth } from "@clerk/nextjs/server";
+import type { Prisma } from "@prisma/client";
+import { revalidatePath } from "next/cache";
+import prisma from "@/lib/prisma";
+import { v2 as cloudinary } from "cloudinary";
+import { getCurrentAcademicYearOrNull } from "@/lib/academicYears";
+import {
+  errorResult,
+  requireActionAccess,
+  successResult,
+} from "@/lib/actions/helpers";
+import {
+  notifyAssignmentSubmitted,
+  notifyAssignmentFeedback,
+} from "./notification.actions";
+
+cloudinary.config({
+  cloud_name: process.env.NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME!,
+  api_key: process.env.CLOUDINARY_API_KEY!,
+  api_secret: process.env.CLOUDINARY_API_SECRET!,
+});
+
+export type SubmissionState = {
+  success: boolean;
+  error: boolean;
+  message: string;
+};
+
+type SubmissionManagerAccess = {
+  userId: string;
+  role: string;
+  schoolId: number;
+};
+
+type AssignmentSubmissionBulkFilters = {
+  classId?: number | null;
+  search?: string | null;
+};
+
+const assignmentManagerWhere = (access: SubmissionManagerAccess) =>
+  access.role === "teacher"
+    ? { OR: [{ teacherId: access.userId }, { lesson: { teacherId: access.userId } }] }
+    : {};
+
+const findManagedSubmission = async (
+  submissionId: number,
+  access: SubmissionManagerAccess,
+) => {
+  return prisma.assignmentSubmission.findFirst({
+    where: {
+      id: submissionId,
+      schoolId: access.schoolId,
+      assignment: assignmentManagerWhere(access),
+    },
+    select: {
+      id: true,
+      assignmentId: true,
+      schoolId: true,
+      assignment: {
+        select: {
+          id: true,
+          academicYearId: true,
+          maxScore: true,
+        },
+      },
+    },
+  });
+};
+
+const getManagedAssignmentGroup = async (
+  assignmentId: number,
+  access: SubmissionManagerAccess,
+) => {
+  const assignment = await prisma.assignment.findFirst({
+    where: {
+      id: assignmentId,
+      schoolId: access.schoolId,
+      ...assignmentManagerWhere(access),
+    },
+    select: {
+      id: true,
+      title: true,
+      startDate: true,
+      endDate: true,
+      subjectId: true,
+      academicYearId: true,
+      maxScore: true,
+    },
+  });
+
+  if (!assignment) return null;
+
+  const groupAssignments = await prisma.assignment.findMany({
+    where: {
+      title: assignment.title,
+      startDate: assignment.startDate,
+      endDate: assignment.endDate,
+      subjectId: assignment.subjectId,
+      schoolId: access.schoolId,
+      academicYearId: assignment.academicYearId,
+      ...assignmentManagerWhere(access),
+    },
+    select: { id: true, classId: true },
+  });
+
+  return {
+    assignment,
+    groupAssignments,
+    assignmentIds: groupAssignments.map((item) => item.id),
+  };
+};
+
+const getBulkAssignmentSubmissions = async (
+  assignmentId: number,
+  access: SubmissionManagerAccess,
+  filters: AssignmentSubmissionBulkFilters = {},
+) => {
+  const group = await getManagedAssignmentGroup(assignmentId, access);
+  if (!group) return null;
+
+  const search = filters.search?.trim();
+
+  const submissions = await prisma.assignmentSubmission.findMany({
+    where: {
+      assignmentId: { in: group.assignmentIds },
+      schoolId: access.schoolId,
+      ...(filters.classId
+        ? { assignment: { classId: filters.classId } }
+        : {}),
+      ...(search
+        ? {
+            student: {
+              OR: [
+                { name: { contains: search, mode: "insensitive" } },
+                { username: { contains: search, mode: "insensitive" } },
+              ],
+            },
+          }
+        : {}),
+    },
+    select: {
+      id: true,
+      assignmentId: true,
+      studentId: true,
+      score: true,
+      academicYearId: true,
+    },
+  });
+
+  return { ...group, submissions };
+};
+
+const deleteAssignmentResultsForSubmissions = async (
+  tx: Prisma.TransactionClient,
+  schoolId: number,
+  submissions: Array<{
+    assignmentId: number;
+    studentId: string;
+    academicYearId: number;
+  }>,
+) => {
+  if (submissions.length === 0) return;
+
+  await tx.result.deleteMany({
+    where: {
+      schoolId,
+      OR: submissions.map((submission) => ({
+        assignmentId: submission.assignmentId,
+        studentId: submission.studentId,
+        academicYearId: submission.academicYearId,
+      })),
+    },
+  });
+};
+
+async function uploadToCloudinary(file: File) {
+  const bytes = await file.arrayBuffer();
+  const buffer = Buffer.from(bytes);
+  const base64 = buffer.toString("base64");
+  const dataUri = `data:${file.type};base64,${base64}`;
+  const extension = file.name.split(".").pop()?.toLowerCase() || "file";
+  const result = await cloudinary.uploader.upload(dataUri, {
+    folder: "submissions",
+    resource_type: "auto",
+    use_filename: true,
+    unique_filename: true,
+  });
+  return {
+    url: result.secure_url,
+    fileType: result.format || file.type || extension,
+    fileName: file.name,
+    publicId: result.public_id,
+  };
+}
+
+async function deleteFromCloudinary(publicId: string) {
+  try {
+    await cloudinary.uploader.destroy(publicId);
+  } catch (error) {
+    console.error("Failed to delete old file:", error);
+  }
+}
+
+function extractPublicIdFromUrl(url: string): string | null {
+  const parts = url.split('/');
+  const uploadIndex = parts.findIndex(p => p === 'upload');
+  if (uploadIndex === -1 || uploadIndex + 2 >= parts.length) return null;
+  const publicIdParts = parts.slice(uploadIndex + 2);
+  const publicId = publicIdParts.join('/').split('.')[0];
+  return publicId;
+}
+
+export async function submitAssignment(
+  _state: SubmissionState,
+  formData: FormData
+): Promise<SubmissionState> {
+  try {
+    const { userId, sessionClaims } = await auth();
+    const role = (sessionClaims?.metadata as { role?: string })?.role;
+    if (!userId || role !== "student") {
+      return { success: false, error: true, message: "Unauthorized" };
+    }
+
+    const assignmentId = Number(formData.get("assignmentId"));
+    if (!assignmentId) {
+      return { success: false, error: true, message: "Assignment ID required" };
+    }
+
+    const student = await prisma.student.findUnique({
+      where: { id: userId },
+      select: { id: true, schoolId: true },
+    });
+    if (!student) {
+      return { success: false, error: true, message: "Student not found" };
+    }
+
+    const assignment = await prisma.assignment.findFirst({
+      where: {
+        id: assignmentId,
+        schoolId: student.schoolId,
+        OR: [
+          { class: { students: { some: { id: userId } } } },
+          { lesson: { class: { students: { some: { id: userId } } } } },
+        ],
+      },
+      select: { id: true, endDate: true, allowLateSubmission: true },
+    });
+    if (!assignment) {
+      return { success: false, error: true, message: "Assignment not found" };
+    }
+
+    const now = new Date();
+    if (now > new Date(assignment.endDate) && !assignment.allowLateSubmission) {
+      return { success: false, error: true, message: "Deadline passed. Submission is not allowed." };
+    }
+
+    const academicYear = await getCurrentAcademicYearOrNull(student.schoolId);
+    if (!academicYear) {
+      return { success: false, error: true, message: "No current academic year" };
+    }
+
+    const file = formData.get("file") as File | null;
+    if (!file || file.size === 0) {
+      return { success: false, error: true, message: "File is required" };
+    }
+    if (file.size > 20 * 1024 * 1024) {
+      return { success: false, error: true, message: "File must be under 20MB" };
+    }
+
+    const existing = await prisma.assignmentSubmission.findUnique({
+      where: { assignmentId_studentId: { assignmentId, studentId: userId } },
+      select: { fileUrl: true },
+    });
+
+    // رفع الملف الجديد
+    let uploadedFile: {
+      url: string;
+      fileType: string;
+      fileName: string;
+      publicId: string;
+    };
+
+    try {
+      uploadedFile = await uploadToCloudinary(file);
+    } catch (uploadError) {
+      console.error("[submitAssignment] upload failed", uploadError);
+      return {
+        success: false,
+        error: true,
+        message: "File upload failed. Please try again.",
+      };
+    }
+
+    // حذف الملف القديم إذا وجد
+    if (existing?.fileUrl) {
+      const oldPublicId = extractPublicIdFromUrl(existing.fileUrl);
+      if (oldPublicId) await deleteFromCloudinary(oldPublicId);
+    }
+
+    const note = formData.get("note") as string | null;
+
+    // حفظ أو تحديث التسليم
+    await prisma.assignmentSubmission.upsert({
+      where: { assignmentId_studentId: { assignmentId, studentId: userId } },
+      create: {
+        fileUrl: uploadedFile.url,
+        fileName: uploadedFile.fileName,
+        fileType: uploadedFile.fileType,
+        note,
+        assignmentId,
+        studentId: userId,
+        schoolId: student.schoolId,
+        academicYearId: academicYear.id,
+      },
+      update: {
+        fileUrl: uploadedFile.url,
+        fileName: uploadedFile.fileName,
+        fileType: uploadedFile.fileType,
+        note,
+        score: null,
+        gradePublished: false,
+        gradedAt: null,
+        gradedBy: null,
+        updatedAt: new Date(),
+      },
+    });
+
+    revalidatePath("/list/assignments");
+
+    // ✅ إشعار المعلم بالتسليم (فقط عند أول تسليم)
+    if (!existing) {
+      try {
+        const assignmentWithLesson = await prisma.assignment.findUnique({
+          where: { id: assignmentId },
+          select: {
+            title: true,
+            teacherId: true,
+            lesson: { select: { teacherId: true } },
+          },
+        });
+        const studentData = await prisma.student.findUnique({
+          where: { id: userId },
+          select: { name: true },
+        });
+        const teacherId =
+          assignmentWithLesson?.teacherId ??
+          assignmentWithLesson?.lesson?.teacherId;
+
+        if (assignmentWithLesson && studentData && teacherId) {
+          await notifyAssignmentSubmitted({
+            schoolId: student.schoolId,
+            assignmentId,
+            assignmentTitle: assignmentWithLesson.title,
+            studentName: studentData.name,
+            teacherId,
+          });
+        }
+      } catch {}
+    }
+
+    const isUpdate = !!existing;
+    const successMessage = isUpdate
+      ? "File replaced successfully!"
+      : "Assignment submitted successfully!";
+
+    return { success: true, error: false, message: successMessage };
+  } catch (err) {
+    console.error(err);
+    return { success: false, error: true, message: "Something went wrong" };
+  }
+}
+
+export async function updateTeacherFeedback(
+  submissionId: number,
+  teacherFeedback: string
+): Promise<SubmissionState> {
+  try {
+    const access = await requireActionAccess(["admin", "teacher"]);
+    if ("error" in access) {
+      return { success: false, error: true, message: access.message };
+    }
+
+    const managedSubmission = await findManagedSubmission(submissionId, access);
+    if (!managedSubmission) {
+      return { success: false, error: true, message: "Submission not found" };
+    }
+
+    const submission = await prisma.assignmentSubmission.update({
+      where: { id: submissionId },
+      data: { teacherFeedback },
+      select: {
+        studentId: true,
+        schoolId: true,
+        assignment: {
+          select: {
+            title: true,
+            teacher: { select: { name: true } },
+            lesson: { select: { teacher: { select: { name: true } } } },
+          },
+        },
+      },
+    });
+
+    // ✅ إشعار الطالب بالفيدباك
+    try {
+      await notifyAssignmentFeedback({
+        schoolId: submission.schoolId,
+        studentId: submission.studentId,
+        assignmentTitle: submission.assignment.title,
+        teacherName:
+          submission.assignment.teacher?.name ??
+          submission.assignment.lesson?.teacher.name ??
+          "Your teacher",
+      });
+    } catch {}
+
+    revalidatePath("/list/assignments");
+    return { success: true, error: false, message: "Feedback saved successfully!" };
+  } catch (err) {
+    console.error(err);
+    return { success: false, error: true, message: "Something went wrong" };
+  }
+}
+
+export async function gradeAssignmentSubmission(
+  submissionId: number,
+  score: number,
+): Promise<SubmissionState> {
+  try {
+    const access = await requireActionAccess(["admin", "teacher"]);
+    if ("error" in access) {
+      return { success: false, error: true, message: access.message };
+    }
+
+    const submission = await findManagedSubmission(submissionId, access);
+    if (!submission) {
+      return { success: false, error: true, message: "Submission not found" };
+    }
+
+    const maxScore = submission.assignment.maxScore;
+
+    if (!Number.isFinite(score) || score < 0 || score > maxScore) {
+      return {
+        success: false,
+        error: true,
+        message: `Score must be between 0 and ${maxScore}`,
+      };
+    }
+
+    await prisma.assignmentSubmission.update({
+      where: { id: submissionId },
+      data: {
+        score,
+        gradePublished: false,
+        gradedAt: new Date(),
+        gradedBy: access.userId,
+      },
+    });
+
+    revalidatePath("/list/assignments");
+    revalidatePath("/list/results");
+
+    return { success: true, error: false, message: "Grade saved successfully!" };
+  } catch (err) {
+    console.error(err);
+    return { success: false, error: true, message: "Something went wrong" };
+  }
+}
+
+export async function publishAssignmentGrades(
+  assignmentId: number,
+): Promise<SubmissionState> {
+  const access = await requireActionAccess(["admin", "teacher"]);
+  if ("error" in access) {
+    return { success: false, error: true, message: access.message };
+  }
+
+  try {
+    const assignment = await prisma.assignment.findFirst({
+      where: {
+        id: assignmentId,
+        schoolId: access.schoolId,
+        ...assignmentManagerWhere(access),
+      },
+      select: {
+        id: true,
+        title: true,
+        startDate: true,
+        endDate: true,
+        subjectId: true,
+        academicYearId: true,
+        maxScore: true,
+      },
+    });
+
+    if (!assignment) {
+      return { success: false, error: true, message: "Assignment not found" };
+    }
+
+    const groupAssignments = await prisma.assignment.findMany({
+      where: {
+        title: assignment.title,
+        startDate: assignment.startDate,
+        endDate: assignment.endDate,
+        subjectId: assignment.subjectId,
+        schoolId: access.schoolId,
+        academicYearId: assignment.academicYearId,
+        ...assignmentManagerWhere(access),
+      },
+      select: { id: true },
+    });
+
+    const assignmentIds = groupAssignments.map((item) => item.id);
+
+    const gradedSubmissions = await prisma.assignmentSubmission.findMany({
+      where: {
+        assignmentId: { in: assignmentIds },
+        schoolId: access.schoolId,
+        score: { not: null },
+      },
+      select: {
+        id: true,
+        assignmentId: true,
+        studentId: true,
+        score: true,
+        academicYearId: true,
+      },
+    });
+
+    if (gradedSubmissions.length === 0) {
+      return {
+        success: false,
+        error: true,
+        message: "No graded submissions to publish",
+      };
+    }
+
+    await prisma.$transaction(async (tx) => {
+      for (const submission of gradedSubmissions) {
+        if (submission.score === null) continue;
+
+        const existingResult = await tx.result.findFirst({
+          where: {
+            schoolId: access.schoolId,
+            assignmentId: submission.assignmentId,
+            studentId: submission.studentId,
+            academicYearId: submission.academicYearId,
+          },
+          select: { id: true },
+        });
+
+        const resultData = {
+          score: Math.round(submission.score),
+          schoolId: access.schoolId,
+          studentId: submission.studentId,
+          examId: null,
+          assignmentId: submission.assignmentId,
+          academicYearId: submission.academicYearId,
+        };
+
+        if (existingResult) {
+          await tx.result.update({
+            where: { id: existingResult.id },
+            data: resultData,
+          });
+        } else {
+          await tx.result.create({ data: resultData });
+        }
+      }
+
+      await tx.assignmentSubmission.updateMany({
+        where: {
+          id: { in: gradedSubmissions.map((submission) => submission.id) },
+          schoolId: access.schoolId,
+        },
+        data: { gradePublished: true },
+      });
+    });
+
+    const result = successResult(["/list/assignments", "/list/results"]);
+    return {
+      ...result,
+      message: "Grades published successfully!",
+    };
+  } catch (err) {
+    return {
+      ...errorResult(err),
+      message: "Something went wrong",
+    };
+  }
+}
+
+export async function clearAssignmentSubmissionGrades(
+  assignmentId: number,
+  filters: AssignmentSubmissionBulkFilters = {},
+): Promise<SubmissionState> {
+  const access = await requireActionAccess(["admin", "teacher"]);
+  if ("error" in access) {
+    return { success: false, error: true, message: access.message };
+  }
+
+  try {
+    const bulk = await getBulkAssignmentSubmissions(assignmentId, access, filters);
+    if (!bulk) {
+      return { success: false, error: true, message: "Assignment not found" };
+    }
+
+    const gradedSubmissions = bulk.submissions.filter(
+      (submission) => submission.score !== null,
+    );
+
+    if (gradedSubmissions.length === 0) {
+      return { success: false, error: true, message: "No grades to remove" };
+    }
+
+    await prisma.$transaction(async (tx) => {
+      await tx.assignmentSubmission.updateMany({
+        where: {
+          id: { in: gradedSubmissions.map((submission) => submission.id) },
+          schoolId: access.schoolId,
+        },
+        data: {
+          score: null,
+          gradePublished: false,
+          gradedAt: null,
+          gradedBy: null,
+        },
+      });
+
+      await deleteAssignmentResultsForSubmissions(
+        tx,
+        access.schoolId,
+        gradedSubmissions,
+      );
+    });
+
+    revalidatePath("/list/assignments");
+    revalidatePath(`/list/assignments/${assignmentId}/submissions`);
+    revalidatePath("/list/results");
+
+    return {
+      success: true,
+      error: false,
+      message: `Removed ${gradedSubmissions.length} grade${gradedSubmissions.length === 1 ? "" : "s"}.`,
+    };
+  } catch (err) {
+    console.error(err);
+    return { success: false, error: true, message: "Something went wrong" };
+  }
+}
+
+export async function adjustAssignmentSubmissionScores(
+  assignmentId: number,
+  amount: number,
+  filters: AssignmentSubmissionBulkFilters = {},
+): Promise<SubmissionState> {
+  const access = await requireActionAccess(["admin", "teacher"]);
+  if ("error" in access) {
+    return { success: false, error: true, message: access.message };
+  }
+
+  try {
+    const bulk = await getBulkAssignmentSubmissions(assignmentId, access, filters);
+    if (!bulk) {
+      return { success: false, error: true, message: "Assignment not found" };
+    }
+
+    const maxScore = bulk.assignment.maxScore;
+    if (!Number.isFinite(amount) || amount === 0 || Math.abs(amount) > maxScore) {
+      return {
+        success: false,
+        error: true,
+        message: `Adjustment must be between -${maxScore} and ${maxScore}, and cannot be 0`,
+      };
+    }
+
+    if (bulk.submissions.length === 0) {
+      return { success: false, error: true, message: "No submissions to adjust" };
+    }
+
+    await prisma.$transaction(async (tx) => {
+      for (const submission of bulk.submissions) {
+        const currentScore = submission.score ?? 0;
+        const nextScore = Math.min(
+          maxScore,
+          Math.max(0, currentScore + amount),
+        );
+
+        await tx.assignmentSubmission.update({
+          where: { id: submission.id },
+          data: {
+            score: nextScore,
+            gradePublished: false,
+            gradedAt: new Date(),
+            gradedBy: access.userId,
+          },
+        });
+      }
+
+      await deleteAssignmentResultsForSubmissions(
+        tx,
+        access.schoolId,
+        bulk.submissions,
+      );
+    });
+
+    revalidatePath("/list/assignments");
+    revalidatePath(`/list/assignments/${assignmentId}/submissions`);
+    revalidatePath("/list/results");
+
+    return {
+      success: true,
+      error: false,
+      message: `Adjusted ${bulk.submissions.length} score${bulk.submissions.length === 1 ? "" : "s"}.`,
+    };
+  } catch (err) {
+    console.error(err);
+    return { success: false, error: true, message: "Something went wrong" };
+  }
+}
diff --git a/src/lib/actions/teacher.actions.ts b/src/lib/actions/teacher.actions.ts
index e3f7766..1075636 100644
--- a/src/lib/actions/teacher.actions.ts
+++ b/src/lib/actions/teacher.actions.ts
@@ -1,5 +1,5 @@
 "use server";
-
+import { sendAccountEmail } from "../mail";
 import { TeacherSchema } from "../formValidationSchemas";
 import prisma from "../prisma";
 import { clerkClient } from "@clerk/nextjs/server";
@@ -74,28 +74,35 @@ export const createTeacher = async (
       publicMetadata: { role: "teacher" },
     });
     createdUserId = user.id;
-
-    await prisma.teacher.create({
-      data: {
-        id: createdUserId,
-        schoolId: access.schoolId,
-        username: data.username,
-        name: data.name,
-        email: data.email || null,
-        phone: data.phone || null,
-        address: data.address,
-        img: data.img || null,
-        bloodType: data.bloodType,
-        sex: data.sex,
-        birthday: data.birthday,
-        subjects: {
-          connect: subjectIds.map((subjectId) => ({ id: subjectId })),
-        },
-        classes: {
-          connect: classIds.map((classId) => ({ id: classId })),
-        },
-      },
-    });
+await prisma.teacher.create({
+  data: {
+    id: createdUserId,
+    schoolId: access.schoolId,
+    username: data.username,
+    name: data.name,
+    email: data.email || null,
+    phone: data.phone || null,
+    address: data.address,
+    img: data.img || null,
+    bloodType: data.bloodType,
+    sex: data.sex,
+    birthday: data.birthday,
+    subjects: {
+      connect: subjectIds.map((subjectId) => ({ id: subjectId })),
+    },
+    classes: {
+      connect: classIds.map((classId) => ({ id: classId })),
+    },
+  },
+});
+
+if (data.email && data.password) {
+  await sendAccountEmail(
+    data.email,
+    data.username,
+    data.password
+  );
+}
 
     return successResult(["/list/teachers"]);
   } catch (err) {
diff --git a/src/lib/ai/cloudinaryFile.ts b/src/lib/ai/cloudinaryFile.ts
new file mode 100644
index 0000000..f175025
--- /dev/null
+++ b/src/lib/ai/cloudinaryFile.ts
@@ -0,0 +1,105 @@
+import cloudinary from "@/lib/cloudinary";
+
+function extractResourceType(fileUrl: string): "image" | "video" | "raw" {
+  if (fileUrl.includes("/image/upload/")) return "image";
+  if (fileUrl.includes("/video/upload/")) return "video";
+  return "raw";
+}
+
+function extractDeliveryType(
+  fileUrl: string,
+): "upload" | "private" | "authenticated" {
+  try {
+    const url = new URL(fileUrl);
+    if (url.pathname.includes("/private/")) return "private";
+    if (url.pathname.includes("/authenticated/")) return "authenticated";
+    return "upload";
+  } catch {
+    return "upload";
+  }
+}
+
+function extractCloudinaryAssetParts(fileUrl: string): {
+  publicIdNoExt: string;
+  format: string;
+} | null {
+  try {
+    const url = new URL(fileUrl);
+    const match = url.pathname.match(
+      /\/(?:image|video|raw)\/(?:upload|private|authenticated)\/(?:v\d+\/)?(.+)$/,
+    );
+    const pathAfterType = match?.[1];
+    if (!pathAfterType) return null;
+
+    const lastDot = pathAfterType.lastIndexOf(".");
+    if (lastDot === -1) return null;
+
+    return {
+      publicIdNoExt: pathAfterType.slice(0, lastDot),
+      format: pathAfterType.slice(lastDot + 1).toLowerCase(),
+    };
+  } catch {
+    return null;
+  }
+}
+
+async function fetchFirstOk(urls: string[]) {
+  for (const url of urls) {
+    const response = await fetch(url, {
+      redirect: "follow",
+      headers: { "User-Agent": "Mozilla/5.0 (compatible; Academix/1.0)" },
+    }).catch(() => null);
+
+    if (response?.ok) {
+      return Buffer.from(await response.arrayBuffer());
+    }
+  }
+
+  throw new Error("Could not download file from storage.");
+}
+
+export async function downloadCloudinaryUrlToBuffer(fileUrl: string) {
+  const urls = [fileUrl];
+  const assetParts = extractCloudinaryAssetParts(fileUrl);
+
+  if (assetParts) {
+    urls.push(
+      cloudinary.utils.private_download_url(
+        assetParts.publicIdNoExt,
+        assetParts.format,
+        {
+          resource_type: extractResourceType(fileUrl),
+          type: extractDeliveryType(fileUrl),
+          expires_at: Math.floor(Date.now() / 1000) + 300,
+          attachment: false,
+        },
+      ),
+      cloudinary.utils.private_download_url(
+        assetParts.publicIdNoExt,
+        assetParts.format,
+        {
+          resource_type: "raw",
+          type: "upload",
+          expires_at: Math.floor(Date.now() / 1000) + 300,
+          attachment: false,
+        },
+      ),
+    );
+  }
+
+  return fetchFirstOk(urls);
+}
+
+export async function downloadPrivateCloudinaryFileToBuffer(
+  publicId: string,
+  format: string,
+) {
+  const signedUrl = cloudinary.utils.private_download_url(publicId, format, {
+    resource_type: "raw",
+    type: "private",
+    expires_at: Math.floor(Date.now() / 1000) + 300,
+    attachment: false,
+  });
+
+  return fetchFirstOk([signedUrl]);
+}
diff --git a/src/lib/ai/geminiEvaluation.ts b/src/lib/ai/geminiEvaluation.ts
new file mode 100644
index 0000000..030fa73
--- /dev/null
+++ b/src/lib/ai/geminiEvaluation.ts
@@ -0,0 +1,162 @@
+import { GoogleGenAI } from "@google/genai";
+
+export type AiEvaluationInput = {
+  questionText: string;
+  modelAnswer?: string | null;
+  rubric?: string | null;
+  studentAnswer: string;
+  maxScore: number;
+};
+
+export type AiPdfEvaluationInput = Omit<AiEvaluationInput, "studentAnswer"> & {
+  pdfBuffer: Buffer;
+  fileName?: string | null;
+};
+
+export type AiEvaluationSuggestion = {
+  score: number;
+  feedback: string;
+  strengths: string[];
+  weaknesses: string[];
+  needsReview: boolean;
+};
+
+const GEMINI_MODEL = process.env.GEMINI_MODEL || "gemini-3.5-flash";
+
+const ai = new GoogleGenAI({
+  apiKey: process.env.GEMINI_API_KEY!,
+});
+
+const clampScore = (score: unknown, maxScore: number) => {
+  const numeric = typeof score === "number" ? score : Number(score);
+  if (!Number.isFinite(numeric)) return 0;
+  return Math.min(maxScore, Math.max(0, numeric));
+};
+
+const toStringArray = (value: unknown) => {
+  if (!Array.isArray(value)) return [];
+  return value
+    .map((item) => String(item).trim())
+    .filter((item) => item.length > 0)
+    .slice(0, 6);
+};
+
+const extractJsonObject = (text: string) => {
+  const fenced = text.match(/```(?:json)?\s*([\s\S]*?)```/i)?.[1];
+  const candidate = fenced ?? text;
+  const start = candidate.indexOf("{");
+  const end = candidate.lastIndexOf("}");
+  if (start === -1 || end === -1 || end <= start) {
+    throw new Error("Gemini did not return JSON.");
+  }
+  return candidate.slice(start, end + 1);
+};
+
+const buildEvaluationPrompt = ({
+  questionText,
+  modelAnswer,
+  rubric,
+  maxScore,
+  studentAnswer,
+}: AiEvaluationInput) => `You are helping a teacher grade a student answer. Your result is only a suggestion; the teacher will approve or edit it.
+
+Return only valid JSON with this shape:
+{
+  "score": number,
+  "feedback": "short teacher-facing feedback",
+  "strengths": ["short bullet"],
+  "weaknesses": ["short bullet"],
+  "needsReview": boolean
+}
+
+Max score: ${maxScore}
+Question:
+${questionText}
+
+Model answer / rubric:
+${modelAnswer || rubric || "No model answer was provided. Grade using the question and general correctness."}
+
+Student answer:
+${studentAnswer}`;
+
+const parseGeminiEvaluation = (
+  rawText: string,
+  maxScore: number,
+): AiEvaluationSuggestion => {
+  const parsed = JSON.parse(extractJsonObject(rawText)) as Record<string, unknown>;
+
+  return {
+    score: clampScore(parsed.score, maxScore),
+    feedback: String(parsed.feedback ?? "").trim() || "No feedback provided.",
+    strengths: toStringArray(parsed.strengths),
+    weaknesses: toStringArray(parsed.weaknesses),
+    needsReview: Boolean(parsed.needsReview ?? true),
+  };
+};
+
+export async function evaluateWithGemini(
+  input: AiEvaluationInput,
+): Promise<{ suggestion: AiEvaluationSuggestion; model: string }> {
+  if (!process.env.GEMINI_API_KEY) {
+    throw new Error("GEMINI_API_KEY is not configured.");
+  }
+
+  const response = await ai.models.generateContent({
+    model: GEMINI_MODEL,
+    contents: [
+      {
+        role: "user",
+        parts: [
+          {
+            text: buildEvaluationPrompt(input),
+          },
+        ],
+      },
+    ],
+  });
+
+  const rawText = response.text ?? "";
+  const suggestion = parseGeminiEvaluation(rawText, input.maxScore);
+
+  return { suggestion, model: GEMINI_MODEL };
+}
+
+export async function evaluatePdfWithGemini(
+  input: AiPdfEvaluationInput,
+): Promise<{ suggestion: AiEvaluationSuggestion; model: string }> {
+  if (!process.env.GEMINI_API_KEY) {
+    throw new Error("GEMINI_API_KEY is not configured.");
+  }
+
+  const response = await ai.models.generateContent({
+    model: GEMINI_MODEL,
+    contents: [
+      {
+        role: "user",
+        parts: [
+          {
+            text: buildEvaluationPrompt({
+              questionText: input.questionText,
+              modelAnswer: input.modelAnswer,
+              rubric: input.rubric,
+              studentAnswer:
+                "The student's answer is attached as a PDF file. Read the PDF and grade it against the question and rubric.",
+              maxScore: input.maxScore,
+            }),
+          },
+          {
+            inlineData: {
+              mimeType: "application/pdf",
+              data: input.pdfBuffer.toString("base64"),
+            },
+          },
+        ],
+      },
+    ],
+  });
+
+  const rawText = response.text ?? "";
+  const suggestion = parseGeminiEvaluation(rawText, input.maxScore);
+
+  return { suggestion, model: GEMINI_MODEL };
+}
diff --git a/src/lib/ai/pdfText.ts b/src/lib/ai/pdfText.ts
new file mode 100644
index 0000000..fea20b4
--- /dev/null
+++ b/src/lib/ai/pdfText.ts
@@ -0,0 +1,77 @@
+import "server-only";
+
+import { createRequire } from "module";
+import path from "path";
+import { pathToFileURL } from "url";
+
+const require = createRequire(import.meta.url);
+
+const ensurePdfJsTextGlobals = () => {
+  const globalScope = globalThis as Record<string, unknown>;
+
+  if (!globalScope.DOMMatrix) globalScope.DOMMatrix = SimpleDOMMatrix;
+  if (!globalScope.ImageData) globalScope.ImageData = SimpleImageData;
+  if (!globalScope.Path2D) globalScope.Path2D = SimplePath2D;
+};
+
+class SimpleDOMMatrix {
+  a = 1;
+  b = 0;
+  c = 0;
+  d = 1;
+  e = 0;
+  f = 0;
+
+  constructor(init?: number[]) {
+    if (Array.isArray(init)) {
+      [this.a, this.b, this.c, this.d, this.e, this.f] = init;
+    }
+  }
+}
+
+class SimpleImageData {}
+class SimplePath2D {}
+
+ensurePdfJsTextGlobals();
+
+type PDFParseConstructor = new (options: {
+  data: Buffer | Uint8Array;
+}) => {
+  getText: () => Promise<{ text?: string }>;
+  destroy: () => Promise<void>;
+};
+
+const { PDFParse } = require("pdf-parse") as {
+  PDFParse: PDFParseConstructor & { setWorker: (workerSrc?: string) => string };
+};
+
+PDFParse.setWorker(
+  pathToFileURL(
+    path.join(
+      process.cwd(),
+      "node_modules",
+      "pdf-parse",
+      "dist",
+      "pdf-parse",
+      "cjs",
+      "pdf.worker.mjs",
+    ),
+  ).href,
+);
+
+export async function extractPdfText(buffer: Buffer) {
+  const parser = new PDFParse({ data: buffer });
+
+  try {
+    const result = await parser.getText();
+    const text = (result.text ?? "").replace(/\s+/g, " ").trim();
+
+    if (!text) {
+      throw new Error("No readable text could be extracted from this PDF.");
+    }
+
+    return text;
+  } finally {
+    await parser.destroy().catch(() => undefined);
+  }
+}
diff --git a/src/lib/attendance.ts b/src/lib/attendance.ts
index ccf90e5..63cd6fe 100644
--- a/src/lib/attendance.ts
+++ b/src/lib/attendance.ts
@@ -6,6 +6,7 @@ export const getAttendanceData = async ({
   userId,
   scope,
   classId,
+  gradeId,
   day,
   schoolId,
 }: {
@@ -13,6 +14,7 @@ export const getAttendanceData = async ({
   userId: string | null;
   scope: "students" | "teachers";
   classId?: number;
+  gradeId?: number;
   day: Date;
   schoolId: number;
 }) => {
@@ -61,6 +63,7 @@ export const getAttendanceData = async ({
       where: {
         schoolId,
         ...(classId ? { classId } : {}),
+        ...(!classId && gradeId ? { class: { gradeId } } : {}),
       },
       include: {
         class: { select: { name: true } },
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index 7ef1461..d23903f 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -2,11 +2,16 @@ import { auth } from "@clerk/nextjs/server";
 import prisma from "./prisma";
 import { redirect } from "next/navigation";
 import { UserRole } from "./utils";
+import { SchoolStatus } from "@prisma/client";
 
 export type AuthUser = {
   userId: string;
   role: UserRole;
   schoolId: number;
+  schoolStatus: SchoolStatus | null;
+  schoolPauseReason: string | null;
+  displayName: string | null;
+  profileImageUrl: string | null;
 };
 
 class AuthError extends Error {
@@ -19,39 +24,62 @@ class AuthError extends Error {
   }
 }
 
-async function getSchoolId(userId: string, role: UserRole): Promise<number> {
-  const select = { schoolId: true } as const;
-
+async function getUserProfile(
+  userId: string,
+  role: UserRole,
+): Promise<{ schoolId: number; displayName: string | null; profileImageUrl: string | null }> {
   try {
     switch (role) {
-      case "admin":
-        return (
-          await prisma.admin.findUniqueOrThrow({
-            where: { id: userId },
-            select,
-          })
-        ).schoolId;
-      case "teacher":
-        return (
-          await prisma.teacher.findUniqueOrThrow({
-            where: { id: userId },
-            select,
-          })
-        ).schoolId;
-      case "student":
-        return (
-          await prisma.student.findUniqueOrThrow({
-            where: { id: userId },
-            select,
-          })
-        ).schoolId;
-      case "parent":
-        return (
-          await prisma.parent.findUniqueOrThrow({
-            where: { id: userId },
-            select,
-          })
-        ).schoolId;
+      case "admin": {
+        const admin = await prisma.admin.findUniqueOrThrow({
+          where: { id: userId },
+          select: { schoolId: true, username: true },
+        });
+
+        return {
+          schoolId: admin.schoolId,
+          displayName: admin.username,
+          profileImageUrl: null,
+        };
+      }
+      case "teacher": {
+        const teacher = await prisma.teacher.findUniqueOrThrow({
+          where: { id: userId },
+          select: { schoolId: true, name: true, img: true },
+        });
+
+        return {
+          schoolId: teacher.schoolId,
+          displayName: teacher.name,
+          profileImageUrl: teacher.img,
+        };
+      }
+      case "student": {
+        const student = await prisma.student.findUniqueOrThrow({
+          where: { id: userId },
+          select: { schoolId: true, name: true, img: true },
+        });
+
+        return {
+          schoolId: student.schoolId,
+          displayName: student.name,
+          profileImageUrl: student.img,
+        };
+      }
+      case "parent": {
+        const parent = await prisma.parent.findUniqueOrThrow({
+          where: { id: userId },
+          select: { schoolId: true, name: true },
+        });
+
+        return {
+          schoolId: parent.schoolId,
+          displayName: parent.name,
+          profileImageUrl: null,
+        };
+      }
+      case "superAdmin":
+        return { schoolId: 0, displayName: null, profileImageUrl: null };
     }
   } catch (err: unknown) {
     if (
@@ -80,9 +108,25 @@ export const getAuthUser = async (): Promise<AuthUser | null> => {
 
   if (!role) return null;
 
-  const schoolId = await getSchoolId(userId, role);
+  const profile = await getUserProfile(userId, role);
+  const schoolId = profile.schoolId;
+  const school =
+    schoolId > 0
+      ? await prisma.school.findUnique({
+          where: { id: schoolId },
+          select: { status: true, pauseReason: true },
+        })
+      : null;
 
-  return { userId, role, schoolId };
+  return {
+    userId,
+    role,
+    schoolId,
+    schoolStatus: school?.status ?? null,
+    schoolPauseReason: school?.pauseReason ?? null,
+    displayName: profile.displayName,
+    profileImageUrl: profile.profileImageUrl,
+  };
 };
 
 export async function requireAuth(): Promise<AuthUser> {
@@ -100,3 +144,10 @@ export async function requireRole(user: AuthUser, roles: UserRole[]) {
     redirect("/unauthorized");
   }
 }
+
+export async function enforceAdminSchoolAccess(user: AuthUser) {
+  if (!["admin", "teacher", "student", "parent"].includes(user.role)) return;
+  if (user.schoolStatus === "ACTIVE") return;
+
+  redirect("/school-access");
+}
diff --git a/src/lib/cloudinary.ts b/src/lib/cloudinary.ts
new file mode 100644
index 0000000..a59c980
--- /dev/null
+++ b/src/lib/cloudinary.ts
@@ -0,0 +1,71 @@
+// import { v2 as cloudinary } from 'cloudinary';
+
+// cloudinary.config({
+//   cloud_name: process.env.CLOUDINARY_CLOUD_NAME,
+//   api_key: process.env.CLOUDINARY_API_KEY,
+//   api_secret: process.env.CLOUDINARY_API_SECRET,
+// });
+
+// export default cloudinary;
+import { v2 as cloudinary } from "cloudinary";
+
+cloudinary.config({
+  cloud_name: process.env.NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME,
+  api_key: process.env.CLOUDINARY_API_KEY,
+  api_secret: process.env.CLOUDINARY_API_SECRET,
+});
+
+export default cloudinary;
+
+export const generateProfileImageUploadSignature = (
+  schoolId: number,
+): {
+  signature: string;
+  timestamp: number;
+  folder: string;
+  apiKey: string;
+  cloudName: string;
+} => {
+  const folder = `schools/${schoolId}/profiles`;
+  const timestamp = Math.floor(Date.now() / 1000);
+  const paramsToSign = { folder, timestamp };
+  const signature = cloudinary.utils.api_sign_request(
+    paramsToSign,
+    process.env.CLOUDINARY_API_SECRET!,
+  );
+
+  return {
+    signature,
+    timestamp,
+    folder,
+    apiKey: process.env.CLOUDINARY_API_KEY!,
+    cloudName: process.env.NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME!,
+  };
+};
+
+export const generateExamUploadSignature = (
+  schoolId: number, examId: number, submissionId: number, questionId: number
+): { signature: string; timestamp: number; folder: string; apiKey: string; cloudName: string } => {
+  const folder = `exams/${schoolId}/${examId}/${submissionId}/${questionId}`;
+  const timestamp = Math.floor(Date.now() / 1000);
+  const paramsToSign = { folder, timestamp, type: "private" };
+  const signature = cloudinary.utils.api_sign_request(paramsToSign, process.env.CLOUDINARY_API_SECRET!);
+  return { signature, timestamp, folder, apiKey: process.env.CLOUDINARY_API_KEY!, cloudName: process.env.NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME! };
+};
+
+export const generatePrivateDownloadUrl = (publicId: string, format: string): string => {
+  return cloudinary.utils.private_download_url(publicId, format, {
+    resource_type: "raw",
+    type: "private",
+    expires_at: Math.floor(Date.now() / 1000) + 3600,
+    attachment: true,
+  });
+};
+
+export const deleteExamFileFromCloudinary = async (publicId: string): Promise<void> => {
+  try {
+    await cloudinary.uploader.destroy(publicId, { resource_type: "raw", type: "private" });
+  } catch (err) {
+    console.error("[Cloudinary] Failed to delete exam file:", publicId, err);
+  }
+};
diff --git a/src/lib/csv.ts b/src/lib/csv.ts
new file mode 100644
index 0000000..3785bfb
--- /dev/null
+++ b/src/lib/csv.ts
@@ -0,0 +1,30 @@
+export type CsvColumn<T> = {
+  header: string;
+  value: (row: T) => unknown;
+};
+
+function csvEscape(value: unknown) {
+  const rawText = String(value ?? "");
+  const text =
+    /^[=+\-@]/.test(rawText) ? `'${rawText}` : rawText;
+  return `"${text.replace(/"/g, '""')}"`;
+}
+
+export function generateCsv<T>(columns: CsvColumn<T>[], rows: T[]) {
+  const headerRow = columns.map((column) => csvEscape(column.header)).join(",");
+
+  const dataRows = rows.map((row) =>
+    columns.map((column) => csvEscape(column.value(row))).join(",")
+  );
+
+  return [headerRow, ...dataRows].join("\n");
+}
+
+export function createCsvResponse(filename: string, csv: string) {
+  return new Response(csv, {
+    headers: {
+      "Content-Type": "text/csv; charset=utf-8",
+      "Content-Disposition": `attachment; filename="${filename}"`,
+    },
+  });
+}
diff --git a/src/lib/enforce-route-access.ts b/src/lib/enforce-route-access.ts
index 912e015..02ffd8b 100644
--- a/src/lib/enforce-route-access.ts
+++ b/src/lib/enforce-route-access.ts
@@ -9,7 +9,7 @@ export async function enforceRouteAccess(pathname: string): Promise<AuthUser> {
     redirect("/sign-in");
   }
 
-  if (!user.schoolId) {
+  if (!user.schoolId && user.role !== "superAdmin") {
     redirect("/unauthorized");
   }
 
diff --git a/src/lib/finalResults.ts b/src/lib/finalResults.ts
new file mode 100644
index 0000000..304f013
--- /dev/null
+++ b/src/lib/finalResults.ts
@@ -0,0 +1,49 @@
+const roundTo = (value: number, digits: number) => {
+  const factor = 10 ** digits;
+  return Math.round(value * factor) / factor;
+};
+
+export const PASSING_AVERAGE = 60;
+
+export type FinalResultStatus = "PASS" | "FAIL" | "NO_RESULTS" | "NOT_UPDATED";
+
+export type FinalResultSummary = {
+  averageScore: number | null;
+  assessmentCount: number;
+  status: FinalResultStatus;
+};
+
+export type AssessmentScore = {
+  score: number;
+  maxScore: number | null;
+};
+
+const toPercentage = ({ score, maxScore }: AssessmentScore) => {
+  if (!maxScore || maxScore <= 0) return null;
+  return (score / maxScore) * 100;
+};
+
+export const calculateFinalResultSummary = (
+  scores: AssessmentScore[],
+): FinalResultSummary => {
+  const percentages = scores
+    .map(toPercentage)
+    .filter((value): value is number => value !== null);
+
+  if (percentages.length === 0) {
+    return {
+      averageScore: null,
+      assessmentCount: 0,
+      status: "NO_RESULTS",
+    };
+  }
+
+  const total = percentages.reduce((sum, percentage) => sum + percentage, 0);
+  const roundedAverage = roundTo(total / percentages.length, 2);
+
+  return {
+    averageScore: roundedAverage,
+    assessmentCount: percentages.length,
+    status: roundedAverage >= PASSING_AVERAGE ? "PASS" : "FAIL",
+  };
+};
diff --git a/src/lib/formValidationSchemas.ts b/src/lib/formValidationSchemas.ts
index 266f28c..dbed187 100644
--- a/src/lib/formValidationSchemas.ts
+++ b/src/lib/formValidationSchemas.ts
@@ -23,6 +23,14 @@ export const classSchema = z.object({
 export type ClassSchema = z.infer<typeof classSchema>;
 /////////////////////////////////////////////////////////////
 
+export const gradeSchema = z.object({
+  id: z.coerce.number().optional(),
+  level: z.coerce.number().int().min(1, { message: "Grade level is required!" }),
+});
+
+export type GradeSchema = z.infer<typeof gradeSchema>;
+/////////////////////////////////////////////////////////////
+
 export const teacherSchema = z.object({
   id: z.string().optional(),
   username: z
@@ -132,7 +140,15 @@ export const lessonSchema = z
     id: z.coerce.number().optional(),
     name: z.string().min(1, { message: "Lesson name is required!" }),
     day: z.enum(
-      ["SATURDAY", "SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY"],
+      [
+        "SATURDAY",
+        "SUNDAY",
+        "MONDAY",
+        "TUESDAY",
+        "WEDNESDAY",
+        "THURSDAY",
+        "FRIDAY",
+      ],
       {
         message: "Day is required!",
       },
@@ -157,6 +173,7 @@ export const lessonDays = [
   "TUESDAY",
   "WEDNESDAY",
   "THURSDAY",
+  "FRIDAY",
 ] as const;
 
 const MAX_LESSON_SLOTS_PER_DAY = 12;
@@ -187,7 +204,7 @@ export const lessonScheduleSchema = z
           ),
         }),
       )
-      .min(lessonDays.length, { message: "Schedule entries are required." }),
+      .min(1, { message: "Schedule entries are required." }),
   })
   .superRefine((data, ctx) => {
     const seen = new Set<string>();
@@ -279,6 +296,39 @@ export const schoolSettingsSchema = z
 
 export type SchoolSettingsSchema = z.infer<typeof schoolSettingsSchema>;
 
+export const schoolDayValues = [
+  "SATURDAY",
+  "SUNDAY",
+  "MONDAY",
+  "TUESDAY",
+  "WEDNESDAY",
+  "THURSDAY",
+  "FRIDAY",
+] as const;
+
+export const schoolDayExceptionTypes = [
+  "HOLIDAY",
+  "OFF_DAY",
+  "WORKING_OVERRIDE",
+] as const;
+
+export const schoolWorkingDaysSchema = z.object({
+  workingDays: z
+    .array(z.enum(schoolDayValues))
+    .min(1, { message: "Select at least one working day." }),
+});
+
+export type SchoolWorkingDaysSchema = z.infer<typeof schoolWorkingDaysSchema>;
+
+export const schoolDayExceptionSchema = z.object({
+  date: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, { message: "Date is required." }),
+  type: z.enum(schoolDayExceptionTypes),
+  name: z.string().max(120).optional().or(z.literal("")),
+  notes: z.string().max(500).optional().or(z.literal("")),
+});
+
+export type SchoolDayExceptionSchema = z.infer<typeof schoolDayExceptionSchema>;
+
 export const academicYearSchema = z
   .object({
     id: z.coerce.number().optional(),
@@ -308,6 +358,7 @@ export const examSchema = z
     startTime: z.coerce.date({ message: "Start time is required!" }),
     endTime: z.coerce.date({ message: "End time is required!" }),
     subjectId: z.coerce.number().min(1, { message: "Subject is required!" }),
+    teacherId: z.string().optional().nullable(),
     classIds: z
       .array(z.coerce.number())
       .min(1, { message: "At least one class is required!" }),
@@ -323,12 +374,18 @@ export const assignmentSchema = z
   .object({
     id: z.coerce.number().optional(),
     title: z.string().min(1, { message: "Assignment title is required!" }),
+    rubric: z.string().optional().nullable(),
     startDate: z.coerce.date({ message: "Start date is required!" }),
     endDate: z.coerce.date({ message: "End date is required!" }),
+    maxScore: z.coerce
+      .number()
+      .positive({ message: "Marks must be greater than 0!" }),
     subjectId: z.coerce.number().min(1, { message: "Subject is required!" }),
+    teacherId: z.string().optional().nullable(),
     classIds: z
       .array(z.coerce.number())
       .min(1, { message: "At least one class is required!" }),
+    allowLateSubmission: z.coerce.boolean().default(false),
   })
   .refine((data) => data.endDate > data.startDate, {
     message: "End date must be after start date!",
@@ -356,13 +413,10 @@ export type ResultSchema = z.infer<typeof resultSchema>;
 ////////////////////////////////////////////////////////////////////////////////////
 export const attendanceBulkSchema = z.object({
   date: z.coerce.date({ message: "Date is required!" }),
-
   scope: z.enum(["students", "teachers"], {
     message: "Attendance scope is required!",
   }),
-
   classId: z.coerce.number().optional(),
-
   records: z
     .array(
       z.object({
@@ -424,8 +478,8 @@ export const messageSchema = z
   .refine(
     (data) =>
       (data.studentIds?.length ?? 0) +
-        (data.parentIds?.length ?? 0) +
-        (data.teacherIds?.length ?? 0) >
+      (data.parentIds?.length ?? 0) +
+      (data.teacherIds?.length ?? 0) >
       0,
     {
       message: "Select at least one recipient.",
@@ -439,37 +493,140 @@ export type MessageSchema = z.infer<typeof messageSchema>;
 // EXAM WORKFLOW SCHEMAS
 ////////////////////////////////////////////////////////////////////////////////////
 
+export const EXAM_FILE_MAX_SIZE_MB = 10;
+
+export const BLOCKED_EXTENSIONS = new Set([
+  "exe", "sh", "bat", "cmd", "ps1", "vbs", "js", "mjs", "cjs",
+  "py", "rb", "php", "pl", "java", "class", "jar", "dll", "so",
+  "dylib", "bin", "com", "scr", "pif", "reg",
+]);
+
+export type FileConfig = {
+  allowedExtensions: string[];
+  minFileSizeMb: number;
+  maxFileSizeMb: number;
+  instructions: string;
+};
+
+export const isFileConfig = (options: unknown): options is FileConfig => {
+  if (!options || typeof options !== "object" || Array.isArray(options)) return false;
+  const o = options as Record<string, unknown>;
+  return (
+    Array.isArray(o.allowedExtensions) &&
+    typeof o.minFileSizeMb === "number" &&
+    typeof o.maxFileSizeMb === "number" &&
+    typeof o.instructions === "string"
+  );
+};
+
+export const fileConfigSchema = z.object({
+  allowedExtensions: z.array(z.string()).default([]),
+  minFileSizeMb: z.coerce.number().min(0).default(0),
+  maxFileSizeMb: z.coerce.number().min(1).max(EXAM_FILE_MAX_SIZE_MB).default(EXAM_FILE_MAX_SIZE_MB),
+  instructions: z.string().default(""),
+});
+
 export const questionSchema = z.object({
   text: z.string().min(1, "Question text is required"),
   type: z.enum(["TRUE_FALSE", "MCQ", "TEXT", "FILE"]),
   points: z.coerce.number().min(1).default(1),
   order: z.coerce.number().min(1),
-  options: z.array(z.string().min(1, "Option text is required")).optional(),
+  options: z.preprocess(
+    (val) => {
+      if (Array.isArray(val)) {
+        return val.map((item) => {
+          if (item && typeof item === "object" && "text" in item) {
+            return item.text;
+          }
+          return item;
+        });
+      }
+      return val;
+    },
+    z.array(z.string()).optional() // أزلنا الشرط الداخلي لكي نقوم بفحصه بشكل مخصص ومتقدم بالأسفل بالرسالة المطلوبة
+  ),
   correctAnswer: z
-    .array(z.string().min(1, "Correct answer is required"))
-    .optional(),
+    .array(z.string())
+    .optional(), // أزلنا الشرط الداخلي هنا للتحكم المتقدم بالأسفل لكل نوع سؤال
   allowMultiple: z.boolean().default(false),
+  textAnswer: z.string().optional().nullable(),
+  fileConfig: fileConfigSchema.optional(),
 }).superRefine((data, ctx) => {
+
+  // 1️⃣ الشروط الخاصة بسؤال الخيارات المتعددة (MCQ)
   if (data.type === "MCQ") {
+    // أ- التحقق من وجود خيارين على الأقل
     if (!data.options || data.options.length < 2) {
-      ctx.addIssue({ code: z.ZodIssueCode.custom, message: "MCQ must have at least 2 options", path: ["options"] });
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "MCQ must have at least 2 options",
+        path: ["options"]
+      });
+    } else {
+      // ب- التحقق من أن جميع الخيارات المضافة تحتوي على نصوص وليست فارغة
+      const hasEmptyOption = data.options.some((opt) => !opt || !opt.trim());
+      if (hasEmptyOption) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "All options must have text. Please fill in all choices.",
+          path: ["options"],
+        });
+      }
     }
+
+    // جـ- التحقق من تحديد الإجابة الصحيحة
     if (!data.correctAnswer || data.correctAnswer.length < 1) {
-      ctx.addIssue({ code: z.ZodIssueCode.custom, message: "MCQ must have a correct answer", path: ["correctAnswer"] });
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Please select the correct answer for this question",
+        path: ["correctAnswer"]
+      });
+    }
+  }
+
+  // 2️⃣ الشروط الخاصة بسؤال صح أو خطأ (TRUE_FALSE)
+  if (data.type === "TRUE_FALSE") {
+    if (!data.correctAnswer || data.correctAnswer.length !== 1 || !["TRUE", "FALSE"].includes(data.correctAnswer[0])) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Please select whether the statement is True or False",
+        path: ["correctAnswer"]
+      });
+    }
+  }
+
+  // 3️⃣ الشروط الخاصة بالسؤال المقالي (TEXT)
+  if (data.type === "TEXT") {
+    if (!data.textAnswer || !data.textAnswer.trim()) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Please provide a model answer for this text question",
+        path: ["textAnswer"],
+      });
     }
   }
-  if (data.type === "TRUE_FALSE" && (!data.correctAnswer || data.correctAnswer.length !== 1)) {
-    ctx.addIssue({ code: z.ZodIssueCode.custom, message: "TRUE/FALSE must have exactly one correct answer", path: ["correctAnswer"] });
+
+  // 4️⃣ الشروط الخاصة بسؤال رفع الملفات (FILE)
+  if (data.type === "FILE") {
+    if (data.fileConfig && data.fileConfig.minFileSizeMb > data.fileConfig.maxFileSizeMb) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Min file size cannot exceed max file size",
+        path: ["fileConfig"]
+      });
+    }
   }
 });
 
 export const createExamWorkflowSchema = z.object({
   title: z.string().min(1, "Title is required"),
+  instructions: z.string().optional().nullable(),
+  teacherId: z.string().optional().nullable(),
   startTime: z.coerce.date(),
   endTime: z.coerce.date(),
   subjectId: z.coerce.number().min(1, "Subject is required"),
   classIds: z.array(z.coerce.number()).min(1, "At least one class is required"),
-  
+
   // Settings
   enableTimer: z.boolean().default(true),
   duration: z.coerce.number().optional(),
@@ -478,7 +635,7 @@ export const createExamWorkflowSchema = z.object({
   autoSaveInterval: z.coerce.number().min(10).default(30),
   enableAutoSubmit: z.boolean().default(true),
   questionsPerPage: z.coerce.number().min(1).default(1),
-  
+
   questions: z.array(questionSchema).min(1, "At least one question is required"),
 }).superRefine((data, ctx) => {
   if (data.endTime <= data.startTime) {
@@ -496,6 +653,10 @@ export const saveAnswerSchema = z.object({
   questionId: z.coerce.number().min(1),
   textAnswer: z.string().nullable().optional(),
   fileUrl: z.string().nullable().optional(),
+  filePublicId: z.string().nullable().optional(),
+  fileOriginalName: z.string().nullable().optional(),
+  fileMimeType: z.string().nullable().optional(),
+  fileSizeBytes: z.coerce.number().nullable().optional(),
 });
 
 export type SaveAnswerSchema = z.infer<typeof saveAnswerSchema>;
diff --git a/src/lib/mail.ts b/src/lib/mail.ts
new file mode 100644
index 0000000..2dd803e
--- /dev/null
+++ b/src/lib/mail.ts
@@ -0,0 +1,62 @@
+import nodemailer from "nodemailer";
+
+export const transporter = nodemailer.createTransport({
+  host: process.env.SMTP_HOST,
+  port: Number(process.env.SMTP_PORT),
+  secure: false,
+  auth: {
+    user: process.env.SMTP_USER,
+    pass: process.env.SMTP_PASS,
+  },
+});
+
+export async function sendAccountEmail(
+  to: string,
+  username: string,
+  password: string
+) {
+  await transporter.sendMail({
+    from: `"Academix" <${process.env.SMTP_USER}>`,
+    to,
+    subject: "Academix Account Information",
+    html: `
+      <div style="font-family:Arial;padding:20px">
+        <h2>Welcome to Academix</h2>
+
+        <p>Your account has been created successfully.</p>
+
+        <p><b>Username:</b> ${username}</p>
+        <p><b>Password:</b> ${password}</p>
+
+        <br/>
+      </div>
+    `,
+  });
+}
+export async function sendSchoolApprovalEmail(
+  to: string,
+  schoolName: string,
+  username: string,
+  password: string
+) {
+  await transporter.sendMail({
+    from: `"Academix" <${process.env.SMTP_USER}>`,
+    to,
+    subject: "School Registration Approved",
+    html: `
+      <div style="font-family:Arial;padding:20px">
+        <h2>Welcome to Academix</h2>
+
+        <p>Your school registration has been approved successfully.</p>
+
+        <p><b>School Name:</b> ${schoolName}</p>
+        <p><b>Username:</b> ${username}</p>
+        <p><b>Password:</b> ${password}</p>
+
+        <br/>
+
+        <p>You can now log in to the system.</p>
+      </div>
+    `,
+  });
+}
\ No newline at end of file
diff --git a/src/lib/pageParams.ts b/src/lib/pageParams.ts
index 1be5bbd..16bef9d 100644
--- a/src/lib/pageParams.ts
+++ b/src/lib/pageParams.ts
@@ -4,3 +4,20 @@ export type PageSearchParams = Promise<
 
 export const getQueryParam = (value: string | string[] | undefined) =>
   Array.isArray(value) ? value[0] : value;
+
+export const searchParamsToRecord = (
+  params: URLSearchParams,
+): Record<string, string | string[]> => {
+  const result: Record<string, string | string[]> = {};
+
+  for (const key of params.keys()) {
+    const values = params.getAll(key);
+    if (values.length === 1) {
+      result[key] = values[0];
+    } else if (values.length > 1) {
+      result[key] = values;
+    }
+  }
+
+  return result;
+};
diff --git a/src/lib/query-builders/assignment-query.ts b/src/lib/query-builders/assignment-query.ts
new file mode 100644
index 0000000..50382b2
--- /dev/null
+++ b/src/lib/query-builders/assignment-query.ts
@@ -0,0 +1,148 @@
+import { Prisma } from "@prisma/client";
+import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+
+type BuildAssignmentQueryInput = {
+  searchParams: PageSearchParams;
+schoolId: number;
+  role: string | null;
+  userId: string;
+};
+
+export async function buildAssignmentQuery({
+  searchParams,
+  schoolId,
+  role,
+  userId,
+}: BuildAssignmentQueryInput) {
+  const resolvedSearchParams = await searchParams;
+
+  const { page, sort, ...queryParams } = resolvedSearchParams;
+
+  const currentPage = getQueryParam(page);
+  const p = currentPage ? Number.parseInt(currentPage, 10) : 1;
+
+  const academicYearId = await getCurrentAcademicYearIdOrNull(schoolId);
+
+  const sortParam = getQueryParam(sort);
+
+  const orderBy: Prisma.AssignmentOrderByWithRelationInput =
+    sortParam === "desc" ? { endDate: "desc" } : { endDate: "asc" };
+
+  if (!academicYearId) {
+    return {
+      academicYearId: null,
+      query: null,
+      orderBy,
+      page: 1,
+    };
+  }
+
+  const query: Prisma.AssignmentWhereInput = {
+    schoolId,
+    academicYearId,
+  };
+
+  const conditions: Prisma.AssignmentWhereInput[] = [];
+
+  for (const [key, rawValue] of Object.entries(queryParams)) {
+    const value = getQueryParam(rawValue);
+
+    if (value === undefined || value === "") continue;
+
+    switch (key) {
+      case "classId": {
+        const classId = Number.parseInt(value, 10);
+
+        if (!Number.isNaN(classId)) {
+          conditions.push({
+            classId,
+          });
+        }
+
+        break;
+      }
+
+      case "gradeId": {
+        const gradeId = Number.parseInt(value, 10);
+
+        if (!Number.isNaN(gradeId)) {
+          conditions.push({
+            class: { gradeId },
+          });
+        }
+
+        break;
+      }
+
+      case "teacherId":
+        conditions.push({
+          OR: [{ teacherId: value }, { lesson: { teacherId: value } }],
+        });
+        break;
+
+      case "search":
+        conditions.push({
+          OR: [
+            {
+              title: {
+                contains: value,
+                mode: "insensitive",
+              },
+            },
+            {
+              subject: {
+                name: {
+                  contains: value,
+                  mode: "insensitive",
+                },
+              },
+            },
+          ],
+        });
+        break;
+    }
+  }
+
+  switch (role) {
+    case "admin":
+      break;
+
+    case "teacher":
+      conditions.push({
+        OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }],
+      });
+      break;
+
+    case "student":
+      conditions.push({
+        class: {
+          students: {
+            some: { id: userId },
+          },
+        },
+      });
+      break;
+
+    case "parent":
+      conditions.push({
+        class: {
+          students: {
+            some: { parentId: userId },
+          },
+        },
+      });
+      break;
+  }
+
+  if (conditions.length > 0) {
+    query.AND = conditions;
+  }
+
+  return {
+    academicYearId,
+    query,
+    orderBy,
+    page: Number.isNaN(p) || p < 1 ? 1 : p,
+  };
+}
diff --git a/src/lib/query-builders/class-query.ts b/src/lib/query-builders/class-query.ts
new file mode 100644
index 0000000..392dc57
--- /dev/null
+++ b/src/lib/query-builders/class-query.ts
@@ -0,0 +1,140 @@
+import { Prisma } from "@prisma/client";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+
+type BuildClassQueryInput = {
+  searchParams: PageSearchParams;
+  schoolId: number;
+  role?: string | null;
+  userId?: string;
+};
+
+export async function buildClassQuery({
+  searchParams,
+  schoolId,
+  role,
+  userId,
+}: BuildClassQueryInput) {
+  const resolvedSearchParams = await searchParams;
+
+  const { page, sort, ...queryParams } = resolvedSearchParams;
+
+  const currentPage = getQueryParam(page);
+  const p = currentPage ? Number.parseInt(currentPage, 10) : 1;
+
+  const query: Prisma.ClassWhereInput = {
+    schoolId,
+  };
+
+  const conditions: Prisma.ClassWhereInput[] = [];
+
+  for (const [key, rawValue] of Object.entries(queryParams)) {
+    const value = getQueryParam(rawValue);
+
+    if (value === undefined || value === "") continue;
+
+    switch (key) {
+      case "supervisorId":
+        conditions.push({
+          supervisorId: value,
+        });
+        break;
+
+      case "gradeId": {
+        const gradeId = Number.parseInt(value, 10);
+
+        if (!Number.isNaN(gradeId)) {
+          conditions.push({
+            gradeId,
+          });
+        }
+
+        break;
+      }
+
+      case "search":
+        conditions.push({
+          OR: [
+            { name: { contains: value, mode: "insensitive" } },
+            {
+              supervisor: {
+                name: { contains: value, mode: "insensitive" },
+              },
+            },
+          ],
+        });
+        break;
+    }
+  }
+
+  if (role === "teacher" && userId) {
+    conditions.push({
+      OR: [
+        {
+          teachers: {
+            some: { id: userId },
+          },
+        },
+        {
+          lessons: {
+            some: { teacherId: userId },
+          },
+        },
+      ],
+    });
+  }
+
+  if (conditions.length > 0) {
+    query.AND = conditions;
+  }
+
+  let orderBy: Prisma.ClassOrderByWithRelationInput = {
+    name: "asc",
+  };
+
+  const sortValue = getQueryParam(sort);
+
+  switch (sortValue) {
+    case "asc":
+      orderBy = { name: "asc" };
+      break;
+
+    case "desc":
+    case "name_desc":
+      orderBy = { name: "desc" };
+      break;
+
+    case "capacity_asc":
+      orderBy = { capacity: "asc" };
+      break;
+
+    case "capacity_desc":
+      orderBy = { capacity: "desc" };
+      break;
+
+    case "grade_asc":
+      orderBy = {
+        grade: {
+          level: "asc",
+        },
+      };
+      break;
+
+    case "grade_desc":
+      orderBy = {
+        grade: {
+          level: "desc",
+        },
+      };
+      break;
+
+    default:
+      orderBy = { name: "asc" };
+      break;
+  }
+
+  return {
+    query,
+    orderBy,
+    page: Number.isNaN(p) || p < 1 ? 1 : p,
+  };
+}
diff --git a/src/lib/query-builders/exam-query.ts b/src/lib/query-builders/exam-query.ts
new file mode 100644
index 0000000..e5adddf
--- /dev/null
+++ b/src/lib/query-builders/exam-query.ts
@@ -0,0 +1,145 @@
+import { Prisma } from "@prisma/client";
+import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+
+type BuildExamQueryInput = {
+  searchParams: PageSearchParams;
+  schoolId: number;
+  role: string | null;
+  userId: string;
+};
+
+export async function buildExamQuery({
+  searchParams,
+  schoolId,
+  role,
+  userId,
+}: BuildExamQueryInput) {
+  const resolvedSearchParams = await searchParams;
+
+  const { page, sort, ...queryParams } = resolvedSearchParams;
+
+  const currentPage = getQueryParam(page);
+  const p = currentPage ? Number.parseInt(currentPage, 10) : 1;
+
+  const academicYearId = await getCurrentAcademicYearIdOrNull(schoolId);
+
+  // Default to newest exams first unless the user explicitly asks for ascending order.
+  const orderBy: Prisma.ExamOrderByWithRelationInput =
+    getQueryParam(sort) === "asc"
+      ? { startTime: "asc" }
+      : { startTime: "desc" };
+
+  if (!academicYearId) {
+    return {
+      academicYearId: null,
+      query: null,
+      orderBy,
+      page: 1,
+    };
+  }
+
+  const query: Prisma.ExamWhereInput = {
+    schoolId,
+    academicYearId,
+  };
+
+  const conditions: Prisma.ExamWhereInput[] = [];
+
+  for (const [key, rawValue] of Object.entries(queryParams)) {
+    const value = getQueryParam(rawValue);
+
+    if (value === undefined || value === "") continue;
+
+    switch (key) {
+      case "classId": {
+        const classId = Number.parseInt(value, 10);
+        if (!Number.isNaN(classId)) {
+          conditions.push({
+            classId,
+          });
+        }
+        break;
+      }
+
+      case "gradeId": {
+        const gradeId = Number.parseInt(value, 10);
+        if (!Number.isNaN(gradeId)) {
+          conditions.push({
+            class: { gradeId },
+          });
+        }
+        break;
+      }
+
+      case "teacherId":
+        conditions.push({
+          OR: [{ teacherId: value }, { lesson: { teacherId: value } }],
+        });
+        break;
+
+      case "search":
+        conditions.push({
+          OR: [
+            {
+              title: {
+                contains: value,
+                mode: "insensitive",
+              },
+            },
+            {
+              subject: {
+                name: {
+                  contains: value,
+                  mode: "insensitive",
+                },
+              },
+            },
+          ],
+        });
+        break;
+    }
+  }
+
+  switch (role) {
+    case "admin":
+      break;
+
+    case "teacher":
+      conditions.push({
+        OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }],
+      });
+      break;
+
+    case "student":
+      conditions.push({
+        class: {
+          students: {
+            some: { id: userId },
+          },
+        },
+      });
+      break;
+
+    case "parent":
+      conditions.push({
+        class: {
+          students: {
+            some: { parentId: userId },
+          },
+        },
+      });
+      break;
+  }
+
+  if (conditions.length > 0) {
+    query.AND = conditions;
+  }
+
+  return {
+    academicYearId,
+    query,
+    orderBy,
+    page: Number.isNaN(p) || p < 1 ? 1 : p,
+  };
+}
diff --git a/src/lib/query-builders/parent-query.ts b/src/lib/query-builders/parent-query.ts
new file mode 100644
index 0000000..5bc1b29
--- /dev/null
+++ b/src/lib/query-builders/parent-query.ts
@@ -0,0 +1,102 @@
+import { Prisma } from "@prisma/client";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+
+type BuildParentQueryInput = {
+  searchParams: PageSearchParams;
+  schoolId: number;
+  role: string | null;
+  userId: string;
+};
+
+export async function buildParentQuery({
+  searchParams,
+  schoolId,
+  role,
+  userId,
+}: BuildParentQueryInput) {
+  const resolvedSearchParams = await searchParams;
+
+  const { page, ...queryParams } = resolvedSearchParams;
+
+  const currentPage = getQueryParam(page);
+  const p = currentPage ? Number.parseInt(currentPage, 10) : 1;
+
+  const query: Prisma.ParentWhereInput = { schoolId };
+  const conditions: Prisma.ParentWhereInput[] = [];
+
+  for (const [key, rawValue] of Object.entries(queryParams)) {
+    const value = getQueryParam(rawValue);
+
+    if (value === undefined || value === "") continue;
+
+    switch (key) {
+      case "classId": {
+        const classId = Number.parseInt(value, 10);
+        if (!Number.isNaN(classId)) {
+          conditions.push({
+            students: { some: { classId } },
+          });
+        }
+        break;
+      }
+
+      case "gradeId": {
+        const gradeId = Number.parseInt(value, 10);
+        if (!Number.isNaN(gradeId)) {
+          conditions.push({
+            students: { some: { class: { gradeId } } },
+          });
+        }
+        break;
+      }
+
+      case "search":
+        conditions.push({
+          OR: [
+            { name: { contains: value, mode: "insensitive" } },
+            { username: { contains: value, mode: "insensitive" } },
+            { email: { contains: value, mode: "insensitive" } },
+            { phone: { contains: value, mode: "insensitive" } },
+            { address: { contains: value, mode: "insensitive" } },
+            {
+              students: {
+                some: {
+                  name: { contains: value, mode: "insensitive" },
+                },
+              },
+            },
+          ],
+        });
+        break;
+    }
+  }
+
+  if (role === "teacher") {
+    conditions.push({
+      students: {
+        some: {
+          class: {
+            lessons: {
+              some: { teacherId: userId },
+            },
+          },
+        },
+      },
+    });
+  }
+
+  if (conditions.length > 0) {
+    query.AND = conditions;
+  }
+
+  const sortParam = getQueryParam(queryParams.sort);
+
+  const orderBy: Prisma.ParentOrderByWithRelationInput =
+    sortParam === "desc" ? { name: "desc" } : { name: "asc" };
+
+  return {
+    query,
+    orderBy,
+    page: Number.isNaN(p) || p < 1 ? 1 : p,
+  };
+}
diff --git a/src/lib/query-builders/result-query.ts b/src/lib/query-builders/result-query.ts
new file mode 100644
index 0000000..c0c30ba
--- /dev/null
+++ b/src/lib/query-builders/result-query.ts
@@ -0,0 +1,176 @@
+import { Prisma } from "@prisma/client";
+import { getCurrentAcademicYearIdOrNull } from "@/lib/academicYears";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+
+type BuildResultQueryInput = {
+  searchParams: PageSearchParams;
+  schoolId: number;
+  role: string | null;
+  userId: string;
+};
+
+export async function buildResultQuery({
+  searchParams,
+  schoolId,
+  role,
+  userId,
+}: BuildResultQueryInput) {
+  const resolvedSearchParams = await searchParams;
+
+  const { page, sort, ...queryParams } = resolvedSearchParams;
+
+  const currentPage = getQueryParam(page);
+  const p = currentPage ? Number.parseInt(currentPage, 10) : 1;
+
+  const academicYearId = await getCurrentAcademicYearIdOrNull(schoolId);
+
+  const sortParam = getQueryParam(sort);
+
+  const orderBy: Prisma.ResultOrderByWithRelationInput =
+    sortParam === "asc" ? { id: "asc" } : { id: "desc" };
+
+  if (!academicYearId) {
+    return {
+      academicYearId: null,
+      query: null,
+      orderBy,
+      page: 1,
+    };
+  }
+
+  const query: Prisma.ResultWhereInput = {
+    schoolId,
+    academicYearId,
+  };
+
+  const conditions: Prisma.ResultWhereInput[] = [];
+
+  for (const [key, rawValue] of Object.entries(queryParams)) {
+    const value = getQueryParam(rawValue);
+
+    if (value === undefined || value === "") continue;
+
+    switch (key) {
+      case "classId": {
+        const classId = Number.parseInt(value, 10);
+        if (!Number.isNaN(classId)) {
+          conditions.push({
+            student: { classId },
+          });
+        }
+        break;
+      }
+
+      case "gradeId": {
+        const gradeId = Number.parseInt(value, 10);
+        if (!Number.isNaN(gradeId)) {
+          conditions.push({
+            student: { class: { gradeId } },
+          });
+        }
+        break;
+      }
+
+      case "studentId":
+        conditions.push({
+          studentId: value,
+        });
+        break;
+
+      case "search":
+        conditions.push({
+          OR: [
+            {
+              student: {
+                name: { contains: value, mode: "insensitive" },
+              },
+            },
+            {
+              exam: {
+                title: { contains: value, mode: "insensitive" },
+              },
+            },
+            {
+              assignment: {
+                title: { contains: value, mode: "insensitive" },
+              },
+            },
+          ],
+        });
+        break;
+    }
+  }
+
+  switch (role) {
+    case "admin":
+      break;
+
+    case "teacher":
+      conditions.push({
+        OR: [
+          {
+            exam: {
+              OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }],
+            },
+          },
+          {
+            assignment: {
+              OR: [{ teacherId: userId }, { lesson: { teacherId: userId } }],
+            },
+          },
+        ],
+      });
+      break;
+
+    case "student":
+      conditions.push({
+        studentId: userId,
+        OR: [
+          // Assignment results — only visible after grades are published
+          {
+            assignmentId: { not: null },
+            assignment: {
+              assignmentSubmissions: {
+                some: {
+                  studentId: userId,
+                  gradePublished: true,
+                },
+              },
+            },
+          },
+          // Exam results — only visible after grades are published
+          {
+            examId: { not: null },
+            exam: {
+              submissions: {
+                some: {
+                  studentId: userId,
+                  gradePublished: true,
+                },
+              },
+            },
+          },
+        ],
+      });
+      break;
+
+    case "parent":
+      conditions.push({
+        student: {
+          parentId: userId,
+        },
+      });
+      break;
+  }
+
+  if (conditions.length > 0) {
+    query.AND = conditions;
+  }
+
+  return {
+    academicYearId,
+    query,
+    orderBy,
+    page: Number.isNaN(p) || p < 1 ? 1 : p,
+  };
+}
diff --git a/src/lib/query-builders/student-query.ts b/src/lib/query-builders/student-query.ts
new file mode 100644
index 0000000..69ff32b
--- /dev/null
+++ b/src/lib/query-builders/student-query.ts
@@ -0,0 +1,154 @@
+import { Prisma, StudentStatus } from "@prisma/client";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+
+type BuildStudentQueryInput = {
+  searchParams: PageSearchParams;
+  schoolId: number;
+  currentAcademicYearId: number;
+  role: string | null;
+  userId: string;
+};
+
+const validStatuses: StudentStatus[] = [
+  "ACTIVE",
+  "REPEATED",
+  "GRADUATED",
+  "LEFT",
+];
+
+export async function buildStudentQuery({
+  searchParams,
+  schoolId,
+  currentAcademicYearId,
+  role,
+  userId,
+}: BuildStudentQueryInput) {
+  const resolvedSearchParams = await searchParams;
+
+  const { page, ...queryParams } = resolvedSearchParams;
+
+  const currentPage = getQueryParam(page);
+  const p = currentPage ? parseInt(currentPage) : 1;
+
+  const statusParam = getQueryParam(queryParams.status);
+  const repeatCountParam = getQueryParam(queryParams.repeatCount);
+
+  const selectedAcademicYearId = currentAcademicYearId;
+
+  const selectedStatus = validStatuses.includes(statusParam as StudentStatus)
+    ? (statusParam as StudentStatus)
+    : "ACTIVE";
+
+  const selectedRepeatCount =
+    repeatCountParam && selectedStatus === "REPEATED"
+      ? Number.parseInt(repeatCountParam, 10)
+      : 1;
+
+  const query: Prisma.StudentWhereInput = {
+    schoolId,
+    academicYears: {
+      some: {
+        academicYearId: selectedAcademicYearId,
+      },
+    },
+    status: selectedStatus,
+  };
+
+  const conditions: Prisma.StudentWhereInput[] = [];
+
+  if (selectedStatus === "REPEATED") {
+    query.repeatCount = Number.isNaN(selectedRepeatCount)
+      ? 1
+      : selectedRepeatCount;
+  }
+
+  for (const [key, rawValue] of Object.entries(queryParams)) {
+    const value = getQueryParam(rawValue);
+
+    if (value === undefined || value === "") continue;
+
+    switch (key) {
+  case "academicYearId":
+    break;
+
+  case "classId":
+    conditions.push({
+      classId: Number(value),
+    });
+    break;
+
+    case "gradeId":
+  conditions.push({
+    class: {
+      gradeId: Number(value),
+    },
+  });
+  break;
+
+  case "teacherId":
+    conditions.push({
+      class: {
+        lessons: {
+          some: { teacherId: value },
+        },
+      },
+    });
+    break;
+
+  case "search":
+    conditions.push({
+      OR: [
+        { name: { contains: value, mode: "insensitive" } },
+        { username: { contains: value, mode: "insensitive" } },
+        { phone: { contains: value, mode: "insensitive" } },
+        { address: { contains: value, mode: "insensitive" } },
+      ],
+    });
+    break;
+    }
+  }
+
+  switch (role) {
+    case "admin":
+      break;
+
+    case "teacher":
+      conditions.push({
+        OR: [
+          {
+            class: {
+              teachers: {
+                some: { id: userId },
+              },
+            },
+          },
+          {
+            class: {
+              lessons: {
+                some: { teacherId: userId },
+              },
+            },
+          },
+        ],
+      });
+      break;
+  }
+
+  if (conditions.length > 0) {
+    query.AND = conditions;
+  }
+
+  const sortParam = getQueryParam(queryParams.sort);
+
+   const orderBy: Prisma.StudentOrderByWithRelationInput =
+  sortParam === "desc" ? { name: "desc" } : { name: "asc" };
+ 
+return {
+  query,
+  orderBy,
+  page: Number.isNaN(p) || p < 1 ? 1 : p,
+  selectedAcademicYearId,
+  selectedStatus,
+  selectedRepeatCount,
+};
+}
diff --git a/src/lib/query-builders/subject-query.ts b/src/lib/query-builders/subject-query.ts
new file mode 100644
index 0000000..f0fb976
--- /dev/null
+++ b/src/lib/query-builders/subject-query.ts
@@ -0,0 +1,99 @@
+import { Prisma } from "@prisma/client";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+
+type BuildSubjectQueryInput = {
+  searchParams: PageSearchParams;
+  schoolId: number;
+  role: string | null;
+  userId: string;
+};
+
+export async function buildSubjectQuery({
+  searchParams,
+  schoolId,
+  role,
+  userId,
+}: BuildSubjectQueryInput) {
+  const resolvedSearchParams = await searchParams;
+
+  const { page, ...queryParams } = resolvedSearchParams;
+
+  const currentPage = getQueryParam(page);
+  const p = currentPage ? Number.parseInt(currentPage, 10) : 1;
+
+  const query: Prisma.SubjectWhereInput = {
+    schoolId,
+  };
+
+  const conditions: Prisma.SubjectWhereInput[] = [];
+
+  for (const [key, rawValue] of Object.entries(queryParams)) {
+    const value = getQueryParam(rawValue);
+
+    if (value === undefined || value === "") continue;
+
+    switch (key) {
+      case "gradeId": {
+        const gradeId = Number.parseInt(value, 10);
+        if (!Number.isNaN(gradeId)) {
+          conditions.push({
+            gradeId,
+          });
+        }
+        break;
+      }
+
+      case "search":
+        conditions.push({
+          OR: [
+            { name: { contains: value, mode: "insensitive" } },
+            {
+              teachers: {
+                some: {
+                  name: { contains: value, mode: "insensitive" },
+                },
+              },
+            },
+          ],
+        });
+        break;
+    }
+  }
+
+  if (role === "teacher") {
+    conditions.push({
+      teachers: {
+        some: {
+          id: userId,
+        },
+      },
+    });
+  }
+
+  if (role === "student") {
+    conditions.push({
+      grade: {
+        students: {
+          some: {
+            id: userId,
+          },
+        },
+      },
+    });
+  }
+
+  if (conditions.length > 0) {
+    query.AND = conditions;
+  }
+
+  const sortParam = getQueryParam(queryParams.sort);
+
+  const orderBy: Prisma.SubjectOrderByWithRelationInput =
+    sortParam === "desc" ? { name: "desc" } : { name: "asc" };
+
+  return {
+    query,
+    orderBy,
+    page: Number.isNaN(p) || p < 1 ? 1 : p,
+  };
+}
diff --git a/src/lib/query-builders/teacher-query.ts b/src/lib/query-builders/teacher-query.ts
new file mode 100644
index 0000000..f44b1ac
--- /dev/null
+++ b/src/lib/query-builders/teacher-query.ts
@@ -0,0 +1,103 @@
+import { Prisma } from "@prisma/client";
+import { getQueryParam, type PageSearchParams } from "@/lib/pageParams";
+
+type BuildTeacherQueryInput = {
+  searchParams: PageSearchParams;
+  schoolId: number;
+};
+
+export async function buildTeacherQuery({
+  searchParams,
+  schoolId,
+}: BuildTeacherQueryInput) {
+  const resolvedSearchParams = await searchParams;
+
+  const { page, ...queryParams } = resolvedSearchParams;
+
+  const currentPage = getQueryParam(page);
+  const p = currentPage ? parseInt(currentPage, 10) : 1;
+
+  const query: Prisma.TeacherWhereInput = {
+    schoolId,
+  };
+
+  const conditions: Prisma.TeacherWhereInput[] = [];
+
+  for (const [key, rawValue] of Object.entries(queryParams)) {
+    const value = getQueryParam(rawValue);
+
+    if (value === undefined || value === "") continue;
+
+    switch (key) {
+   case "classId": {
+  const classId = Number.parseInt(value, 10);
+
+  if (!Number.isNaN(classId)) {
+    conditions.push({
+      OR: [
+        {
+          classes: {
+            some: {
+              id: classId,
+            },
+          },
+        },
+        {
+          supervisedClasses: {
+            some: {
+              id: classId,
+            },
+          },
+        },
+      ],
+    });
+  }
+
+  break;
+}
+      case "subjectId":{
+  conditions.push({
+    subjects: {
+      some: {
+        id: Number(value),
+      },
+    },
+  });
+  break;
+      }
+      case "search":
+        conditions.push({
+          OR: [
+            { name: { contains: value, mode: "insensitive" } },
+            { username: { contains: value, mode: "insensitive" } },
+            { email: { contains: value, mode: "insensitive" } },
+            { phone: { contains: value, mode: "insensitive" } },
+            { address: { contains: value, mode: "insensitive" } },
+            {
+              subjects: {
+                some: {
+                  name: { contains: value, mode: "insensitive" },
+                },
+              },
+            },
+          ],
+        });
+        break;
+    }
+  }
+
+  if (conditions.length > 0) {
+    query.AND = conditions;
+  }
+
+  const sortParam = getQueryParam(queryParams.sort);
+
+  const orderBy: Prisma.TeacherOrderByWithRelationInput =
+    sortParam === "desc" ? { name: "desc" } : { name: "asc" };
+
+  return {
+    query,
+    orderBy,
+    page: Number.isNaN(p) || p < 1 ? 1 : p,
+  };
+}
diff --git a/src/lib/schoolCalendar.ts b/src/lib/schoolCalendar.ts
new file mode 100644
index 0000000..525c7d1
--- /dev/null
+++ b/src/lib/schoolCalendar.ts
@@ -0,0 +1,20 @@
+export const schoolWeekDays = [
+  "SATURDAY",
+  "SUNDAY",
+  "MONDAY",
+  "TUESDAY",
+  "WEDNESDAY",
+  "THURSDAY",
+  "FRIDAY",
+] as const;
+
+export type SchoolWeekDay = (typeof schoolWeekDays)[number];
+
+export const defaultWorkingDays: SchoolWeekDay[] = [
+  "SATURDAY",
+  "SUNDAY",
+  "MONDAY",
+  "TUESDAY",
+  "WEDNESDAY",
+  "THURSDAY",
+];
diff --git a/src/lib/schoolSettings.ts b/src/lib/schoolSettings.ts
index e4ddc34..afa8a37 100644
--- a/src/lib/schoolSettings.ts
+++ b/src/lib/schoolSettings.ts
@@ -1,4 +1,9 @@
 import prisma from "./prisma";
+import {
+  defaultWorkingDays,
+  schoolWeekDays,
+  type SchoolWeekDay,
+} from "./schoolCalendar";
 
 const DEFAULT_SCHEDULE = {
   workDayStartHour: 7,
@@ -7,6 +12,7 @@ const DEFAULT_SCHEDULE = {
   workDayEndMinute: 30,
   lessonDurationMinutes: 45,
   lessonsPerDay: 6,
+  workingDays: defaultWorkingDays,
 } as const;
 
 const clamp = (value: number, min: number, max: number) =>
@@ -24,6 +30,27 @@ export type SchoolScheduleSettings = {
   workDayEndMinute: number;
   lessonDurationMinutes: number;
   lessonsPerDay: number;
+  workingDays: SchoolWeekDay[];
+};
+
+export type SchoolDayExceptionItem = {
+  id: number;
+  date: string;
+  type: "HOLIDAY" | "OFF_DAY" | "WORKING_OVERRIDE";
+  name: string | null;
+  notes: string | null;
+};
+
+const normalizeWorkingDays = (value: unknown): SchoolWeekDay[] => {
+  if (!Array.isArray(value)) return defaultWorkingDays;
+
+  const parsed = value.filter((item): item is SchoolWeekDay =>
+    schoolWeekDays.includes(item as SchoolWeekDay),
+  );
+
+  if (parsed.length === 0) return defaultWorkingDays;
+
+  return schoolWeekDays.filter((day) => parsed.includes(day));
 };
 
 export const getDefaultSchoolScheduleSettings = (): SchoolScheduleSettings => ({
@@ -38,6 +65,7 @@ export const getSchoolScheduleSettings = async (
     workDayEnd: Date;
     lessonDuration: number;
     lessonsPerDay: number;
+    workingDays: unknown;
   } | null = null;
 
   try {
@@ -48,6 +76,7 @@ export const getSchoolScheduleSettings = async (
         workDayEnd: true,
         lessonDuration: true,
         lessonsPerDay: true,
+        workingDays: true,
       },
     });
   } catch {
@@ -68,5 +97,62 @@ export const getSchoolScheduleSettings = async (
     workDayEndMinute: clamp(end.minute, 0, 59),
     lessonDurationMinutes: clamp(settings.lessonDuration, 15, 180),
     lessonsPerDay: clamp(settings.lessonsPerDay, 1, 12),
+    workingDays: normalizeWorkingDays(settings.workingDays),
   };
 };
+
+export const getSchoolDayExceptions = async (
+  schoolId: number,
+): Promise<SchoolDayExceptionItem[]> => {
+  try {
+    const dayExceptionDelegate = (
+      prisma as unknown as {
+        schoolDayException?: {
+          findMany: (args: {
+            where: { schoolId: number };
+            orderBy: { date: "asc" };
+            select: {
+              id: true;
+              date: true;
+              type: true;
+              name: true;
+              notes: true;
+            };
+          }) => Promise<
+            {
+              id: number;
+              date: Date;
+              type: "HOLIDAY" | "OFF_DAY" | "WORKING_OVERRIDE";
+              name: string | null;
+              notes: string | null;
+            }[]
+          >;
+        };
+      }
+    ).schoolDayException;
+
+    if (!dayExceptionDelegate?.findMany) return [];
+
+    const items = await dayExceptionDelegate.findMany({
+      where: { schoolId },
+      orderBy: { date: "asc" },
+      select: {
+        id: true,
+        date: true,
+        type: true,
+        name: true,
+        notes: true,
+      },
+    });
+
+    return items.map((item) => ({
+      id: item.id,
+      date: item.date.toISOString().slice(0, 10),
+      type: item.type,
+      name: item.name,
+      notes: item.notes,
+    }));
+  } catch {
+    return [];
+  }
+};
diff --git a/src/lib/settings.ts b/src/lib/settings.ts
index 9dc83e5..1b71217 100644
--- a/src/lib/settings.ts
+++ b/src/lib/settings.ts
@@ -3,10 +3,12 @@ import { UserRole } from "./utils";
 export const ITEM_PER_PAGE = 10;
 
 export const routePermissions: Record<string, UserRole[]> = {
+  "/super-admin(.*)": ["superAdmin"],
   "/admin(.*)": ["admin"],
   "/teacher(.*)": ["teacher"],
   "/student(.*)": ["student"],
   "/parent(.*)": ["parent"],
+  "/school-access(.*)": ["admin", "teacher", "student", "parent"],
 
   "/list/lessons(.*)": ["admin"],
   "/list/teachers(.*)": ["admin"],
@@ -14,9 +16,12 @@ export const routePermissions: Record<string, UserRole[]> = {
   "/list/parents(.*)": ["admin", "teacher"],
   "/list/subjects(.*)": ["admin", "teacher", "student", "parent"],
   "/list/classes(.*)": ["admin", "teacher"],
+  "/list/grades(.*)": ["admin"],
   "/list/exams(.*)": ["admin", "teacher", "student", "parent"],
   "/list/assignments(.*)": ["admin", "teacher", "student", "parent"],
   "/list/results(.*)": ["admin", "teacher", "student", "parent"],
+  "/list/final-results": ["admin", "teacher", "student", "parent"],
+  "/list/final-results(.*)": ["admin", "teacher", "student", "parent"],
   "/list/attendance(.*)": ["admin", "teacher"],
   "/list/events(.*)": ["admin", "teacher", "student", "parent"],
   "/list/announcements(.*)": ["admin", "teacher", "student", "parent"],
diff --git a/src/lib/storage.ts b/src/lib/storage.ts
index 197fa10..d67d2ee 100644
--- a/src/lib/storage.ts
+++ b/src/lib/storage.ts
@@ -36,7 +36,7 @@ export const validateFile = (file: File): string | null => {
  * Used server-side to reject tampered URLs.
  */
 export const validateFileUrl = (url: string): boolean => {
-  // Must be a relative path starting with /uploads/
+  if (url.startsWith("https://res.cloudinary.com/")) return true;
   return /^\/uploads\/\d+\/[^/]+\/\d+_[^/]+$/.test(url);
 };
 
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 259b516..4fc6a51 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -1,3 +1,5 @@
+import type { SchoolWeekDay } from "./schoolCalendar";
+
 const getLatestSaturday = (): Date => {
   const today = new Date();
   const dayOfWeek = today.getDay();
@@ -14,9 +16,10 @@ const dayOffsets = {
   TUESDAY: 3,
   WEDNESDAY: 4,
   THURSDAY: 5,
+  FRIDAY: 6,
 } as const;
 
-type LessonDay = keyof typeof dayOffsets | "FRIDAY";
+type LessonDay = keyof typeof dayOffsets;
 
 export const adjustScheduleToCurrentWeek = (
   lessons: {
@@ -26,12 +29,23 @@ export const adjustScheduleToCurrentWeek = (
     start: Date;
     end: Date;
   }[],
+  workingDays?: SchoolWeekDay[],
 ): { title: string; lessonName?: string; start: Date; end: Date }[] => {
   const latestSaturday = getLatestSaturday();
+  const enabledDays = new Set<SchoolWeekDay>(
+    workingDays ?? [
+      "SATURDAY",
+      "SUNDAY",
+      "MONDAY",
+      "TUESDAY",
+      "WEDNESDAY",
+      "THURSDAY",
+      "FRIDAY",
+    ],
+  );
 
   return lessons.flatMap((lesson) => {
-    // Friday is an off day and should not be shown in the work schedule.
-    if (lesson.day === "FRIDAY") {
+    if (!enabledDays.has(lesson.day)) {
       return [];
     }
 
@@ -67,13 +81,14 @@ export const adjustScheduleToCurrentWeek = (
   });
 };
 
-export type UserRole = "admin" | "teacher" | "student" | "parent";
+export type UserRole = "admin" | "teacher" | "student" | "parent" | "superAdmin";
 export function getRoleHome(role: UserRole): string {
   const homes: Record<UserRole, string> = {
     admin: "/admin",
     teacher: "/teacher",
     student: "/student",
     parent: "/parent",
+    superAdmin: "/super-admin",
   };
   return homes[role];
 }
diff --git a/src/proxy.ts b/src/proxy.ts
index 3ed7ab1..b493ac9 100644
--- a/src/proxy.ts
+++ b/src/proxy.ts
@@ -1,14 +1,19 @@
 import { clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server";
-import { routePermissions } from "./lib/settings";
 import { NextResponse } from "next/server";
-
-type AllowedRole = string;
+import { routePermissions } from "./lib/settings";
+import { getRoleHome, type UserRole } from "./lib/utils";
 
 const isSignInRoute = createRouteMatcher(["/sign-in(.*)"]);
-const isPublicRoute = createRouteMatcher(["/sign-in(.*)", "/api/webhooks(.*)"]);
+const isPublicRoute = createRouteMatcher([
+  "/",
+  "/sign-in(.*)",
+  "/api/webhooks(.*)",
+  "/school-signup(.*)",
+  "/api/cron(.*)",
+]);
 
 const matchers = (
-  Object.entries(routePermissions) as [string, AllowedRole[]][]
+  Object.entries(routePermissions) as [string, UserRole[]][]
 ).map(([route, allowedRoles]) => ({
   matcher: createRouteMatcher([route]),
   allowedRoles,
@@ -18,37 +23,67 @@ export default clerkMiddleware(async (auth, req) => {
   const { userId, sessionClaims } = await auth();
 
   const role =
-    (sessionClaims?.metadata as { role?: AllowedRole } | undefined)?.role ??
-    null;
+    (sessionClaims?.metadata as { role?: UserRole } | undefined)?.role ?? null;
 
   const isSignIn = isSignInRoute(req);
   const isPublic = isPublicRoute(req);
+  const isRoot = req.nextUrl.pathname === "/";
+
+  const shouldUsePostLogin =
+    role === "admin" ||
+    role === "teacher" ||
+    role === "student" ||
+    role === "parent";
+
+  if (
+    role === "superAdmin" &&
+    (req.nextUrl.pathname.startsWith("/list/") ||
+      req.nextUrl.pathname.startsWith("/settings"))
+  ) {
+    return NextResponse.redirect(new URL("/super-admin", req.url));
+  }
 
-  // ✅ 1. If already signed in, don't stay on /sign-in
   if (isSignIn && userId) {
-    const redirectUrl =
-      req.nextUrl.searchParams.get("redirect_url") || (role ? `/${role}` : "/");
+    const redirectUrl = req.nextUrl.searchParams.get("redirect_url");
+    if (redirectUrl) {
+      return NextResponse.redirect(new URL(redirectUrl, req.url));
+    }
 
-    return NextResponse.redirect(new URL(redirectUrl, req.url));
+    if (role) {
+      const destination = shouldUsePostLogin
+        ? "/post-login"
+        : getRoleHome(role);
+      return NextResponse.redirect(new URL(destination, req.url));
+    }
+
+    // Keep user on /sign-in loading view until role is available.
+    return NextResponse.next();
+  }
+
+  if (isRoot && userId) {
+    if (role) {
+      const destination = shouldUsePostLogin
+        ? "/post-login"
+        : getRoleHome(role);
+      return NextResponse.redirect(new URL(destination, req.url));
+    }
+    return NextResponse.redirect(new URL("/post-login", req.url));
   }
 
-  // ✅ 2. Allow public routes always
   if (isPublic) {
     return NextResponse.next();
   }
 
-  // ✅ 3. If user not ready yet → DON'T redirect immediately (fixes your bug)
   if (!userId) {
     const signInUrl = new URL("/sign-in", req.url);
     signInUrl.searchParams.set("redirect_url", req.nextUrl.pathname);
     return NextResponse.redirect(signInUrl);
   }
 
-  // ✅ 4. Role-based protection
   for (const { matcher, allowedRoles } of matchers) {
     if (matcher(req)) {
       if (!role || !allowedRoles.includes(role)) {
-        const dest = role ? `/${role}` : "/unauthorized";
+        const dest = role ? getRoleHome(role) : "/unauthorized";
         return NextResponse.redirect(new URL(dest, req.url));
       }
       break;
@@ -62,5 +97,6 @@ export const config = {
   matcher: [
     "/((?!_next|[^?]*\\.(?:html?|css|js(?!on)|jpe?g|webp|png|gif|svg|ttf|woff2?|ico|csv|docx?|xlsx?|zip|webmanifest)).*)",
     "/(api|trpc)(.*)",
+    "/((?!api|trpc|_next|_vercel|.*\\..*).*)",
   ],
 };
diff --git a/src/types/react-big-calendar-internal.d.ts b/src/types/react-big-calendar-internal.d.ts
new file mode 100644
index 0000000..771e29f
--- /dev/null
+++ b/src/types/react-big-calendar-internal.d.ts
@@ -0,0 +1,9 @@
+declare module "react-big-calendar/lib/Week" {
+  const Week: any;
+  export default Week;
+}
+
+declare module "react-big-calendar/lib/TimeGrid" {
+  const TimeGrid: any;
+  export default TimeGrid;
+}
diff --git a/tailwind.config.ts b/tailwind.config.ts
index fdcf643..6641b56 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -14,6 +14,12 @@ const config: Config = {
           "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))",
       },
       colors: {
+        academixInk: "#24104F",
+        academixInkMuted: "#3B1B76",
+        academixSurface: "#F7F3FF",
+        academixPanel: "#FFFFFF",
+        academixBorder: "#E9DDFD",
+
         academixSky: "#C3EBFA",
         academixSkyLight: "#EDF9FD",
 
@@ -21,10 +27,25 @@ const config: Config = {
         academixPurpleLight: "#F1F0FF",
 
         academixPurpleDark: "#7C3AED",
+        academixPurpleDeep: "#24104F",
+        academixPurpleMuted: "#3B1B76",
 
-        academixYellow: "#FAE27C",
+        academixYellow: "#FCD34D",
         academixYellowLight: "#FEFCE8",
       },
+      keyframes: {
+        wiggle: {
+          "0%, 100%": {
+            transform: "rotate(-10deg)",
+          },
+          "50%": {
+            transform: "rotate(10deg)",
+          },
+        },
+      },
+      animation: {
+        wiggle: "wiggle 1s ease-in-out infinite",
+      },
     },
   },
   plugins: [],