From 4ebf523de709c00f0feed861669ba858cbac33a2 Mon Sep 17 00:00:00 2001
From: Methexx <methum.edu@gmail.com>
Date: Thu, 14 May 2026 17:48:34 +0530
Subject: [PATCH 1/7] fix: Ci pipleine automate and release flutter package

---
 .github/workflows/ci.yml               |   48 +
 .github/workflows/flutter-release.yml  |   58 ++
 Documentation/01-PROJECT-OVERVIEW.md   |  482 ++++++++++
 Documentation/02-BACKEND-DEEP-DIVE.md  | 1028 ++++++++++++++++++++
 Documentation/03-FRONTEND-WEB-APP.md   |  741 ++++++++++++++
 Documentation/04-FLUTTER-MOBILE-APP.md | 1225 ++++++++++++++++++++++++
 Documentation/05-DEVOPS-DOCKER-CICD.md |  973 +++++++++++++++++++
 README.md                              |  565 ++++++-----
 8 files changed, 4859 insertions(+), 261 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 .github/workflows/flutter-release.yml
 create mode 100644 Documentation/01-PROJECT-OVERVIEW.md
 create mode 100644 Documentation/02-BACKEND-DEEP-DIVE.md
 create mode 100644 Documentation/03-FRONTEND-WEB-APP.md
 create mode 100644 Documentation/04-FLUTTER-MOBILE-APP.md
 create mode 100644 Documentation/05-DEVOPS-DOCKER-CICD.md

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..2fcf782
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,48 @@
+name: CI Tests
+
+on:
+  pull_request:
+
+jobs:
+  backend-tests:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: apps/backend
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: npm
+          cache-dependency-path: package-lock.json
+
+      - name: Install dependencies
+        working-directory: .
+        run: npm ci
+
+      - name: Run unit tests
+        run: npm run test:unit
+
+      - name: Run integration tests
+        run: npm run test:integration
+
+  flutter-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.32.0'
+          channel: stable
+          cache: true
+
+      - name: Get dependencies
+        working-directory: apps/flutter
+        run: flutter pub get
+
+      - name: Run widget tests
+        working-directory: apps/flutter
+        run: flutter test
diff --git a/.github/workflows/flutter-release.yml b/.github/workflows/flutter-release.yml
new file mode 100644
index 0000000..4d82bc9
--- /dev/null
+++ b/.github/workflows/flutter-release.yml
@@ -0,0 +1,58 @@
+name: Flutter Release APK
+
+on:
+  push:
+    branches:
+      - release/development
+
+permissions:
+  contents: write
+
+jobs:
+  build-and-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.32.0'
+          channel: stable
+          cache: true
+
+      - name: Get dependencies
+        working-directory: apps/flutter
+        run: flutter pub get
+
+      - name: Build debug APK
+        working-directory: apps/flutter
+        run: flutter build apk --debug --dart-define=API_BASE_URL=${{ secrets.RAILWAY_BACKEND_URL }}
+
+      - name: Get next version tag
+        id: tag
+        run: |
+          LATEST=$(git tag --list 'v*' --sort=-version:refname | head -n1)
+          if [ -z "$LATEST" ]; then
+            NEXT="v1.0.0"
+          else
+            NEXT=$(echo $LATEST | awk -F. '{printf "%s.%s.%d", $1, $2, $3+1}')
+          fi
+          echo "tag=$NEXT" >> $GITHUB_OUTPUT
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ steps.tag.outputs.tag }}
+          name: "Release ${{ steps.tag.outputs.tag }}"
+          body: |
+            Debug APK — built from `release/development`
+            Commit: ${{ github.sha }}
+          files: apps/flutter/build/app/outputs/flutter-apk/app-debug.apk
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Documentation/01-PROJECT-OVERVIEW.md b/Documentation/01-PROJECT-OVERVIEW.md
new file mode 100644
index 0000000..7567112
--- /dev/null
+++ b/Documentation/01-PROJECT-OVERVIEW.md
@@ -0,0 +1,482 @@
+# Universe System — Project Overview & Architecture
+
+> **Document 1 of 5** — Complete project overview, monorepo structure, tech stack, features, and high-level architecture.
+
+---
+
+## Table of Contents
+
+1. [What is Universe System?](#what-is-universe-system)
+2. [Monorepo Structure](#monorepo-structure)
+3. [User Roles & Permissions](#user-roles--permissions)
+4. [Complete Feature List](#complete-feature-list)
+5. [Tech Stack Summary](#tech-stack-summary)
+6. [System Architecture Diagram](#system-architecture-diagram)
+7. [Data Flow Across Apps](#data-flow-across-apps)
+8. [Module-by-Module Working Style](#module-by-module-working-style)
+9. [Existing Documentation Map](#existing-documentation-map)
+
+---
+
+## What is Universe System?
+
+**Universe System** (also referred to as *School Connect*) is a **full-stack, multi-platform School Management Information System** that connects four user types — **Administrators, Teachers, Security Officers, and Parents** — through a single backend serving both a web dashboard (Next.js) and a parent-facing mobile app (Flutter).
+
+The platform digitizes the day-to-day life of a school — from gate entry/exit tracking via QR scans, to attendance, term results, complaints, lost & found, push notifications, AI-powered policy chatbot, and a real-time messaging system between teachers and parents.
+
+### Core Capabilities
+
+| Capability | Description |
+|---|---|
+| **Gate Tracking** | QR-based check-in/out at the school gate with real-time parent notifications |
+| **Attendance** | Daily attendance sessions per class with parent visibility |
+| **Results & Grades** | Teachers publish term results; parents view child's grades |
+| **Messaging** | Direct messages between teachers and parents with AI draft suggestion |
+| **Announcements** | School-wide or class-scoped notices |
+| **Complaints** | Parent-filed complaints triaged to admin, then assigned to staff |
+| **Lost & Found** | Parents report lost items; staff post found items |
+| **RAG Chatbot** | AI-powered Q&A over school policy PDFs (Gemini-embedded vectors) |
+| **Push Notifications** | Firebase FCM alerts to parent's phone for gate scans, messages, etc. |
+| **Role-Based Dashboards** | Distinct UIs for Admin / Teacher / Security / Parent |
+
+---
+
+## Monorepo Structure
+
+The repository is an **npm workspace monorepo** with three application workspaces:
+
+```
+Universe-System/                          ← Repository root
+│
+├── apps/
+│   ├── backend/                          ← Fastify + Prisma REST API (port 5000)
+│   │   ├── src/
+│   │   │   ├── server.ts                 ← App entry: startup, Redis, Firebase init
+│   │   │   ├── app.ts                    ← Fastify config: plugins, routes, errors
+│   │   │   ├── config/                   ← env, prisma, redis, supabase, firebase
+│   │   │   ├── common/                   ← middleware, utils (jwt, hash, otp, email)
+│   │   │   ├── modules/                  ← 11 feature modules (auth/users/gate/...)
+│   │   │   └── scripts/seedAdmin.ts      ← DB seeding
+│   │   ├── prisma/
+│   │   │   ├── schema.prisma             ← 20 models, pgvector + uuid-ossp extensions
+│   │   │   └── migrations/               ← Generated migration history
+│   │   ├── tests/                        ← Jest unit + integration tests
+│   │   ├── Dockerfile.dev
+│   │   ├── jest.config.js
+│   │   └── package.json
+│   │
+│   ├── frontend/                         ← Next.js 16 + React 19 web dashboard (port 3000)
+│   │   ├── src/
+│   │   │   ├── app/                      ← App Router: admin/, teacher/, security/, auth pages
+│   │   │   ├── features/                 ← 10 feature modules (auth/messages/gate/rag/...)
+│   │   │   ├── shared/                   ← components, hooks, lib
+│   │   │   └── core/                     ← config, constants
+│   │   ├── public/                       ← Static assets
+│   │   ├── Dockerfile.dev
+│   │   ├── eslint.config.mjs
+│   │   └── package.json
+│   │
+│   └── flutter/                          ← Flutter parent mobile app (Android/iOS)
+│       ├── lib/
+│       │   ├── main.dart                 ← Entry: Firebase, ServiceLocator setup
+│       │   ├── app.dart                  ← MultiProvider + MaterialApp.router
+│       │   ├── core/                     ← api, di, navigation, services, storage
+│       │   ├── features/                 ← 15 feature modules (auth/dashboard/results/...)
+│       │   └── shared/                   ← themes, reusable widgets
+│       ├── android/                      ← Native Android project
+│       ├── ios/                          ← Native iOS project
+│       ├── test/                         ← Widget tests
+│       └── pubspec.yaml
+│
+├── Doc/                                  ← Existing detailed reference docs (10 files)
+├── Documentation/                        ← THIS folder (5 comprehensive guides)
+│
+├── .github/workflows/                    ← CI/CD (ci.yml, flutter-release.yml)
+├── .husky/                               ← Git hooks (pre-commit, pre-push, commit-msg)
+├── .vscode/, .claude/, .mcp.json         ← IDE & AI configs
+│
+├── docker-compose.yml                    ← Prod stack (redis, backend, frontend)
+├── docker-compose.dev.yml                ← Dev stack with hot reload volumes
+├── package.json                          ← Root workspace scripts
+├── package-lock.json                     ← Single root lockfile
+├── commitlint.config.js                  ← Conventional Commits enforcement
+├── .prettierrc                           ← Code formatting rules
+├── .eslintignore, .gitignore, .dockerignore
+└── vercel.json                           ← Next.js Vercel deployment config
+```
+
+### Workspace Linking
+
+`package.json` (root) declares:
+
+```json
+{
+  "workspaces": ["apps/frontend", "apps/backend"]
+}
+```
+
+`apps/flutter` is **not** a Node workspace — it has its own `pubspec.yaml` and is managed independently via the Dart/Flutter toolchain.
+
+---
+
+## User Roles & Permissions
+
+The system supports **5 roles**, with `pending` being a transitional state.
+
+| Role | Description | Sign-up Path | Approval Required |
+|---|---|---|---|
+| **pending** | Account created, awaiting admin approval | Self-registers (teacher/security) | Yes — admin promotes |
+| **admin** | Full system control: user management, students, classes, RAG policies | Seeded or promoted by another admin | — |
+| **teacher** | Mark attendance, post notices, message parents, publish results | Self-registers → admin approves | Yes |
+| **security** | Scan QR at gate, view gate logs, message parents | Self-registers → admin approves | Yes |
+| **parent** | View child's gate/attendance/results, file complaints, chat with teachers | Multi-step OTP + 2FA verification | No — auto-active after OTP |
+
+### Parent Registration is Special (2FA)
+
+Parents go through a **2-factor identity check** to prove they own the child:
+1. Submit email + student ID number → backend validates `parent_email` matches school records
+2. OTP sent via Resend
+3. After OTP verification, the parent must answer profile questions: **grade, class, admission year, gender** — server-side validation against the Student record
+4. On success, parent user + `ParentStudent` link created atomically in a Prisma transaction
+
+---
+
+## Complete Feature List
+
+### Backend Feature Modules (11)
+
+| Module | Path | Purpose |
+|---|---|---|
+| **auth** | `apps/backend/src/modules/auth/` | Registration, OTP, login, password reset, JWT refresh, FCM token, 2FA for parents |
+| **users** | `apps/backend/src/modules/users/` | User profile, admin user management (approve/suspend/delete) |
+| **school** | `apps/backend/src/modules/school/` | Grades, classes, students, student photo upload, overview stats |
+| **gate** | `apps/backend/src/modules/gate/` | QR scan IN/OUT, manual entry, time-series stats, parent's child history, auto-checkout scheduler |
+| **attendance** | `apps/backend/src/modules/attendance/` | Daily attendance sessions, batch submit, calendar dates, summaries |
+| **announcements** | `apps/backend/src/modules/announcements/` | School-wide or class-scoped notices with image upload |
+| **messages** | `apps/backend/src/modules/messages/` | Inbox, threads, contacts, send/read, AI draft suggestion |
+| **complaints** | `apps/backend/src/modules/complaints/` | Parent files → admin triages → staff assignment → resolution |
+| **lost-found** | `apps/backend/src/modules/lost-found/` | Found items (posted by staff), lost reports (filed by parents) |
+| **results** | `apps/backend/src/modules/results/` | Terms, result sets per class/term, modules + student grades, publish/unpublish |
+| **rag** | `apps/backend/src/modules/rag/` | Policy PDF ingestion (chunk + embed), hybrid search, LLM answer generation, eval logs |
+
+### Frontend Web Feature Modules (10)
+
+| Module | Path | Used By |
+|---|---|---|
+| **auth** | `apps/frontend/src/features/auth/` | All roles |
+| **attendance** | `apps/frontend/src/features/attendance/` | Admin, Teacher |
+| **gate** | `apps/frontend/src/features/gate/` | Security, Admin |
+| **messages** | `apps/frontend/src/features/messages/` | All roles |
+| **notices** | `apps/frontend/src/features/notices/` | Admin, Teacher |
+| **complaints** | `apps/frontend/src/features/complaints/` | Admin, Teacher |
+| **results** | `apps/frontend/src/features/results/` | Teacher |
+| **rag** | `apps/frontend/src/features/rag/` | Admin (policy chatbot in overview) |
+| **school** | `apps/frontend/src/features/school/` | Admin |
+
+### Flutter Mobile Feature Modules (15)
+
+| Module | Path | Description |
+|---|---|---|
+| **splash** | `lib/features/splash/` | Splash + welcome onboarding screen |
+| **auth** | `lib/features/auth/` | Login, multi-step registration with OTP, forgot password, biometric login |
+| **dashboard** | `lib/features/dashboard/` | Home grid with action cards, animated bubble effects, announcements carousel, live clock |
+| **profile** | `lib/features/profile/` | Parent + child + teacher info, profile setup |
+| **attendance** | `lib/features/attendance/` | Paginated attendance records for child |
+| **gate** | `lib/features/gate/` | Child's gate IN/OUT history + currently-inside-school status |
+| **results** | `lib/features/results/` | Per-term grades, modules, average score, grade letter (A+, A, B+...) |
+| **messages** | `lib/features/messages/` | Inbox + contacts tab, conversations with teachers |
+| **contact_teacher** | `lib/features/contact_teacher/` | Direct chat with class teacher |
+| **support** | `lib/features/support/` | File complaints/suggestions, view status (pending/assigned/resolved) |
+| **notices** | `lib/features/notices/` | School & class announcements |
+| **notifications** | `lib/features/notifications/` | Notification history |
+| **chatbot** | `lib/features/chatbot/` | RAG-powered policy Q&A |
+| **lost_and_found** | `lib/features/lost_and_found/` | Lost item reporting (stub) |
+| **settings** | `lib/features/settings/` | Theme, logout, preferences |
+
+---
+
+## Tech Stack Summary
+
+### Backend
+
+| Layer | Technology | Version |
+|---|---|---|
+| **Runtime** | Node.js | 20-alpine |
+| **Framework** | Fastify | 5.7.4 |
+| **Language** | TypeScript | 5.9.3 (strict mode, ES2020) |
+| **Database** | PostgreSQL via Supabase | with `pgvector` & `uuid-ossp` |
+| **ORM** | Prisma | 6.16.3 |
+| **Cache** | Redis (optional) | 7-alpine |
+| **Validation** | Zod | 4.3.6 |
+| **Auth** | JWT (jsonwebtoken) + bcryptjs | 9.0.3 / 3.0.3 |
+| **AI** | Google Gemini, Anthropic Claude SDK | 0.24.1 / 0.93.0 |
+| **Email** | Resend | 6.12.2 |
+| **Push** | Firebase Admin | 13.8.0 |
+| **Logging** | Pino + pino-pretty | 10.3.1 / 13.1.3 |
+| **Scheduling** | node-cron | 4.2.1 |
+| **PDF** | pdf-parse | 2.4.5 |
+| **Testing** | Jest + ts-jest + supertest | 29.7.0 / 29.4.9 / 7.2.2 |
+
+### Frontend (Next.js)
+
+| Layer | Technology | Version |
+|---|---|---|
+| **Framework** | Next.js (App Router) | 16.1.6 |
+| **UI Library** | React | 19.2.3 |
+| **Language** | TypeScript | 5.x (strict) |
+| **Styling** | Tailwind CSS | 3.4.19 |
+| **Forms** | react-hook-form + Zod | 7.73.1 / 4.3.6 |
+| **Charts** | Recharts | 3.8.1 |
+| **Animation** | Framer Motion | 12.38.0 |
+| **Icons** | lucide-react | 1.8.0 |
+| **QR** | qrcode + react-qr-code | 1.5.4 / 2.0.18 |
+| **QR Scan** | @zxing/browser + @zxing/library | 0.2.0 / 0.22.0 |
+| **Database SDK** | @supabase/supabase-js | 2.105.1 |
+| **Lint** | ESLint 9 + next/core-web-vitals + next/typescript | — |
+
+### Flutter (Mobile)
+
+| Layer | Technology | Version |
+|---|---|---|
+| **Framework** | Flutter | 3.32.0 |
+| **Language** | Dart | SDK ^3.10.1 |
+| **State** | provider | 6.1.5 |
+| **Routing** | go_router | 16.2.1 |
+| **HTTP** | dio | 5.9.0 |
+| **Storage** | flutter_secure_storage + shared_preferences | 9.2.4 / 2.5.3 |
+| **Biometric** | local_auth | 3.0.1 |
+| **Firebase** | firebase_core + firebase_messaging | 3.0.0 / 15.0.0 |
+| **Notifications** | flutter_local_notifications | 21.0.0 |
+| **Fonts** | google_fonts (Plus Jakarta Sans) | 6.2.1 |
+| **OTP UI** | pinput | 6.0.2 |
+| **Animation** | animations | 2.0.11 |
+
+### DevOps
+
+| Tool | Purpose |
+|---|---|
+| **Docker Compose** | Local stack (Redis + Backend + Frontend) |
+| **GitHub Actions** | CI tests (ci.yml) + Flutter APK release (flutter-release.yml) |
+| **Husky** | Git hooks: pre-commit, pre-push, commit-msg |
+| **commitlint** | Conventional Commits enforcement |
+| **lint-staged** | Run ESLint --fix on staged files |
+| **Prettier** | Code formatting (singleQuote, 2 tab, 100 width) |
+| **Vercel** | Web frontend hosting (vercel.json) |
+| **Railway** | Backend production hosting (referenced in CI secrets) |
+| **Supabase Cloud** | Managed PostgreSQL + Auth + Storage |
+
+---
+
+## System Architecture Diagram
+
+```
+┌─────────────────────────────────────────────────────────────────────────┐
+│                          USER DEVICES                                   │
+│                                                                         │
+│   ┌────────────┐    ┌────────────┐    ┌────────────┐   ┌────────────┐   │
+│   │   Admin    │    │  Teacher   │    │  Security  │   │   Parent   │   │
+│   │  Browser   │    │  Browser   │    │  Browser   │   │  Phone/App │   │
+│   │ (Next.js)  │    │ (Next.js)  │    │ (Next.js)  │   │ (Flutter)  │   │
+│   └─────┬──────┘    └─────┬──────┘    └─────┬──────┘   └─────┬──────┘   │
+└─────────┼─────────────────┼─────────────────┼────────────────┼──────────┘
+          │                 │                 │                │
+          │ HTTPS/Cookies   │                 │                │ HTTPS/JWT
+          │                 │                 │                │
+          └─────────────────┴─────┬───────────┴────────────────┘
+                                  │
+                  ┌───────────────▼────────────────┐
+                  │      Fastify API (5000)        │
+                  │  ┌──────────────────────────┐  │
+                  │  │ helmet + cors + rate-lim │  │
+                  │  ├──────────────────────────┤  │
+                  │  │ authenticate + rbac      │  │
+                  │  ├──────────────────────────┤  │
+                  │  │ 11 modules:              │  │
+                  │  │ auth, users, school,     │  │
+                  │  │ gate, attendance,        │  │
+                  │  │ announcements, messages, │  │
+                  │  │ complaints, lost-found,  │  │
+                  │  │ results, rag             │  │
+                  │  └──────┬──────────┬────────┘  │
+                  └─────────┼──────────┼───────────┘
+                            │          │
+                ┌───────────▼─┐    ┌──▼──────────────┐
+                │  Redis 7    │    │  Prisma Client  │
+                │  (cache,    │    └──────┬──────────┘
+                │   sessions, │           │
+                │   online)   │   ┌───────▼────────────┐
+                └─────────────┘   │  PostgreSQL        │
+                                  │  (Supabase)        │
+                                  │  + pgvector        │
+                                  │  + uuid-ossp       │
+                                  │  20 models         │
+                                  └────────────────────┘
+
+                  ┌────────────────┐    ┌─────────────────┐
+                  │ Gemini API     │    │  Resend Email   │
+                  │ (embed + LLM)  │    │  (OTP/Approval) │
+                  └────────────────┘    └─────────────────┘
+
+                  ┌────────────────┐    ┌─────────────────┐
+                  │ Firebase FCM   │    │  Supabase       │
+                  │ (push notif)   │    │  Storage        │
+                  └────────────────┘    └─────────────────┘
+```
+
+---
+
+## Data Flow Across Apps
+
+### Example 1: Gate Scan → Parent Notification
+
+```
+1. Security Officer (Frontend /security/dashboard) scans QR code
+2. POST /api/gate/scan { student_id, direction:"IN", method:"qr" }
+3. Fastify: authenticate → rbac(['admin','teacher','security']) → controller
+4. Controller:
+   a. Prisma: insert GateEvent
+   b. Redis: cache invalidate (delCacheByPattern('gate:*'))
+   c. Fetch Student → ParentStudent[] → User.fcm_token
+   d. Firebase Admin: sendMulticastFcmNotification(tokens, "Child checked in", body)
+5. Parent (Flutter app):
+   - FCM listener (FirebaseMessaging.onMessage) fires
+   - flutter_local_notifications shows OS notification
+   - GateViewModel pulls latest events on next refresh
+```
+
+### Example 2: Parent Files Complaint
+
+```
+1. Parent (Flutter /support/submit) types complaint, selects category
+2. POST /api/complaints { category, description, student_id }
+3. Backend: authenticate → controller → Prisma.complaint.create({ status:'pending' })
+4. Admin (Frontend /admin/complaints):
+   - Sees new complaint with status badge
+   - PUT /api/complaints/:id/assign { assigned_to_id: teacherId }
+   - Status updates to 'assigned'
+5. Teacher (Frontend /teacher/complaints):
+   - Sees assigned complaint
+   - PUT /api/complaints/:id/status { status:'resolved', reply_note }
+6. Parent app refreshes — sees resolution + reply note in detail screen
+```
+
+### Example 3: RAG Chatbot Query
+
+```
+1. User (Flutter /chatbot OR Frontend /admin/overview/policies) types question
+2. POST /api/rag/query { question, top_k:5 }
+3. Rate limit: 10/min per IP
+4. Cache check: Redis key based on question hash → if hit, return cached
+5. Pipeline:
+   a. Embed query via Gemini gemini-embedding-2 (768-dim)
+   b. Hybrid search: pgvector cosine similarity + tsvector BM25
+   c. Re-rank top chunks by term frequency
+   d. Build prompt + call Gemini 2.5 Flash Lite
+   e. Cache answer for 1 hour
+   f. Log to EvaluationLog table (query, chunks, answer, confidence)
+6. Return { answer, sources, confidence }
+```
+
+---
+
+## Module-by-Module Working Style
+
+Every backend module follows the same **4-file pattern**:
+
+```
+modules/<feature>/
+├── <feature>.routes.ts       ← Fastify route registration
+├── <feature>.controller.ts   ← Request handlers
+├── <feature>.service.ts      ← Business logic (sometimes inline in controller for small modules)
+└── <feature>.schema.ts       ← Zod validation schemas
+```
+
+### Why This Pattern?
+
+| File | Responsibility |
+|---|---|
+| **routes** | URL paths, HTTP method, schema validation in `preHandler`, RBAC guards, rate limits |
+| **controller** | Parse `request`, call service, format response, set status code |
+| **service** | Pure business logic — Prisma queries, external API calls, transformations |
+| **schema** | Zod schemas; types are inferred via `z.infer<typeof schema>['body']` |
+
+### Frontend (Next.js) Pattern
+
+```
+src/features/<feature>/
+├── lib/
+│   └── <feature>-api.ts      ← fetch wrappers returning { ok, data } | { ok:false, error }
+├── components/               ← Feature-specific React components
+├── context/                  ← Optional ContextProvider for shared state
+└── types/                    ← TypeScript interfaces (mirror backend)
+```
+
+### Flutter Pattern (MVVM + Repository)
+
+```
+lib/features/<feature>/
+├── models/                   ← Pure data classes with fromJson/toJson
+├── repositories/             ← Abstract + Api implementation (Dio calls)
+├── viewmodels/               ← extends ChangeNotifier; loading/error/data state
+└── views/                    ← Widget tree consuming ViewModel via Provider
+```
+
+---
+
+## Existing Documentation Map
+
+The repository already contains an extensive `Doc/` folder with **10 deep-dive references**. Use this guide alongside them:
+
+| File | Purpose |
+|---|---|
+| `Doc/00-master-project-reference.md` | Master reference: roles, terminology, glossary |
+| `Doc/01-system-architecture.md` | Architecture diagrams, deployment topology |
+| `Doc/02-database-schema.md` | Every table, every column, relationships |
+| `Doc/03-api-endpoints.md` | Detailed REST API reference |
+| `Doc/04-backend-structure.md` | Backend folder structure & patterns |
+| `Doc/05-realtime-channels.md` | Realtime + Firebase push channels |
+| `Doc/06-auth-flow.md` | Step-by-step auth flow by role |
+| `Doc/07-data-flow.md` | Feature-by-feature data movement |
+| `Doc/08-flutter-app-structure.md` | Flutter MVVM architecture |
+| `Doc/09-sprint-timeline.md` | Week-by-week development log |
+| `Doc/10-production-readiness.md` | Deployment checklist, security hardening |
+
+The 5 docs in `Documentation/` (this folder) are designed to be **standalone and comprehensive** — giving a reader the whole picture without needing the `Doc/` folder, while `Doc/` provides deeper drill-downs for specific topics.
+
+### Reading Order
+
+| If you want to... | Read |
+|---|---|
+| Understand the whole system | `Documentation/01-PROJECT-OVERVIEW.md` (this file) |
+| Build / modify the backend | `Documentation/02-BACKEND-DEEP-DIVE.md` |
+| Build / modify the web app | `Documentation/03-FRONTEND-WEB-APP.md` |
+| Build / modify the mobile app | `Documentation/04-FLUTTER-MOBILE-APP.md` |
+| Deploy / run locally / CI | `Documentation/05-DEVOPS-DOCKER-CICD.md` |
+
+---
+
+## Quick-Start Commands
+
+```bash
+# Install everything (npm workspaces)
+npm install
+
+# Generate Prisma client
+npm run prisma:generate --prefix apps/backend
+
+# Run dev (without Docker)
+npm run backend:dev          # Terminal 1 — http://localhost:5000
+npm run frontend:dev         # Terminal 2 — http://localhost:3000
+
+# Run dev (with Docker)
+docker compose -f docker-compose.dev.yml up --build
+
+# Flutter
+cd apps/flutter
+flutter pub get
+flutter run                  # Connects to http://10.0.2.2:5000 on emulator
+```
+
+---
+
+**Next:** [02-BACKEND-DEEP-DIVE.md](02-BACKEND-DEEP-DIVE.md) — Fastify, Prisma, all API endpoints, auth, RAG pipeline.
diff --git a/Documentation/02-BACKEND-DEEP-DIVE.md b/Documentation/02-BACKEND-DEEP-DIVE.md
new file mode 100644
index 0000000..c2fd3bc
--- /dev/null
+++ b/Documentation/02-BACKEND-DEEP-DIVE.md
@@ -0,0 +1,1028 @@
+# Universe System — Backend Deep Dive
+
+> **Document 2 of 5** — Fastify backend: every API endpoint, database schema, authentication, RAG pipeline, middleware, testing, and packages.
+
+**Location:** `apps/backend/`
+**Port:** `5000`
+**Entry:** `src/server.ts` → `src/app.ts`
+
+---
+
+## Table of Contents
+
+1. [Application Bootstrap](#application-bootstrap)
+2. [Folder Structure (Detailed)](#folder-structure-detailed)
+3. [Every Package & Its Role](#every-package--its-role)
+4. [Database Schema (Prisma)](#database-schema-prisma)
+5. [Authentication & Authorization](#authentication--authorization)
+6. [Middleware Stack](#middleware-stack)
+7. [Complete API Reference](#complete-api-reference)
+8. [The RAG Pipeline (How the Chatbot Works)](#the-rag-pipeline-how-the-chatbot-works)
+9. [Scheduled Jobs](#scheduled-jobs)
+10. [Caching Strategy (Redis)](#caching-strategy-redis)
+11. [External Integrations](#external-integrations)
+12. [Testing Strategy](#testing-strategy)
+13. [Environment Variables](#environment-variables)
+14. [NPM Scripts](#npm-scripts)
+15. [Error Handling & Response Format](#error-handling--response-format)
+
+---
+
+## Application Bootstrap
+
+### `src/server.ts` — Entry Point
+
+```typescript
+// Simplified responsibility flow
+1. Load env (validated by Zod in config/env.ts)
+2. Initialize Redis (graceful: skip if REDIS_URL not set)
+3. Initialize Firebase Admin (FCM)
+4. Build Fastify app via createApp() in app.ts
+5. Start cron schedulers (gate auto-checkout)
+6. app.listen({ port: env.PORT, host: '0.0.0.0' })
+```
+
+### `src/app.ts` — Fastify Configuration
+
+```typescript
+// What it does, in order:
+1. Create Fastify instance with Pino logger
+2. Register @fastify/cookie
+3. Register @fastify/multipart (5 MB per file limit)
+4. Register @fastify/cors (origins: WEB_URL, FLUTTER_ORIGIN, localhost:3000, localhost:3001)
+5. Register @fastify/helmet (CORP: cross-origin, CSP: disabled)
+6. Register @fastify/rate-limit (global: 100 req/min)
+7. Set custom error handler (errorHandler middleware)
+8. Register routes with prefixes:
+     /api/auth, /api/users, /api/school, /api/gate,
+     /api/attendance, /api/announcements, /api/messages,
+     /api/complaints, /api/lost-found, /api/results, /api/rag
+9. Add GET /health → { ok: true }
+```
+
+---
+
+## Folder Structure (Detailed)
+
+```
+apps/backend/
+├── src/
+│   ├── server.ts                              ← App startup
+│   ├── app.ts                                 ← Fastify configuration
+│   │
+│   ├── config/
+│   │   ├── env.ts                             ← Zod env schema, fails loud on missing vars
+│   │   ├── prisma.ts                          ← PrismaClient singleton (dev: global to survive HMR)
+│   │   ├── redis.ts                           ← Redis client; optional, degrades gracefully
+│   │   ├── supabase.ts                        ← createClient public + admin (storage uploads)
+│   │   └── firebase.ts                        ← Firebase Admin init from FIREBASE_SERVICE_ACCOUNT_JSON
+│   │
+│   ├── common/
+│   │   ├── middleware/
+│   │   │   ├── authenticate.ts                ← JWT verify, DB lookup with retry, Redis online status
+│   │   │   ├── rbac.ts                        ← Role guard: rbac(['admin','teacher'])
+│   │   │   └── errorHandler.ts                ← Zod → 400, Fastify errors → statusCode, else 500
+│   │   └── utils/
+│   │       ├── jwt.ts                         ← generateToken({userId,role,email}), verifyToken
+│   │       ├── hash.ts                        ← bcrypt: hashPassword(10 rounds), comparePassword
+│   │       ├── otp.ts                         ← generateOTP() → 6-digit string
+│   │       ├── cache.ts                       ← getCache/setCache/delCache/delCacheByPattern
+│   │       ├── email.ts                       ← Resend: sendOtpEmail, sendApprovalEmail (3/10min per addr)
+│   │       └── response.ts                    ← successResponse(msg,data) / errorResponse(msg,err)
+│   │
+│   ├── modules/                               ← 11 feature modules (see Module section)
+│   │   ├── auth/
+│   │   ├── users/
+│   │   ├── school/
+│   │   ├── gate/
+│   │   ├── attendance/
+│   │   ├── announcements/
+│   │   ├── messages/
+│   │   ├── complaints/
+│   │   ├── lost-found/
+│   │   ├── results/
+│   │   └── rag/
+│   │       ├── rag.routes.ts
+│   │       ├── rag.schema.ts
+│   │       ├── controllers/
+│   │       │   ├── ingest.controller.ts       ← PDF upload → chunk → embed → store
+│   │       │   ├── query.controller.ts        ← Full RAG pipeline
+│   │       │   ├── documents.controller.ts    ← List/Delete policy PDFs
+│   │       │   └── eval.controller.ts         ← Evaluation metrics
+│   │       └── services/
+│   │           ├── chunker.service.ts         ← Recursive / character / markdown chunking
+│   │           ├── embedder.service.ts        ← Gemini embeddings (768-dim, batch 100)
+│   │           ├── retrieval.service.ts       ← Hybrid search + re-rank
+│   │           ├── generation.service.ts      ← Gemini 2.5 Flash Lite answer gen
+│   │           └── eval.service.ts            ← Log to EvaluationLog
+│   │
+│   └── scripts/
+│       └── seedAdmin.ts                       ← Bootstrap first admin user
+│
+├── prisma/
+│   ├── schema.prisma                          ← 20 models, 7 phases
+│   └── migrations/                            ← Auto-generated history
+│
+├── tests/
+│   ├── setup.ts                               ← Jest mocks (Prisma, Redis, Firebase, Email)
+│   ├── unit/
+│   │   ├── hash.test.ts
+│   │   ├── jwt.test.ts
+│   │   ├── otp.test.ts
+│   │   └── schemas.test.ts
+│   └── integration/
+│       ├── auth.test.ts                       ← supertest against built app
+│       ├── attendance.test.ts
+│       └── gate.test.ts
+│
+├── .env.example                               ← All required env vars documented
+├── Dockerfile.dev                             ← Node 20 alpine, hot reload
+├── jest.config.js                             ← ts-jest preset, 70% coverage threshold
+├── nodemon.json                               ← Watch src/, exec ts-node src/server.ts
+├── tsconfig.json                              ← strict, ES2020, CommonJS
+├── tsconfig.build.json                        ← rootDir: src, outDir: dist
+└── package.json
+```
+
+---
+
+## Every Package & Its Role
+
+### Production Dependencies
+
+| Package | Version | What it does | Where it's used |
+|---|---|---|---|
+| `fastify` | 5.7.4 | Async-first HTTP framework | `app.ts`, all routes |
+| `@fastify/cookie` | 11.0.2 | Parse cookies (auth_token) | `app.ts`, login controller |
+| `@fastify/cors` | 11.2.0 | CORS plugin | `app.ts` |
+| `@fastify/helmet` | 13.0.2 | Security headers (X-Frame-Options, etc.) | `app.ts` |
+| `@fastify/jwt` | 10.0.0 | JWT plugin (alternative API) | Available, our code uses `jsonwebtoken` directly |
+| `@fastify/multipart` | 10.0.0 | File uploads (student photos, PDFs) | school routes, rag routes |
+| `@fastify/rate-limit` | 10.3.0 | Per-route + global limiting | `app.ts` global, auth & rag routes per-route |
+| `@prisma/client` | 6.16.3 | Auto-generated ORM client | Everywhere (`config/prisma.ts`) |
+| `prisma` | 6.16.3 | CLI for migrations/generate | npm scripts |
+| `@supabase/supabase-js` | 2.97.0 | Supabase SDK | `config/supabase.ts`, file storage |
+| `redis` | 4.7.1 | Redis client | `config/redis.ts`, `utils/cache.ts` |
+| `bcryptjs` | 3.0.3 | Password hashing | `utils/hash.ts` |
+| `jsonwebtoken` | 9.0.3 | JWT signing/verifying | `utils/jwt.ts` |
+| `zod` | 4.3.6 | Schema validation + TS inference | Every `*.schema.ts` |
+| `firebase-admin` | 13.8.0 | FCM push notifications, admin SDK | `config/firebase.ts`, gate controller |
+| `resend` | 6.12.2 | Transactional email | `utils/email.ts` |
+| `@google/generative-ai` | 0.24.1 | Gemini embeddings + LLM | rag services |
+| `@anthropic-ai/sdk` | 0.93.0 | Claude API (available, currently unused) | (future) |
+| `axios` | 1.14.0 | External HTTP calls | rag/eval services |
+| `node-cron` | 4.2.1 | Cron scheduler | `gate.scheduler.ts` |
+| `pdf-parse` | 2.4.5 | Extract text from PDFs | `ingest.controller.ts` |
+| `pino` | 10.3.1 | JSON logger (built into Fastify) | Auto-loaded by Fastify |
+| `pino-pretty` | 13.1.3 | Pretty-print logs in dev | dev only |
+| `dotenv` | 16.4.7 | Load `.env` files | Auto-loaded by env.ts |
+
+### Development Dependencies
+
+| Package | Purpose |
+|---|---|
+| `typescript@5.9.3` | Type checker / compiler |
+| `ts-node@10.9.2` | Run TS without compile step (dev) |
+| `ts-node-dev@2.0.0` | TS + watch + restart |
+| `nodemon@3.1.14` | File watcher (used by `npm run dev`) |
+| `jest@29.7.0` | Test runner |
+| `ts-jest@29.4.9` | Jest TypeScript preset |
+| `@types/jest@29.5.14` | Jest types |
+| `@types/node@22.x` | Node.js types |
+| `@types/bcryptjs`, `@types/jsonwebtoken` | Type stubs |
+| `supertest@7.2.2` | HTTP assertions for integration tests |
+| `@types/supertest@7.2.0` | Supertest types |
+| `ndb@1.1.5` | Node debugger UI |
+
+---
+
+## Database Schema (Prisma)
+
+**File:** `apps/backend/prisma/schema.prisma` (~444 lines, 20 models)
+**Database:** PostgreSQL via Supabase
+**Extensions:** `vector` (pgvector for embeddings), `uuid-ossp` (UUID gen)
+
+### Phase 1 — Authentication
+
+```prisma
+model User {
+  id                String   @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
+  email             String   @unique
+  password_hash     String
+  role              String   // pending | teacher | security | admin | parent
+  requested_role    String?
+  full_name         String?
+  avatar_url        String?
+  phone_number      String?
+  fcm_token         String?  // for push notifications
+  user_id_no        String?  @unique  // e.g., T-000001, S-000001, P-000001
+  gender            String?
+  is_active         Boolean  @default(true)
+  is_suspended      Boolean  @default(false)
+  created_at        DateTime @default(now()) @db.Timestamptz
+  updated_at        DateTime @updatedAt @db.Timestamptz
+  last_seen         DateTime? @db.Timestamptz
+
+  // relations (~13 inverse relations: classes_taught, parent_links, gate_scans, ...)
+  @@index([email])
+  @@index([role])
+  @@index([is_active])
+  @@index([role, is_active])
+}
+
+model OtpVerification {
+  id          String   @id @default(uuid())
+  email       String
+  otp_code    String   // 6-digit
+  expires_at  DateTime @db.Timestamptz
+  is_used     Boolean  @default(false)
+  attempts    Int      @default(0)  // capped at 3
+  created_at  DateTime @default(now()) @db.Timestamptz
+  @@index([email])
+}
+```
+
+### Phase 2 — Core (Profiles, Students, Classes)
+
+```prisma
+model SchoolGrade {
+  id          String   @id @default(uuid())
+  name        String   @unique         // "Grade 10"
+  created_at  DateTime @default(now())
+  classes     Class[]
+}
+
+model Class {
+  id              String       @id @default(uuid())
+  school_grade_id String
+  name            String        // "10-A"
+  teacher_id      String?      // FK to User
+  subject         String?
+  created_at      DateTime     @default(now())
+
+  school_grade        SchoolGrade  @relation(fields: [school_grade_id], references: [id])
+  teacher             User?         @relation("ClassTeacher", fields: [teacher_id], references: [id])
+  students            Student[]
+  announcements       Announcement[]
+  attendanceSessions  AttendanceSession[]
+  result_sets         ResultSet[]
+
+  @@unique([school_grade_id, name])
+  @@index([teacher_id])
+}
+
+model Student {
+  id                 String   @id @default(uuid())
+  full_name          String
+  date_of_birth      DateTime? @db.Date
+  photo_url          String?
+  student_id_no      String   @unique  // shown on ID card
+  qr_code            String   @unique  // payload for QR
+  class_id           String?
+  gender             String?
+  parent_email       String?
+  parent_mobile      String?
+  parent_name        String?
+  fcm_token          String?
+  is_parent_linked   Boolean  @default(false)
+  is_active          Boolean  @default(true)
+  // ...
+  class              Class?            @relation(fields: [class_id], references: [id])
+  parents            ParentStudent[]
+  gate_events        GateEvent[]
+  attendance_records AttendanceRecord[]
+  // ...
+}
+
+model ParentStudent {
+  id           String   @id @default(uuid())
+  parent_id    String   // FK User
+  student_id   String   @unique  // 1 parent <-> 1 student
+  relation     String?  // "mother", "father", "guardian"
+  verified_via String?  // 'school_records' | 'admin_override'
+  linked_at    DateTime @default(now())
+}
+```
+
+### Phase 3 — Gate & Attendance
+
+```prisma
+model GateEvent {
+  id              String   @id @default(uuid())
+  student_id      String
+  scanned_by_id   String?  // null if auto-checkout (cron)
+  direction       String   // "IN" | "OUT"
+  method          String   // "qr" | "manual"
+  manual_reason   String?
+  timestamp       DateTime @default(now()) @db.Timestamptz
+
+  @@index([student_id])
+  @@index([timestamp])
+  @@index([student_id, timestamp])
+}
+
+model AttendanceRecord {
+  id            String  @id @default(uuid())
+  student_id    String
+  date          DateTime @db.Date
+  status        String   // "present" | "absent" | "late" | "excused"
+  marked_by_id  String?
+  session_id    String?
+  remarks       String?
+
+  @@unique([student_id, date])
+}
+
+model AttendanceSession {
+  id          String   @id @default(uuid())
+  class_id    String
+  teacher_id  String
+  date        DateTime @db.Date
+  records     AttendanceRecord[]
+  @@unique([class_id, date])
+}
+```
+
+### Phase 4 — Announcements, Messages, Complaints
+
+```prisma
+model Announcement {
+  id          String  @id @default(uuid())
+  author_id   String
+  title       String
+  content     String   @db.Text
+  image_url   String?
+  scope       String   // "school_wide" | "class"
+  target      String   // "all" | "parents_only" | "staff_only" | <class_id>
+  class_id    String?
+}
+
+model Message {
+  id            String  @id @default(uuid())
+  sender_id     String
+  receiver_id   String
+  student_id    String? // contextual: "about which student?"
+  content       String  @db.Text
+  is_read       Boolean @default(false)
+  created_at    DateTime @default(now())
+}
+
+model Complaint {
+  id              String  @id @default(uuid())
+  parent_id       String   // who filed
+  student_id      String?
+  category        String   // "academic" | "teacher_conduct" | "facility" | "administrative" | "suggestion" | "other"
+  description     String   @db.Text
+  status          String   // "pending" | "assigned" | "resolved" | "rejected"
+  assigned_to_id  String?  // FK User
+  assigned_at     DateTime?
+  reply_note      String?  @db.Text
+  resolved_by_id  String?
+  created_at      DateTime @default(now())
+  updated_at      DateTime @updatedAt
+}
+```
+
+### Phase 5 — Lost & Found
+
+```prisma
+model LostFoundItem {
+  id            String   @id @default(uuid())
+  posted_by     String   // staff who found
+  item_name     String
+  description   String?  @db.Text
+  photo_url     String?
+  found_at      String?
+  found_date    DateTime?
+  status        String   @default("unclaimed")  // "unclaimed" | "collected"
+  collected_at  DateTime?
+}
+
+model LostFoundReport {
+  id            String   @id @default(uuid())
+  parent_id     String
+  student_id    String
+  item_name     String
+  description   String?
+  photo_url     String?
+  date_lost     DateTime?
+  status        String   @default("open")  // "open" | "recovered"
+}
+```
+
+### Phase 6 — RAG (Policy Documents + Chatbot)
+
+```prisma
+model PolicyDocument {
+  id            String   @id @default(uuid())
+  uploaded_by   String
+  file_name     String
+  display_name  String
+  storage_path  String   // Supabase Storage path
+  file_hash     String?  @unique  // SHA-256, prevents duplicate uploads
+  is_processed  Boolean  @default(false)
+  chunk_count   Int      @default(0)
+  chunks        DocumentChunk[]
+}
+
+model DocumentChunk {
+  id           String   @id @default(uuid())
+  document_id  String
+  chunk_text   String   @db.Text
+  embedding    Unsupported("vector(768)")?  // pgvector
+  chunk_index  Int
+  @@index([document_id])
+}
+
+model EvaluationLog {
+  id                String   @id @default(uuid())
+  query             String   @db.Text
+  retrieved_chunks  Json     // [{id, score, text}]
+  generated_answer  String   @db.Text
+  confidence_score  Float?
+  sources           Json     // [{document, page, snippet}]
+  created_at        DateTime @default(now())
+}
+```
+
+### Phase 7 — Results
+
+```prisma
+model Term {
+  id          String  @id @default(uuid())
+  label       String  // "Term 1 2026"
+  created_by  String
+  result_sets ResultSet[]
+}
+
+model ResultSet {
+  id            String   @id @default(uuid())
+  class_id      String
+  teacher_id    String
+  term_id       String
+  status        String   @default("draft")  // "draft" | "published"
+  published_at  DateTime?
+  modules       ResultModule[]
+  grades        StudentGrade[]
+  @@unique([class_id, term_id])
+}
+
+model ResultModule {
+  id             String  @id @default(uuid())
+  result_set_id  String
+  name           String  // "Mathematics", "Science"
+  order_index    Int
+  grades         StudentGrade[]
+  @@unique([result_set_id, name])
+}
+
+model StudentGrade {
+  id            String  @id @default(uuid())
+  result_set_id String
+  module_id     String
+  student_id    String
+  score         Float?  // 0-100
+  @@unique([result_set_id, module_id, student_id])
+}
+```
+
+---
+
+## Authentication & Authorization
+
+### Strategy
+**JWT (7-day expiry)** + **bcrypt password hashing (10 rounds)** + **Role-Based Access Control (RBAC)**.
+
+### Auth Endpoints (`/api/auth`)
+
+| Method | Path | Rate Limit | Auth | Purpose |
+|---|---|---|---|---|
+| POST | `/register` | 5/min | — | Start registration (sends OTP) |
+| POST | `/verify-otp` | 10/min | — | Verify OTP code |
+| POST | `/complete-registration` | — | — | Parent 2FA + create user |
+| POST | `/login` | 15/min | — | Email + password → JWT |
+| POST | `/resend-otp` | 3/min | — | Resend OTP (60s cooldown) |
+| POST | `/forgot-password` | 5/min | — | Send password-reset OTP |
+| POST | `/reset-password` | 5/min | — | Reset with OTP + new pass |
+| PUT | `/change-password` | — | ✓ | Authenticated password change |
+| PUT | `/link-child` | — | — | Link parent → student (OTP gated) |
+| POST | `/refresh` | — | ✓ | New JWT for existing session |
+| POST | `/logout` | — | ✓ | Clear cookie |
+| POST | `/logout-all` | — | ✓ | Invalidate all sessions |
+| PUT | `/fcm-token` | — | ✓ | Update Firebase token |
+| GET | `/me` | — | ✓ | Current user + classes_taught |
+| GET | `/parent-profile` | — | ✓ Parent | Parent + child + teacher details |
+
+### Registration Flow — Non-Parent (Teacher/Security)
+
+```
+1. POST /api/auth/register
+   { email, password, full_name, phone_number, role:"teacher" }
+   → Generate OTP, store pending registration in Redis + in-memory Map (10 min TTL)
+   → sendOtpEmail(email, otp)
+   → 200 { message: "OTP sent" }
+
+2. POST /api/auth/verify-otp
+   { email, otp_code }
+   → Lookup OtpVerification (not expired, not used, < 3 attempts)
+   → Create User { role:"pending", requested_role:"teacher" }
+   → Mark OTP as used
+   → Generate JWT, set httpOnly cookie + return token
+   → 200 { token, user, requires_profile_setup: false }
+
+3. Admin sees in /admin/overview/pending-requests
+   → PUT /api/users/:id/promote → role:"teacher", is_active:true
+   → sendApprovalEmail(email, fullName, "teacher")
+```
+
+### Registration Flow — Parent (2FA)
+
+```
+1. POST /api/auth/register
+   { email, password, full_name, student_id_no }
+   → Validate student exists, parent_email matches, not already linked
+   → Store pending registration with student snapshot
+   → sendOtpEmail
+   → 200 { message: "OTP sent" }
+
+2. POST /api/auth/verify-otp
+   { email, otp_code }
+   → Mark OTP verified in Redis (DO NOT create user yet)
+   → 200 { student: {...}, requires_profile_setup: true }
+
+3. POST /api/auth/complete-registration  ← 2nd factor: identity proof
+   { email, grade, class, admission_year, gender }
+   → Validate answers match school records for the student
+   → BEGIN TRANSACTION
+       INSERT User (role:"parent", user_id_no:"P-000001")
+       INSERT ParentStudent (parent_id, student_id, verified_via:"school_records")
+   → COMMIT
+   → Generate JWT
+   → 200 { token, user }
+```
+
+### JWT Claims
+
+```typescript
+{
+  userId: string;   // User.id
+  role:   string;   // "admin" | "teacher" | "security" | "parent" | "pending"
+  email:  string;
+}
+```
+
+**Secret:** `JWT_SECRET` env var (min 32 chars validated by Zod)
+**Expiry:** `7d`
+**Cookie:** `auth_token`, HttpOnly, Secure (prod), SameSite=Lax, maxAge 7d
+
+### Middleware Application
+
+```typescript
+// Example: gate routes
+fastify.post('/scan',
+  {
+    schema: { body: scanSchema },
+    preHandler: [
+      authenticate,                               // verify JWT, attach user to request
+      rbac(['admin', 'teacher', 'security'])      // 403 if role not allowed
+    ]
+  },
+  scanController
+);
+```
+
+---
+
+## Middleware Stack
+
+### 1. `authenticate.ts`
+
+```typescript
+// File: src/common/middleware/authenticate.ts
+async function authenticate(request, reply) {
+  // 1. Extract token: Authorization "Bearer ..." OR cookie auth_token
+  // 2. verifyToken(token) → claims { userId, role, email }
+  // 3. Prisma.user.findUnique({ where:{id:userId} }) with retry (2x, 500ms backoff)
+  // 4. If user is_active=false, is_suspended=true, or role="pending" → 401/403
+  // 5. Set Redis online status: SETEX online:<userId> 35 "1"
+  // 6. request.user = { userId, role, email }
+}
+```
+
+**Returns 503** if database is unavailable after retries.
+
+### 2. `rbac.ts`
+
+```typescript
+// File: src/common/middleware/rbac.ts
+function rbac(allowed: string[]) {
+  return async (request, reply) => {
+    if (!allowed.includes(request.user.role)) {
+      return reply.status(403).send(errorResponse('Forbidden'));
+    }
+  };
+}
+```
+
+### 3. `errorHandler.ts`
+
+```typescript
+// Catches:
+ZodError       → 400 { success:false, message:"Validation failed", error: issues[] }
+FastifyError   → uses error.statusCode + error.message
+Other          → 500 (dev includes stack trace)
+```
+
+### 4. Global Plugins (in `app.ts`)
+
+| Plugin | Config |
+|---|---|
+| `@fastify/cookie` | Default |
+| `@fastify/multipart` | `limits: { fileSize: 5_242_880 }` (5 MB) |
+| `@fastify/cors` | `origin: [WEB_URL, FLUTTER_ORIGIN, localhost:3000, localhost:3001]`, `credentials: true` |
+| `@fastify/helmet` | `crossOriginResourcePolicy: { policy: 'cross-origin' }`, `contentSecurityPolicy: false` |
+| `@fastify/rate-limit` | `max: 100`, `timeWindow: '1 minute'` |
+
+---
+
+## Complete API Reference
+
+### Health
+- `GET /health` → `{ ok: true }`
+
+### Users (`/api/users`)
+| Method | Path | Roles |
+|---|---|---|
+| GET | `/me` | All |
+| PUT | `/me` | All — update full_name, avatar_url, phone |
+| DELETE | `/me` | All — self-delete |
+| PUT | `/fcm-token` | All — update push token |
+| GET | `/pending` | admin |
+| GET | `/all` | admin |
+| GET | `/teachers` | admin |
+| PUT | `/:id/promote` | admin — pending → role |
+| PUT | `/:id/suspend` | admin |
+| PUT | `/:id/unsuspend` | admin |
+| DELETE | `/:id` | admin |
+
+### School (`/api/school`)
+| Method | Path | Roles | Purpose |
+|---|---|---|---|
+| POST | `/grades` | admin | Create grade |
+| GET | `/grades` | admin, teacher | List grades |
+| DELETE | `/grades/:id` | admin | Delete grade |
+| POST | `/classes` | admin | Create class |
+| GET | `/classes` | admin | List classes |
+| GET | `/grades-with-classes` | admin | Tree view |
+| PATCH | `/classes/:id` | admin | Edit class |
+| DELETE | `/classes/:id` | admin | Delete class |
+| GET | `/classes/:id/students` | admin, teacher | Students in class |
+| GET | `/students/next-id` | admin | Generate next student ID |
+| POST | `/students/photo` | admin | Upload photo (multipart) |
+| POST | `/students` | admin | Create student |
+| GET | `/students` | admin, teacher | List/filter students |
+| PATCH | `/students/:id` | admin | Edit student |
+| DELETE | `/students/:id` | admin | Delete student |
+| GET | `/overview/stats` | admin, teacher | Dashboard stats |
+| GET | `/overview/recent-activity` | admin | Activity feed |
+
+### Gate (`/api/gate`)
+| Method | Path | Roles | Notes |
+|---|---|---|---|
+| POST | `/scan` | admin, teacher, security | Creates GateEvent + FCM to parent |
+| GET | `/student` | admin, security, teacher | Lookup by student_id_no |
+| GET | `/search` | admin, security, teacher | Autocomplete |
+| GET | `/stats` | admin, security, teacher | "Checked in today" |
+| GET | `/stats/timeseries` | admin | range=today\|week\|30days |
+| GET | `/events` | admin, security, teacher | Recent scans |
+| GET | `/my-child-events` | parent | Child's history + current IN/OUT status |
+
+### Attendance (`/api/attendance`)
+| Method | Path | Roles |
+|---|---|---|
+| POST | `/mark` | admin, teacher |
+| GET | `/` | admin, teacher, security |
+| POST | `/session` | admin, teacher |
+| GET | `/session` | admin, teacher |
+| POST | `/session/submit` | admin, teacher — batch save |
+| GET | `/session/dates` | admin, teacher — for calendar |
+| GET | `/summary` | admin, teacher |
+| GET | `/my-child` | parent |
+
+### Announcements (`/api/announcements`)
+| Method | Path | Roles |
+|---|---|---|
+| POST | `/` | admin, teacher |
+| GET | `/` | All (filtered by scope/target) |
+| DELETE | `/:id` | admin or author |
+
+### Messages (`/api/messages`)
+| Method | Path |
+|---|---|
+| GET | `/inbox` |
+| GET | `/contacts` |
+| GET | `/thread/:userId` |
+| POST | `/send` |
+| PUT | `/:id/read` |
+| POST | `/ai-draft` |
+| DELETE | `/:id` |
+
+### Complaints (`/api/complaints`)
+| Method | Path | Notes |
+|---|---|---|
+| POST | `/` | Parent files |
+| GET | `/my` | Parent's own |
+| GET | `/all` | Admin |
+| GET | `/:id` | Admin / Parent / Assignee |
+| PUT | `/:id/assign` | Admin → staff |
+| PUT | `/:id/status` | Status flow: pending → assigned → resolved |
+
+### Lost & Found (`/api/lost-found`)
+| Method | Path | Notes |
+|---|---|---|
+| POST | `/items` | Staff posts found item |
+| GET | `/items` | Browse unclaimed |
+| PUT | `/items/:id/collected` | Mark collected |
+| DELETE | `/items/:id` | Remove |
+| POST | `/reports` | Parent reports lost |
+| GET | `/reports/my` | Parent's reports |
+| PUT | `/reports/:id/recovered` | Mark recovered |
+| GET | `/reports` | Staff view all |
+
+### Results (`/api/results`)
+| Method | Path | Roles |
+|---|---|---|
+| GET | `/terms` | teacher, admin |
+| POST | `/terms` | teacher, admin |
+| PATCH | `/terms/:termId` | teacher, admin |
+| DELETE | `/terms/:termId` | teacher, admin |
+| GET | `/class/:classId?term_id=...` | teacher, admin — auto-creates if missing |
+| PATCH | `/:resultSetId` | teacher — save modules + grades |
+| POST | `/:resultSetId/publish` | teacher |
+| POST | `/:resultSetId/unpublish` | teacher |
+| GET | `/my-child` | parent |
+
+### RAG (`/api/rag`)
+| Method | Path | Roles | Rate |
+|---|---|---|---|
+| POST | `/documents` | admin | — |
+| GET | `/documents` | admin | — |
+| DELETE | `/documents/:id` | admin | — |
+| POST | `/query` | admin, teacher, parent | 10/min |
+| GET | `/eval/report` | admin | — |
+
+---
+
+## The RAG Pipeline (How the Chatbot Works)
+
+### Ingestion (admin uploads policy PDF)
+
+```
+POST /api/rag/documents  (multipart, file=<PDF>)
+  ├─ Save to Supabase Storage → return storage_path
+  ├─ Compute SHA-256 hash → reject if already exists (file_hash UNIQUE)
+  ├─ INSERT PolicyDocument (is_processed=false)
+  ├─ Background: pdf-parse extract text
+  ├─ chunker.service.ts split into ~500-token chunks (recursive_character)
+  ├─ embedder.service.ts: Gemini "gemini-embedding-2" in batches of 100
+  │    → 3072-dim → TRUNCATE to first 768 dims (pgvector index limit)
+  ├─ INSERT DocumentChunk rows with embedding vector(768)
+  └─ UPDATE PolicyDocument SET is_processed=true, chunk_count=N
+```
+
+### Query (user asks question)
+
+```
+POST /api/rag/query { question, top_k:5 }
+  ├─ Rate limit check (10/min)
+  ├─ Cache lookup: Redis key sha256(question.lower)
+  │    → IF hit: return cached { answer, sources, confidence }
+  ├─ embedder.embedQuery(question) → 768-dim vector
+  ├─ retrieval.service.ts:
+  │    1. pgvector: SELECT ... ORDER BY embedding <-> $query LIMIT k*2
+  │    2. tsvector BM25: full-text search on chunk_text
+  │    3. Merge + dedupe by chunk_id
+  │    4. Re-rank: boost chunks with high term frequency of question words
+  │    5. Return top_k (default 5)
+  ├─ generation.service.ts:
+  │    Build prompt:
+  │      "You are a school policy assistant. Use ONLY the context below.
+  │       If the answer is not in context, say 'I don't know'."
+  │      + retrieved chunks
+  │    Call Gemini "gemini-2.5-flash-lite"
+  │    Parse answer + extract source citations
+  ├─ eval.service.ts: INSERT EvaluationLog (query, chunks, answer, confidence)
+  ├─ Cache for 1 hour
+  └─ 200 { answer, sources:[{document, snippet, score}], confidence }
+```
+
+### Why 768 dims, not 3072?
+
+PgVector's HNSW/IVFFlat indexes have a **2000-dim cap**. Gemini's `gemini-embedding-2` returns 3072 dims with **Matryoshka representation learning**, meaning the first N dims contain the most important information. Truncating to 768 preserves ~95% of semantic quality while making vector indexing feasible.
+
+---
+
+## Scheduled Jobs
+
+### Gate Auto-Checkout — `gate.scheduler.ts`
+
+```typescript
+// Runs daily at 18:00 (6 PM) school time
+cron.schedule('0 18 * * *', async () => {
+  // Find all students with last GateEvent direction="IN" today
+  // INSERT GateEvent { student_id, direction:"OUT", method:"manual",
+  //                    manual_reason:"Auto-checkout at end of day", scanned_by_id:null }
+  // FCM notify parents: "Day ended — please verify your child is home"
+});
+```
+
+---
+
+## Caching Strategy (Redis)
+
+| Key Pattern | TTL | Purpose |
+|---|---|---|
+| `rag:answer:<sha256(question)>` | 3600s (1 hr) | RAG answer cache |
+| `pending_reg:<email>` | ~600s | Pending registration during OTP window |
+| `online:<userId>` | 35s | Refreshed on every authenticated request — used to show "online now" |
+| `gate:stats:<scope>` | 60s | Dashboard stats; invalidated on scan |
+
+**Graceful degradation:** If `REDIS_URL` is not set, all `getCache`/`setCache` calls return null/no-op. App keeps working without cache.
+
+---
+
+## External Integrations
+
+| Service | Purpose | File |
+|---|---|---|
+| **Gemini API** | `gemini-embedding-2` (embeddings) + `gemini-2.5-flash-lite` (LLM) | `rag/services/embedder.service.ts`, `generation.service.ts` |
+| **Firebase Admin** | FCM push notifications: `sendFcmNotification`, `sendMulticastFcmNotification` | `config/firebase.ts` |
+| **Resend** | Transactional email; from `noreply@mg.methum.space` | `utils/email.ts` |
+| **Supabase JS** | Storage (student photos, PDFs) via admin client | `config/supabase.ts` |
+| **Anthropic SDK** | Imported, reserved for future use (message AI draft fallback) | — |
+
+---
+
+## Testing Strategy
+
+**Framework:** Jest 29 + ts-jest preset + supertest
+
+### Layout
+
+```
+tests/
+├── setup.ts                    ← Global jest.mock() for all externals
+├── unit/
+│   ├── hash.test.ts            ← bcrypt round-trip, compare wrong password
+│   ├── jwt.test.ts             ← sign + verify, expired tokens, tampered
+│   ├── otp.test.ts             ← length, randomness
+│   └── schemas.test.ts         ← Zod schema validation cases
+└── integration/
+    ├── auth.test.ts            ← POST /api/auth/register edge cases
+    ├── attendance.test.ts      ← Session create + batch submit
+    └── gate.test.ts            ← Scan flow, parent notification mocking
+```
+
+### Mocks (`tests/setup.ts`)
+
+```typescript
+jest.mock('../src/config/prisma', () => ({
+  prisma: {
+    user: { findUnique: jest.fn(), create: jest.fn(), update: jest.fn() },
+    attendanceSession: { upsert: jest.fn() },
+    attendanceRecord: { findMany: jest.fn() },
+    gateLog: { create: jest.fn() }
+  }
+}));
+
+jest.mock('../src/config/firebase', () => ({
+  sendFcmNotification: jest.fn().mockResolvedValue(true),
+  sendMulticastFcmNotification: jest.fn().mockResolvedValue({ successCount: 1 })
+}));
+
+jest.mock('../src/utils/email', () => ({
+  sendOtpEmail: jest.fn().mockResolvedValue(true),
+  sendApprovalEmail: jest.fn().mockResolvedValue(true)
+}));
+```
+
+### Config (`jest.config.js`)
+
+```javascript
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/tests/**/*.test.ts'],
+  setupFiles: ['<rootDir>/tests/setup.ts'],
+  collectCoverageFrom: [
+    'src/common/utils/**/*.ts',
+    'src/modules/auth/**/*.ts'
+  ],
+  coverageThreshold: { global: { lines: 70 } }
+};
+```
+
+### Running
+
+```bash
+npm run test              # all
+npm run test:unit         # tests/unit only
+npm run test:integration  # tests/integration only
+npm run test:coverage     # generate coverage/ folder
+npm run test:watch        # watch mode
+```
+
+---
+
+## Environment Variables
+
+Defined in `.env.example` and validated by Zod in `src/config/env.ts` on startup.
+
+| Variable | Required | Description |
+|---|---|---|
+| `PORT` | No (5000) | HTTP port |
+| `NODE_ENV` | No | development \| production \| test |
+| `DATABASE_URL` | **Yes** | Pooled Postgres connection (PgBouncer) |
+| `DIRECT_URL` | **Yes** | Direct Postgres for Prisma migrations |
+| `REDIS_URL` | No | Redis connection; disables cache if absent |
+| `REDIS_DEFAULT_TTL` | No (120) | Default cache TTL seconds |
+| `JWT_SECRET` | **Yes** (≥32 chars) | JWT signing |
+| `SUPABASE_URL` | **Yes** | Supabase project URL |
+| `SUPABASE_ANON_KEY` | **Yes** | Public key |
+| `SUPABASE_SERVICE_KEY` | **Yes** | Service role (storage admin) |
+| `RESEND_API_KEY` | **Yes** | Email transactional |
+| `RESEND_FROM_EMAIL` | No | Default `noreply@mg.methum.space` |
+| `GEMINI_API_KEY` | **Yes** | Embeddings + LLM |
+| `ANTHROPIC_API_KEY` | No | Future Claude integration |
+| `OPENAI_API_KEY` | No | Optional fallback |
+| `FIREBASE_PROJECT_ID` | **Yes** | FCM |
+| `FIREBASE_SERVICE_ACCOUNT_JSON` | **Yes** | Stringified service account JSON |
+| `WEB_URL` | **Yes** | CORS allow origin |
+| `FLUTTER_ORIGIN` | **Yes** | CORS allow origin |
+
+---
+
+## NPM Scripts
+
+```json
+{
+  "dev":                       "nodemon",
+  "build":                     "tsc -p tsconfig.build.json",
+  "start":                     "node dist/server.js",
+  "lint":                      "echo 'No linting yet'",
+  "test":                      "jest",
+  "test:unit":                 "jest tests/unit",
+  "test:integration":          "jest tests/integration",
+  "test:coverage":             "jest --coverage",
+  "test:watch":                "jest --watch",
+  "prisma:generate":           "prisma generate",
+  "prisma:migrate:dev":        "prisma migrate dev",
+  "prisma:migrate:deploy":     "prisma migrate deploy",
+  "prisma:push":               "prisma db push",
+  "prisma:studio":             "prisma studio",
+  "postinstall":               "prisma generate"
+}
+```
+
+---
+
+## Error Handling & Response Format
+
+### Success Envelope
+
+```json
+{
+  "success": true,
+  "message": "Login successful",
+  "data": { "token": "...", "user": { ... } }
+}
+```
+
+### Error Envelope
+
+```json
+{
+  "success": false,
+  "message": "Invalid credentials",
+  "error":   "Specific detail (dev only stack trace)"
+}
+```
+
+### HTTP Status Codes
+
+| Code | Used For |
+|---|---|
+| 200 | OK |
+| 201 | Created |
+| 400 | Validation failure (Zod) |
+| 401 | Missing/invalid token |
+| 403 | Authenticated but role denied (RBAC) |
+| 404 | Not found |
+| 409 | Conflict (duplicate email, etc.) |
+| 429 | Rate limit exceeded |
+| 500 | Internal error |
+| 503 | Database temporarily unreachable |
+
+---
+
+**Next:** [03-FRONTEND-WEB-APP.md](03-FRONTEND-WEB-APP.md) — Next.js 16 admin/teacher/security dashboard.
diff --git a/Documentation/03-FRONTEND-WEB-APP.md b/Documentation/03-FRONTEND-WEB-APP.md
new file mode 100644
index 0000000..b93bf53
--- /dev/null
+++ b/Documentation/03-FRONTEND-WEB-APP.md
@@ -0,0 +1,741 @@
+# Universe System — Frontend Web App Deep Dive
+
+> **Document 3 of 5** — Next.js 16 + React 19 web dashboard for Admin, Teacher, and Security roles.
+
+**Location:** `apps/frontend/`
+**Port:** `3000`
+**Framework:** Next.js 16 App Router
+**Language:** TypeScript (strict)
+**Styling:** Tailwind CSS 3.4 + custom CSS
+
+---
+
+## Table of Contents
+
+1. [What Does the Frontend Do?](#what-does-the-frontend-do)
+2. [Tech Stack & Packages](#tech-stack--packages)
+3. [Folder Structure](#folder-structure)
+4. [Routing — Every Page Mapped](#routing--every-page-mapped)
+5. [Auth & Session Management](#auth--session-management)
+6. [State Management](#state-management)
+7. [API Integration Layer](#api-integration-layer)
+8. [Feature Modules Walkthrough](#feature-modules-walkthrough)
+9. [UI / Component System](#ui--component-system)
+10. [Styling Approach](#styling-approach)
+11. [Build & Deployment](#build--deployment)
+12. [Linting & Quality](#linting--quality)
+13. [Notable Patterns & Conventions](#notable-patterns--conventions)
+
+---
+
+## What Does the Frontend Do?
+
+The Next.js web app is the **staff-facing dashboard** for the Universe System. It is used by three roles:
+
+| Role | What they do |
+|---|---|
+| **Admin** | Approve registrations, manage students/teachers/classes, view system logs, run policy RAG, see complaints, monitor gate activity, send school-wide notices |
+| **Teacher** | Mark attendance, post class notices, message parents (with AI draft), publish term results, manage own classes |
+| **Security** | Scan QR at gate (camera + zxing), view recent gate logs, message admin |
+
+> Parents do **not** use this web app — they use the Flutter mobile app instead.
+
+---
+
+## Tech Stack & Packages
+
+### Core
+
+| Package | Version | What it does |
+|---|---|---|
+| `next` | 16.1.6 | App Router framework (SSR + RSC + Routing) |
+| `react` | 19.2.3 | UI library |
+| `react-dom` | 19.2.3 | DOM bindings |
+| `typescript` | 5.x | Static typing |
+
+### UI & Styling
+
+| Package | Version | What it does |
+|---|---|---|
+| `tailwindcss` | 3.4.19 | Utility-first styling |
+| `postcss` | latest | CSS processor (used by Tailwind) |
+| `clsx` | 2.1.1 | Conditional className strings |
+| `tailwind-merge` | 3.5.0 | Resolve Tailwind conflicts (`merge('p-4', 'p-6') === 'p-6'`) |
+| `framer-motion` | 12.38.0 | Page/component animations |
+| `lucide-react` | 1.8.0 | Open-source SVG icon set |
+
+### Forms & Validation
+
+| Package | Version | What it does |
+|---|---|---|
+| `react-hook-form` | 7.73.1 | Form state, validation, performance |
+| `zod` | 4.3.6 | Runtime + compile-time schemas (matches backend) |
+| `@hookform/resolvers` | 5.2.2 | Bridge Zod → react-hook-form |
+
+### Data Visualization
+
+| Package | Version | What it does |
+|---|---|---|
+| `recharts` | 3.8.1 | Charts (gate trends, attendance summary) |
+
+### QR / Barcode (used by Security dashboard)
+
+| Package | Version | What it does |
+|---|---|---|
+| `qrcode` | 1.5.4 | Render QR codes (for student ID cards) |
+| `react-qr-code` | 2.0.18 | React wrapper for QR rendering |
+| `@zxing/browser` | 0.2.0 | Webcam-based scanner |
+| `@zxing/library` | 0.22.0 | Core barcode library |
+
+### Backend Access
+
+| Package | Version | What it does |
+|---|---|---|
+| `@supabase/supabase-js` | 2.105.1 | Direct Supabase client (used for realtime; primary path goes through backend API) |
+| `redis` | 5.11.0 | Redis client (only used in Edge/route handlers if direct cache access needed) |
+
+### Dev Tooling
+
+| Package | Purpose |
+|---|---|
+| `eslint@9.x` | Linter |
+| `eslint-config-next` | Next.js + React Hooks rules |
+| `@types/react`, `@types/node`, `@types/react-dom` | TypeScript stubs |
+| `tailwindcss/postcss` | PostCSS preset |
+
+---
+
+## Folder Structure
+
+```
+apps/frontend/
+├── public/                            ← Static files (favicons, images)
+├── src/
+│   ├── app/                           ← Next.js App Router (folder = route segment)
+│   │   ├── layout.tsx                 ← Root layout: providers (AuthContext), <html><body>
+│   │   ├── page.tsx                   ← / → redirect to /login
+│   │   ├── globals.css                ← Tailwind directives + CSS variables
+│   │   ├── favicon.ico
+│   │   ├── not-found.tsx              ← 404
+│   │   │
+│   │   ├── login/page.tsx             ← Public login form
+│   │   ├── register/page.tsx          ← Multi-step parent reg (also staff)
+│   │   ├── forgot-password/page.tsx
+│   │   ├── pending/page.tsx           ← "Your account is pending admin approval"
+│   │   │
+│   │   ├── admin/
+│   │   │   ├── layout.tsx             ← Admin-only wrapper, RBAC guard, sidebar
+│   │   │   ├── overview/
+│   │   │   │   ├── page.tsx           ← Dashboard cards (stats, recent activity)
+│   │   │   │   ├── pending-requests/page.tsx ← Approve/reject users
+│   │   │   │   └── policies/page.tsx  ← RAG chatbot
+│   │   │   ├── attendance/page.tsx
+│   │   │   ├── calendar/page.tsx
+│   │   │   ├── enrollments/page.tsx
+│   │   │   ├── complaints/page.tsx
+│   │   │   ├── logs/page.tsx
+│   │   │   ├── messages/page.tsx
+│   │   │   ├── notices/page.tsx
+│   │   │   ├── students/page.tsx
+│   │   │   ├── teachers/page.tsx
+│   │   │   └── profile/page.tsx
+│   │   │
+│   │   ├── teacher/
+│   │   │   ├── layout.tsx             ← Teacher-only wrapper
+│   │   │   ├── overview/page.tsx
+│   │   │   ├── attendance/page.tsx
+│   │   │   ├── calendar/page.tsx
+│   │   │   ├── classes/page.tsx
+│   │   │   ├── complaints/page.tsx
+│   │   │   ├── lost-and-found/page.tsx
+│   │   │   ├── messages/page.tsx
+│   │   │   ├── notices/page.tsx
+│   │   │   ├── results/page.tsx
+│   │   │   └── profile/page.tsx
+│   │   │
+│   │   └── security/
+│   │       ├── layout.tsx
+│   │       ├── dashboard/page.tsx     ← QR scanner + manual entry
+│   │       ├── logs/page.tsx
+│   │       ├── messages/page.tsx
+│   │       ├── overview/page.tsx
+│   │       └── profile/page.tsx
+│   │
+│   ├── core/                          ← App-wide config
+│   │   ├── config/
+│   │   └── constants/
+│   │
+│   ├── features/                      ← Feature modules
+│   │   ├── auth/
+│   │   │   ├── components/
+│   │   │   │   ├── auth-shell.tsx     ← Shared layout (logo, carousel side panel)
+│   │   │   │   ├── login-form.tsx
+│   │   │   │   ├── register-form.tsx
+│   │   │   │   └── forgot-password-form.tsx
+│   │   │   ├── context/AuthContext.tsx ← Global { user, login, logout, loading }
+│   │   │   ├── lib/
+│   │   │   │   ├── auth-api.ts        ← fetch wrappers
+│   │   │   │   ├── register-api.ts
+│   │   │   │   ├── register-schemas.ts ← Zod schemas
+│   │   │   │   └── validators.ts
+│   │   │   └── types/auth.ts
+│   │   │
+│   │   ├── attendance/lib/attendance-api.ts
+│   │   ├── gate/lib/gate-api.ts
+│   │   ├── messages/
+│   │   │   ├── components/MessagesContainer.tsx
+│   │   │   ├── context/UnreadMessagesContext.tsx
+│   │   │   └── lib/messages-api.ts
+│   │   ├── notices/lib/notices-api.ts
+│   │   ├── complaints/lib/complaints-api.ts
+│   │   ├── results/lib/results-api.ts
+│   │   ├── rag/lib/rag-api.ts
+│   │   └── school/lib/school-api.ts
+│   │
+│   ├── shared/                        ← Cross-feature reusables
+│   │   ├── components/
+│   │   │   ├── auth/                  ← AuthButton, AuthInput, GoogleButton, AuthCarousel
+│   │   │   │   └── register/          ← OtpInput, PasswordStrengthBar, StepIndicator, StepOne...
+│   │   │   ├── layout/
+│   │   │   │   ├── DashboardLayout.tsx ← Sidebar + topbar + content
+│   │   │   │   └── Header.tsx
+│   │   │   ├── admin/                 ← StudentProfileCard, EditStudentModal, GradesHistory
+│   │   │   ├── ui/                    ← Generic primitives (Button, Modal, Input, ...)
+│   │   │   └── AttendanceCalendar.tsx
+│   │   ├── hooks/useCachedFetch.ts
+│   │   └── lib/                       ← cn(), formatDate(), etc.
+│   │
+│   └── custom.d.ts                    ← Module declarations for imports
+│
+├── .env.local                         ← Local environment (gitignored)
+├── eslint.config.mjs                  ← Flat config (ESLint 9)
+├── next.config.ts                     ← Next.js config
+├── tsconfig.json                      ← strict, paths aliases
+├── postcss.config.mjs
+├── tailwind.config.ts
+├── Dockerfile.dev
+└── package.json
+```
+
+---
+
+## Routing — Every Page Mapped
+
+The App Router uses the file system as routing convention. Each `page.tsx` is a route.
+
+### Public Routes
+
+| Route | Page | Purpose |
+|---|---|---|
+| `/` | redirects → `/login` | — |
+| `/login` | login-form | Email + password → JWT cookie |
+| `/register` | multi-step `RegisterFlow` | Step 1: details → Step 2: OTP → Step 3: pending |
+| `/forgot-password` | forgot-password-form | Send OTP → reset |
+| `/pending` | message page | Shown when `role==="pending"` |
+
+### Admin Routes (`/admin/*`)
+
+| Route | Page Purpose |
+|---|---|
+| `/admin/overview` | Stats dashboard (students, teachers, today's gate count, etc.) |
+| `/admin/overview/pending-requests` | List + promote/reject pending users |
+| `/admin/overview/policies` | RAG chatbot for school policy Q&A |
+| `/admin/attendance` | View attendance across all classes |
+| `/admin/calendar` | School-wide calendar |
+| `/admin/enrollments` | Create/edit student enrollments |
+| `/admin/complaints` | All complaints; assign to staff; view replies |
+| `/admin/logs` | System activity / audit log |
+| `/admin/messages` | Admin inbox |
+| `/admin/notices` | Create/delete school-wide notices |
+| `/admin/students` | Student CRUD with photo upload |
+| `/admin/teachers` | Teacher list, suspend/unsuspend |
+| `/admin/profile` | Personal admin profile |
+
+### Teacher Routes (`/teacher/*`)
+
+| Route | Page Purpose |
+|---|---|
+| `/teacher/overview` | Dashboard: my classes, today's tasks |
+| `/teacher/attendance` | Open class today → mark students → submit session |
+| `/teacher/calendar` | Class calendar |
+| `/teacher/classes` | List of classes I teach |
+| `/teacher/complaints` | Complaints assigned to me |
+| `/teacher/lost-and-found` | View/manage lost items |
+| `/teacher/messages` | Conversations with parents (AI draft helper) |
+| `/teacher/notices` | Post class notices |
+| `/teacher/results` | Term result entry: select term → class → modules → grades → publish |
+| `/teacher/profile` | Teacher profile |
+
+### Security Routes (`/security/*`)
+
+| Route | Page Purpose |
+|---|---|
+| `/security/overview` | Today's stats: checked-in count |
+| `/security/dashboard` | **QR scanner via webcam + manual student lookup** |
+| `/security/logs` | Recent gate events table |
+| `/security/messages` | Direct chat with admin |
+| `/security/profile` | Security profile |
+
+---
+
+## Auth & Session Management
+
+### `AuthContext.tsx` — Global Auth State
+
+```typescript
+// src/features/auth/context/AuthContext.tsx
+type AuthUser = {
+  userId: string;
+  email: string;
+  role: 'admin' | 'teacher' | 'security' | 'parent' | 'pending';
+  full_name?: string;
+  phone_number?: string;
+  avatar_url?: string;
+  gender?: string;
+  last_seen?: string;
+  classes_taught?: Array<{
+    id: string;
+    name: string;
+    school_grade: { id: string; name: string };
+  }>;
+};
+
+type AuthContextValue = {
+  user: AuthUser | null;
+  loading: boolean;
+  login: (email, password) => Promise<{ok:true} | {ok:false, error}>;
+  logout: () => Promise<void>;
+  refresh: () => Promise<void>;
+};
+```
+
+### Auth Flow
+
+```
+1. <RootLayout> wraps children with <AuthProvider>
+2. AuthProvider on mount calls getMe() → /api/auth/me
+   - If 200 → setUser
+   - If 401 → user stays null
+3. Pages that need the user use `useAuth()` hook
+4. Role-specific layouts (admin/layout.tsx) read user and:
+   - If null && !loading → router.push('/login')
+   - If user.role !== 'admin' → router.push(`/${user.role}/overview`)
+```
+
+### Login Flow
+
+```
+1. User submits <LoginForm />
+2. POST /api/auth/login (credentials:'include') → backend sets httpOnly cookie
+3. On success → context.refresh() → getMe()
+4. Router push to /{role}/overview
+```
+
+### Cookies vs Tokens
+
+The backend supports **both**:
+- HttpOnly cookie `auth_token` (preferred for browser security — protects against XSS)
+- `Authorization: Bearer <token>` header (used by Flutter)
+
+Frontend uses **cookies only**; all `fetch()` calls include `credentials: 'include'`.
+
+---
+
+## State Management
+
+| Concern | Approach |
+|---|---|
+| **Auth user** | React Context (`AuthContext`) |
+| **Unread message badge** | React Context (`UnreadMessagesContext`) |
+| **Form state** | `react-hook-form` (local to form) |
+| **Server data** | Custom `useCachedFetch` hook (small built-in cache) |
+| **Page-level state** | `useState` / `useReducer` |
+| **URL state** | `useSearchParams`, `useRouter` (Next.js) |
+
+There is **no Redux, Zustand, or Tanstack Query**. Data fetching is direct `fetch()` calls wrapped in feature-level API libraries.
+
+### `useCachedFetch` (`src/shared/hooks/useCachedFetch.ts`)
+
+A lightweight hook that:
+- Caches responses in-memory by URL key
+- Returns `{ data, error, loading, refresh }`
+- Re-fetches on mount unless cached value exists and isn't stale
+
+---
+
+## API Integration Layer
+
+### The `request<T>` Pattern
+
+Every feature has a `*-api.ts` file with a typed `request()` helper:
+
+```typescript
+// src/features/auth/lib/auth-api.ts (abridged)
+type Response<T> =
+  | { ok: true; data: T }
+  | { ok: false; status: number; error: string; retry_after?: number };
+
+async function request<T>(path: string, init?: RequestInit): Promise<Response<T>> {
+  try {
+    const res = await fetch(`${API_URL}${path}`, {
+      ...init,
+      credentials: 'include',
+      headers: { 'Content-Type': 'application/json', ...init?.headers }
+    });
+    const body = await res.json();
+    if (!res.ok) {
+      return {
+        ok: false,
+        status: res.status,
+        error: body.message ?? 'Request failed',
+        retry_after: res.headers.get('retry-after') ? Number(res.headers.get('retry-after')) : undefined
+      };
+    }
+    return { ok: true, data: body.data };
+  } catch (e) {
+    return { ok: false, status: 0, error: 'Network error' };
+  }
+}
+
+export const loginUser = (email, password) =>
+  request<{ token: string; user: AuthUser }>('/api/auth/login', {
+    method: 'POST',
+    body: JSON.stringify({ email, password })
+  });
+
+export const getMe = () =>
+  request<AuthUser>('/api/auth/me');
+```
+
+### Base URL
+
+```typescript
+const API_URL = process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:5000';
+```
+
+### Per-feature API libs
+
+| File | Exports |
+|---|---|
+| `features/auth/lib/auth-api.ts` | login, logout, getMe, register, verifyOtp, completeRegistration, forgotPassword, resetPassword |
+| `features/auth/lib/register-api.ts` | startRegistration, resendOtp |
+| `features/attendance/lib/attendance-api.ts` | createSession, submitSession, getSession, getDates, getSummary |
+| `features/gate/lib/gate-api.ts` | scan, search, getEvents, getStats, getTimeseries |
+| `features/messages/lib/messages-api.ts` | getInbox, getContacts, getThread, sendMessage, markRead, aiDraft |
+| `features/notices/lib/notices-api.ts` | createAnnouncement, listAnnouncements, deleteAnnouncement |
+| `features/complaints/lib/complaints-api.ts` | listAll, assignComplaint, updateStatus |
+| `features/results/lib/results-api.ts` | listTerms, createTerm, getOrCreateResultSet, saveResults, publish, unpublish |
+| `features/rag/lib/rag-api.ts` | listDocuments, uploadDocument, deleteDocument, queryRag, getEvalReport |
+| `features/school/lib/school-api.ts` | createGrade, listGrades, createClass, listClasses, createStudent, listStudents, uploadStudentPhoto |
+
+---
+
+## Feature Modules Walkthrough
+
+### `features/auth/` — Login + Multi-step Registration
+
+The registration flow has 3 steps managed by `RegisterFlow.tsx`:
+
+```
+StepOneDetails → StepTwoOtp → StepThreePending
+   (form)         (6 boxes)     (waiting page)
+```
+
+Components:
+- `OtpInput` — 6 individual input boxes, auto-advance on type, paste support
+- `PasswordStrengthBar` — Live visual indicator using regex rules
+- `StepIndicator` — Animated step dots
+
+### `features/messages/` — Real-time-ish messaging
+
+The `MessagesContainer` is a full inbox UI:
+- Left panel: contact list
+- Right panel: thread view + composer
+- `UnreadMessagesContext` exposes a count badge to sidebar
+- Polling (no WebSockets) — every N seconds the inbox refreshes
+- AI draft button calls `POST /api/messages/ai-draft` and inserts the suggested text
+
+### `features/rag/` — Policy Chatbot
+
+Used in `/admin/overview/policies`:
+- Upload PDF → uploads progress shown via custom progress UI
+- Ask question → calls `POST /api/rag/query`
+- Displays answer with source snippets (clickable to expand)
+
+### `features/gate/` — Security Dashboard QR Scanner
+
+`/security/dashboard` uses **@zxing/browser**:
+```typescript
+import { BrowserMultiFormatReader } from '@zxing/browser';
+
+const reader = new BrowserMultiFormatReader();
+reader.decodeFromConstraints(
+  { video: { facingMode: 'environment' } },
+  videoRef.current,
+  (result) => {
+    if (result) {
+      const qrPayload = result.getText();
+      scanGate(qrPayload, direction);
+    }
+  }
+);
+```
+
+When a scan succeeds:
+1. Decode QR → `qr_code` string
+2. Show student card (photo, name, class)
+3. Security clicks IN or OUT button
+4. `POST /api/gate/scan` → success animation → parent gets FCM push
+
+### `features/school/` — Admin Student & Class Management
+
+`/admin/students`:
+- List with search + pagination
+- Add student modal: form + photo upload (separate endpoint `/students/photo`)
+- `StudentProfileCard` shows details
+- `EditStudentModal` edits in place
+- `GradesHistory` shows result sets across terms
+
+`/admin/teachers`:
+- List, promote pending → teacher, suspend/unsuspend
+
+`/admin/enrollments`:
+- Tree view of `Grade → Classes → Students` from `/grades-with-classes` + drill-down
+
+### `features/results/` — Term Result Entry
+
+`/teacher/results`:
+- Select term (or create new via inline form)
+- Select class (only teacher's classes shown)
+- Backend auto-creates ResultSet (`GET /api/results/class/:classId?term_id=...`)
+- Editable grid: rows = students, columns = modules
+- Add/rename modules dynamically
+- PATCH `/api/results/:resultSetId` saves entire matrix
+- POST `/api/results/:resultSetId/publish` makes visible to parents
+
+---
+
+## UI / Component System
+
+### No Pre-Built Library
+
+The frontend deliberately does **not** use shadcn/ui, MUI, Chakra, or any UI kit. All components are **hand-rolled** to match the school's specific design (rounded cards, soft teal palette, generous whitespace).
+
+### Component Categories
+
+```
+shared/components/
+├── ui/                            ← Primitives
+│   ├── Button.tsx                 ← Primary, secondary, outline, sizes
+│   ├── Input.tsx
+│   ├── Modal.tsx
+│   ├── Card.tsx
+│   ├── Badge.tsx
+│   ├── Avatar.tsx
+│   └── Toast.tsx
+├── auth/                          ← Auth-page specifics
+│   ├── auth-button.tsx
+│   ├── auth-input.tsx
+│   ├── auth-checkbox.tsx
+│   ├── auth-carousel.tsx          ← Side panel image carousel on login
+│   ├── auth-layout.tsx
+│   ├── google-button.tsx
+│   └── register/
+│       ├── OtpInput.tsx
+│       ├── PasswordStrengthBar.tsx
+│       ├── RegisterFlow.tsx       ← orchestrates 3 steps
+│       ├── StepIndicator.tsx
+│       ├── StepOneDetails.tsx
+│       ├── StepTwoOtp.tsx
+│       └── StepThreePending.tsx
+├── layout/
+│   ├── DashboardLayout.tsx        ← role-aware sidebar + topbar
+│   └── Header.tsx
+├── admin/
+│   ├── StudentProfileCard.tsx
+│   ├── AddStudentButton.tsx
+│   ├── EditStudentModal.tsx
+│   └── GradesHistory.tsx
+└── AttendanceCalendar.tsx         ← Shared between admin & teacher
+```
+
+### Animations
+
+`framer-motion` is used for:
+- Page transitions (fade + slide)
+- Card hover states
+- Modal enter/exit
+- Toast notifications
+
+---
+
+## Styling Approach
+
+### Tailwind Configuration
+
+`tailwind.config.ts` extends:
+- Custom palette: `primary` (teal #1A3A44 mirroring Flutter), `accent`, `surface`, `muted`
+- Font family: `Kumbh Sans` (Google Fonts via `next/font`)
+- Custom shadows: `card`, `soft`
+- Custom border radii
+
+### `globals.css`
+
+```css
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+:root {
+  --color-primary: #1A3A44;
+  --color-bg:      #F0FBFF;
+  --color-text:    #101820;
+  --radius-card:   16px;
+}
+```
+
+### Class Composition Helper
+
+```typescript
+// shared/lib/cn.ts
+import { clsx } from 'clsx';
+import { twMerge } from 'tailwind-merge';
+
+export const cn = (...classes) => twMerge(clsx(...classes));
+```
+
+Used everywhere:
+```tsx
+<button className={cn('px-4 py-2 rounded-md bg-primary', isLoading && 'opacity-50', className)}>
+```
+
+---
+
+## Build & Deployment
+
+### npm Scripts
+
+```json
+{
+  "dev":   "next dev",
+  "build": "next build",
+  "start": "next start",
+  "lint":  "eslint src/"
+}
+```
+
+### `next.config.ts`
+
+Standard Next.js 16 config. Image domains configured for Supabase storage URLs.
+
+### `vercel.json` (repo root)
+
+```json
+{
+  "framework": "nextjs",
+  "installCommand": "npm install",
+  "buildCommand": "npm run build",
+  "outputDirectory": ".next"
+}
+```
+
+This tells Vercel to:
+1. Run `npm install` at repo root (so workspaces resolve)
+2. Build with default Next.js production config
+3. Output to `.next/`
+
+### Environment Variables
+
+| Var | Required | Notes |
+|---|---|---|
+| `NEXT_PUBLIC_API_URL` | Yes | Backend base URL (`http://localhost:5000` dev, Railway URL prod) |
+| `NEXT_PUBLIC_SUPABASE_URL` | Yes | Public Supabase project URL |
+| `NEXT_PUBLIC_SUPABASE_ANON_KEY` | Yes | Public-safe anon key |
+
+`NEXT_PUBLIC_*` prefix exposes the value to the browser bundle.
+
+---
+
+## Linting & Quality
+
+### ESLint 9 Flat Config (`eslint.config.mjs`)
+
+```javascript
+import nextVitals from "eslint-config-next/core-web-vitals";
+import nextTs from "eslint-config-next/typescript";
+
+export default [
+  ...nextVitals,
+  ...nextTs,
+  {
+    ignores: ['.next/**', 'node_modules/**', 'build/**', '*.lock']
+  }
+];
+```
+
+### Run
+
+```bash
+npm run lint          # from apps/frontend/
+npm run frontend:lint # from repo root
+```
+
+### Pre-commit
+
+Husky pre-commit hook runs lint-staged, which runs `eslint --fix` on changed files only.
+
+---
+
+## Notable Patterns & Conventions
+
+### File Naming
+
+| Pattern | Used For |
+|---|---|
+| `kebab-case.tsx` | Files |
+| `PascalCase.tsx` | Components (some files) — mix exists, `kebab-case` preferred for new |
+| `useCamelCase.ts` | Custom hooks |
+| `*-api.ts` | Backend API wrappers |
+| `*-schemas.ts` | Zod schemas |
+
+### Route-Specific Layouts
+
+Each role has a `layout.tsx` that:
+1. Reads `useAuth()` user
+2. Redirects to `/login` if not authenticated
+3. Redirects to correct role overview if mismatched role
+4. Renders `<DashboardLayout role="admin">` with sidebar + topbar
+
+### Server vs Client Components
+
+- **Server components** (default in App Router): static pages, layouts
+- **Client components** (`'use client'` directive): all interactive pages (forms, scanners, dashboards)
+
+Since this app is highly interactive, **almost every page is `'use client'`**.
+
+### Type Sharing with Backend
+
+Types are **not** imported across packages (no `tsconfig` path to `apps/backend/src`). Instead, types are duplicated:
+- Backend defines them via `z.infer<typeof schema>` in `*.schema.ts`
+- Frontend re-declares them in `features/<feature>/types/` or inline
+
+The Zod schemas in `features/auth/lib/register-schemas.ts` mirror the backend's so that both sides validate identically.
+
+### Error & Loading States
+
+Convention:
+```tsx
+if (loading) return <Spinner />;
+if (error)   return <ErrorBanner message={error} />;
+return <RealUI data={data} />;
+```
+
+---
+
+## Testing
+
+The frontend currently has **no test suite** configured. CI (`ci.yml`) only runs backend + Flutter tests. This is a known gap — Jest + React Testing Library or Playwright would be the conventional addition.
+
+---
+
+**Next:** [04-FLUTTER-MOBILE-APP.md](04-FLUTTER-MOBILE-APP.md) — Flutter parent-facing mobile app.
diff --git a/Documentation/04-FLUTTER-MOBILE-APP.md b/Documentation/04-FLUTTER-MOBILE-APP.md
new file mode 100644
index 0000000..18dd74a
--- /dev/null
+++ b/Documentation/04-FLUTTER-MOBILE-APP.md
@@ -0,0 +1,1225 @@
+# Universe System — Flutter Mobile App Deep Dive
+
+> **Document 4 of 5** — Parent-facing Flutter (Dart) mobile application running on Android & iOS.
+
+**Location:** `apps/flutter/`
+**Framework:** Flutter 3.32.0 (Dart SDK ^3.10.1)
+**Target Audience:** Parents (only)
+**Architecture:** MVVM (Model–View–ViewModel) + Repository pattern
+
+---
+
+## Table of Contents
+
+1. [What the App Does](#what-the-app-does)
+2. [Tech Stack & Packages](#tech-stack--packages)
+3. [Folder Structure](#folder-structure)
+4. [Bootstrap Flow](#bootstrap-flow)
+5. [Architecture — MVVM in Practice](#architecture--mvvm-in-practice)
+6. [State Management with Provider](#state-management-with-provider)
+7. [Navigation with GoRouter](#navigation-with-gorouter)
+8. [Networking Layer (Dio)](#networking-layer-dio)
+9. [Authentication & Session](#authentication--session)
+10. [Local Storage Strategy](#local-storage-strategy)
+11. [Firebase Push Notifications](#firebase-push-notifications)
+12. [Biometric Login](#biometric-login)
+13. [Every Feature Module](#every-feature-module)
+14. [Theming & Design System](#theming--design-system)
+15. [Custom Widgets](#custom-widgets)
+16. [Testing](#testing)
+17. [Build & Release](#build--release)
+18. [Platform-Specific Notes](#platform-specific-notes)
+
+---
+
+## What the App Does
+
+The Flutter app is the **parents' window into their child's school life**. Parents install it on Android (and iOS, when published) and use it for:
+
+| Feature | What the parent sees |
+|---|---|
+| 🏠 **Dashboard** | Greeting, live clock, action cards, latest announcements |
+| 🚪 **Gate Status** | Is my child currently inside school? Full IN/OUT history |
+| ✅ **Attendance** | Daily attendance with present/absent/late status |
+| 📊 **Results** | Per-term grades for each module + computed letter grade |
+| 💬 **Messages** | Two-way chat with the child's teachers |
+| 📢 **Notices** | School-wide and class-specific announcements |
+| 🤖 **Chatbot** | RAG-powered Q&A over school policies |
+| 🙋 **Support** | File complaints/suggestions, track status |
+| 🔍 **Lost & Found** | Browse found items |
+| 🔔 **Notifications** | History of FCM push messages |
+| ⚙️ **Settings** | Theme, biometric toggle, logout |
+| 👤 **Profile** | Parent info + child info + teacher info |
+
+> Staff (admin/teacher/security) do **not** use this app — they use the Next.js web frontend.
+
+---
+
+## Tech Stack & Packages
+
+### Production Dependencies (`pubspec.yaml`)
+
+| Package | Version | Purpose |
+|---|---|---|
+| `flutter` | SDK ^3.10.1 | Framework |
+| `cupertino_icons` | ^1.0.8 | iOS-style icons |
+| `google_fonts` | ^6.2.1 | Plus Jakarta Sans font loaded at runtime |
+| `provider` | ^6.1.5 | State management (ChangeNotifier-based) |
+| `go_router` | ^16.2.1 | Declarative routing |
+| `dio` | ^5.9.0 | HTTP client with interceptors |
+| `flutter_secure_storage` | ^9.2.4 | Encrypted storage (tokens, biometric creds) |
+| `shared_preferences` | ^2.5.3 | Lightweight KV store (cache, prefs) |
+| `local_auth` | ^3.0.1 | Biometric auth (fingerprint/face) |
+| `firebase_core` | ^3.0.0 | Firebase initialization |
+| `firebase_messaging` | ^15.0.0 | FCM push notifications |
+| `flutter_local_notifications` | ^21.0.0 | Display notifications in foreground |
+| `pinput` | ^6.0.2 | OTP input UI (6 boxes) |
+| `animations` | ^2.0.11 | Material motion animations |
+
+### Dev Dependencies
+
+| Package | Purpose |
+|---|---|
+| `flutter_test` (SDK) | Widget + unit testing |
+| `flutter_lints` | ^6.0.0 — opinionated lint rules |
+
+### Notably Absent
+- ❌ No Riverpod / Bloc / GetX (Provider is the only state library)
+- ❌ No SQLite / Hive (only `shared_preferences` for caching)
+- ❌ No WebSockets (data is fetched on-demand + FCM-driven)
+- ❌ No image caching library (raw `NetworkImage` used; could add `cached_network_image` later)
+- ❌ No internationalization (English only, no `intl` package)
+
+---
+
+## Folder Structure
+
+```
+apps/flutter/
+├── lib/
+│   ├── main.dart                              ← Entry: Firebase init, DI setup, runApp()
+│   ├── app.dart                               ← UniverseApp: MultiProvider + MaterialApp.router
+│   ├── firebase_options.dart                  ← Generated by flutterfire CLI
+│   │
+│   ├── core/
+│   │   ├── api/
+│   │   │   ├── api_client.dart                ← Dio instance with base URL, timeout
+│   │   │   ├── api_config.dart                ← Base URL (env-aware)
+│   │   │   └── api_endpoints.dart             ← All endpoint path constants
+│   │   ├── constants/
+│   │   │   ├── app_colors.dart                ← #1A3A44 primary, palette
+│   │   │   ├── app_routes.dart                ← Route path strings
+│   │   │   └── app_strings.dart               ← UI text constants
+│   │   ├── di/
+│   │   │   └── service_locator.dart           ← Singleton instances (manual DI)
+│   │   ├── navigation/
+│   │   │   └── app_router.dart                ← GoRouter config: 22 routes + redirect logic
+│   │   ├── services/
+│   │   │   ├── firebase_service.dart          ← FCM token, foreground msg handler
+│   │   │   └── biometric_service.dart         ← local_auth wrapper
+│   │   ├── storage/
+│   │   │   ├── secure_storage.dart            ← flutter_secure_storage wrapper
+│   │   │   └── local_storage.dart             ← shared_preferences wrapper
+│   │   └── viewmodels/
+│   │       └── base_viewmodel.dart            ← ChangeNotifier with loading/error fields
+│   │
+│   ├── features/                              ← 15 feature modules
+│   │   ├── splash/views/{splash,welcome}_screen.dart
+│   │   ├── auth/
+│   │   │   ├── models/user_model.dart
+│   │   │   ├── repositories/auth_repository.dart    ← abstract + ApiAuthRepository
+│   │   │   ├── viewmodels/auth_viewmodel.dart
+│   │   │   └── views/{login,register,registration_otp,forgot_password}_screen.dart
+│   │   ├── dashboard/views/dashboard_screen.dart
+│   │   ├── profile/{models,repositories,viewmodels,views}/...
+│   │   ├── attendance/{models,repositories,viewmodels,views}/...
+│   │   ├── gate/{models,repositories,viewmodels,views}/...
+│   │   ├── results/{models,repositories,viewmodels,views}/...
+│   │   ├── messages/{models,repositories,viewmodels,views}/...
+│   │   ├── contact_teacher/views/teacher_chat_screen.dart
+│   │   ├── support/{models,repositories,viewmodels,views}/...
+│   │   ├── notices/{models,repositories,viewmodels,views}/...
+│   │   ├── notifications/views/notifications_screen.dart
+│   │   ├── chatbot/{services,views}/...
+│   │   ├── lost_and_found/views/lost_and_found_screen.dart
+│   │   └── settings/views/settings_screen.dart
+│   │
+│   └── shared/
+│       ├── themes/app_theme.dart              ← Material3 light theme
+│       └── widgets/
+│           ├── action_card.dart               ← Animated gradient card with bubbles
+│           ├── app_button.dart                ← Primary button with loading
+│           ├── custom_button.dart
+│           ├── custom_textfield.dart
+│           └── live_clock_widget.dart
+│
+├── test/widget_test.dart                      ← Single smoke test
+├── .githooks/                                 ← pre-commit (format), pre-push (test)
+├── android/
+│   ├── app/
+│   │   ├── build.gradle.kts                   ← Java 17, Google Services plugin
+│   │   ├── google-services.json               ← Firebase Android config
+│   │   └── src/main/AndroidManifest.xml       ← Permissions (notifications, biometric)
+│   └── settings.gradle.kts
+├── ios/
+│   ├── Runner.xcworkspace                     ← Xcode workspace
+│   ├── Runner/Info.plist
+│   └── Runner/GoogleService-Info.plist        ← Firebase iOS config
+├── Assets/                                    ← Image assets
+├── pubspec.yaml
+├── pubspec.lock
+└── analysis_options.yaml                      ← Lint config (flutter_lints)
+```
+
+---
+
+## Bootstrap Flow
+
+### `main.dart`
+
+```dart
+Future<void> main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+  // 1. Initialize Firebase
+  await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+  // 2. Set background message handler (must be top-level fn)
+  FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
+  // 3. Initialize DI / Service Locator
+  await ServiceLocator.instance.setup();
+  // 4. Run app
+  runApp(const UniverseApp());
+}
+```
+
+### `service_locator.dart` — Manual DI
+
+```dart
+class ServiceLocator {
+  static final instance = ServiceLocator._();
+  late final ApiClient apiClient;
+  late final SecureStorage secureStorage;
+  late final LocalStorage localStorage;
+  late final BiometricService biometricService;
+  late final FirebaseService firebaseService;
+  // Repositories
+  late final AuthRepository authRepository;
+  late final ProfileRepository profileRepository;
+  // ... 8 more
+  // ViewModels
+  late final AuthViewModel authViewModel;
+  late final ProfileViewModel profileViewModel;
+  // ... 6 more
+
+  Future<void> setup() async {
+    secureStorage = SecureStorage();
+    localStorage = LocalStorage();
+    await localStorage.init();
+    apiClient = ApiClient(secureStorage);
+    // wire up everything in dependency order
+    authRepository = ApiAuthRepository(apiClient, secureStorage, localStorage);
+    authViewModel = AuthViewModel(authRepository, biometricService, localStorage);
+    // ...
+  }
+}
+```
+
+> **Why not GetIt?** The codebase uses a hand-rolled singleton holder. Simpler, fewer dependencies, but less idiomatic. GetIt could replace it cleanly if needed.
+
+### `app.dart`
+
+```dart
+class UniverseApp extends StatelessWidget {
+  Widget build(BuildContext context) {
+    final sl = ServiceLocator.instance;
+    return MultiProvider(
+      providers: [
+        ChangeNotifierProvider.value(value: sl.authViewModel),
+        ChangeNotifierProvider.value(value: sl.profileViewModel),
+        ChangeNotifierProvider.value(value: sl.messagesViewModel),
+        ChangeNotifierProvider.value(value: sl.gateViewModel),
+        ChangeNotifierProvider.value(value: sl.attendanceViewModel),
+        ChangeNotifierProvider.value(value: sl.resultsViewModel),
+        ChangeNotifierProvider.value(value: sl.supportViewModel),
+        ChangeNotifierProvider.value(value: sl.noticesViewModel),
+      ],
+      child: MaterialApp.router(
+        title: 'UniVerse',
+        theme: AppTheme.light,
+        routerConfig: appRouter,
+        debugShowCheckedModeBanner: false,
+      ),
+    );
+  }
+}
+```
+
+---
+
+## Architecture — MVVM in Practice
+
+Every feature follows the same shape:
+
+```
+features/<feature>/
+├── models/                  ← Pure Dart classes (data only)
+├── repositories/            ← API-talking layer (Dio calls + JSON parsing)
+├── viewmodels/              ← extends ChangeNotifier (state + methods + notifyListeners)
+└── views/                   ← Widget tree (consumes ViewModel via Provider)
+```
+
+### Why MVVM?
+
+- **Testable:** Repositories can be mocked. ViewModels are plain Dart.
+- **Separation:** UI doesn't call Dio. ViewModel doesn't know about widgets.
+- **Reactive:** `notifyListeners()` triggers UI rebuild.
+
+### Example — `attendance` feature
+
+#### Model
+
+```dart
+// features/attendance/models/attendance_model.dart
+class AttendanceRecordModel {
+  final String id;
+  final DateTime date;
+  final String status;           // present | absent | late | excused
+  final String? remarks;
+  final String? markedByName;
+
+  AttendanceRecordModel.fromJson(Map<String, dynamic> json)
+    : id = json['id'],
+      date = DateTime.parse(json['date']),
+      status = json['status'],
+      remarks = json['remarks'],
+      markedByName = json['marked_by']?['full_name'];
+}
+
+class AttendanceResponseModel {
+  final List<AttendanceRecordModel> records;
+  final int total;
+  final int page;
+}
+```
+
+#### Repository
+
+```dart
+// features/attendance/repositories/attendance_repository.dart
+class AttendanceRepository {
+  final ApiClient _api;
+  AttendanceRepository(this._api);
+
+  Future<AttendanceResponseModel> getMyChildAttendance({
+    required int page,
+    required int limit,
+  }) async {
+    final res = await _api.dio.get(
+      '/api/attendance/my-child',
+      queryParameters: {'page': page, 'limit': limit},
+    );
+    return AttendanceResponseModel.fromJson(res.data['data']);
+  }
+}
+```
+
+#### ViewModel
+
+```dart
+// features/attendance/viewmodels/attendance_viewmodel.dart
+class AttendanceViewModel extends BaseViewModel {
+  final AttendanceRepository _repo;
+  AttendanceViewModel(this._repo);
+
+  final List<AttendanceRecordModel> records = [];
+  int _page = 1;
+  bool hasMore = true;
+
+  Future<void> load({bool refresh = false}) async {
+    if (refresh) { _page = 1; records.clear(); hasMore = true; }
+    if (!hasMore) return;
+    setLoading(true);
+    try {
+      final res = await _repo.getMyChildAttendance(page: _page, limit: 20);
+      records.addAll(res.records);
+      hasMore = records.length < res.total;
+      _page++;
+      setError(null);
+    } catch (e) {
+      setError(e.toString());
+    } finally {
+      setLoading(false);
+      notifyListeners();
+    }
+  }
+
+  Future<void> refresh() => load(refresh: true);
+  Future<void> loadMore() => load();
+}
+```
+
+#### View
+
+```dart
+// features/attendance/views/attendance_screen.dart
+class AttendanceScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<AttendanceViewModel>(
+      builder: (context, vm, _) {
+        if (vm.isLoading && vm.records.isEmpty) return CircularProgressIndicator();
+        if (vm.error != null) return ErrorView(vm.error!);
+        return RefreshIndicator(
+          onRefresh: vm.refresh,
+          child: ListView.builder(
+            itemCount: vm.records.length + (vm.hasMore ? 1 : 0),
+            itemBuilder: (ctx, i) {
+              if (i == vm.records.length) {
+                vm.loadMore();
+                return Center(child: CircularProgressIndicator());
+              }
+              return AttendanceTile(record: vm.records[i]);
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+```
+
+---
+
+## State Management with Provider
+
+### `BaseViewModel`
+
+```dart
+// core/viewmodels/base_viewmodel.dart
+class BaseViewModel extends ChangeNotifier {
+  bool _isLoading = false;
+  String? _error;
+
+  bool get isLoading => _isLoading;
+  String? get error => _error;
+
+  void setLoading(bool v) { _isLoading = v; notifyListeners(); }
+  void setError(String? msg) { _error = msg; notifyListeners(); }
+}
+```
+
+### How Views Watch ViewModels
+
+```dart
+// Option 1: Consumer<T>
+Consumer<AuthViewModel>(builder: (ctx, vm, _) => Text(vm.user?.fullName ?? ''))
+
+// Option 2: context.watch<T>() inside build()
+final vm = context.watch<AuthViewModel>();
+
+// Option 3: context.read<T>() for one-off calls (no rebuild)
+context.read<AuthViewModel>().login(email, password);
+```
+
+### ViewModel Inventory
+
+| ViewModel | What It Holds | Where It's Read |
+|---|---|---|
+| `AuthViewModel` | user, token, biometric available, login methods, app lifecycle | login_screen, splash_screen, settings_screen |
+| `ProfileViewModel` | ParentProfileModel (cache-first) | profile_screen, dashboard_screen |
+| `MessagesViewModel` | inbox threads, current thread messages, contacts | messages_screen, teacher_inbox_screen |
+| `GateViewModel` | gate events list, isInsideSchool, pagination | gate_status_screen, dashboard_screen |
+| `AttendanceViewModel` | records, pagination | attendance_screen |
+| `ResultsViewModel` | selected term, terms list, results per term | results_screen |
+| `SupportViewModel` | complaints + suggestions split by tab | support_screen |
+| `NoticesViewModel` | announcements list | notices_screen, dashboard_screen (top 4) |
+
+---
+
+## Navigation with GoRouter
+
+### Configuration — `core/navigation/app_router.dart`
+
+```dart
+final appRouter = GoRouter(
+  initialLocation: '/',
+  redirect: (context, state) {
+    final vm = ServiceLocator.instance.authViewModel;
+    final isAuthed = vm.isLoggedIn;
+    final isAuthRoute = ['/login', '/register', '/welcome', '/forgot-password']
+        .any((p) => state.matchedLocation.startsWith(p));
+
+    if (!isAuthed && !isAuthRoute && state.matchedLocation != '/') {
+      return '/login';
+    }
+    if (isAuthed && isAuthRoute) {
+      return '/dashboard';
+    }
+    return null;  // no redirect
+  },
+  routes: [
+    GoRoute(path: '/', builder: (_, __) => SplashScreen()),
+    GoRoute(path: '/welcome', pageBuilder: (_, __) => _slideTransition(WelcomeScreen())),
+    // ... 21 more routes
+  ],
+);
+```
+
+### Custom Page Transition
+
+```dart
+CustomTransitionPage _slideTransition(Widget child) {
+  return CustomTransitionPage(
+    child: child,
+    transitionDuration: Duration(milliseconds: 420),
+    reverseTransitionDuration: Duration(milliseconds: 320),
+    transitionsBuilder: (ctx, anim, _, child) {
+      final curved = CurvedAnimation(parent: anim, curve: Curves.easeOutCubic);
+      return SlideTransition(
+        position: Tween(begin: Offset(0.05, 0.05), end: Offset.zero).animate(curved),
+        child: FadeTransition(opacity: curved, child: child),
+      );
+    },
+  );
+}
+```
+
+### Route List (22 routes)
+
+| Path | Screen |
+|---|---|
+| `/` | SplashScreen |
+| `/welcome` | WelcomeScreen |
+| `/login` | LoginScreen |
+| `/register` | RegisterScreen |
+| `/register/otp` | RegistrationOtpScreen |
+| `/forgot-password` | ForgotPasswordScreen |
+| `/dashboard` | DashboardScreen |
+| `/profile` | ProfileScreen |
+| `/profile-setup` | ProfileSetupScreen |
+| `/attendance` | AttendanceScreen |
+| `/gate-status` | GateStatusScreen |
+| `/results` | ResultsScreen |
+| `/messages` | MessagesScreen |
+| `/teacher-inbox` | TeacherInboxScreen |
+| `/teacher-chat` | TeacherChatScreen |
+| `/notices` | NoticesScreen |
+| `/notifications` | NotificationsScreen |
+| `/chatbot` | ChatBotScreen |
+| `/support` | SupportScreen |
+| `/support/submit` | SubmitComplaintScreen |
+| `/support/detail` | ComplaintDetailScreen |
+| `/lost-and-found` | LostAndFoundScreen |
+| `/settings` | SettingsScreen |
+
+### Navigation Calls
+
+```dart
+context.go('/dashboard');         // Replace current
+context.push('/profile');         // Stack-push
+context.pop();                    // Stack-pop
+```
+
+---
+
+## Networking Layer (Dio)
+
+### `ApiClient` — `core/api/api_client.dart`
+
+```dart
+class ApiClient {
+  late final Dio dio;
+  final SecureStorage _secureStorage;
+
+  ApiClient(this._secureStorage) {
+    dio = Dio(BaseOptions(
+      baseUrl: ApiConfig.baseUrl,
+      connectTimeout: Duration(seconds: 20),
+      receiveTimeout: Duration(seconds: 20),
+      sendTimeout: Duration(seconds: 20),
+      headers: {'Content-Type': 'application/json'},
+    ));
+
+    dio.interceptors.add(InterceptorsWrapper(
+      onRequest: (options, handler) async {
+        final token = await _secureStorage.getAccessToken();
+        if (token != null) {
+          options.headers['Authorization'] = 'Bearer $token';
+        }
+        return handler.next(options);
+      },
+      onError: (err, handler) {
+        // 401 → broadcast "logout" event (clear stored token, push to /login)
+        return handler.next(err);
+      },
+    ));
+  }
+}
+```
+
+### `ApiConfig.baseUrl`
+
+```dart
+class ApiConfig {
+  static const String baseUrl = String.fromEnvironment(
+    'API_BASE_URL',
+    defaultValue: 'http://10.0.2.2:5000',   // Android emulator → host machine
+  );
+}
+```
+
+Built with: `flutter build apk --dart-define=API_BASE_URL=https://api.example.com`
+
+### `ApiEndpoints` — Centralized Path Constants
+
+```dart
+class ApiEndpoints {
+  static const auth = '/api/auth';
+  static const login = '$auth/login';
+  static const register = '$auth/register';
+  static const verifyOtp = '$auth/verify-otp';
+  static const me = '$auth/me';
+  static const parentProfile = '$auth/parent-profile';
+  // ...
+  static const gateMyChild = '/api/gate/my-child-events';
+  static const attendanceMyChild = '/api/attendance/my-child';
+  static const resultsMyChild = '/api/results/my-child';
+  static const ragQuery = '/api/rag/query';
+  // ...
+}
+```
+
+### Error Handling Pattern in Repositories
+
+```dart
+Future<UserModel> login(String email, String password) async {
+  try {
+    final res = await _api.dio.post('/api/auth/login', data: {
+      'email': email, 'password': password
+    });
+    return UserModel.fromJson(res.data['data']['user']);
+  } on DioException catch (e) {
+    if (e.type == DioExceptionType.connectionTimeout ||
+        e.type == DioExceptionType.connectionError) {
+      throw Exception('Could not connect to the server. Please check your API IP address.');
+    }
+    final msg = e.response?.data['message'] ?? 'Login failed';
+    throw Exception(msg);
+  }
+}
+```
+
+---
+
+## Authentication & Session
+
+### Login Flow
+
+```
+1. User enters email + password
+2. AuthViewModel.login() → AuthRepository.login()
+3. POST /api/auth/login → { token, user }
+4. SecureStorage.saveAccessToken(token)
+5. SecureStorage.saveBiometricCredentials(email, password) if "Enable Biometric" was on
+6. SharedPreferences.setBool('keep_me_signed_in', value)
+7. POST /api/users/fcm-token to upload FCM token
+8. notifyListeners → router redirect to /dashboard
+```
+
+### Multi-Step Registration
+
+```
+Step 1: /register
+  - Form: full_name, email, password, student_id_no
+  - POST /api/auth/register → OTP emailed
+  - Navigate to /register/otp
+
+Step 2: /register/otp (pinput widget — 6 boxes)
+  - POST /api/auth/verify-otp
+  - Response: { student, requires_profile_setup: true } for parents
+  - Navigate to /profile-setup
+
+Step 3: /profile-setup
+  - Form: grade, class, admission_year, gender
+  - POST /api/auth/complete-registration (server validates against Student record)
+  - Response: { token, user }
+  - Save token → /dashboard
+```
+
+### Session Restoration
+
+On app launch (Splash screen):
+```dart
+Future<void> restoreSession() async {
+  final token = await secureStorage.getAccessToken();
+  if (token == null) return;          // → /login
+  try {
+    final res = await dio.post('/api/auth/refresh');
+    user = UserModel.fromJson(res.data['data']['user']);
+    secureStorage.saveAccessToken(res.data['data']['token']);
+    notifyListeners();
+  } catch (_) {
+    await secureStorage.deleteAccessToken();
+    // → /login
+  }
+}
+```
+
+### "Keep Me Signed In" + App Lifecycle
+
+```dart
+class AuthViewModel with WidgetsBindingObserver {
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.paused) {
+      final keepSignedIn = localStorage.getBool('keep_me_signed_in') ?? false;
+      if (!keepSignedIn) {
+        logout();   // app backgrounded without opt-in → clear session
+      }
+    }
+  }
+}
+```
+
+### Logout
+
+```dart
+Future<void> logout() async {
+  try { await dio.post('/api/auth/logout'); } catch (_) {}
+  await secureStorage.deleteAccessToken();
+  await localStorage.clearProfileCache();
+  await localStorage.setBool('keep_me_signed_in', false);
+  user = null;
+  notifyListeners();
+}
+```
+
+---
+
+## Local Storage Strategy
+
+### Two Tiers
+
+#### `flutter_secure_storage` (Encrypted)
+
+Platform: Android Keystore + iOS Keychain
+
+| Key | Value |
+|---|---|
+| `access_token` | JWT (renewed on refresh) |
+| `biometric_enabled` | "true" / "false" |
+| `biometric_email` | Saved email for fingerprint login |
+| `biometric_password` | Saved password (encrypted at OS layer) |
+
+#### `shared_preferences` (Plain)
+
+| Key | Value | Purpose |
+|---|---|---|
+| `keep_me_signed_in` | bool | Whether to persist session on app backgrounding |
+| `selected_theme` | string | (reserved for future dark mode) |
+| `profile_cache` | JSON string of ParentProfileModel | Cache-first profile loading |
+| `messages_inbox_<userId>` | JSON list of ThreadModel | Inbox cache |
+| `messages_thread_<userId>_<contactId>` | JSON list of MessageModel | Thread cache |
+| `fcm_token` | string | FCM token (uploaded to backend) |
+
+### Cache-First Loading Pattern
+
+```dart
+// profile_viewmodel.dart
+Future<void> loadProfile() async {
+  // 1. Show cached profile immediately
+  final cached = await localStorage.getString('profile_cache');
+  if (cached != null) {
+    profile = ParentProfileModel.fromJson(jsonDecode(cached));
+    notifyListeners();
+  }
+  // 2. Fetch fresh in background
+  try {
+    final fresh = await repo.getParentProfile();
+    profile = fresh;
+    await localStorage.setString('profile_cache', jsonEncode(fresh.toJson()));
+    notifyListeners();
+  } catch (_) {
+    // keep showing cached
+  }
+}
+```
+
+---
+
+## Firebase Push Notifications
+
+### Setup in `FirebaseService` (`core/services/firebase_service.dart`)
+
+```dart
+class FirebaseService {
+  final _msg = FirebaseMessaging.instance;
+  final _local = FlutterLocalNotificationsPlugin();
+
+  Future<void> init({void Function(RemoteMessage)? onNotificationTap}) async {
+    // 1. Request permission
+    await _msg.requestPermission(alert: true, badge: true, sound: true);
+
+    // 2. Init local notifications (Android channel + iOS settings)
+    const androidInit = AndroidInitializationSettings('@mipmap/ic_launcher');
+    const iosInit = DarwinInitializationSettings();
+    await _local.initialize(
+      InitializationSettings(android: androidInit, iOS: iosInit),
+      onDidReceiveNotificationResponse: (response) {
+        // tapped a local notification - bring to relevant screen
+      },
+    );
+
+    // 3. Android notification channel (high importance)
+    const channel = AndroidNotificationChannel(
+      'high_importance_channel',
+      'High Importance Notifications',
+      importance: Importance.high,
+    );
+    await _local.resolvePlatformSpecificImplementation<
+        AndroidFlutterLocalNotificationsPlugin>()?.createNotificationChannel(channel);
+
+    // 4. Foreground listener (Android auto-displays in background)
+    FirebaseMessaging.onMessage.listen(_handleForegroundMessage);
+
+    // 5. Tap-from-background
+    FirebaseMessaging.onMessageOpenedApp.listen((msg) {
+      onNotificationTap?.call(msg);
+    });
+
+    // 6. Cold-start (app launched from notification tap)
+    final initial = await _msg.getInitialMessage();
+    if (initial != null) onNotificationTap?.call(initial);
+  }
+
+  void _handleForegroundMessage(RemoteMessage msg) {
+    final n = msg.notification;
+    if (n == null) return;
+    _local.show(
+      n.hashCode,
+      n.title,
+      n.body,
+      const NotificationDetails(
+        android: AndroidNotificationDetails(
+          'high_importance_channel',
+          'High Importance Notifications',
+          importance: Importance.high,
+          icon: '@mipmap/ic_launcher',
+        ),
+        iOS: DarwinNotificationDetails(),
+      ),
+    );
+  }
+
+  Future<String?> getToken() => _msg.getToken();
+  Stream<String> onTokenRefresh() => _msg.onTokenRefresh;
+}
+```
+
+### Token Upload to Backend
+
+```dart
+// After login or token refresh
+final fcmToken = await firebaseService.getToken();
+if (fcmToken != null) {
+  await dio.put('/api/users/fcm-token', data: {'fcm_token': fcmToken});
+}
+```
+
+### When Notifications Arrive
+
+| Trigger | Server Sends FCM |
+|---|---|
+| Child checked IN at gate | "Your child has arrived at school" |
+| Child checked OUT at gate | "Your child has left school" |
+| New message from teacher | "Mrs. Smith sent you a message" |
+| New school-wide notice | "New announcement: ..." (optional) |
+| Complaint assigned/resolved | "Your complaint status has been updated" |
+
+---
+
+## Biometric Login
+
+### `BiometricService` (`core/services/biometric_service.dart`)
+
+```dart
+class BiometricService {
+  final _auth = LocalAuthentication();
+
+  Future<bool> canAuthenticate() async {
+    return await _auth.canCheckBiometrics && await _auth.isDeviceSupported();
+  }
+
+  Future<bool> authenticate({String reason = 'Sign in to UniVerse'}) async {
+    try {
+      return await _auth.authenticate(
+        localizedReason: reason,
+        options: AuthenticationOptions(
+          biometricOnly: true,
+          stickyAuth: true,
+        ),
+      );
+    } on PlatformException {
+      return false;
+    }
+  }
+}
+```
+
+### Flow
+
+```
+1. User toggles "Enable Biometric" on first login → saves email + password to secure storage
+2. Next time login screen loads: AuthViewModel.tryBiometricLogin()
+   - if biometric_enabled && credentials exist:
+     - prompt biometric
+     - on success: read creds → call login(email, password)
+3. Settings screen has toggle to disable
+```
+
+### Permissions
+
+| Platform | Permission |
+|---|---|
+| Android | `android.permission.USE_BIOMETRIC` in AndroidManifest.xml |
+| iOS | `NSFaceIDUsageDescription` in Info.plist |
+
+---
+
+## Every Feature Module
+
+### 1. Splash & Welcome (`features/splash/`)
+
+- **SplashScreen** — Calls `AuthViewModel.restoreSession()` then routes to `/dashboard` or `/welcome` based on auth state.
+- **WelcomeScreen** — Onboarding carousel for new users → `/login`.
+
+### 2. Auth (`features/auth/`)
+
+- **LoginScreen** — Email + password, biometric button, "Keep me signed in", link to register/forgot
+- **RegisterScreen** — Step 1 of 3
+- **RegistrationOtpScreen** — `pinput` widget, resend OTP timer
+- **ForgotPasswordScreen** — OTP-based reset
+
+### 3. Dashboard (`features/dashboard/`)
+
+The home grid:
+- **Profile header** — parent name + child photo (base64 supported)
+- **LiveClockWidget** — animated digital clock
+- **6 Action Cards** — Gate, Attendance, Support, Contact Teacher, Lost & Found, More (chatbot/results/notices)
+  - Each card is `ActionCard` widget with animated bubble effects, gradient bg
+- **Announcement carousel** — top 4 from NoticesViewModel
+- **Page entry animation** — 700ms slide + fade
+
+### 4. Profile (`features/profile/`)
+
+- **ProfileScreen** — Shows ParentProfileModel: parent details, linked student details, class teacher details
+- **ProfileSetupScreen** — Used during first-time parent registration (completes 2FA)
+
+### 5. Attendance (`features/attendance/`)
+
+- Paginated list of `AttendanceRecordModel`
+- Status badge: present (green) / absent (red) / late (yellow) / excused (blue)
+- Pull-to-refresh, infinite scroll
+
+### 6. Gate (`features/gate/`)
+
+- **GateStatusScreen** — Big banner: "Inside School" or "At Home" based on most recent event
+- Events list with direction icon, timestamp, method (qr/manual), scanned by name
+- Live update via FCM-triggered refresh
+
+### 7. Results (`features/results/`)
+
+- Term selector at top
+- Per-term: list of modules with scores
+- Grade letter calculated client-side:
+  - 90-100: A+, 80-89: A, 75-79: A-, 70-74: B+, 65-69: B, 60-64: B-, 50-59: C, etc.
+- Average score shown at bottom
+
+### 8. Messages (`features/messages/`)
+
+- **MessagesScreen** — Tab bar: Inbox | Contacts
+  - Inbox: ThreadModel list with last message preview + unread badge
+  - Contacts: list of available contacts (teachers, admin)
+- **TeacherInboxScreen** — Conversation thread, send composer
+- Cache-first thread loading (instant UX, background refresh)
+- AI draft button (calls backend `/api/messages/ai-draft`)
+
+### 9. Contact Teacher (`features/contact_teacher/`)
+
+- **TeacherChatScreen** — Direct chat with class teacher, similar to TeacherInbox but starts from teacher ID
+
+### 10. Support (`features/support/`)
+
+- **SupportScreen** — TabBar: Complaints | Suggestions
+  - List with status badge (pending/assigned/in_progress/resolved/rejected)
+  - FAB → SubmitComplaintScreen
+- **SubmitComplaintScreen** — Form: category dropdown, description, optional student picker
+- **ComplaintDetailScreen** — Full description + reply note + status timeline
+
+### 11. Notices (`features/notices/`)
+
+- **NoticesScreen** — Announcement cards
+- Scope gradient (school-wide = blue, class = purple)
+- Author info with role badge
+- Relative date ("2 hours ago")
+
+### 12. Notifications (`features/notifications/`)
+
+- **NotificationsScreen** — History of received FCM messages
+
+### 13. Chatbot (`features/chatbot/`)
+
+- **ChatBotScreen** — Conversational UI
+- `ChatBotService.askQuestion(question)` → POST `/api/rag/query`
+- Display: bubble for user query, then bot answer + expandable source citations + confidence %
+
+### 14. Lost & Found (`features/lost_and_found/`)
+
+- **LostAndFoundScreen** — Stub; future expansion to list found items + report lost
+
+### 15. Settings (`features/settings/`)
+
+- **SettingsScreen** — Toggle biometric, change theme (reserved), logout
+
+---
+
+## Theming & Design System
+
+### `AppTheme.light` (`shared/themes/app_theme.dart`)
+
+```dart
+class AppTheme {
+  static final light = ThemeData(
+    useMaterial3: true,
+    colorScheme: ColorScheme.fromSeed(
+      seedColor: Color(0xFF1A3A44),
+      brightness: Brightness.light,
+    ),
+    scaffoldBackgroundColor: Color(0xFFF0FBFF),
+    textTheme: GoogleFonts.plusJakartaSansTextTheme(),
+    inputDecorationTheme: InputDecorationTheme(
+      filled: true,
+      fillColor: Colors.white,
+      contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 14),
+      enabledBorder: OutlineInputBorder(
+        borderRadius: BorderRadius.circular(12),
+        borderSide: BorderSide(color: Color(0xFFE0E0E0)),
+      ),
+      focusedBorder: OutlineInputBorder(
+        borderRadius: BorderRadius.circular(12),
+        borderSide: BorderSide(color: Color(0xFF1A3A44), width: 1.5),
+      ),
+    ),
+  );
+}
+```
+
+### Color Tokens (`core/constants/app_colors.dart`)
+
+| Token | Hex | Usage |
+|---|---|---|
+| `primary` | `#1A3A44` | Brand, buttons, links |
+| `background` | `#F0FBFF` | Scaffold background |
+| `textPrimary` | `#101820` | Headings, body |
+| `textSecondary` | `#A7BFC6` | Hints, captions |
+| `border` | `#E0E0E0` | Card outlines, dividers |
+
+### Typography
+
+Single font: **Plus Jakarta Sans** (via `google_fonts`).
+
+> Note: `google_fonts` downloads the font at runtime by default. For production, pre-bundle the .ttf into `Assets/fonts/` and reference it locally to remove the download dependency.
+
+### Dark Mode
+
+**Not implemented.** Single light theme only.
+
+---
+
+## Custom Widgets
+
+### `ActionCard` — `shared/widgets/action_card.dart`
+
+The signature dashboard card with:
+- Continuous rounded rectangle (custom path, not standard Material radius)
+- Linear gradient background (color varies per card index)
+- 3 animated bubbles drifting on sine/cosine curves over 8-second cycles
+- Icon + label centered
+- Optional badge (e.g., unread message count)
+
+### `AppButton` — `shared/widgets/app_button.dart`
+
+- 28px border radius (continuous shape)
+- Drop shadow: 4px y offset, 11% black opacity
+- Loading state: spinner overlay, disable taps
+- Variants: primary (filled teal), secondary (outline)
+
+### `CustomTextField` — `shared/widgets/custom_textfield.dart`
+
+Form input with optional label, hint, suffix icon, obscure toggle for passwords. Uses theme's `InputDecorationTheme`.
+
+### `LiveClockWidget` — `shared/widgets/live_clock_widget.dart`
+
+Stateful widget with a `Timer.periodic(Duration(seconds:1))` updating displayed time. Used in dashboard header.
+
+---
+
+## Testing
+
+### Existing Tests
+
+```
+test/widget_test.dart
+```
+
+```dart
+testWidgets('App boots and shows splash', (WidgetTester tester) async {
+  await ServiceLocator.instance.setup();
+  await tester.pumpWidget(const UniverseApp());
+  expect(find.text('UniVerse'), findsOneWidget);
+});
+```
+
+That's it — **a single smoke test**.
+
+### CI Hookup
+
+In `.github/workflows/ci.yml`, the `flutter-tests` job:
+
+```yaml
+- uses: subosito/flutter-action@v2
+  with: { flutter-version: '3.32.0', cache: true }
+- run: flutter pub get
+  working-directory: apps/flutter
+- run: flutter test
+  working-directory: apps/flutter
+```
+
+### Pre-push Hook
+
+`.githooks/pre-push` runs `flutter test` before allowing `git push`. Can be skipped with `SKIP_FLUTTER_HOOKS=1`.
+
+### Test Gaps
+
+- No unit tests for ViewModels (could mock Repository)
+- No widget tests for screens
+- No integration tests
+- No mock Dio adapter
+
+**Recommended additions:** `mocktail`, `bloc_test` (if migrating), `integration_test` for end-to-end flows.
+
+---
+
+## Build & Release
+
+### Local Development
+
+```bash
+cd apps/flutter
+flutter pub get
+flutter run                  # default: connects to http://10.0.2.2:5000
+```
+
+### Override API URL at Build Time
+
+```bash
+flutter run \
+  --dart-define=API_BASE_URL=https://api.staging.example.com
+```
+
+### Production Builds
+
+```bash
+# Android APK (debug-signed)
+flutter build apk --debug --dart-define=API_BASE_URL=https://api.prod.example.com
+
+# Android App Bundle (release-signed — requires signing config)
+flutter build appbundle --release
+
+# iOS (requires Apple Developer account + Xcode)
+flutter build ipa --release
+```
+
+### CI/CD — GitHub Actions `flutter-release.yml`
+
+Triggered on push to `release/development` branch:
+
+```yaml
+- uses: actions/checkout@v4
+  with: { fetch-depth: 0 }
+- uses: actions/setup-java@v4
+  with: { java-version: '17', distribution: 'temurin' }
+- uses: subosito/flutter-action@v2
+  with: { flutter-version: '3.32.0' }
+- run: flutter pub get
+  working-directory: apps/flutter
+- run: |
+    flutter build apk --debug \
+      --dart-define=API_BASE_URL=${{ secrets.RAILWAY_BACKEND_URL }}
+  working-directory: apps/flutter
+- # Auto-bump semver tag (v1.0.0 → v1.0.1)
+- # Create GitHub Release with APK attached
+```
+
+### Git Hooks (`.githooks/`)
+
+These are **native Git hooks** (not Husky):
+
+```
+.githooks/
+├── pre-commit       ← formats staged .dart files
+└── pre-push         ← runs flutter test
+```
+
+Enable once:
+```bash
+git config core.hooksPath apps/flutter/.githooks
+```
+
+---
+
+## Platform-Specific Notes
+
+### Android (`android/`)
+
+`app/build.gradle.kts`:
+- Java toolchain: **17**
+- Compile/target SDK from `flutter.compileSdkVersion`
+- Plugins: `com.google.gms.google-services` (Firebase)
+- Core library desugaring: `2.1.4` (Java 17 → older Android APIs)
+
+`AndroidManifest.xml` permissions:
+```xml
+<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
+<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+<uses-permission android:name="android.permission.WAKE_LOCK"/>
+```
+
+Single activity: `MainActivity` (singleTop launchMode).
+
+### iOS (`ios/`)
+
+- Standard Flutter iOS scaffold
+- `Info.plist`: `NSFaceIDUsageDescription` for biometric auth
+- `GoogleService-Info.plist` for Firebase
+- Push notification capability must be enabled in Xcode
+- Provisioning profile + signing identity required for builds
+
+### Web / Desktop
+
+Buildable in principle but **not configured or tested**. The QR scanner and biometric features won't work outside mobile.
+
+---
+
+## API Base URL Per Platform
+
+| Environment | Base URL |
+|---|---|
+| Android Emulator | `http://10.0.2.2:5000` (host machine loopback) |
+| iOS Simulator | `http://127.0.0.1:5000` (override via `--dart-define`) |
+| Physical Device (LAN) | `http://192.168.x.x:5000` (override) |
+| Production | `https://<railway-url>` (set via `--dart-define`) |
+
+---
+
+**Next:** [05-DEVOPS-DOCKER-CICD.md](05-DEVOPS-DOCKER-CICD.md) — Docker, CI/CD, deployment.
diff --git a/Documentation/05-DEVOPS-DOCKER-CICD.md b/Documentation/05-DEVOPS-DOCKER-CICD.md
new file mode 100644
index 0000000..7697c51
--- /dev/null
+++ b/Documentation/05-DEVOPS-DOCKER-CICD.md
@@ -0,0 +1,973 @@
+# Universe System — DevOps, Docker, CI/CD & Tooling
+
+> **Document 5 of 5** — Everything operational: Docker, GitHub Actions, deployment, environment, hooks, linting, scripts, and the complete package landscape.
+
+---
+
+## Table of Contents
+
+1. [Repository-Level Layout](#repository-level-layout)
+2. [npm Workspaces Setup](#npm-workspaces-setup)
+3. [Docker & Containerization](#docker--containerization)
+4. [Local Development — Two Paths](#local-development--two-paths)
+5. [Environment Variables Master Reference](#environment-variables-master-reference)
+6. [GitHub Actions CI/CD](#github-actions-cicd)
+7. [Git Hooks (Husky + Native)](#git-hooks-husky--native)
+8. [Linting, Formatting, Commit Validation](#linting-formatting-commit-validation)
+9. [Deployment Targets](#deployment-targets)
+10. [Complete Package Inventory (All Three Apps)](#complete-package-inventory-all-three-apps)
+11. [Operational Playbooks](#operational-playbooks)
+12. [Troubleshooting](#troubleshooting)
+
+---
+
+## Repository-Level Layout
+
+```
+Universe-System/
+├── apps/
+│   ├── backend/                    ← Node/Fastify
+│   ├── frontend/                   ← Next.js
+│   └── flutter/                    ← Flutter (not in npm workspaces)
+│
+├── .github/workflows/
+│   ├── ci.yml                      ← PR checks: backend tests + Flutter tests
+│   └── flutter-release.yml         ← Push to release/development → builds APK
+│
+├── .husky/
+│   ├── pre-commit                  ← npm run precommit (lint + lint-staged)
+│   ├── pre-push                    ← npm run prepush (lint + build)
+│   ├── commit-msg                  ← commitlint validation
+│   └── _/                          ← Husky internals (gitignored)
+│
+├── .vscode/                        ← VSCode workspace settings (MCP config)
+├── .claude/                        ← Claude Code agent configuration
+├── Doc/                            ← Existing detailed docs (10 files)
+├── Documentation/                  ← This 5-document set
+├── node_modules/                   ← Hoisted workspace deps
+│
+├── docker-compose.yml              ← Production-style stack
+├── docker-compose.dev.yml          ← Dev stack with hot reload mounts
+├── .dockerignore
+│
+├── package.json                    ← Root workspace manifest + scripts
+├── package-lock.json               ← Single, authoritative lockfile
+├── vercel.json                     ← Vercel deployment config
+├── commitlint.config.js            ← Conventional Commits rules
+├── .prettierrc                     ← Code formatting rules
+├── .eslintignore
+├── .gitignore
+├── .mcp.json                       ← MCP servers (Supabase)
+├── skills-lock.json                ← Claude skills lockfile
+│
+├── README.md                       ← Quick start + overview
+├── TECH_STACK.md                   ← Tech dependency rationale
+├── PROJECT_LOG.md                  ← Historical development log
+├── PROJECT_REPORT.md               ← Detailed status report
+├── firebase-debug.log              ← (transient debug output)
+└── lint.log                        ← (transient lint output)
+```
+
+---
+
+## npm Workspaces Setup
+
+### Root `package.json`
+
+```json
+{
+  "name": "universe-system",
+  "version": "1.0.0",
+  "private": true,
+  "workspaces": ["apps/frontend", "apps/backend"],
+  "scripts": {
+    "frontend:dev":   "npm run dev --prefix apps/frontend",
+    "frontend:lint":  "npm run lint --prefix apps/frontend",
+    "frontend:build": "npm run build --prefix apps/frontend",
+    "backend:dev":    "npm run dev --prefix apps/backend",
+    "backend:test":   "npm run test --prefix apps/backend",
+    "lint":           "npm run frontend:lint && npm run backend:lint",
+    "precommit":      "npm run lint && lint-staged",
+    "prepush":        "npm run lint && npm run frontend:build",
+    "test":           "npm run backend:test",
+    "build":          "npm run frontend:build",
+    "prepare":        "husky"
+  },
+  "devDependencies": {
+    "husky": "^9.1.7",
+    "lint-staged": "^16.2.7",
+    "@commitlint/cli": "^19.3.0",
+    "@commitlint/config-conventional": "^19.3.0",
+    "prettier": "^3.3.3"
+  },
+  "lint-staged": {
+    "apps/frontend/**/*.{js,jsx,ts,tsx}": [
+      "npm run lint --prefix apps/frontend -- --fix"
+    ],
+    "apps/backend/**/*.{js,mjs,cjs,ts}": [
+      "npm run lint --prefix apps/backend -- --fix"
+    ]
+  }
+}
+```
+
+### Why Workspaces?
+
+- **Single `node_modules/` hoisted at root** — shared deps deduplicated
+- **One `package-lock.json`** — deterministic installs across all workspaces
+- **Root scripts orchestrate sub-apps** — `npm run backend:dev` from root
+- **`apps/flutter` is NOT in workspaces** — Dart has its own `pubspec.lock`
+
+### Install
+
+```bash
+# Single command installs everything
+npm install
+```
+
+Behind the scenes this:
+1. Reads root `package.json` workspaces array
+2. Installs each workspace's deps into the root `node_modules/`
+3. Symlinks `apps/frontend/node_modules` and `apps/backend/node_modules` if needed
+4. Runs `postinstall` hooks (Prisma generates client)
+5. Runs `prepare` script → installs Husky
+
+---
+
+## Docker & Containerization
+
+### Production Stack — `docker-compose.yml`
+
+```yaml
+services:
+  redis:
+    image: redis:7-alpine
+    container_name: universe-redis
+    restart: unless-stopped
+    ports: ["6379:6379"]
+    volumes: [redis_data:/data]
+
+  backend:
+    build:
+      context: .
+      dockerfile: apps/backend/Dockerfile.dev
+    container_name: universe-backend
+    restart: unless-stopped
+    ports: ["5000:5000"]
+    env_file: ./apps/backend/.env
+    environment:
+      - REDIS_URL=redis://redis:6379
+      - NODE_ENV=production
+    depends_on: [redis]
+
+  frontend:
+    build:
+      context: .
+      dockerfile: apps/frontend/Dockerfile.dev
+    container_name: universe-frontend
+    restart: unless-stopped
+    ports: ["3000:3000"]
+    env_file: ./apps/frontend/.env.local
+    environment:
+      - NEXT_PUBLIC_API_URL=http://backend:5000
+      - NODE_ENV=production
+    depends_on: [backend]
+
+volumes:
+  redis_data:
+```
+
+### Development Stack — `docker-compose.dev.yml`
+
+```yaml
+services:
+  redis:
+    image: redis:7-alpine
+    ports: ["6379:6379"]
+    volumes: [redis_data:/data]
+
+  backend:
+    build:
+      context: .
+      dockerfile: apps/backend/Dockerfile.dev
+    ports: ["5000:5000"]
+    volumes:
+      - ./apps/backend:/app/apps/backend
+      - /app/apps/backend/node_modules         # Anonymous volume preserves container's node_modules
+    env_file: ./apps/backend/.env
+    environment:
+      - REDIS_URL=redis://redis:6379
+    depends_on: [redis]
+
+  frontend:
+    build:
+      context: .
+      dockerfile: apps/frontend/Dockerfile.dev
+    ports: ["3000:3000"]
+    volumes:
+      - ./apps/frontend:/app/apps/frontend
+      - /app/apps/frontend/node_modules
+      - /app/apps/frontend/.next               # Don't shadow build artefacts
+    env_file: ./apps/frontend/.env.local
+    environment:
+      - NEXT_PUBLIC_API_URL=http://backend:5000
+    depends_on: [backend]
+
+volumes:
+  redis_data:
+```
+
+### Key Differences (Dev vs Prod)
+
+| Aspect | Dev | Prod |
+|---|---|---|
+| Volume mounts | ✅ Code mounted for hot reload | ❌ Code baked into image |
+| node_modules | Anonymous volume preserves container's | Built into image |
+| NODE_ENV | development (default) | production |
+| Restart policy | none | unless-stopped |
+| Use case | Iterative coding | Demo / staging |
+
+> **Note:** Both compose files currently use `Dockerfile.dev` — there is no separate `Dockerfile.prod`. For real production, a multi-stage build with `npm ci --omit=dev` and `tsc` compilation would be the next step.
+
+### Dockerfiles
+
+#### `apps/backend/Dockerfile.dev`
+
+```dockerfile
+FROM node:20-alpine
+WORKDIR /app
+COPY package.json package-lock.json ./
+COPY apps/backend/package.json ./apps/backend/
+RUN npm ci --workspace=apps/backend
+COPY apps/backend ./apps/backend
+WORKDIR /app/apps/backend
+EXPOSE 5000
+CMD ["npm", "run", "dev"]
+```
+
+#### `apps/frontend/Dockerfile.dev`
+
+```dockerfile
+FROM node:20-alpine
+WORKDIR /app
+COPY package.json package-lock.json ./
+COPY apps/frontend/package.json ./apps/frontend/
+RUN npm ci --workspace=apps/frontend
+COPY apps/frontend ./apps/frontend
+WORKDIR /app/apps/frontend
+EXPOSE 3000
+CMD ["npm", "run", "dev"]
+```
+
+**Image size:** ~150 MB for each (`node:20-alpine` base + workspace deps).
+
+### `.dockerignore` (root)
+
+```
+node_modules/
+apps/frontend/node_modules
+apps/backend/node_modules
+apps/frontend/.next
+apps/backend/dist
+.git/
+**/.env
+**/.env.local
+coverage
+**/*.dockerignore
+**/Dockerfile*
+```
+
+Stops Docker from copying gigabytes of local node_modules into the build context — image build becomes ~10x faster.
+
+---
+
+## Local Development — Two Paths
+
+### Path A — Without Docker (Recommended for daily dev)
+
+```bash
+# One-time
+npm install
+npm run prisma:generate --prefix apps/backend
+
+# Each session
+npm run backend:dev      # Terminal 1 → http://localhost:5000
+npm run frontend:dev     # Terminal 2 → http://localhost:3000
+
+# Flutter (in 3rd terminal)
+cd apps/flutter
+flutter pub get
+flutter run
+```
+
+Requires:
+- Node.js 20+
+- Flutter 3.32.0 + Android Studio (for emulator) or Xcode (for iOS)
+- Redis (optional) — run `docker run -p 6379:6379 redis:7-alpine` or skip
+- `.env` files configured in `apps/backend/` and `apps/frontend/`
+
+### Path B — With Docker Compose
+
+```bash
+# Dev stack with hot reload
+docker compose -f docker-compose.dev.yml up --build
+
+# Logs streamed from all containers
+# Code changes in apps/backend/src/ or apps/frontend/src/ auto-restart
+
+# Stop
+docker compose -f docker-compose.dev.yml down
+
+# Stop + clean volumes (resets Redis data)
+docker compose -f docker-compose.dev.yml down -v
+```
+
+For the production-style stack:
+```bash
+docker compose up --build
+```
+
+---
+
+## Environment Variables Master Reference
+
+### Backend — `apps/backend/.env`
+
+| Var | Required | Notes |
+|---|---|---|
+| `PORT` | No (5000) | HTTP port |
+| `NODE_ENV` | No | development / production / test |
+| `DATABASE_URL` | **Yes** | Supabase pooled URL (PgBouncer) |
+| `DIRECT_URL` | **Yes** | Direct Supabase URL (Prisma migrations) |
+| `REDIS_URL` | No | `redis://redis:6379` in Docker, `redis://localhost:6379` local |
+| `REDIS_DEFAULT_TTL` | No | Default cache TTL seconds (default 120) |
+| `JWT_SECRET` | **Yes** (≥32 chars) | Signing key |
+| `SUPABASE_URL` | **Yes** | Project URL |
+| `SUPABASE_ANON_KEY` | **Yes** | Public key |
+| `SUPABASE_SERVICE_KEY` | **Yes** | Server-only key (bypasses RLS) |
+| `RESEND_API_KEY` | **Yes** | Email service |
+| `RESEND_FROM_EMAIL` | No | Default `noreply@mg.methum.space` |
+| `GEMINI_API_KEY` | **Yes** | Embeddings + LLM |
+| `ANTHROPIC_API_KEY` | No | Future Claude features |
+| `OPENAI_API_KEY` | No | Optional fallback |
+| `FIREBASE_PROJECT_ID` | **Yes** | FCM target project |
+| `FIREBASE_SERVICE_ACCOUNT_JSON` | **Yes** | Service account JSON (stringified) |
+| `WEB_URL` | **Yes** | CORS allow origin (frontend URL) |
+| `FLUTTER_ORIGIN` | **Yes** | CORS allow origin for Flutter dev |
+
+### Frontend — `apps/frontend/.env.local`
+
+| Var | Required | Notes |
+|---|---|---|
+| `NEXT_PUBLIC_API_URL` | **Yes** | Backend base URL (no trailing slash) |
+| `NEXT_PUBLIC_SUPABASE_URL` | **Yes** | Public Supabase project URL |
+| `NEXT_PUBLIC_SUPABASE_ANON_KEY` | **Yes** | Public anon key |
+
+`NEXT_PUBLIC_*` prefix exposes vars to browser bundle.
+
+### Flutter — Build-time
+
+Pass via `--dart-define`:
+```bash
+flutter build apk --dart-define=API_BASE_URL=https://api.example.com
+```
+
+Defaults to `http://10.0.2.2:5000` (Android emulator → host).
+
+---
+
+## GitHub Actions CI/CD
+
+### Workflow 1 — `ci.yml` (Pull Request Tests)
+
+**Triggers:** `pull_request` to any branch
+
+```yaml
+name: CI
+
+on: [pull_request]
+
+jobs:
+  backend-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'npm'
+      - run: npm ci
+      - run: npm run test:unit --prefix apps/backend
+      - run: npm run test:integration --prefix apps/backend
+
+  flutter-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.32.0'
+          cache: true
+      - run: flutter pub get
+        working-directory: apps/flutter
+      - run: flutter test
+        working-directory: apps/flutter
+```
+
+**Status:** Frontend has **no automated tests in CI** — known gap.
+
+### Workflow 2 — `flutter-release.yml` (APK Build)
+
+**Triggers:** `push` to `release/development` branch
+
+```yaml
+name: Flutter Release APK
+
+on:
+  push:
+    branches: [release/development]
+
+jobs:
+  build-and-release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write           # for creating GitHub Release
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0        # full history (needed for tagging)
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.32.0'
+          channel: 'stable'
+
+      - run: flutter pub get
+        working-directory: apps/flutter
+
+      - name: Build debug APK
+        working-directory: apps/flutter
+        run: |
+          flutter build apk --debug \
+            --dart-define=API_BASE_URL=${{ secrets.RAILWAY_BACKEND_URL }}
+
+      - name: Compute next version tag
+        id: tag
+        run: |
+          # Read latest tag, bump patch, e.g., v1.0.0 → v1.0.1
+          LATEST=$(git tag --sort=-v:refname | head -n1 || echo "v1.0.0")
+          # ... bump logic ...
+          echo "version=v$NEW_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ steps.tag.outputs.version }}
+          files: apps/flutter/build/app/outputs/flutter-apk/app-debug.apk
+          generate_release_notes: true
+```
+
+### Secrets Used
+
+| Secret | Used By | Purpose |
+|---|---|---|
+| `RAILWAY_BACKEND_URL` | flutter-release.yml | Production backend URL baked into APK |
+| `GITHUB_TOKEN` | (default) | Creates GitHub Release |
+
+### Status Matrix
+
+| App | CI Tests | Build Pipeline | Auto Deploy |
+|---|---|---|---|
+| **Backend** | ✅ ci.yml (unit + integration) | — | Railway (manual or webhook) |
+| **Frontend** | ❌ None | Vercel auto-builds on push | Vercel main branch |
+| **Flutter** | ✅ ci.yml (widget tests) | ✅ flutter-release.yml | GitHub Release artefact |
+
+---
+
+## Git Hooks (Husky + Native)
+
+### Repo-Level Husky Hooks (`.husky/`)
+
+#### `pre-commit`
+
+```bash
+#!/usr/bin/env bash
+export PATH="/c/Program Files/nodejs:$PATH"
+
+echo "🔍 Running lint and formatting checks..."
+
+if ! npm run precommit; then
+  echo "❌ Linting failed. Please fix the errors above."
+  exit 1
+fi
+
+echo "✅ Linting and formatting passed."
+```
+
+Calls `npm run precommit` which is `npm run lint && lint-staged`.
+
+#### `pre-push`
+
+```bash
+#!/usr/bin/env bash
+export PATH="/c/Program Files/nodejs:$PATH"
+
+echo "🏗️  Running production build before push..."
+
+if ! npm run prepush; then
+  echo "❌ Build failed. Push aborted."
+  exit 1
+fi
+
+echo "✅ Build successful. Pushing to remote."
+```
+
+Calls `npm run prepush` which is `npm run lint && npm run frontend:build`. Tests are intentionally not in pre-push (CI handles them).
+
+#### `commit-msg`
+
+Runs `commitlint --edit "$1"` to validate the commit message against Conventional Commits rules.
+
+### Flutter-Specific Native Hooks (`apps/flutter/.githooks/`)
+
+These are **not Husky** — they're plain Git hooks activated by:
+
+```bash
+git config core.hooksPath apps/flutter/.githooks
+```
+
+| Hook | Action |
+|---|---|
+| `pre-commit` | `dart format` on staged `.dart` files, re-stage formatted files |
+| `pre-push` | `flutter test` |
+
+**Skip flags:**
+```bash
+SKIP_FLUTTER_HOOKS=1 git commit -m "msg"
+RUN_FLUTTER_ANALYZE=1 git commit -m "msg"    # also runs flutter analyze
+```
+
+---
+
+## Linting, Formatting, Commit Validation
+
+### Prettier (`.prettierrc`)
+
+```json
+{
+  "singleQuote": true,
+  "semi": true,
+  "tabWidth": 2,
+  "trailingComma": "es5",
+  "printWidth": 100,
+  "endOfLine": "auto"
+}
+```
+
+Applied to all JS/TS/JSON/MD files repo-wide.
+
+### Frontend ESLint (`apps/frontend/eslint.config.mjs`)
+
+```javascript
+import nextVitals from "eslint-config-next/core-web-vitals";
+import nextTs from "eslint-config-next/typescript";
+
+export default [
+  ...nextVitals,
+  ...nextTs,
+  {
+    ignores: [
+      '.next/**', 'node_modules/**', 'build/**',
+      '*.lock', 'public/**'
+    ]
+  }
+];
+```
+
+ESLint 9 **flat config** format (not the legacy `.eslintrc`).
+
+### Backend Linting
+
+Currently a **placeholder**:
+```json
+"lint": "echo 'No linting yet'"
+```
+
+The backend follows TypeScript strict mode but has no ESLint config. Recommended addition: ESLint + `@typescript-eslint/parser`.
+
+### Commitlint (`commitlint.config.js`)
+
+```javascript
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'type-enum': [2, 'always', [
+      'feat', 'fix', 'docs', 'style', 'refactor',
+      'perf', 'test', 'build', 'ci', 'chore', 'revert'
+    ]],
+    'subject-case': [2, 'never', [
+      'sentence-case', 'start-case', 'pascal-case', 'upper-case'
+    ]],
+    'subject-max-length': [2, 'always', 100],
+  }
+};
+```
+
+Recent commit examples (showing compliance):
+- `feat: setup real data fetching complain management`
+- `fix: chatbot endpoints issue and migrate to gemini`
+- `fix: announcement section data fetching`
+
+### Lint-Staged
+
+Only re-lints files that are staged for commit:
+
+```json
+"lint-staged": {
+  "apps/frontend/**/*.{js,jsx,ts,tsx}": [
+    "npm run lint --prefix apps/frontend -- --fix"
+  ],
+  "apps/backend/**/*.{js,mjs,cjs,ts}": [
+    "npm run lint --prefix apps/backend -- --fix"
+  ]
+}
+```
+
+Keeps pre-commit fast (full lint runs at pre-push and CI).
+
+---
+
+## Deployment Targets
+
+| Component | Platform | Trigger |
+|---|---|---|
+| **Frontend** | Vercel | Auto on `git push` to main / preview branches via Vercel GitHub integration |
+| **Backend** | Railway | Manual deploy or GitHub webhook (referenced in CI secrets as `RAILWAY_BACKEND_URL`) |
+| **Database** | Supabase Cloud | Managed (no deploy needed); migrations via `prisma migrate deploy` |
+| **Mobile APK** | GitHub Releases | Auto on push to `release/development` |
+| **Mobile iOS** | TestFlight / App Store | Manual `flutter build ipa` + Xcode upload |
+| **Redis** | Railway / Upstash / Redis Cloud | (any provider with `REDIS_URL`) |
+
+### Vercel — `vercel.json`
+
+```json
+{
+  "framework": "nextjs",
+  "installCommand": "npm install",
+  "buildCommand": "npm run build",
+  "outputDirectory": ".next"
+}
+```
+
+The custom `installCommand` is required because this is a monorepo — Vercel needs to install from the **repository root** so workspaces resolve, then `npm run build` is the root script that delegates to `apps/frontend`.
+
+### Railway (Backend)
+
+Typical config:
+- **Root directory:** `/`
+- **Build command:** `npm install && npm run build --prefix apps/backend && npx prisma migrate deploy --schema=apps/backend/prisma/schema.prisma`
+- **Start command:** `npm run start --prefix apps/backend`
+- **Env vars:** Set via Railway dashboard (DATABASE_URL, JWT_SECRET, etc.)
+
+### Supabase Database
+
+```bash
+# Apply migrations in production
+DATABASE_URL=... DIRECT_URL=... npx prisma migrate deploy
+```
+
+Production secrets are stored in Railway / Vercel environments — never committed.
+
+---
+
+## Complete Package Inventory (All Three Apps)
+
+### Backend (`apps/backend/package.json`)
+
+#### Production
+```
+@anthropic-ai/sdk          @fastify/cookie          @fastify/cors
+@fastify/helmet            @fastify/jwt             @fastify/multipart
+@fastify/rate-limit        @google/generative-ai    @prisma/client
+@supabase/supabase-js      axios                    bcryptjs
+dotenv                     fastify                  firebase-admin
+jsonwebtoken               node-cron                pdf-parse
+pino                       pino-pretty              prisma
+redis                      resend                   zod
+```
+
+#### Development
+```
+@types/bcryptjs   @types/jest        @types/jsonwebtoken
+@types/node       @types/supertest   jest
+ndb               nodemon            supertest
+ts-jest           ts-node            ts-node-dev
+typescript
+```
+
+### Frontend (`apps/frontend/package.json`)
+
+#### Production
+```
+@hookform/resolvers       @supabase/supabase-js    @zxing/browser
+@zxing/library            clsx                      framer-motion
+lucide-react              next                      qrcode
+react                     react-dom                 react-hook-form
+react-qr-code             recharts                  redis
+tailwind-merge            tailwindcss               zod
+```
+
+#### Development
+```
+@types/node        @types/react        @types/react-dom
+@types/qrcode      autoprefixer        eslint
+eslint-config-next postcss             typescript
+```
+
+### Flutter (`apps/flutter/pubspec.yaml`)
+
+#### Production
+```
+flutter (SDK)                 cupertino_icons       google_fonts
+provider                      go_router             dio
+flutter_secure_storage        shared_preferences    local_auth
+firebase_core                 firebase_messaging    flutter_local_notifications
+pinput                        animations
+```
+
+#### Development
+```
+flutter_test (SDK)    flutter_lints
+```
+
+### Root (`package.json`)
+
+```
+husky                                 lint-staged
+@commitlint/cli                       @commitlint/config-conventional
+prettier
+```
+
+---
+
+## Operational Playbooks
+
+### Adding a New API Endpoint
+
+```
+1. apps/backend/src/modules/<feature>/<feature>.schema.ts
+   → Add Zod schema for body/params/query
+
+2. apps/backend/src/modules/<feature>/<feature>.controller.ts
+   → Add handler function
+
+3. apps/backend/src/modules/<feature>/<feature>.routes.ts
+   → Register route with preHandler: [authenticate, rbac([...])]
+
+4. apps/backend/tests/integration/<feature>.test.ts
+   → Add supertest case
+
+5. apps/frontend/src/features/<feature>/lib/<feature>-api.ts
+   → Add fetch wrapper
+
+6. apps/flutter/lib/features/<feature>/repositories/<feature>_repository.dart
+   → Add Dio call + JSON parsing
+
+7. Update consumers (UI components / ViewModels)
+
+8. Commit: feat(<feature>): add <endpoint name>
+```
+
+### Adding a Database Migration
+
+```bash
+cd apps/backend
+
+# 1. Edit prisma/schema.prisma
+# 2. Generate + apply
+npx prisma migrate dev --name "add_<thing>"
+
+# 3. Verify
+npx prisma studio
+```
+
+In production:
+```bash
+npx prisma migrate deploy
+```
+
+### Rotating JWT_SECRET
+
+```
+1. Generate new secret: openssl rand -base64 48
+2. Update env var on backend host (Railway)
+3. Restart backend → all existing tokens invalidated
+4. Users will see 401 on next request → forced re-login
+```
+
+### Resetting Local Dev Database
+
+```bash
+cd apps/backend
+npx prisma migrate reset           # drops + recreates + seeds
+npm run dev
+```
+
+### Adding a New Workspace Dependency
+
+```bash
+# Frontend
+npm install --workspace apps/frontend <package>
+
+# Backend
+npm install --workspace apps/backend <package>
+
+# Root (devDep)
+npm install --save-dev -D <package>
+```
+
+### Building a Production Image
+
+```bash
+# Build manually (no compose)
+docker build -f apps/backend/Dockerfile.dev -t universe-backend:latest .
+docker run -p 5000:5000 --env-file apps/backend/.env universe-backend:latest
+
+docker build -f apps/frontend/Dockerfile.dev -t universe-frontend:latest .
+docker run -p 3000:3000 --env-file apps/frontend/.env.local universe-frontend:latest
+```
+
+---
+
+## Troubleshooting
+
+### "Prisma client not found" after install
+```bash
+npm run prisma:generate --prefix apps/backend
+```
+
+### Husky hooks not running
+```bash
+npm run prepare       # reinstall hooks
+# Or manually:
+git config core.hooksPath .husky
+```
+
+### Flutter "Could not connect to the server"
+- Android emulator must use `10.0.2.2` not `localhost`
+- iOS simulator uses `127.0.0.1`
+- Physical device on same Wi-Fi: use machine LAN IP, ensure firewall allows port 5000
+
+### Frontend can't reach backend in Docker
+- From `frontend` container, backend hostname is `backend:5000` (service name), not `localhost`
+- Ensure `NEXT_PUBLIC_API_URL=http://backend:5000` in compose env
+
+### Backend 503 on every request
+- DB likely unreachable. Check `DATABASE_URL`. Supabase pooled connections can pause on free tier.
+
+### Redis cache "always missing"
+- If `REDIS_URL` is unset, all cache operations silently no-op (by design). Check container logs for "Redis disabled (no REDIS_URL)" message.
+
+### Commits rejected by commitlint
+- Use Conventional Commits format: `<type>(<scope>): <subject>`
+- Type must be one of: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
+- Subject must be lowercase (no Title Case)
+
+### "fatal: cannot find module 'husky'"
+```bash
+npm install
+npm run prepare
+```
+
+### Vercel build fails: "package not found"
+- Check `vercel.json` has `"installCommand": "npm install"` (runs at repo root, resolves workspaces)
+- Do NOT set Vercel's Root Directory to `apps/frontend` — keep it at repo root
+
+### Flutter release APK can't connect to backend
+- Verify `--dart-define=API_BASE_URL=...` was passed at build time
+- Verify the URL is HTTPS (Android blocks plain HTTP from API 28+ unless `usesCleartextTraffic="true"`)
+- Verify CORS on backend allows your domain (`WEB_URL` / `FLUTTER_ORIGIN` env var)
+
+---
+
+## Quick Reference Card
+
+```
+┌─ Common Commands ────────────────────────────────────────┐
+│                                                          │
+│  Install:           npm install                          │
+│  Backend dev:       npm run backend:dev                  │
+│  Frontend dev:      npm run frontend:dev                 │
+│  Backend tests:     npm run backend:test                 │
+│  Flutter dev:       cd apps/flutter && flutter run       │
+│                                                          │
+│  Prisma:                                                 │
+│    Generate:  npm run prisma:generate --prefix apps/backend │
+│    Migrate:   npm run prisma:migrate:dev --prefix apps/backend │
+│    Studio:    npm run prisma:studio --prefix apps/backend │
+│                                                          │
+│  Docker:                                                 │
+│    Dev up:    docker compose -f docker-compose.dev.yml up │
+│    Dev down:  docker compose -f docker-compose.dev.yml down │
+│    Prod up:   docker compose up --build                  │
+│                                                          │
+│  Build:                                                  │
+│    Frontend:  npm run frontend:build                     │
+│    Backend:   npm run build --prefix apps/backend        │
+│    Flutter:   flutter build apk --debug                  │
+│                                                          │
+└──────────────────────────────────────────────────────────┘
+```
+
+---
+
+## Where Each Thing Lives — Cheat Sheet
+
+| Looking For | File Path |
+|---|---|
+| All backend routes | `apps/backend/src/modules/*/[*].routes.ts` |
+| Database schema | `apps/backend/prisma/schema.prisma` |
+| Backend env validation | `apps/backend/src/config/env.ts` |
+| All web pages | `apps/frontend/src/app/**/page.tsx` |
+| Web auth context | `apps/frontend/src/features/auth/context/AuthContext.tsx` |
+| Flutter routes | `apps/flutter/lib/core/navigation/app_router.dart` |
+| Flutter ViewModels | `apps/flutter/lib/features/*/viewmodels/` |
+| Docker compose | `docker-compose.yml` / `docker-compose.dev.yml` |
+| GitHub Actions | `.github/workflows/ci.yml` / `flutter-release.yml` |
+| Git hooks | `.husky/` (repo) / `apps/flutter/.githooks/` (flutter only) |
+| Lint rules | `apps/frontend/eslint.config.mjs` / `.prettierrc` |
+| Commit rules | `commitlint.config.js` |
+| Existing detailed docs | `Doc/00-master-project-reference.md` ... `Doc/10-production-readiness.md` |
+| This 5-doc set | `Documentation/01-PROJECT-OVERVIEW.md` ... `Documentation/05-DEVOPS-DOCKER-CICD.md` |
+
+---
+
+## Status & Known Gaps
+
+| Concern | Status |
+|---|---|
+| Backend unit + integration tests | ✅ Jest, ~70% coverage threshold |
+| Flutter widget tests | 🟡 1 smoke test only |
+| Frontend tests | ❌ Not configured |
+| Backend ESLint | ❌ Placeholder only |
+| Dockerfile.prod (multi-stage) | ❌ Only Dockerfile.dev exists |
+| iOS Flutter CI build | ❌ Only Android APK pipeline |
+| Internationalization | ❌ English only across all apps |
+| Dark mode (Flutter) | ❌ Light theme only |
+| WebSocket realtime | ❌ Uses polling + FCM |
+| Frontend image optimization | 🟡 Uses raw `<img>` in places (could use `next/image`) |
+
+---
+
+**End of documentation set.** This is the last of 5 documents:
+
+1. [01-PROJECT-OVERVIEW.md](01-PROJECT-OVERVIEW.md) — Big picture, monorepo, roles, features
+2. [02-BACKEND-DEEP-DIVE.md](02-BACKEND-DEEP-DIVE.md) — Fastify, Prisma, APIs, RAG
+3. [03-FRONTEND-WEB-APP.md](03-FRONTEND-WEB-APP.md) — Next.js admin/teacher/security dashboard
+4. [04-FLUTTER-MOBILE-APP.md](04-FLUTTER-MOBILE-APP.md) — Flutter parent app, MVVM, Firebase
+5. [05-DEVOPS-DOCKER-CICD.md](05-DEVOPS-DOCKER-CICD.md) — This file: Docker, CI/CD, tooling
diff --git a/README.md b/README.md
index d391514..c599f90 100644
--- a/README.md
+++ b/README.md
@@ -1,261 +1,304 @@
-  # UniVerse Platform
-  
-A full-stack university management platform built with **Fastify** (backend), **Next.js** (web frontend), and **Flutter** (mobile app).
-
---- 
-   
-## What is UniVerse?
-
-UniVerse is an all-in-one university platform that helps students, lecturers, and admins manage:
-
-- 🔐 Authentication & role-based access (Student / Lecturer / Admin)
-- 📢 Announcements & notice board
-- 📅 Attendance tracking
-- 💬 Messaging between users
-- 📝 Complaints & feedback
-- 🔔 Push notifications (Firebase)
-- 🤖 AI assistant (OpenAI)
-- 👤 User & profile management
-
----
-
-## Tech Stack
-
-| Layer | Technology |
-|---|---|
-| Backend API | [Fastify](https://fastify.dev/) + TypeScript |
-| Web Frontend | [Next.js 16](https://nextjs.org/) + React 19 + Tailwind CSS v4 |
-| Mobile App | [Flutter](https://flutter.dev/) (Dart) |
-| Database | [Supabase](https://supabase.com/) (PostgreSQL) |
-| Auth | Supabase Auth + JWT |
-| Push Notifications | Firebase Cloud Messaging (FCM) |
-| AI | OpenAI API |
-| Containerization | Docker + Docker Compose |
-
----
-
-## Project Structure
-
-```
-UniVerse-Platform/
-├── backend/                  # Fastify REST API (Node.js + TypeScript)
-│   ├── src/
-│   │   ├── app.ts
-│   │   ├── server.ts
-│   │   ├── common/
-│   │   │   ├── middleware/
-│   │   │   └── utils/
-│   │   ├── config/
-│   │   └── modules/
-│   │       ├── ai/
-│   │       ├── announcements/
-│   │       ├── attendance/
-│   │       ├── auth/
-│   │       ├── complaints/
-│   │       ├── messages/
-│   │       ├── notifications/
-│   │       └── users/
-│   ├── .env.example
-│   ├── Dockerfile.dev
-│   ├── nodemon.json
-│   ├── package.json
-│   └── tsconfig.json
-├── frontend/                 # Next.js web app
-│   ├── src/
-│   │   └── app/
-│   │       ├── globals.css
-│   │       ├── layout.tsx
-│   │       └── page.tsx
-│   ├── Dockerfile.dev
-│   ├── next.config.ts
-│   └── package.json
-├── mobile/                   # Flutter mobile app (coming soon)
-│   ├── lib/
-│   │   ├── main.dart
-│   │   ├── screens/
-│   │   ├── widgets/
-│   │   ├── services/
-│   │   ├── models/
-│   │   └── providers/
-│   └── pubspec.yaml
-├── Doc/
-│   └── PROJECT_STATUS.md     # Detailed step-by-step progress
-├── .gitignore
-├── docker-compose.dev.yml
-└── README.md                 # This file
-```
-
----
-
-## Getting Started
-
-### Prerequisites
-
-Make sure you have the following installed:
-
-- [Node.js 20+](https://nodejs.org/)
-- [Docker Desktop](https://www.docker.com/products/docker-desktop/)
-- [Flutter SDK 3.x](https://docs.flutter.dev/get-started/install)
-- [Git](https://git-scm.com/)
-
----
-
-### 1. Clone the Repository
-
-```bash
-git clone <your-repo-url>
-cd UniVerse-Platform
-```
-
----
-
-### 2. Set Up Environment Variables
-
-Copy the example env file and fill in your real values:
-
-```bash
-cp backend/.env.example backend/.env
-```
-
-Edit `backend/.env`:
-
-```env
-PORT=5000
-DATABASE_URL=postgresql://postgres:your_password@db.your-project-ref.supabase.co:5432/postgres?schema=public
-SUPABASE_URL=https://your-project.supabase.co
-SUPABASE_ANON_KEY=your_anon_key
-SUPABASE_SERVICE_KEY=your_service_role_key
-JWT_SECRET=your_jwt_secret
-OPENAI_API_KEY=sk-...
-FIREBASE_PROJECT_ID=your-firebase-project-id
-```
-
----
-
-### 3. Run with Docker (Recommended)
-
-From the project root:
-
-```bash
-docker compose -f docker-compose.dev.yml up --build
-```
-
-This starts:
-| Service | URL |
-|---|---|
-| Backend API | http://localhost:5000 |
-| Health Check | http://localhost:5000/health |
-| Web Frontend | http://localhost:3000 |
-
-To stop:
-```bash
-docker compose -f docker-compose.dev.yml down
-```
-
----
-
-### 4. Run Without Docker
-
-**Backend:**
-```bash
-cd backend
-npm install
-npm run prisma:generate
-npx nodemon
-```
-
-**Frontend (Web):**
-```bash
-cd frontend
-npm install
-npm run dev
-```
-
-Both run on the same ports as above.
-
----
-
-### 5. Run the Flutter Mobile App
-
-```bash
-cd mobile
-flutter pub get
-flutter run
-```
-
-> Make sure a device or emulator is connected. For API calls from the emulator, use `http://10.0.2.2:5000` (Android) or `http://localhost:5000` (iOS simulator) as the base URL instead of `localhost`.
-
-**Flutter environment config** (`mobile/lib/config/app_config.dart`):
-```dart
-class AppConfig {
-  static const String apiBaseUrl = 'http://10.0.2.2:5000'; // Android emulator
-  // static const String apiBaseUrl = 'http://localhost:5000'; // iOS simulator
-  // static const String apiBaseUrl = 'https://api.yourdomain.com'; // Production
-}
-```
-
-**Build Flutter APK (Android):**
-```bash
-flutter build apk --release
-```
-
-**Build Flutter for iOS:**
-```bash
-flutter build ios --release
-```
-
----
-
-## API Endpoints
-
-| Method | Endpoint | Description |
-|---|---|---|
-| GET | `/health` | Health check |
-| POST | `/auth/register` | Register user |
-| POST | `/auth/login` | Login |
-| GET | `/users/me` | Get current user |
-| GET | `/announcements` | List announcements |
-| POST | `/attendance` | Mark attendance |
-| GET | `/messages` | List messages |
-| POST | `/complaints` | Submit complaint |
-| GET | `/notifications` | Get notifications |
-| POST | `/ai/chat` | AI assistant |
-
-> Full API documentation coming soon.
-
----
-
-## Flutter App Features (Planned)
-
-- [ ] Login / Register screens
-- [ ] Role-based dashboard (Student / Lecturer / Admin)
-- [ ] Announcements feed
-- [ ] Attendance marking (QR code / GPS)
-- [ ] In-app messaging
-- [ ] Complaints submission
-- [ ] Push notifications via Firebase FCM
-- [ ] AI chat screen
-- [ ] Profile management
-- [ ] Dark / Light mode
-
----
-
-## Branch Strategy
-
-| Branch | Purpose |
-|---|---|
-| `main` | Production-ready code |
-| `release/development` | Active development |
-| `feature/*` | Individual features |
-
----
-
-## Project Progress
-
-See [Doc/PROJECT_STATUS.md](Doc/PROJECT_STATUS.md) for the full step-by-step build progress.
-
----
-
-## License
-
-ISC
+<div align="center">
+
+# 🎓 UniVerse — School Management Platform
+
+![Fastify](https://img.shields.io/badge/Fastify-5.7-000000?style=for-the-badge&logo=fastify&logoColor=white)
+![Next.js](https://img.shields.io/badge/Next.js-16-black?style=for-the-badge&logo=next.js)
+![React](https://img.shields.io/badge/React-19-61DAFB?style=for-the-badge&logo=react&logoColor=black)
+![Flutter](https://img.shields.io/badge/Flutter-3.32-02569B?style=for-the-badge&logo=flutter&logoColor=white)
+![TypeScript](https://img.shields.io/badge/TypeScript-5-3178C6?style=for-the-badge&logo=typescript&logoColor=white)
+![Prisma](https://img.shields.io/badge/Prisma-6-2D3748?style=for-the-badge&logo=prisma&logoColor=white)
+![PostgreSQL](https://img.shields.io/badge/Supabase-PostgreSQL-3ECF8E?style=for-the-badge&logo=supabase&logoColor=white)
+![Redis](https://img.shields.io/badge/Redis-7-DC382D?style=for-the-badge&logo=redis&logoColor=white)
+![Docker](https://img.shields.io/badge/Docker-Compose-2496ED?style=for-the-badge&logo=docker&logoColor=white)
+![Firebase](https://img.shields.io/badge/Firebase-FCM-FFCA28?style=for-the-badge&logo=firebase&logoColor=black)
+![Gemini](https://img.shields.io/badge/Gemini-AI-4285F4?style=for-the-badge&logo=google&logoColor=white)
+
+**Connecting Admins • Teachers • Security • Parents through one unified backend, a web dashboard, and a mobile app.**
+
+</div>
+
+---
+
+## ✨ What's Inside
+
+<table>
+<tr>
+<td>
+
+🔐 **Auth & RBAC**
+JWT + bcrypt + OTP, 5 roles (admin/teacher/security/parent/pending), parent 2FA
+
+🚪 **Gate System**
+QR scan IN/OUT + auto-checkout cron at 18:00 + parent FCM alerts
+
+✅ **Attendance**
+Daily sessions, batch submit, calendar view, parent visibility
+
+📊 **Results**
+Per-term modules, grades, publish/unpublish flow
+
+</td>
+<td>
+
+💬 **Messaging**
+Threads, contacts, AI draft suggestions
+
+📢 **Announcements**
+School-wide & class-scoped notices
+
+🤖 **RAG Chatbot**
+Policy PDFs → Gemini embeddings (768-dim pgvector) → hybrid search → LLM
+
+🙋 **Complaints**
+Parent → admin → staff triage, status state machine
+
+</td>
+<td>
+
+🔔 **Push Notifications**
+Firebase FCM (multicast)
+
+🔍 **Lost & Found**
+Items posted by staff, reports filed by parents
+
+📧 **Email**
+Resend OTPs & approval notifications
+
+⚡ **Cache**
+Redis for RAG, sessions, online status (graceful degrade)
+
+</td>
+</tr>
+</table>
+
+---
+
+## 📁 Project Structure
+
+```
+Universe-System/                              🟦 npm workspace monorepo
+│
+├── 🟩 apps/
+│   ├── backend/                              ⚙️  Fastify + Prisma REST API  ·  :5000
+│   │   ├── src/
+│   │   │   ├── server.ts · app.ts            🚀 entry + Fastify config
+│   │   │   ├── config/                       🔧 env · prisma · redis · firebase · supabase
+│   │   │   ├── common/{middleware,utils}/    🛡️  authenticate · rbac · errorHandler · jwt · hash · otp · email · cache
+│   │   │   └── modules/                      📦 11 feature modules
+│   │   │       ├── auth/ · users/ · school/
+│   │   │       ├── gate/ · attendance/
+│   │   │       ├── announcements/ · messages/
+│   │   │       ├── complaints/ · lost-found/ · results/
+│   │   │       └── rag/{controllers,services}  🤖 chunker · embedder · retrieval · generation
+│   │   ├── prisma/schema.prisma              🗄️  20 models · pgvector · uuid-ossp
+│   │   ├── tests/{unit,integration}/         🧪 Jest + supertest
+│   │   ├── Dockerfile.dev · jest.config.js
+│   │   └── package.json
+│   │
+│   ├── frontend/                             🌐 Next.js 16 + React 19 + Tailwind  ·  :3000
+│   │   ├── src/
+│   │   │   ├── app/                          📍 App Router
+│   │   │   │   ├── login/ · register/ · forgot-password/ · pending/
+│   │   │   │   ├── admin/    {overview,attendance,students,teachers,complaints,notices,...}
+│   │   │   │   ├── teacher/  {overview,attendance,classes,results,messages,notices,...}
+│   │   │   │   └── security/ {dashboard,logs,messages,overview,profile}
+│   │   │   ├── features/                     🧩 auth · attendance · gate · messages · notices · complaints · results · rag · school
+│   │   │   ├── shared/components/            🎨 layout · auth · admin · ui · AttendanceCalendar
+│   │   │   ├── shared/hooks/ · shared/lib/
+│   │   │   └── core/
+│   │   ├── Dockerfile.dev · eslint.config.mjs
+│   │   └── package.json
+│   │
+│   └── flutter/                              📱 Flutter parent app (Android/iOS)
+│       ├── lib/
+│       │   ├── main.dart · app.dart · firebase_options.dart
+│       │   ├── core/                         🔧 api · di · navigation · services · storage
+│       │   ├── features/                     🧩 15 modules
+│       │   │   ├── splash/ · auth/ · dashboard/ · profile/
+│       │   │   ├── attendance/ · gate/ · results/
+│       │   │   ├── messages/ · contact_teacher/ · notices/
+│       │   │   ├── chatbot/ · support/ · lost_and_found/
+│       │   │   ├── notifications/ · settings/
+│       │   └── shared/{themes,widgets}/      🎨 ActionCard · AppButton · LiveClockWidget
+│       ├── android/ · ios/
+│       ├── test/widget_test.dart
+│       ├── .githooks/{pre-commit,pre-push}
+│       └── pubspec.yaml
+│
+├── 🟪 .github/workflows/
+│   ├── ci.yml                                ✅ PR tests (backend + flutter)
+│   └── flutter-release.yml                   📦 APK auto-build on release/development
+│
+├── 🟧 .husky/                                🪝 pre-commit · pre-push · commit-msg (commitlint)
+├── 🟫 Doc/                                   📚 10 detailed reference docs
+├── 🟨 Documentation/                         📖 5 comprehensive guides (overview · backend · frontend · flutter · devops)
+│
+├── 🐳 docker-compose.yml                     production stack
+├── 🐳 docker-compose.dev.yml                 dev stack (hot reload)
+├── 📦 package.json · package-lock.json       single root workspace
+├── 🎨 .prettierrc · commitlint.config.js     code style + conventional commits
+├── ⚡ vercel.json                            Vercel deploy config
+└── 🔌 .mcp.json                              MCP servers (Supabase)
+```
+
+---
+
+## 🐳 Quick Start with Docker
+
+> 🟢 **One command. Three services up.**
+
+```bash
+# 1️⃣  Set env vars
+cp apps/backend/.env.example apps/backend/.env       # fill in secrets
+touch apps/frontend/.env.local                       # add NEXT_PUBLIC_API_URL=http://backend:5000
+
+# 2️⃣  Run the dev stack (hot reload)
+docker compose -f docker-compose.dev.yml up --build
+
+# 3️⃣  Stop
+docker compose -f docker-compose.dev.yml down
+```
+
+### 🟢 Services started
+
+| Service | URL | Container |
+|---|---|---|
+| 🟦 **Backend API** | http://localhost:5000 | `universe-backend` |
+| 💚 **Health Check** | http://localhost:5000/health | — |
+| 🟪 **Web Frontend** | http://localhost:3000 | `universe-frontend` |
+| 🔴 **Redis** | localhost:6379 | `universe-redis` |
+
+### 🔵 Production stack
+
+```bash
+docker compose up --build      # uses docker-compose.yml (no volume mounts, NODE_ENV=production)
+```
+
+---
+
+## 🧑‍💻 Run Without Docker
+
+```bash
+npm install                                          # install all workspaces
+npm run prisma:generate --prefix apps/backend        # generate Prisma client
+
+# Two terminals
+npm run backend:dev          # ⚙️  http://localhost:5000
+npm run frontend:dev         # 🌐 http://localhost:3000
+
+# Flutter (3rd terminal)
+cd apps/flutter && flutter pub get && flutter run
+```
+
+> 📲 Android emulator uses `http://10.0.2.2:5000` · iOS simulator uses `http://127.0.0.1:5000`.
+
+---
+
+## 🔑 Required Environment Variables
+
+<details>
+<summary>🟦 <b>Backend</b> — <code>apps/backend/.env</code></summary>
+
+```env
+PORT=5000
+DATABASE_URL=postgresql://...                # Supabase pooled
+DIRECT_URL=postgresql://...                  # Supabase direct (Prisma migrations)
+REDIS_URL=redis://redis:6379                 # optional (graceful degrade)
+JWT_SECRET=...                               # min 32 chars
+SUPABASE_URL=...
+SUPABASE_ANON_KEY=...
+SUPABASE_SERVICE_KEY=...
+RESEND_API_KEY=re_...
+GEMINI_API_KEY=...
+FIREBASE_PROJECT_ID=...
+FIREBASE_SERVICE_ACCOUNT_JSON='{"type":"service_account",...}'
+WEB_URL=http://localhost:3000
+FLUTTER_ORIGIN=http://localhost:3001
+```
+</details>
+
+<details>
+<summary>🟪 <b>Frontend</b> — <code>apps/frontend/.env.local</code></summary>
+
+```env
+NEXT_PUBLIC_API_URL=http://localhost:5000
+NEXT_PUBLIC_SUPABASE_URL=https://....supabase.co
+NEXT_PUBLIC_SUPABASE_ANON_KEY=...
+```
+</details>
+
+<details>
+<summary>📱 <b>Flutter</b> — build-time</summary>
+
+```bash
+flutter build apk --dart-define=API_BASE_URL=https://api.yourdomain.com
+```
+</details>
+
+---
+
+## 🎯 Tech Stack at a Glance
+
+| Layer | Backend | Web | Mobile |
+|---|---|---|---|
+| **Framework** | 🟢 Fastify 5 | ⚫ Next.js 16 App Router | 🔵 Flutter 3.32 |
+| **Language** | 🔷 TypeScript | 🔷 TypeScript | 🎯 Dart |
+| **State / Data** | Prisma 6 + PostgreSQL | React 19 + Context | Provider + Repositories |
+| **HTTP** | Built-in (Fastify) | fetch + credentials | Dio + interceptors |
+| **Validation** | Zod 4 | Zod + react-hook-form | Custom |
+| **Auth** | JWT (7d) + bcrypt + OTP | HttpOnly cookies | flutter_secure_storage + biometric |
+| **Cache / Realtime** | Redis 7 | — | FCM + local notifications |
+| **AI** | Gemini embeddings + LLM | — | Calls backend RAG |
+| **Testing** | 🟡 Jest (3 of 11 modules) | 🔴 None yet | 🔴 1 smoke test |
+| **Hosting** | Railway | Vercel | GitHub Releases / TestFlight |
+
+---
+
+## 🪝 Git Hooks (auto-enforced)
+
+| Hook | Action |
+|---|---|
+| 🟢 `pre-commit` | ESLint --fix on staged files |
+| 🟡 `pre-push` | Lint + production build |
+| 🔵 `commit-msg` | Conventional Commits (`feat:` `fix:` `docs:` ...) |
+| 📱 Flutter `pre-commit` | `dart format` staged `.dart` files |
+| 📱 Flutter `pre-push` | `flutter test` |
+
+---
+
+## 🚦 CI/CD
+
+| Workflow | Trigger | What it does |
+|---|---|---|
+| 🟢 `ci.yml` | Every PR | Backend unit + integration tests · Flutter widget tests |
+| 📦 `flutter-release.yml` | Push to `release/development` | Builds debug APK · Auto-bumps semver tag · Publishes GitHub Release |
+
+---
+
+## 📚 Documentation
+
+| Folder | Contents |
+|---|---|
+| 📖 [`Documentation/`](Documentation/) | **5 comprehensive guides** — overview · backend · frontend · flutter · devops |
+| 📚 [`Doc/`](Doc/) | **10 deep references** — schema · auth flow · API · realtime · sprints · production checklist |
+
+---
+
+## 🌿 Branch Strategy
+
+| Branch | Purpose |
+|---|---|
+| 🟢 `main` | Production-ready |
+| 🟡 `release/development` | Active integration (triggers Flutter APK build) |
+| 🔵 `feature/*` | Individual work |
+
+---
+
+<div align="center">
+
+**Built with ❤️ by [@Methexx](https://github.com/Methexx)**
+
+📄 ISC License
+
+</div>

From fb47fc6f432e584f2d354b06b524617e2a308fde Mon Sep 17 00:00:00 2001
From: Methexx <methum.edu@gmail.com>
Date: Thu, 14 May 2026 22:52:30 +0530
Subject: [PATCH 2/7] fix: Ci pipleine automate issue

---
 .github/workflows/ci.yml              | 2 +-
 .github/workflows/flutter-release.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2fcf782..9767af9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.32.0'
+          flutter-version: '3.41.9'
           channel: stable
           cache: true
 
diff --git a/.github/workflows/flutter-release.yml b/.github/workflows/flutter-release.yml
index 4d82bc9..5bb6423 100644
--- a/.github/workflows/flutter-release.yml
+++ b/.github/workflows/flutter-release.yml
@@ -23,7 +23,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.32.0'
+          flutter-version: '3.41.9'
           channel: stable
           cache: true
 

From 2222a2f9421ed3c82ee239c313757e3c2d237a59 Mon Sep 17 00:00:00 2001
From: Methexx <methum.edu@gmail.com>
Date: Fri, 15 May 2026 09:32:19 +0530
Subject: [PATCH 3/7] fix: calender backend functionality

---
 apps/backend/prisma/schema.prisma             |  22 +
 apps/backend/src/app.ts                       |   2 +
 .../modules/calendar/calendar.controller.ts   |  95 +++++
 .../src/modules/calendar/calendar.routes.ts   |  12 +
 .../src/modules/calendar/calendar.schema.ts   |  12 +
 .../features/splash/views/welcome_screen.dart |  15 -
 apps/frontend/src/app/admin/calendar/page.tsx |  89 +++-
 apps/frontend/src/app/admin/students/page.tsx |  75 +---
 .../src/app/teacher/calendar/page.tsx         | 397 ++----------------
 .../src/features/calendar/lib/calendar-api.ts |  53 +++
 apps/frontend/src/shared/lib/api-client.ts    |  24 ++
 11 files changed, 336 insertions(+), 460 deletions(-)
 create mode 100644 apps/backend/src/modules/calendar/calendar.controller.ts
 create mode 100644 apps/backend/src/modules/calendar/calendar.routes.ts
 create mode 100644 apps/backend/src/modules/calendar/calendar.schema.ts
 create mode 100644 apps/frontend/src/features/calendar/lib/calendar-api.ts
 create mode 100644 apps/frontend/src/shared/lib/api-client.ts

diff --git a/apps/backend/prisma/schema.prisma b/apps/backend/prisma/schema.prisma
index d75b970..81b2303 100644
--- a/apps/backend/prisma/schema.prisma
+++ b/apps/backend/prisma/schema.prisma
@@ -48,6 +48,7 @@ model User {
   policy_documents      PolicyDocument[]   @relation("PolicyDocuments")
   result_sets           ResultSet[]
   terms                 Term[]
+  events_created        CalendarEvent[]    @relation("EventsCreated")
 
   @@index([email])
   @@index([role])
@@ -441,3 +442,24 @@ model StudentGrade {
   @@index([student_id])
   @@map("student_grades")
 }
+// ==========================================
+// PHASE 8: CALENDAR
+// ==========================================
+
+model CalendarEvent {
+  id          String   @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
+  title       String
+  description String?  @db.Text
+  start_time  DateTime @db.Timestamptz()
+  end_time    DateTime @db.Timestamptz()
+  location    String?
+  type        String   @default("event") // 'event' | 'holiday' | 'exam' | 'meeting'
+  created_by  String   @db.Uuid
+  creator     User     @relation("EventsCreated", fields: [created_by], references: [id])
+  created_at  DateTime @default(now()) @db.Timestamptz()
+  updated_at  DateTime @default(now()) @updatedAt @db.Timestamptz()
+
+  @@index([start_time])
+  @@index([created_by])
+  @@map("calendar_events")
+}
diff --git a/apps/backend/src/app.ts b/apps/backend/src/app.ts
index 8d02c1a..b1e0e49 100644
--- a/apps/backend/src/app.ts
+++ b/apps/backend/src/app.ts
@@ -15,6 +15,7 @@ import complaintsRoutes from './modules/complaints/complaints.routes';
 import lostFoundRoutes from './modules/lost-found/lost-found.routes';
 import ragRoutes from './modules/rag/rag.routes';
 import resultsRoutes from './modules/results/results.routes';
+import calendarRoutes from './modules/calendar/calendar.routes';
 import { errorHandler } from './common/middleware/errorHandler';
 import { env } from './config/env';
 
@@ -69,6 +70,7 @@ app.register(complaintsRoutes, { prefix: '/api/complaints' });
 app.register(lostFoundRoutes, { prefix: '/api/lost-found' });
 app.register(ragRoutes, { prefix: '/api/rag' });
 app.register(resultsRoutes, { prefix: '/api/results' });
+app.register(calendarRoutes, { prefix: '/api/calendar' });
 
 app.get('/health', async () => {
   return { status: 'ok', message: 'Universe API is running' };
diff --git a/apps/backend/src/modules/calendar/calendar.controller.ts b/apps/backend/src/modules/calendar/calendar.controller.ts
new file mode 100644
index 0000000..da70c3e
--- /dev/null
+++ b/apps/backend/src/modules/calendar/calendar.controller.ts
@@ -0,0 +1,95 @@
+import { FastifyRequest, FastifyReply } from 'fastify';
+import { prisma } from '../../config/prisma';
+import { createEventSchema, updateEventSchema } from './calendar.schema';
+import { z } from 'zod';
+
+export const createEvent = async (request: FastifyRequest, reply: FastifyReply) => {
+  const user = (request as any).user;
+  
+  if (user.role !== 'admin') {
+    return reply.status(403).send({ success: false, message: 'Admin access required' });
+  }
+
+  try {
+    const data = createEventSchema.parse(request.body);
+
+    const event = await prisma.calendarEvent.create({
+      data: {
+        title: data.title,
+        description: data.description,
+        start_time: new Date(data.start_time),
+        end_time: new Date(data.end_time),
+        location: data.location,
+        type: data.type,
+        created_by: user.userId,
+      },
+    });
+
+    return reply.status(201).send({ success: true, message: 'Event created successfully', data: event });
+  } catch (error: any) {
+    if (error instanceof z.ZodError) {
+      return reply.status(400).send({ success: false, errors: error.issues });
+    }
+    return reply.status(500).send({ success: false, message: 'Server Error', error: error.message });
+  }
+};
+
+export const getEvents = async (request: FastifyRequest, reply: FastifyReply) => {
+  try {
+    const events = await prisma.calendarEvent.findMany({
+      orderBy: { start_time: 'asc' },
+      include: {
+        creator: { select: { full_name: true } }
+      }
+    });
+
+    return reply.status(200).send({ success: true, data: events });
+  } catch (error: any) {
+    return reply.status(500).send({ success: false, message: 'Server Error', error: error.message });
+  }
+};
+
+export const updateEvent = async (request: FastifyRequest<{ Params: { id: string } }>, reply: FastifyReply) => {
+  const user = (request as any).user;
+  const { id } = request.params;
+
+  if (user.role !== 'admin') {
+    return reply.status(403).send({ success: false, message: 'Admin access required' });
+  }
+
+  try {
+    const data = updateEventSchema.parse(request.body);
+
+    const updateData: any = { ...data };
+    if (data.start_time) updateData.start_time = new Date(data.start_time);
+    if (data.end_time) updateData.end_time = new Date(data.end_time);
+
+    const event = await prisma.calendarEvent.update({
+      where: { id },
+      data: updateData,
+    });
+
+    return reply.status(200).send({ success: true, message: 'Event updated successfully', data: event });
+  } catch (error: any) {
+    if (error instanceof z.ZodError) {
+      return reply.status(400).send({ success: false, errors: error.issues });
+    }
+    return reply.status(500).send({ success: false, message: 'Server Error', error: error.message });
+  }
+};
+
+export const deleteEvent = async (request: FastifyRequest<{ Params: { id: string } }>, reply: FastifyReply) => {
+  const user = (request as any).user;
+  const { id } = request.params;
+
+  if (user.role !== 'admin') {
+    return reply.status(403).send({ success: false, message: 'Admin access required' });
+  }
+
+  try {
+    await prisma.calendarEvent.delete({ where: { id } });
+    return reply.status(200).send({ success: true, message: 'Event deleted successfully' });
+  } catch (error: any) {
+    return reply.status(500).send({ success: false, message: 'Server Error', error: error.message });
+  }
+};
diff --git a/apps/backend/src/modules/calendar/calendar.routes.ts b/apps/backend/src/modules/calendar/calendar.routes.ts
new file mode 100644
index 0000000..444c65c
--- /dev/null
+++ b/apps/backend/src/modules/calendar/calendar.routes.ts
@@ -0,0 +1,12 @@
+import { FastifyInstance } from 'fastify';
+import { createEvent, getEvents, updateEvent, deleteEvent } from './calendar.controller';
+import { authenticate } from '../../common/middleware/authenticate';
+
+export default async function calendarRoutes(fastify: FastifyInstance) {
+  fastify.addHook('preHandler', authenticate);
+
+  fastify.get('/', getEvents);
+  fastify.post('/', createEvent);
+  fastify.put('/:id', updateEvent);
+  fastify.delete('/:id', deleteEvent);
+}
diff --git a/apps/backend/src/modules/calendar/calendar.schema.ts b/apps/backend/src/modules/calendar/calendar.schema.ts
new file mode 100644
index 0000000..98e0fd7
--- /dev/null
+++ b/apps/backend/src/modules/calendar/calendar.schema.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod';
+
+export const createEventSchema = z.object({
+  title: z.string().min(1, 'Title is required'),
+  description: z.string().optional(),
+  start_time: z.string().datetime(),
+  end_time: z.string().datetime(),
+  location: z.string().optional(),
+  type: z.enum(['event', 'holiday', 'exam', 'meeting']).default('event'),
+});
+
+export const updateEventSchema = createEventSchema.partial();
diff --git a/apps/flutter/lib/features/splash/views/welcome_screen.dart b/apps/flutter/lib/features/splash/views/welcome_screen.dart
index 5bbb234..99d87e5 100644
--- a/apps/flutter/lib/features/splash/views/welcome_screen.dart
+++ b/apps/flutter/lib/features/splash/views/welcome_screen.dart
@@ -115,21 +115,6 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
                 const SizedBox(height: 50),
               ],
             ),
-            Positioned(
-              top: 20,
-              right: 20,
-              child: TextButton(
-                onPressed: () => context.go(AppRoutes.profileSetup),
-                child: const Text(
-                  'Skip (Dev)',
-                  style: TextStyle(
-                    color: AppColors.primary,
-                    fontWeight: FontWeight.bold,
-                    fontSize: 16,
-                  ),
-                ),
-              ),
-            ),
             Listener(
               onPointerDown: (_) => _stopAutoPlay(),
               child: PageView.builder(
diff --git a/apps/frontend/src/app/admin/calendar/page.tsx b/apps/frontend/src/app/admin/calendar/page.tsx
index 7c7f9bc..ada577f 100644
--- a/apps/frontend/src/app/admin/calendar/page.tsx
+++ b/apps/frontend/src/app/admin/calendar/page.tsx
@@ -6,6 +6,13 @@ import { TextInput } from '@/shared/components/ui/forms/TextInput';
 import { SelectInput } from '@/shared/components/ui/forms/SelectInput';
 import { ChevronLeft, ChevronRight, Clock, Plus, Trash2, Edit2, CheckCircle2 } from 'lucide-react';
 import clsx from 'clsx';
+import { 
+  getCalendarEvents, 
+  createCalendarEvent, 
+  updateCalendarEvent, 
+  deleteCalendarEvent,
+  CalendarEvent as ApiEvent 
+} from '@/features/calendar/lib/calendar-api';
 
 interface CalendarEvent {
   id: string;
@@ -25,18 +32,49 @@ const EVENT_COLORS = [
   { label: 'Pink', value: 'bg-pink-500' },
 ];
 
-const INITIAL_EVENTS: CalendarEvent[] = [
-  { id: '1', title: 'Teacher Meeting', date: new Date().toISOString().split('T')[0], time: '10:00 AM', color: 'bg-purple-500', description: 'Monthly staff synchronization' },
-  { id: '2', title: 'Science Fair', date: new Date().toISOString().split('T')[0], time: '02:00 PM', color: 'bg-blue-500', description: 'Annual science fair in the main hall' },
-];
+const TYPE_TO_COLOR: Record<string, string> = {
+  meeting: 'bg-purple-500',
+  event: 'bg-blue-500',
+  holiday: 'bg-emerald-500',
+  exam: 'bg-red-500',
+};
+
+const COLOR_TO_TYPE: Record<string, string> = {
+  'bg-purple-500': 'meeting',
+  'bg-blue-500': 'event',
+  'bg-emerald-500': 'holiday',
+  'bg-red-500': 'exam',
+  'bg-orange-500': 'event',
+  'bg-pink-500': 'event',
+};
 
 export default function CalendarPage() {
   const [currentDate, setCurrentDate] = useState(new Date());
   const [selectedDate, setSelectedDate] = useState<string>(new Date().toISOString().split('T')[0]);
-  const [events, setEvents] = useState<CalendarEvent[]>(INITIAL_EVENTS);
+  const [events, setEvents] = useState<CalendarEvent[]>([]);
   const [isFormOpen, setIsFormOpen] = useState(false);
   const [editingEventId, setEditingEventId] = useState<string | null>(null);
 
+  const fetchEvents = React.useCallback(async () => {
+    const res = await getCalendarEvents();
+    if (res.ok) {
+      const mapped = res.data.map((ev: ApiEvent) => ({
+        id: ev.id,
+        title: ev.title,
+        date: ev.start_time.split('T')[0],
+        time: new Date(ev.start_time).toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit', hour12: true }),
+        color: TYPE_TO_COLOR[ev.type] || 'bg-blue-500',
+        description: ev.description || '',
+      }));
+      setEvents(mapped);
+    }
+  }, []);
+
+  React.useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
+    void fetchEvents();
+  }, [fetchEvents]);
+
   const [formData, setFormData] = useState({
     title: '',
     time: '',
@@ -75,18 +113,36 @@ export default function CalendarPage() {
     setFormData(prev => ({ ...prev, [name]: value }));
   };
 
-  const handleSaveEvent = () => {
+  const handleSaveEvent = async () => {
     if (!formData.title || !formData.time) return;
 
+    // Parse time to ISO
+    const [timeStr, modifier] = formData.time.split(' ');
+    const [hoursStr, minutesStr] = timeStr.split(':');
+    let hours = Number(hoursStr);
+    const minutes = Number(minutesStr);
+    if (modifier === 'PM' && hours < 12) hours += 12;
+    if (modifier === 'AM' && hours === 12) hours = 0;
+    
+    const start = new Date(selectedDate);
+    start.setHours(hours, minutes, 0, 0);
+    const end = new Date(start);
+    end.setHours(start.getHours() + 1);
+
+    const payload = {
+      title: formData.title,
+      description: formData.description,
+      start_time: start.toISOString(),
+      end_time: end.toISOString(),
+      type: COLOR_TO_TYPE[formData.color] || 'event',
+    };
+
     if (editingEventId) {
-      setEvents(prev => prev.map(ev => ev.id === editingEventId ? { ...ev, ...formData, date: selectedDate } : ev));
+      const res = await updateCalendarEvent(editingEventId, payload);
+      if (res.ok) await fetchEvents();
     } else {
-      const newEvent: CalendarEvent = {
-        id: Date.now().toString(),
-        date: selectedDate,
-        ...formData
-      };
-      setEvents(prev => [...prev, newEvent]);
+      const res = await createCalendarEvent(payload);
+      if (res.ok) await fetchEvents();
     }
     
     setIsFormOpen(false);
@@ -105,8 +161,11 @@ export default function CalendarPage() {
     setIsFormOpen(true);
   };
 
-  const handleDeleteEvent = (id: string) => {
-    setEvents(prev => prev.filter(ev => ev.id !== id));
+  const handleDeleteEvent = async (id: string) => {
+    const res = await deleteCalendarEvent(id);
+    if (res.ok) {
+      await fetchEvents();
+    }
   };
 
   const openNewEventForm = () => {
diff --git a/apps/frontend/src/app/admin/students/page.tsx b/apps/frontend/src/app/admin/students/page.tsx
index e5f12b1..9892f2c 100644
--- a/apps/frontend/src/app/admin/students/page.tsx
+++ b/apps/frontend/src/app/admin/students/page.tsx
@@ -6,11 +6,8 @@ import { PageHeader } from '@/shared/components/layout/PageHeader';
 import { TabSelector } from '@/shared/components/ui/TabSelector';
 import { FilterBar } from '@/shared/components/ui/FilterBar';
 import { DirectoryTable } from '@/shared/components/ui/DirectoryTable';
-import { Calendar as CalendarIcon, CheckCircle2, XCircle } from 'lucide-react';
-import clsx from 'clsx';
 import { StudentProfileCard } from './components/StudentProfileCard';
 import { AddStudentButton } from './components/AddStudentButton';
-import { GradesHistory } from './components/GradesHistory';
 import { EditStudentModal, Student } from './components/EditStudentModal';
 import { getStudents, type StudentRecord, updateStudent, deleteStudent as deleteStudentApi } from '@/features/school/lib/school-api';
 import { cacheGet, cacheSet } from '@/shared/lib/local-cache';
@@ -48,7 +45,7 @@ function mapApiStudentToStudent(s: StudentRecord): Student {
 
 export default function StudentsPage() {
   const searchParams = useSearchParams();
-  const [activeTab, setActiveTab] = useState<'general' | 'attendance' | 'grades'>('general');
+  const [activeTab, setActiveTab] = useState<'general'>('general');
   const [selectedStudentId, setSelectedStudentId] = useState<string>('');
 
   const [students, setStudents] = useState<Student[]>([]);
@@ -159,12 +156,10 @@ export default function StudentsPage() {
             <h2 className="text-xl font-bold text-[#0f172a]">Directory</h2>
             <TabSelector
               options={[
-                { id: 'general', label: 'General' },
-                { id: 'attendance', label: 'Attendance' },
-                { id: 'grades', label: 'Grades' }
+                { id: 'general', label: 'General' }
               ]}
               activeTab={activeTab}
-              onTabChange={(id) => setActiveTab(id as 'general' | 'attendance' | 'grades')}
+              onTabChange={(id) => setActiveTab(id as 'general')}
             />
           </div>
 
@@ -248,70 +243,6 @@ export default function StudentsPage() {
   </div>
 )}
 
-{activeTab === 'attendance' && (
-   <div className="flex flex-col gap-4 animate-in fade-in duration-300 w-full">
-     <div className="flex pl-1 pr-1 w-full">
-        <FilterBar
-            searchPlaceholder="Search Student by ID or Name"
-            searchValue={searchQuery}
-            onSearchChange={setSearchQuery}
-            filters={[
-              { id: 'month', label: 'Month', icon: <CalendarIcon className="h-4 w-4 text-gray-400" />, options: [{label: 'April 2024', value: 'apr'}], value: '', onChange: () => {} },
-              { id: 'week', label: 'Week', options: [{label: 'Week 1', value: 'w1'}], value: '', onChange: () => {} },
-              { id: 'class', label: 'Class', options: [{label: '10-A', value: '10a'}], value: '', onChange: () => {} }
-            ]}
-        />
-     </div>
-
-     <div className="bg-white rounded-xl border border-gray-200 overflow-hidden overflow-x-auto w-full">
-        <table className="w-full text-left text-sm whitespace-nowrap min-w-[1000px]">
-              <thead className="bg-[#fafafa] border-b border-gray-100 text-gray-700 font-bold text-[13px] tracking-wider">
-                <tr>
-                  <th className="py-4 px-6 font-bold">Student ID</th>
-                  {[8,9,10,11,12,13,14,15,16,17,18,19,20,21].map(day => (
-                    <th key={day} className="py-4 px-2 text-center text-[13px] font-bold">
-                      {String(day).padStart(2, '0')}
-                    </th>
-                  ))}
-                </tr>
-              </thead>
-              <tbody className="divide-y divide-gray-100 text-gray-700 font-medium bg-white">
-                {filteredStudents.length > 0 ? filteredStudents.map((student, rowIndex) => {
-                  const isSelected = student.id === selectedStudentId;
-                  return (
-                  <tr key={student.id} onClick={() => setSelectedStudentId(student.id)} className={clsx("cursor-pointer transition-colors hover:bg-gray-50/50", isSelected && "bg-blue-50/50")}>
-                    <td className="py-4 px-6 text-[13px] text-[#475569]">
-                      {student.name} {student.id}
-                    </td>
-                    {[8,9,10,11,12,13,14,15,16,17,18,19,20,21].map((day) => (
-                      <td key={day} className="py-4 px-2">
-                         <div className="flex justify-center">
-                            {(day + rowIndex) % 5 === 0 || (day === 10 && rowIndex % 2 !== 0) ?
-                              <XCircle className="w-[18px] h-[18px] text-red-500 fill-red-100" /> :
-                              <CheckCircle2 className="w-[18px] h-[18px] text-green-500 fill-green-100" />
-                            }
-                         </div>
-                      </td>
-                    ))}
-                  </tr>
-                )}) : (
-                  <tr>
-                    <td colSpan={15} className="py-8 text-center text-gray-500">
-                      No logs found matching your criteria.
-                    </td>
-                  </tr>
-                )}
-              </tbody>
-        </table>
-     </div>
-   </div>
-)}
-
-{activeTab === 'grades' && (
-   <div className="flex flex-col gap-4 animate-in fade-in duration-300 w-full">
-      <GradesHistory />
-   </div>
-)}
 
 </div>
 
diff --git a/apps/frontend/src/app/teacher/calendar/page.tsx b/apps/frontend/src/app/teacher/calendar/page.tsx
index 3a129d5..fd6d5a0 100644
--- a/apps/frontend/src/app/teacher/calendar/page.tsx
+++ b/apps/frontend/src/app/teacher/calendar/page.tsx
@@ -1,21 +1,19 @@
 "use client";
 
-import React, { useMemo, useRef, useState } from "react";
+import React, { useMemo, useState } from "react";
 import clsx from "clsx";
 import {
   CheckCircle2,
   ChevronLeft,
   ChevronRight,
   Clock,
-  Edit2,
-  Megaphone,
-  Plus,
   Shield,
-  Trash2,
-  Users,
-  X,
 } from "lucide-react";
 import { PageHeader } from "@/shared/components/layout/PageHeader";
+import { 
+  getCalendarEvents, 
+  CalendarEvent as ApiEvent 
+} from '@/features/calendar/lib/calendar-api';
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -56,28 +54,9 @@ function parseTimeSort(time: string): number {
   return h * 60 + min;
 }
 
-// ─── Mock Data ────────────────────────────────────────────────────────────────
-
-const INITIAL_EVENTS: CalEvent[] = [
-  // Principal events — read-only for teacher
-  { id:"p1", title:"Monthly Staff Meeting",    date:fmt(2026,4,24), time:"9:00 AM",   timeSort:540,  source:"principal", category:"meeting",  description:"All-staff sync. Agenda: Term 2 prep, attendance policy update, sports day coordination." },
-  { id:"p2", title:"School Closure",           date:fmt(2026,4,25), time:"All Day",   timeSort:0,    source:"principal", category:"holiday",  description:"School closed — water supply issue. Normal schedule resumes April 26th." },
-  { id:"p3", title:"Parent–Teacher Meeting",   date:fmt(2026,5,3),  time:"2:00 PM",  timeSort:840,  source:"principal", category:"meeting",  description:"Grade 10 & 11 PTM. Attendance mandatory for all class teachers. 2:00 PM – 5:00 PM, Main Hall." },
-  // School events — read-only
-  { id:"s1", title:"Term 2 Exams Begin",       date:fmt(2026,5,15), time:"8:00 AM",  timeSort:480,  source:"school",    category:"exam",     description:"Term 2 examinations commence. All teachers to submit question papers by May 5th." },
-  { id:"s2", title:"Vesak Holiday",            date:fmt(2026,5,12), time:"All Day",  timeSort:0,    source:"school",    category:"holiday",  description:"Vesak Full Moon Poya Day — school closed." },
-  { id:"s3", title:"Annual Sports Day",        date:fmt(2026,5,22), time:"8:00 AM",  timeSort:480,  source:"school",    category:"event",    description:"Annual Sports Day. Duty teachers report by 7:30 AM. Volunteer sign-up due April 30." },
-  { id:"s4", title:"Term 1 Results Published", date:fmt(2026,5,8),  time:"10:00 AM", timeSort:600,  source:"school",    category:"event",    description:"Term 1 results published on the parent portal. Notify parents via messaging." },
-  // Teacher's own events — editable
-  { id:"m1", title:"10-A Science Lab Prep",    date:fmt(2026,4,26), time:"11:00 AM", timeSort:660,  source:"mine",      category:"reminder", description:"Prepare materials for ecosystem lab experiment. Check microscopes from equipment room." },
-  { id:"m2", title:"10-A Math Revision",       date:fmt(2026,4,27), time:"3:00 PM",  timeSort:900,  source:"mine",      category:"meeting",  description:"Extra revision for Grade 10-A — Algebra & Calculus. Room 14." },
-  { id:"m3", title:"11-B Progress Review",     date:fmt(2026,4,29), time:"1:00 PM",  timeSort:780,  source:"mine",      category:"meeting",  description:"Internal review of 11-B student progress before the PTM. Prepare summary report." },
-  { id:"m4", title:"Grade Submission Deadline",date:fmt(2026,5,5),  time:"5:00 PM",  timeSort:1020, source:"mine",      category:"reminder", description:"Term 1 final grades must be submitted to admin by end of day." },
-];
-
 // ─── Config ───────────────────────────────────────────────────────────────────
 
-const CAT: Record<EventCategory, {
+const CAT: Record<string, {
   label: string; barColor: string; chipBg: string; chipText: string; dotColor: string;
 }> = {
   meeting:  { label:"Meeting",  barColor:"bg-[#4f46e5]", chipBg:"bg-[#eef2ff]", chipText:"text-[#4f46e5]", dotColor:"bg-[#4f46e5]" },
@@ -87,27 +66,13 @@ const CAT: Record<EventCategory, {
   holiday:  { label:"Holiday",  barColor:"bg-[#94a3b8]", chipBg:"bg-[#f1f5f9]", chipText:"text-[#475569]", dotColor:"bg-[#94a3b8]" },
 };
 
-const SRC: Record<EventSource, { label: string; bg: string; text: string; Icon: React.ElementType }> = {
-  principal: { label:"Principal", bg:"bg-amber-100",  text:"text-amber-700",  Icon:Shield    },
-  school:    { label:"School",    bg:"bg-[#f1f5f9]",  text:"text-[#475569]",  Icon:Megaphone },
-  mine:      { label:"My Event",  bg:"bg-[#eef2ff]",  text:"text-[#4f46e5]",  Icon:Users     },
-};
-
-// ─── EventCard ────────────────────────────────────────────────────────────────
-
 function EventCard({
   event,
-  onEdit,
-  onDelete,
 }: {
   event: CalEvent;
-  onEdit: () => void;
-  onDelete: () => void;
 }) {
   const [expanded, setExpanded] = useState(false);
-  const { barColor, chipBg, chipText, label: catLabel } = CAT[event.category];
-  const { label: srcLabel, bg: srcBg, text: srcText, Icon: SrcIcon } = SRC[event.source];
-  const canEdit  = event.source === "mine";
+  const { barColor, chipBg, chipText, label: catLabel } = CAT[event.category] || CAT.event;
   const longDesc = (event.description?.length ?? 0) > 90;
 
   return (
@@ -117,25 +82,6 @@ function EventCard({
       <div className="py-3 pl-4 pr-3">
         <div className="flex items-start justify-between gap-2">
           <p className="text-[13px] font-bold leading-snug text-[#0f172a]">{event.title}</p>
-
-          {canEdit && (
-            <div className="flex flex-shrink-0 gap-1 opacity-0 transition-opacity group-hover:opacity-100">
-              <button
-                type="button"
-                onClick={onEdit}
-                className="rounded-md p-1.5 text-[#94a3b8] hover:bg-[#f1f5f9] hover:text-[#4f46e5]"
-              >
-                <Edit2 className="h-3.5 w-3.5" />
-              </button>
-              <button
-                type="button"
-                onClick={onDelete}
-                className="rounded-md p-1.5 text-[#94a3b8] hover:bg-red-50 hover:text-red-500"
-              >
-                <Trash2 className="h-3.5 w-3.5" />
-              </button>
-            </div>
-          )}
         </div>
 
         <div className="mt-1.5 flex flex-wrap items-center gap-1.5">
@@ -146,9 +92,9 @@ function EventCard({
           <span className={clsx("rounded-full px-2 py-0.5 text-[10px] font-semibold", chipBg, chipText)}>
             {catLabel}
           </span>
-          <span className={clsx("inline-flex items-center gap-1 rounded-full px-2 py-0.5 text-[10px] font-semibold", srcBg, srcText)}>
-            <SrcIcon className="h-2.5 w-2.5" />
-            {srcLabel}
+          <span className="inline-flex items-center gap-1 rounded-full px-2 py-0.5 text-[10px] font-semibold bg-[#f1f5f9] text-[#475569]">
+            <Shield className="h-2.5 w-2.5" />
+            Admin
           </span>
         </div>
 
@@ -173,144 +119,32 @@ function EventCard({
   );
 }
 
-// ─── ComposeModal ─────────────────────────────────────────────────────────────
-
-type ComposeForm = { title: string; time: string; category: EventCategory; description: string };
-
-const BLANK_FORM: ComposeForm = { title: "", time: "", category: "meeting", description: "" };
-
-function ComposeModal({
-  date,
-  initial,
-  onClose,
-  onSave,
-}: {
-  date: string;
-  initial?: ComposeForm;
-  onClose: () => void;
-  onSave: (form: ComposeForm) => void;
-}) {
-  const [form, setForm] = useState<ComposeForm>(initial ?? BLANK_FORM);
-  const canSave = form.title.trim().length > 0 && form.time.trim().length > 0;
-
-  const displayDate = new Date(date + "T12:00:00").toLocaleDateString("en-US", {
-    weekday: "long", month: "long", day: "numeric",
-  });
-
-  return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/30 p-4 backdrop-blur-sm">
-      <div className="w-full max-w-[480px] rounded-[20px] border border-[#e2e8f0] bg-white shadow-xl">
-        <div className="flex items-center justify-between border-b border-[#e2e8f0] px-6 py-4">
-          <div>
-            <h2 className="text-[15px] font-bold text-[#0f172a]">
-              {initial ? "Edit Event" : "Add Event"}
-            </h2>
-            <p className="text-[12px] text-[#64748b]">{displayDate}</p>
-          </div>
-          <button
-            type="button"
-            onClick={onClose}
-            className="rounded-lg p-1.5 text-[#94a3b8] transition-colors hover:bg-[#f1f5f9] hover:text-[#475569]"
-          >
-            <X className="h-4 w-4" />
-          </button>
-        </div>
-
-        <div className="space-y-4 px-6 py-5">
-          <div>
-            <label className="mb-1.5 block text-[12px] font-semibold text-[#475569]">Title *</label>
-            <input
-              type="text"
-              value={form.title}
-              onChange={(e) => setForm((p) => ({ ...p, title: e.target.value }))}
-              placeholder="e.g. 10-A Revision Session"
-              className="w-full rounded-[10px] border border-[#e2e8f0] px-4 py-2.5 text-[13px] text-[#0f172a] outline-none placeholder:text-[#cbd5e1] focus:border-[#4f46e5]"
-            />
-          </div>
-
-          <div>
-            <label className="mb-1.5 block text-[12px] font-semibold text-[#475569]">Time *</label>
-            <input
-              type="text"
-              value={form.time}
-              onChange={(e) => setForm((p) => ({ ...p, time: e.target.value }))}
-              placeholder="e.g. 3:00 PM"
-              className="w-full rounded-[10px] border border-[#e2e8f0] px-4 py-2.5 text-[13px] text-[#0f172a] outline-none placeholder:text-[#cbd5e1] focus:border-[#4f46e5]"
-            />
-          </div>
-
-          <div>
-            <label className="mb-1.5 block text-[12px] font-semibold text-[#475569]">Category *</label>
-            <div className="flex flex-wrap gap-2">
-              {(["meeting", "reminder", "exam", "event"] as EventCategory[]).map((cat) => {
-                const { label, chipBg, chipText } = CAT[cat];
-                return (
-                  <button
-                    key={cat}
-                    type="button"
-                    onClick={() => setForm((p) => ({ ...p, category: cat }))}
-                    className={clsx(
-                      "rounded-full border px-3 py-1 text-[12px] font-semibold transition-all",
-                      form.category === cat
-                        ? clsx(chipBg, chipText, "border-current")
-                        : "border-[#e2e8f0] bg-white text-[#94a3b8] hover:border-[#cbd5e1]"
-                    )}
-                  >
-                    {label}
-                  </button>
-                );
-              })}
-            </div>
-          </div>
-
-          <div>
-            <label className="mb-1.5 block text-[12px] font-semibold text-[#475569]">
-              Description{" "}
-              <span className="font-normal text-[#94a3b8]">(optional)</span>
-            </label>
-            <textarea
-              value={form.description}
-              onChange={(e) => setForm((p) => ({ ...p, description: e.target.value }))}
-              placeholder="Add details about this event…"
-              rows={3}
-              className="w-full resize-none rounded-[10px] border border-[#e2e8f0] px-4 py-2.5 text-[13px] leading-relaxed text-[#0f172a] outline-none placeholder:text-[#cbd5e1] focus:border-[#4f46e5]"
-            />
-          </div>
-        </div>
-
-        <div className="flex items-center justify-end gap-3 border-t border-[#e2e8f0] px-6 py-4">
-          <button
-            type="button"
-            onClick={onClose}
-            className="rounded-[10px] border border-[#e2e8f0] px-5 py-2 text-[13px] font-semibold text-[#475569] hover:bg-[#f8fafc]"
-          >
-            Cancel
-          </button>
-          <button
-            type="button"
-            onClick={() => canSave && onSave(form)}
-            disabled={!canSave}
-            className="rounded-[10px] bg-[#4f46e5] px-5 py-2 text-[13px] font-semibold text-white transition-colors hover:bg-[#4338ca] disabled:cursor-not-allowed disabled:bg-[#c7d2fe]"
-          >
-            {initial ? "Save Changes" : "Add Event"}
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-// ─── Main Page ────────────────────────────────────────────────────────────────
-
 export default function TeacherCalendarPage() {
-  const [events, setEvents]           = useState<CalEvent[]>(INITIAL_EVENTS);
+  const [events, setEvents] = useState<CalEvent[]>([]);
   const [currentDate, setCurrentDate] = useState(new Date());
   const [selectedDate, setSelectedDate] = useState(TODAY);
-  const [sourceFilter, setSourceFilter] = useState<"all" | EventSource>("all");
-  const [compose, setCompose] = useState<{ open: boolean; editId: string | null }>({
-    open: false, editId: null,
-  });
-  const idRef = useRef(200);
+
+  const fetchEvents = React.useCallback(async () => {
+    const res = await getCalendarEvents();
+    if (res.ok) {
+      const mapped = res.data.map((ev: ApiEvent) => ({
+        id: ev.id,
+        title: ev.title,
+        date: ev.start_time.split('T')[0],
+        time: new Date(ev.start_time).toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit', hour12: true }),
+        timeSort: parseTimeSort(new Date(ev.start_time).toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit', hour12: true })),
+        source: 'school' as const,
+        category: ev.type as EventCategory,
+        description: ev.description || '',
+      }));
+      setEvents(mapped);
+    }
+  }, []);
+
+  React.useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
+    void fetchEvents();
+  }, [fetchEvents]);
 
   const year           = currentDate.getFullYear();
   const month          = currentDate.getMonth();
@@ -326,53 +160,15 @@ export default function TeacherCalendarPage() {
   const getCellEvents = (day: number) =>
     events.filter((e) => e.date === fmt(year, month + 1, day));
 
-  // Day panel: filtered + sorted
+  // Day panel: sorted
   const dayEvents = useMemo(
     () =>
       events
-        .filter((e) => e.date === selectedDate && (sourceFilter === "all" || e.source === sourceFilter))
+        .filter((e) => e.date === selectedDate)
         .sort((a, b) => a.timeSort - b.timeSort),
-    [events, selectedDate, sourceFilter]
+    [events, selectedDate]
   );
 
-  // Upcoming: next 5 events from today, any source
-  const upcoming = useMemo(
-    () =>
-      events
-        .filter((e) => e.date >= TODAY)
-        .sort((a, b) => a.date.localeCompare(b.date) || a.timeSort - b.timeSort)
-        .slice(0, 5),
-    [events]
-  );
-
-  const editingEvent = compose.editId ? events.find((e) => e.id === compose.editId) : undefined;
-
-  const handleSave = (form: ComposeForm) => {
-    if (compose.editId) {
-      setEvents((prev) =>
-        prev.map((e) =>
-          e.id === compose.editId
-            ? { ...e, title: form.title, time: form.time, timeSort: parseTimeSort(form.time), category: form.category, description: form.description }
-            : e
-        )
-      );
-    } else {
-      setEvents((prev) => [
-        ...prev,
-        {
-          id: `mine-${idRef.current++}`,
-          date: selectedDate,
-          source: "mine",
-          timeSort: parseTimeSort(form.time),
-          ...form,
-        },
-      ]);
-    }
-    setCompose({ open: false, editId: null });
-  };
-
-  const handleDelete = (id: string) => setEvents((prev) => prev.filter((e) => e.id !== id));
-
   const selectedDisplayDate = new Date(selectedDate + "T12:00:00").toLocaleDateString("en-US", {
     weekday: "long", month: "long", day: "numeric",
   });
@@ -384,53 +180,6 @@ export default function TeacherCalendarPage() {
         subtitle="Track school events, principal meetings, and your own schedule."
       />
 
-      {/* ── Upcoming strip ─────────────────────────────────────────────────── */}
-      {upcoming.length > 0 && (
-        <div>
-          <p className="mb-2 text-[11px] font-bold uppercase tracking-wide text-[#94a3b8]">
-            Upcoming
-          </p>
-          <div className="flex gap-3 overflow-x-auto pb-1">
-            {upcoming.map((ev) => {
-              const { chipBg, chipText } = CAT[ev.category];
-              const label =
-                ev.date === TODAY
-                  ? "Today"
-                  : new Date(ev.date + "T12:00:00").toLocaleDateString("en-US", {
-                      month: "short",
-                      day: "numeric",
-                    });
-              return (
-                <button
-                  key={ev.id}
-                  type="button"
-                  onClick={() => {
-                    const d = new Date(ev.date + "T12:00:00");
-                    setCurrentDate(new Date(d.getFullYear(), d.getMonth(), 1));
-                    setSelectedDate(ev.date);
-                  }}
-                  className="flex min-w-[152px] flex-shrink-0 flex-col gap-1.5 rounded-[14px] border border-[#e2e8f0] bg-white p-3 text-left shadow-[0_2px_4px_rgba(0,0,0,0.02)] transition-shadow hover:shadow-sm"
-                >
-                  <span
-                    className={clsx(
-                      "self-start rounded-full px-2 py-0.5 text-[10px] font-bold",
-                      chipBg,
-                      chipText
-                    )}
-                  >
-                    {label}
-                  </span>
-                  <p className="text-[12px] font-bold leading-snug text-[#0f172a] line-clamp-2">
-                    {ev.title}
-                  </p>
-                  <p className="text-[11px] text-[#94a3b8]">{ev.time}</p>
-                </button>
-              );
-            })}
-          </div>
-        </div>
-      )}
-
       {/* ── Main two-panel area ──────────────────────────────────────────────── */}
       <div className="grid grid-cols-1 items-start gap-5 lg:grid-cols-12">
 
@@ -532,8 +281,8 @@ export default function TeacherCalendarPage() {
                         key={ev.id}
                         className={clsx(
                           "truncate rounded-[3px] px-1 py-px text-[9px] font-semibold leading-tight",
-                          CAT[ev.category].chipBg,
-                          CAT[ev.category].chipText
+                          CAT[ev.category]?.chipBg || "bg-gray-100",
+                          CAT[ev.category]?.chipText || "text-gray-600"
                         )}
                       >
                         {ev.title}
@@ -560,16 +309,6 @@ export default function TeacherCalendarPage() {
                 </div>
               )
             )}
-            <div className="ml-auto flex items-center gap-3">
-              {(Object.entries(SRC) as [EventSource, (typeof SRC)[EventSource]][]).map(
-                ([key, val]) => (
-                  <div key={key} className="flex items-center gap-1">
-                    <val.Icon className={clsx("h-3 w-3", val.text)} />
-                    <span className="text-[11px] text-[#64748b]">{val.label}</span>
-                  </div>
-                )
-              )}
-            </div>
           </div>
         </div>
 
@@ -586,36 +325,6 @@ export default function TeacherCalendarPage() {
                     : `${dayEvents.length} event${dayEvents.length > 1 ? "s" : ""}`}
                 </p>
               </div>
-              <button
-                type="button"
-                onClick={() => setCompose({ open: true, editId: null })}
-                className="inline-flex flex-shrink-0 items-center gap-1.5 rounded-[10px] bg-[#4f46e5] px-3 py-2 text-[12px] font-bold text-white transition-colors hover:bg-[#4338ca]"
-              >
-                <Plus className="h-3.5 w-3.5" />
-                Add Event
-              </button>
-            </div>
-
-            {/* Source filter */}
-            <div className="mt-3 flex flex-wrap gap-1.5">
-              {(["all", "principal", "school", "mine"] as ("all" | EventSource)[]).map((src) => (
-                <button
-                  key={src}
-                  type="button"
-                  onClick={() => setSourceFilter(src)}
-                  className={clsx(
-                    "rounded-full border px-3 py-1 text-[11px] font-bold transition-all",
-                    sourceFilter === src
-                      ? "border-[#0f172a] bg-[#0f172a] text-white"
-                      : "border-[#e2e8f0] bg-white text-[#64748b] hover:border-[#cbd5e1]"
-                  )}
-                >
-                  {src === "all"       ? "All"
-                   : src === "principal" ? "Principal"
-                   : src === "school"    ? "School"
-                                        : "My Events"}
-                </button>
-              ))}
             </div>
           </div>
 
@@ -626,7 +335,7 @@ export default function TeacherCalendarPage() {
                 <CheckCircle2 className="h-10 w-10 text-[#e2e8f0]" />
                 <p className="text-[14px] font-semibold text-[#475569]">All clear</p>
                 <p className="text-[12px] text-[#94a3b8]">
-                  No events for this day. Use + Add Event to schedule one.
+                  No events for this day.
                 </p>
               </div>
             ) : (
@@ -635,41 +344,13 @@ export default function TeacherCalendarPage() {
                   <EventCard
                     key={ev.id}
                     event={ev}
-                    onEdit={() => setCompose({ open: true, editId: ev.id })}
-                    onDelete={() => handleDelete(ev.id)}
                   />
                 ))}
               </div>
             )}
           </div>
-
-          {/* Panel footer hint */}
-          <div className="border-t border-[#f1f5f9] px-5 py-3">
-            <p className="text-[11px] text-[#94a3b8]">
-              Principal &amp; School events are read-only. Hover your own events to edit or delete.
-            </p>
-          </div>
         </div>
       </div>
-
-      {/* ── Compose modal ──────────────────────────────────────────────────── */}
-      {compose.open && (
-        <ComposeModal
-          date={selectedDate}
-          initial={
-            editingEvent
-              ? {
-                  title: editingEvent.title,
-                  time: editingEvent.time,
-                  category: editingEvent.category,
-                  description: editingEvent.description ?? "",
-                }
-              : undefined
-          }
-          onClose={() => setCompose({ open: false, editId: null })}
-          onSave={handleSave}
-        />
-      )}
     </div>
   );
 }
diff --git a/apps/frontend/src/features/calendar/lib/calendar-api.ts b/apps/frontend/src/features/calendar/lib/calendar-api.ts
new file mode 100644
index 0000000..74060e7
--- /dev/null
+++ b/apps/frontend/src/features/calendar/lib/calendar-api.ts
@@ -0,0 +1,53 @@
+import { request } from '../../../shared/lib/api-client';
+
+export interface CalendarEvent {
+  id: string;
+  title: string;
+  description: string | null;
+  start_time: string;
+  end_time: string;
+  location: string | null;
+  type: 'event' | 'holiday' | 'exam' | 'meeting';
+  created_by: string;
+  creator?: {
+    full_name: string | null;
+  };
+}
+
+export function getCalendarEvents() {
+  return request<CalendarEvent[]>('/api/calendar');
+}
+
+export function createCalendarEvent(data: {
+  title: string;
+  description?: string;
+  start_time: string;
+  end_time: string;
+  location?: string;
+  type?: string;
+}) {
+  return request<CalendarEvent>('/api/calendar', {
+    method: 'POST',
+    body: JSON.stringify(data),
+  });
+}
+
+export function updateCalendarEvent(id: string, data: Partial<{
+  title: string;
+  description?: string;
+  start_time: string;
+  end_time: string;
+  location?: string;
+  type?: string;
+}>) {
+  return request<CalendarEvent>(`/api/calendar/${id}`, {
+    method: 'PUT',
+    body: JSON.stringify(data),
+  });
+}
+
+export function deleteCalendarEvent(id: string) {
+  return request<{ success: true }>(`/api/calendar/${id}`, {
+    method: 'DELETE',
+  });
+}
diff --git a/apps/frontend/src/shared/lib/api-client.ts b/apps/frontend/src/shared/lib/api-client.ts
new file mode 100644
index 0000000..c4fbfff
--- /dev/null
+++ b/apps/frontend/src/shared/lib/api-client.ts
@@ -0,0 +1,24 @@
+const BASE = process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:5000';
+
+export type ApiOk<T> = { ok: true; data: T };
+export type ApiErr = { ok: false; status: number; error: string };
+export type ApiResult<T> = ApiOk<T> | ApiErr;
+
+export async function request<T>(path: string, options: RequestInit = {}): Promise<ApiResult<T>> {
+  try {
+    const hasBody = options.body !== undefined && options.body !== null;
+    const res = await fetch(`${BASE}${path}`, {
+      credentials: 'include',
+      headers: {
+        ...(hasBody ? { 'Content-Type': 'application/json' } : {}),
+        ...options.headers,
+      },
+      ...options,
+    });
+    const json = await res.json().catch(() => ({}));
+    if (res.ok) return { ok: true, data: (json.data ?? json) as T };
+    return { ok: false, status: res.status, error: json.error ?? json.message ?? 'UNKNOWN' };
+  } catch {
+    return { ok: false, status: 0, error: 'NETWORK_ERROR' };
+  }
+}

From f75dda9a3c3d9fdd69704099c41d89adab4880bd Mon Sep 17 00:00:00 2001
From: Methexx <methum.edu@gmail.com>
Date: Fri, 15 May 2026 11:20:31 +0530
Subject: [PATCH 4/7] fix: flutter setting screens new wireups

---
 .../src/modules/users/settings.schema.ts      |  10 +
 .../src/modules/users/users.controller.ts     |  40 ++++
 .../backend/src/modules/users/users.routes.ts |   2 +
 apps/flutter/lib/app.dart                     |   4 +
 .../lib/core/constants/app_routes.dart        |   2 +
 apps/flutter/lib/core/di/service_locator.dart |   6 +
 .../lib/core/navigation/app_router.dart       |  15 +-
 .../auth/viewmodels/auth_viewmodel.dart       |  27 +--
 .../settings/models/settings_model.dart       |  53 ++++++
 .../repositories/settings_repository.dart     |  42 +++++
 .../viewmodels/settings_viewmodel.dart        |  76 ++++++++
 .../settings/views/privacy_policy_screen.dart |  80 ++++++++
 .../settings/views/settings_screen.dart       | 174 ++----------------
 .../views/terms_of_service_screen.dart        |  80 ++++++++
 apps/flutter/lib/main.dart                    |   1 +
 15 files changed, 438 insertions(+), 174 deletions(-)
 create mode 100644 apps/backend/src/modules/users/settings.schema.ts
 create mode 100644 apps/flutter/lib/features/settings/models/settings_model.dart
 create mode 100644 apps/flutter/lib/features/settings/repositories/settings_repository.dart
 create mode 100644 apps/flutter/lib/features/settings/viewmodels/settings_viewmodel.dart
 create mode 100644 apps/flutter/lib/features/settings/views/privacy_policy_screen.dart
 create mode 100644 apps/flutter/lib/features/settings/views/terms_of_service_screen.dart

diff --git a/apps/backend/src/modules/users/settings.schema.ts b/apps/backend/src/modules/users/settings.schema.ts
new file mode 100644
index 0000000..e7dfbe2
--- /dev/null
+++ b/apps/backend/src/modules/users/settings.schema.ts
@@ -0,0 +1,10 @@
+import { z } from 'zod';
+
+export const updateSettingsSchema = z.object({
+  pushNotifications: z.boolean().optional(),
+  attendanceAlerts: z.boolean().optional(),
+  gateAlerts: z.boolean().optional(),
+  resultAlerts: z.boolean().optional(),
+});
+
+export type UpdateSettingsInput = z.infer<typeof updateSettingsSchema>;
diff --git a/apps/backend/src/modules/users/users.controller.ts b/apps/backend/src/modules/users/users.controller.ts
index a1aef67..8584713 100644
--- a/apps/backend/src/modules/users/users.controller.ts
+++ b/apps/backend/src/modules/users/users.controller.ts
@@ -2,6 +2,7 @@ import { FastifyRequest, FastifyReply } from 'fastify';
 import { prisma } from '../../config/prisma';
 import { z } from 'zod';
 import { UsersService } from './users.service';
+import { updateSettingsSchema } from './settings.schema';
 
 const updateFcmTokenSchema = z.object({
   fcm_token: z.string().min(1),
@@ -113,5 +114,44 @@ export const UsersController = {
       request.log.error(error);
       reply.status(500).send({ success: false, message: 'Failed to update FCM token' });
     }
+  },
+
+  async getSettings(request: FastifyRequest, reply: FastifyReply) {
+    const user = (request as any).user;
+    let settings = await (prisma as any).userSettings.findUnique({
+      where: { userId: user.userId },
+    });
+
+    if (!settings) {
+      settings = await (prisma as any).userSettings.create({
+        data: { userId: user.userId },
+      });
+    }
+
+    return reply.status(200).send({ success: true, data: settings });
+  },
+
+  async updateSettings(request: FastifyRequest, reply: FastifyReply) {
+    try {
+      const user = (request as any).user;
+      const body = updateSettingsSchema.parse(request.body);
+
+      const settings = await (prisma as any).userSettings.upsert({
+        where: { userId: user.userId },
+        update: body,
+        create: {
+          ...body,
+          userId: user.userId,
+        },
+      });
+
+      return reply.status(200).send({ success: true, data: settings });
+    } catch (error) {
+      if (error instanceof z.ZodError) {
+        return reply.status(400).send({ success: false, message: 'Invalid input' });
+      }
+      request.log.error(error);
+      reply.status(500).send({ success: false, message: 'Failed to update settings' });
+    }
   }
 };
diff --git a/apps/backend/src/modules/users/users.routes.ts b/apps/backend/src/modules/users/users.routes.ts
index 0ad157d..b5efa04 100644
--- a/apps/backend/src/modules/users/users.routes.ts
+++ b/apps/backend/src/modules/users/users.routes.ts
@@ -19,6 +19,8 @@ export default async function usersRoutes(fastify: FastifyInstance) {
   fastify.delete('/me', UsersController.deleteMe);
 
   fastify.put('/fcm-token', UsersController.updateFcmToken);
+  fastify.get('/settings', UsersController.getSettings);
+  fastify.patch('/settings', UsersController.updateSettings);
 
   // 2. ADMIN-ONLY ROUTES
   // We use the `authorize` RBAC middleware in the preHandler array
diff --git a/apps/flutter/lib/app.dart b/apps/flutter/lib/app.dart
index e5e212d..6456e2a 100644
--- a/apps/flutter/lib/app.dart
+++ b/apps/flutter/lib/app.dart
@@ -11,6 +11,7 @@ import 'package:universe_app/features/attendance/viewmodels/attendance_viewmodel
 import 'package:universe_app/features/results/viewmodels/results_viewmodel.dart';
 import 'package:universe_app/features/support/viewmodels/support_viewmodel.dart';
 import 'package:universe_app/features/notices/viewmodels/notices_viewmodel.dart';
+import 'package:universe_app/features/settings/viewmodels/settings_viewmodel.dart';
 import 'package:universe_app/shared/themes/app_theme.dart';
 
 class UniverseApp extends StatefulWidget {
@@ -24,6 +25,7 @@ class UniverseApp extends StatefulWidget {
     required this.resultsViewModel,
     required this.supportViewModel,
     required this.noticesViewModel,
+    required this.settingsViewModel,
   });
 
   final AuthViewModel authViewModel;
@@ -34,6 +36,7 @@ class UniverseApp extends StatefulWidget {
   final ResultsViewModel resultsViewModel;
   final SupportViewModel supportViewModel;
   final NoticesViewModel noticesViewModel;
+  final SettingsViewModel settingsViewModel;
 
   @override
   State<UniverseApp> createState() => _UniverseAppState();
@@ -72,6 +75,7 @@ class _UniverseAppState extends State<UniverseApp> with WidgetsBindingObserver {
         ChangeNotifierProvider<ResultsViewModel>.value(value: widget.resultsViewModel),
         ChangeNotifierProvider<SupportViewModel>.value(value: widget.supportViewModel),
         ChangeNotifierProvider<NoticesViewModel>.value(value: widget.noticesViewModel),
+        ChangeNotifierProvider<SettingsViewModel>.value(value: widget.settingsViewModel),
       ],
       child: MaterialApp.router(
         title: AppStrings.appName,
diff --git a/apps/flutter/lib/core/constants/app_routes.dart b/apps/flutter/lib/core/constants/app_routes.dart
index 031d09f..2e1be7e 100644
--- a/apps/flutter/lib/core/constants/app_routes.dart
+++ b/apps/flutter/lib/core/constants/app_routes.dart
@@ -20,6 +20,8 @@ class AppRoutes {
   static const String settings = '/settings';
   static const String notices = '/notices';
   static const String notifications = '/notifications';
+  static const String privacyPolicy = '/settings/privacy';
+  static const String termsOfService = '/settings/terms';
 
   // Support sub-routes
   static const String submitComplaint = '/support/submit';
diff --git a/apps/flutter/lib/core/di/service_locator.dart b/apps/flutter/lib/core/di/service_locator.dart
index b25b36f..858e3b7 100644
--- a/apps/flutter/lib/core/di/service_locator.dart
+++ b/apps/flutter/lib/core/di/service_locator.dart
@@ -19,6 +19,8 @@ import 'package:universe_app/features/support/repositories/support_repository.da
 import 'package:universe_app/features/support/viewmodels/support_viewmodel.dart';
 import 'package:universe_app/features/notices/repositories/notices_repository.dart';
 import 'package:universe_app/features/notices/viewmodels/notices_viewmodel.dart';
+import 'package:universe_app/features/settings/repositories/settings_repository.dart';
+import 'package:universe_app/features/settings/viewmodels/settings_viewmodel.dart';
 
 class ServiceLocator {
   ServiceLocator._();
@@ -44,6 +46,8 @@ class ServiceLocator {
   late SupportViewModel supportViewModel;
   late NoticesRepository noticesRepository;
   late NoticesViewModel noticesViewModel;
+  late SettingsRepository settingsRepository;
+  late SettingsViewModel settingsViewModel;
 
   Future<void> setup() async {
     apiClient = ApiClient(baseUrl: ApiConfig.baseUrl);
@@ -87,5 +91,7 @@ class ServiceLocator {
       secureStorage: secureStorageService,
     );
     noticesViewModel = NoticesViewModel(repository: noticesRepository);
+    settingsRepository = SettingsRepository(apiClient.dio, secureStorageService);
+    settingsViewModel = SettingsViewModel(settingsRepository);
   }
 }
diff --git a/apps/flutter/lib/core/navigation/app_router.dart b/apps/flutter/lib/core/navigation/app_router.dart
index 642a4bd..a4a6765 100644
--- a/apps/flutter/lib/core/navigation/app_router.dart
+++ b/apps/flutter/lib/core/navigation/app_router.dart
@@ -25,6 +25,8 @@ import 'package:universe_app/features/profile/views/profile_screen.dart';
 import 'package:universe_app/features/settings/views/settings_screen.dart';
 import 'package:universe_app/features/notices/views/notices_screen.dart';
 import 'package:universe_app/features/notifications/views/notifications_screen.dart';
+import 'package:universe_app/features/settings/views/privacy_policy_screen.dart';
+import 'package:universe_app/features/settings/views/terms_of_service_screen.dart';
 
 CustomTransitionPage<void> _slideTransition({
   required LocalKey key,
@@ -204,12 +206,21 @@ class AppRouter {
           key: state.pageKey,
           child: const NoticesScreen(),
         ),
+      ),
+        ),
+      ),
+      GoRoute(
+        path: AppRoutes.privacyPolicy,
+        pageBuilder: (context, state) => _slideTransition(
+          key: state.pageKey,
+          child: const PrivacyPolicyScreen(),
+        ),
       ),
       GoRoute(
-        path: AppRoutes.notifications,
+        path: AppRoutes.termsOfService,
         pageBuilder: (context, state) => _slideTransition(
           key: state.pageKey,
-          child: const NotificationsScreen(),
+          child: const TermsOfServiceScreen(),
         ),
       ),
     ],
diff --git a/apps/flutter/lib/features/auth/viewmodels/auth_viewmodel.dart b/apps/flutter/lib/features/auth/viewmodels/auth_viewmodel.dart
index 9b0097c..e5fe380 100644
--- a/apps/flutter/lib/features/auth/viewmodels/auth_viewmodel.dart
+++ b/apps/flutter/lib/features/auth/viewmodels/auth_viewmodel.dart
@@ -64,20 +64,25 @@ class AuthViewModel extends BaseViewModel {
     final availableAndEnabled = await isBiometricAvailableAndEnabled();
     if (!availableAndEnabled) return false;
 
-    final authenticated = await _biometricService.authenticate(
-      reason: 'Please authenticate to log in automatically',
-    );
+    try {
+      final authenticated = await _biometricService.authenticate(
+        reason: 'Please authenticate to log in automatically',
+      );
 
-    if (!authenticated) return false;
+      if (!authenticated) return false;
 
-    final creds = await _secureStorage.getBiometricCredentials();
-    if (creds == null) return false;
+      final creds = await _secureStorage.getBiometricCredentials();
+      if (creds == null) return false;
 
-    return login(
-      email: creds['email']!,
-      password: creds['password']!,
-      keepMeSignedIn: await _localStorage.getKeepMeSignedIn(),
-    );
+      return login(
+        email: creds['email']!,
+        password: creds['password']!,
+        keepMeSignedIn: await _localStorage.getKeepMeSignedIn(),
+      );
+    } catch (e) {
+      setError('Biometric authentication failed or was canceled.');
+      return false;
+    }
   }
 
   Future<bool> login({
diff --git a/apps/flutter/lib/features/settings/models/settings_model.dart b/apps/flutter/lib/features/settings/models/settings_model.dart
new file mode 100644
index 0000000..2840e69
--- /dev/null
+++ b/apps/flutter/lib/features/settings/models/settings_model.dart
@@ -0,0 +1,53 @@
+class UserSettingsModel {
+  final String id;
+  final String userId;
+  final bool pushNotifications;
+  final bool attendanceAlerts;
+  final bool gateAlerts;
+  final bool resultAlerts;
+
+  UserSettingsModel({
+    required this.id,
+    required this.userId,
+    required this.pushNotifications,
+    required this.attendanceAlerts,
+    required this.gateAlerts,
+    required this.resultAlerts,
+  });
+
+  factory UserSettingsModel.fromJson(Map<String, dynamic> json) {
+    return UserSettingsModel(
+      id: (json['id'] ?? '').toString(),
+      userId: (json['userId'] ?? json['user_id'] ?? '').toString(),
+      pushNotifications: (json['pushNotifications'] ?? json['push_notifications'] ?? true) == true,
+      attendanceAlerts: (json['attendanceAlerts'] ?? json['attendance_alerts'] ?? true) == true,
+      gateAlerts: (json['gateAlerts'] ?? json['gate_alerts'] ?? true) == true,
+      resultAlerts: (json['resultAlerts'] ?? json['result_alerts'] ?? true) == true,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'pushNotifications': pushNotifications,
+      'attendanceAlerts': attendanceAlerts,
+      'gateAlerts': gateAlerts,
+      'resultAlerts': resultAlerts,
+    };
+  }
+
+  UserSettingsModel copyWith({
+    bool? pushNotifications,
+    bool? attendanceAlerts,
+    bool? gateAlerts,
+    bool? resultAlerts,
+  }) {
+    return UserSettingsModel(
+      id: id,
+      userId: userId,
+      pushNotifications: pushNotifications ?? this.pushNotifications,
+      attendanceAlerts: attendanceAlerts ?? this.attendanceAlerts,
+      gateAlerts: gateAlerts ?? this.gateAlerts,
+      resultAlerts: resultAlerts ?? this.resultAlerts,
+    );
+  }
+}
diff --git a/apps/flutter/lib/features/settings/repositories/settings_repository.dart b/apps/flutter/lib/features/settings/repositories/settings_repository.dart
new file mode 100644
index 0000000..2acb505
--- /dev/null
+++ b/apps/flutter/lib/features/settings/repositories/settings_repository.dart
@@ -0,0 +1,42 @@
+import 'package:dio/dio.dart';
+import 'package:universe_app/core/storage/secure_storage.dart';
+import 'package:universe_app/features/settings/models/settings_model.dart';
+
+class SettingsRepository {
+  final Dio _dio;
+  final SecureStorageService _secureStorage;
+
+  SettingsRepository(this._dio, this._secureStorage);
+
+  Future<Map<String, String>> _getAuthHeaders() async {
+    final token = await _secureStorage.getAccessToken();
+    return {
+      'Authorization': 'Bearer $token',
+    };
+  }
+
+  Future<UserSettingsModel> getSettings() async {
+    try {
+      final response = await _dio.get(
+        '/api/users/settings',
+        options: Options(headers: await _getAuthHeaders()),
+      );
+      return UserSettingsModel.fromJson(response.data['data']);
+    } on DioException catch (e) {
+      throw Exception(e.response?.data['message'] ?? 'Failed to load settings');
+    }
+  }
+
+  Future<UserSettingsModel> updateSettings(Map<String, dynamic> settings) async {
+    try {
+      final response = await _dio.patch(
+        '/api/users/settings',
+        data: settings,
+        options: Options(headers: await _getAuthHeaders()),
+      );
+      return UserSettingsModel.fromJson(response.data['data']);
+    } on DioException catch (e) {
+      throw Exception(e.response?.data['message'] ?? 'Failed to update settings');
+    }
+  }
+}
diff --git a/apps/flutter/lib/features/settings/viewmodels/settings_viewmodel.dart b/apps/flutter/lib/features/settings/viewmodels/settings_viewmodel.dart
new file mode 100644
index 0000000..3105481
--- /dev/null
+++ b/apps/flutter/lib/features/settings/viewmodels/settings_viewmodel.dart
@@ -0,0 +1,76 @@
+import 'package:universe_app/core/viewmodels/base_viewmodel.dart';
+import 'package:universe_app/features/settings/models/settings_model.dart';
+import 'package:universe_app/features/settings/repositories/settings_repository.dart';
+
+class SettingsViewModel extends BaseViewModel {
+  final SettingsRepository _repository;
+
+  SettingsViewModel(this._repository) {
+    // Initialize with defaults to allow interaction immediately
+    _settings = UserSettingsModel(
+      id: '',
+      userId: '',
+      pushNotifications: true,
+      attendanceAlerts: true,
+      gateAlerts: true,
+      resultAlerts: true,
+    );
+  }
+
+  UserSettingsModel? _settings;
+  UserSettingsModel? get settings => _settings;
+
+  Future<void> loadSettings() async {
+    setLoading(true);
+    try {
+      final remoteSettings = await _repository.getSettings();
+      _settings = remoteSettings;
+      print('Settings loaded: ${_settings?.toJson()}');
+      notifyListeners();
+    } catch (e) {
+      print('Error loading settings: $e');
+      setError(e.toString());
+      // Keep defaults on error
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  Future<void> _updateRemote() async {
+    if (_settings == null) return;
+    try {
+      await _repository.updateSettings(_settings!.toJson());
+    } catch (e) {
+      setError(e.toString());
+      // In a real app, we might want to rollback, but let's keep it simple for now
+    }
+  }
+
+  Future<void> updatePushNotifications(bool value) async {
+    if (_settings == null) return;
+    _settings = _settings!.copyWith(pushNotifications: value);
+    notifyListeners();
+    await _updateRemote();
+  }
+
+  Future<void> updateAttendanceAlerts(bool value) async {
+    if (_settings == null) return;
+    _settings = _settings!.copyWith(attendanceAlerts: value);
+    notifyListeners();
+    await _updateRemote();
+  }
+
+  Future<void> updateGateAlerts(bool value) async {
+    if (_settings == null) return;
+    _settings = _settings!.copyWith(gateAlerts: value);
+    notifyListeners();
+    await _updateRemote();
+  }
+
+  Future<void> updateResultAlerts(bool value) async {
+    if (_settings == null) return;
+    _settings = _settings!.copyWith(resultAlerts: value);
+    notifyListeners();
+    await _updateRemote();
+  }
+}
diff --git a/apps/flutter/lib/features/settings/views/privacy_policy_screen.dart b/apps/flutter/lib/features/settings/views/privacy_policy_screen.dart
new file mode 100644
index 0000000..3e5fe86
--- /dev/null
+++ b/apps/flutter/lib/features/settings/views/privacy_policy_screen.dart
@@ -0,0 +1,80 @@
+import 'package:flutter/material.dart';
+import 'package:universe_app/core/constants/app_colors.dart';
+
+class PrivacyPolicyScreen extends StatelessWidget {
+  const PrivacyPolicyScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: const Color(0xFFF4FAFB),
+      appBar: AppBar(
+        title: const Text('Privacy Policy', style: TextStyle(fontWeight: FontWeight.w800, color: Colors.white)),
+        backgroundColor: AppColors.primary,
+        elevation: 0,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back_ios_new_rounded, color: Colors.white),
+          onPressed: () => Navigator.pop(context),
+        ),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(24.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _buildSection(
+              'Privacy Policy Statement',
+              'Last Updated: May 2026',
+              isHeader: true,
+            ),
+            const SizedBox(height: 24),
+            _buildSection(
+              '1. Data Collection',
+              'We collect information you provide directly to us, such as when you create an account, update your profile, or communicate with us. This includes your name, email, and student-related information.',
+            ),
+            _buildSection(
+              '2. Use of Information',
+              'We use the information we collect to provide, maintain, and improve our services, including facilitating communication between parents and teachers and providing school notifications.',
+            ),
+            _buildSection(
+              '3. Data Security',
+              'We take reasonable measures to help protect information about you from loss, theft, misuse and unauthorized access, disclosure, alteration and destruction.',
+            ),
+            _buildSection(
+              '4. Contact Us',
+              'If you have any questions about this Privacy Policy, please contact us at support@school.lk.',
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSection(String title, String content, {bool isHeader = false}) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 24.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            title,
+            style: TextStyle(
+              fontSize: isHeader ? 22 : 16,
+              fontWeight: FontWeight.w800,
+              color: const Color(0xFF16212A),
+            ),
+          ),
+          const SizedBox(height: 8),
+          Text(
+            content,
+            style: const TextStyle(
+              fontSize: 14,
+              color: Color(0xFF78909C),
+              height: 1.6,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/apps/flutter/lib/features/settings/views/settings_screen.dart b/apps/flutter/lib/features/settings/views/settings_screen.dart
index 8ec9d0b..444a663 100644
--- a/apps/flutter/lib/features/settings/views/settings_screen.dart
+++ b/apps/flutter/lib/features/settings/views/settings_screen.dart
@@ -11,6 +11,7 @@ import 'package:universe_app/core/constants/app_routes.dart';
 import 'package:universe_app/core/di/service_locator.dart';
 import 'package:universe_app/features/auth/viewmodels/auth_viewmodel.dart';
 import 'package:universe_app/features/profile/viewmodels/profile_viewmodel.dart';
+import 'package:universe_app/features/settings/viewmodels/settings_viewmodel.dart';
 
 ImageProvider? _resolveImage(String? url) {
   if (url == null) return null;
@@ -32,17 +33,8 @@ class SettingsScreen extends StatefulWidget {
 
 class _SettingsScreenState extends State<SettingsScreen>
     with SingleTickerProviderStateMixin {
-  // ── Toggle states ──────────────────────────────────────────────────────────
-  bool _pushNotifications = true;
-  bool _emailNotifications = false;
-  bool _smsAlerts = true;
-  bool _attendanceAlerts = true;
-  bool _gateAlerts = true;
-  bool _resultAlerts = false;
-  bool _darkMode = false;
   bool _biometric = false;
   bool _autoLock = true;
-  String _selectedLanguage = 'English';
 
   // ── Entry animation ────────────────────────────────────────────────────────
   late final AnimationController _entryCtrl;
@@ -68,6 +60,8 @@ class _SettingsScreenState extends State<SettingsScreen>
     WidgetsBinding.instance.addPostFrameCallback((_) {
       final profileVm = context.read<ProfileViewModel>();
       if (profileVm.profile == null) profileVm.loadProfile();
+      
+      context.read<SettingsViewModel>().loadSettings();
     });
   }
 
@@ -77,20 +71,6 @@ class _SettingsScreenState extends State<SettingsScreen>
     super.dispose();
   }
 
-  void _showLanguageSheet() {
-    showModalBottomSheet<void>(
-      context: context,
-      backgroundColor: Colors.transparent,
-      barrierColor: Colors.black.withValues(alpha: 0.55),
-      builder: (context) => _LanguageSheet(
-        selected: _selectedLanguage,
-        onSelect: (lang) {
-          setState(() => _selectedLanguage = lang);
-          Navigator.pop(context);
-        },
-      ),
-    );
-  }
 
   void _showLogoutSheet() {
     showModalBottomSheet<void>(
@@ -151,9 +131,8 @@ class _SettingsScreenState extends State<SettingsScreen>
                                 label: 'Push Notifications',
                                 subtitle: 'Receive app alerts',
                                 icon: Icons.notifications_none_rounded,
-                                value: _pushNotifications,
-                                onChanged: (v) =>
-                                    setState(() => _pushNotifications = v),
+                                value: context.watch<SettingsViewModel>().settings?.pushNotifications ?? true,
+                                onChanged: (v) => context.read<SettingsViewModel>().updatePushNotifications(v),
                               ),
                             ],
                           ),
@@ -173,30 +152,27 @@ class _SettingsScreenState extends State<SettingsScreen>
                                 label: 'Attendance Alerts',
                                 subtitle: 'Absence & late marks',
                                 icon: Icons.qr_code_scanner_rounded,
-                                value: _attendanceAlerts,
+                                value: context.watch<SettingsViewModel>().settings?.attendanceAlerts ?? true,
                                 activeColor: const Color(0xFF4A90D9),
-                                onChanged: (v) =>
-                                    setState(() => _attendanceAlerts = v),
+                                onChanged: (v) => context.read<SettingsViewModel>().updateAttendanceAlerts(v),
                               ),
                               _Divider(),
                               _ToggleRow(
                                 label: 'Gate Alerts',
                                 subtitle: 'Entry & exit notifications',
                                 icon: Icons.sensor_door_rounded,
-                                value: _gateAlerts,
+                                value: context.watch<SettingsViewModel>().settings?.gateAlerts ?? true,
                                 activeColor: const Color(0xFF64C4E6),
-                                onChanged: (v) =>
-                                    setState(() => _gateAlerts = v),
+                                onChanged: (v) => context.read<SettingsViewModel>().updateGateAlerts(v),
                               ),
                               _Divider(),
                               _ToggleRow(
                                 label: 'Result Alerts',
                                 subtitle: 'New results published',
                                 icon: Icons.bar_chart_rounded,
-                                value: _resultAlerts,
+                                value: context.watch<SettingsViewModel>().settings?.resultAlerts ?? true,
                                 activeColor: const Color(0xFF2EAA75),
-                                onChanged: (v) =>
-                                    setState(() => _resultAlerts = v),
+                                onChanged: (v) => context.read<SettingsViewModel>().updateResultAlerts(v),
                               ),
                             ],
                           ),
@@ -212,16 +188,6 @@ class _SettingsScreenState extends State<SettingsScreen>
                           const SizedBox(height: 10),
                           _SettingsCard(
                             children: [
-                              _ToggleRow(
-                                label: 'Dark Mode',
-                                subtitle: 'Switch to dark theme',
-                                icon: Icons.dark_mode_rounded,
-                                value: _darkMode,
-                                activeColor: const Color(0xFF374151),
-                                onChanged: (v) =>
-                                    setState(() => _darkMode = v),
-                              ),
-                              _Divider(),
                               _TapRow(
                                 label: 'Theme Color',
                                 subtitle: 'Customize app accent',
@@ -322,21 +288,12 @@ class _SettingsScreenState extends State<SettingsScreen>
                           const SizedBox(height: 10),
                           _SettingsCard(
                             children: [
-                              _TapRow(
-                                label: 'Language',
-                                subtitle: _selectedLanguage,
-                                icon: Icons.language_rounded,
-                                iconColor: const Color(0xFF2E6B7F),
-                                trailing: _ChipLabel(_selectedLanguage == 'English' ? 'EN' : _selectedLanguage == 'Sinhala' ? 'SI' : 'TA'),
-                                onTap: _showLanguageSheet,
-                              ),
-                              _Divider(),
                               _TapRow(
                                 label: 'Privacy Policy',
                                 subtitle: 'Read our privacy terms',
                                 icon: Icons.policy_outlined,
                                 iconColor: const Color(0xFF78909C),
-                                onTap: () {},
+                                onTap: () => context.push(AppRoutes.privacyPolicy),
                               ),
                               _Divider(),
                               _TapRow(
@@ -344,7 +301,7 @@ class _SettingsScreenState extends State<SettingsScreen>
                                 subtitle: 'Usage terms & conditions',
                                 icon: Icons.article_outlined,
                                 iconColor: const Color(0xFF78909C),
-                                onTap: () {},
+                                onTap: () => context.push(AppRoutes.termsOfService),
                               ),
                               _Divider(),
                               _TapRow(
@@ -1205,109 +1162,4 @@ class _ColorDot extends StatelessWidget {
   }
 }
 
-class _LanguageSheet extends StatelessWidget {
-  const _LanguageSheet({required this.selected, required this.onSelect});
-  final String selected;
-  final ValueChanged<String> onSelect;
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      decoration: const BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.only(
-          topLeft: Radius.circular(32),
-          topRight: Radius.circular(32),
-        ),
-      ),
-      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 20),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Container(
-            width: 40,
-            height: 4,
-            decoration: BoxDecoration(
-              color: const Color(0xFFE5E7EB),
-              borderRadius: BorderRadius.circular(2),
-            ),
-          ),
-          const SizedBox(height: 24),
-          const Text(
-            'Select Language',
-            style: TextStyle(
-              fontSize: 20,
-              fontWeight: FontWeight.w800,
-              color: Color(0xFF1F2937),
-              fontFamily: 'Plus Jakarta Sans',
-            ),
-          ),
-          const SizedBox(height: 24),
-          _LanguageOption(
-            label: 'English',
-            isSelected: selected == 'English',
-            onTap: () => onSelect('English'),
-          ),
-          _LanguageOption(
-            label: 'Sinhala',
-            isSelected: selected == 'Sinhala',
-            onTap: () => onSelect('Sinhala'),
-          ),
-          _LanguageOption(
-            label: 'Tamil',
-            isSelected: selected == 'Tamil',
-            onTap: () => onSelect('Tamil'),
-          ),
-          const SizedBox(height: 20),
-        ],
-      ),
-    );
-  }
-}
-
-class _LanguageOption extends StatelessWidget {
-  const _LanguageOption({
-    required this.label,
-    required this.isSelected,
-    required this.onTap,
-  });
-  final String label;
-  final bool isSelected;
-  final VoidCallback onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onTap,
-      child: Container(
-        margin: const EdgeInsets.only(bottom: 12),
-        padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
-        decoration: BoxDecoration(
-          color: isSelected ? const Color(0xFFE0F4FA) : Colors.white,
-          borderRadius: BorderRadius.circular(16),
-          border: Border.all(
-            color: isSelected ? const Color(0xFF2E6B7F) : const Color(0xFFF3F4F6),
-            width: 1.5,
-          ),
-        ),
-        child: Row(
-          children: [
-            Text(
-              label,
-              style: TextStyle(
-                fontSize: 16,
-                fontWeight: isSelected ? FontWeight.w700 : FontWeight.w500,
-                color: isSelected ? const Color(0xFF2E6B7F) : const Color(0xFF4B5563),
-                fontFamily: 'Plus Jakarta Sans',
-              ),
-            ),
-            const Spacer(),
-            if (isSelected)
-              const Icon(Icons.check_circle_rounded, color: Color(0xFF2E6B7F)),
-          ],
-        ),
-      ),
-    );
-  }
-}
 
diff --git a/apps/flutter/lib/features/settings/views/terms_of_service_screen.dart b/apps/flutter/lib/features/settings/views/terms_of_service_screen.dart
new file mode 100644
index 0000000..705385c
--- /dev/null
+++ b/apps/flutter/lib/features/settings/views/terms_of_service_screen.dart
@@ -0,0 +1,80 @@
+import 'package:flutter/material.dart';
+import 'package:universe_app/core/constants/app_colors.dart';
+
+class TermsOfServiceScreen extends StatelessWidget {
+  const TermsOfServiceScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: const Color(0xFFF4FAFB),
+      appBar: AppBar(
+        title: const Text('Terms of Service', style: TextStyle(fontWeight: FontWeight.w800, color: Colors.white)),
+        backgroundColor: AppColors.primary,
+        elevation: 0,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back_ios_new_rounded, color: Colors.white),
+          onPressed: () => Navigator.pop(context),
+        ),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(24.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _buildSection(
+              'Terms of Service',
+              'Last Updated: May 2026',
+              isHeader: true,
+            ),
+            const SizedBox(height: 24),
+            _buildSection(
+              '1. Acceptance of Terms',
+              'By accessing or using our application, you agree to be bound by these terms of service and all applicable laws and regulations.',
+            ),
+            _buildSection(
+              '2. Use License',
+              'Permission is granted to temporarily use this application for personal, non-commercial school-related communication only.',
+            ),
+            _buildSection(
+              '3. User Responsibilities',
+              'Users are responsible for maintaining the confidentiality of their account information and for all activities that occur under their account.',
+            ),
+            _buildSection(
+              '4. Limitations',
+              'In no event shall the school or its developers be liable for any damages arising out of the use or inability to use the application.',
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSection(String title, String content, {bool isHeader = false}) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 24.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            title,
+            style: TextStyle(
+              fontSize: isHeader ? 22 : 16,
+              fontWeight: FontWeight.w800,
+              color: const Color(0xFF16212A),
+            ),
+          ),
+          const SizedBox(height: 8),
+          Text(
+            content,
+            style: const TextStyle(
+              fontSize: 14,
+              color: Color(0xFF78909C),
+              height: 1.6,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/apps/flutter/lib/main.dart b/apps/flutter/lib/main.dart
index 5517e08..9cd6b20 100644
--- a/apps/flutter/lib/main.dart
+++ b/apps/flutter/lib/main.dart
@@ -40,5 +40,6 @@ void main() async {
     resultsViewModel: sl.resultsViewModel,
     supportViewModel: sl.supportViewModel,
     noticesViewModel: sl.noticesViewModel,
+    settingsViewModel: sl.settingsViewModel,
   ));
 }

From 90c144ef51ceac747fe77ec69814569c18c25097 Mon Sep 17 00:00:00 2001
From: Methexx <methum.edu@gmail.com>
Date: Fri, 15 May 2026 13:35:07 +0530
Subject: [PATCH 5/7] fix: lost and found backend

---
 apps/backend/prisma/schema.prisma             |  37 +-
 .../lost-found/lost-found.controller.ts       | 120 ++++-
 .../modules/lost-found/lost-found.routes.ts   |   6 +-
 .../modules/lost-found/lost-found.schema.ts   |   9 +
 .../src/modules/users/users.controller.ts     |   4 +-
 apps/flutter/lib/app.dart                     |   4 +
 apps/flutter/lib/core/di/service_locator.dart |   7 +
 .../models/lost_found_model.dart              | 121 +++++
 .../repositories/lost_found_repository.dart   |  98 ++++
 .../viewmodels/lost_found_viewmodel.dart      |  85 ++++
 .../views/lost_and_found_screen.dart          | 462 +++++-------------
 apps/flutter/lib/main.dart                    |   1 +
 apps/frontend/package.json                    |   1 +
 .../src/app/admin/lost-and-found/page.tsx     | 240 +++++++++
 apps/frontend/src/app/layout.tsx              |   6 +-
 .../src/app/teacher/lost-and-found/page.tsx   | 146 ++++--
 .../shared/components/layout/sidebarConfig.ts |   1 +
 package-lock.json                             |  32 +-
 18 files changed, 988 insertions(+), 392 deletions(-)
 create mode 100644 apps/flutter/lib/features/lost_and_found/models/lost_found_model.dart
 create mode 100644 apps/flutter/lib/features/lost_and_found/repositories/lost_found_repository.dart
 create mode 100644 apps/flutter/lib/features/lost_and_found/viewmodels/lost_found_viewmodel.dart
 create mode 100644 apps/frontend/src/app/admin/lost-and-found/page.tsx

diff --git a/apps/backend/prisma/schema.prisma b/apps/backend/prisma/schema.prisma
index 81b2303..fb7581a 100644
--- a/apps/backend/prisma/schema.prisma
+++ b/apps/backend/prisma/schema.prisma
@@ -49,6 +49,8 @@ model User {
   result_sets           ResultSet[]
   terms                 Term[]
   events_created        CalendarEvent[]    @relation("EventsCreated")
+  lost_found_comments   LostFoundComment[]
+  settings              UserSettings?
 
   @@index([email])
   @@index([role])
@@ -298,6 +300,7 @@ model LostFoundItem {
   status       String   @default("unclaimed") // 'unclaimed' | 'collected'
   collected_at DateTime? @db.Timestamptz()
   created_at   DateTime @default(now()) @db.Timestamptz()
+  comments     LostFoundComment[]
 
   @@index([posted_by])
   @@index([status])
@@ -316,12 +319,30 @@ model LostFoundReport {
   date_lost   DateTime? @db.Date
   status      String   @default("open") // 'open' | 'recovered'
   created_at  DateTime @default(now()) @db.Timestamptz()
+  comments    LostFoundComment[]
 
   @@index([parent_id])
   @@index([status])
   @@map("lost_found_reports")
 }
 
+model LostFoundComment {
+  id              String           @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
+  author_id       String           @db.Uuid
+  author          User             @relation(fields: [author_id], references: [id], onDelete: Cascade)
+  content         String           @db.Text
+  item_id         String?          @db.Uuid
+  item            LostFoundItem?   @relation(fields: [item_id], references: [id], onDelete: Cascade)
+  report_id       String?          @db.Uuid
+  report          LostFoundReport? @relation(fields: [report_id], references: [id], onDelete: Cascade)
+  created_at      DateTime         @default(now()) @db.Timestamptz()
+
+  @@index([author_id])
+  @@index([item_id])
+  @@index([report_id])
+  @@map("lost_found_comments")
+}
+
 // ==========================================
 // PHASE 6: RAG — POLICY DOCUMENTS + CHATBOT
 // ==========================================
@@ -459,7 +480,21 @@ model CalendarEvent {
   created_at  DateTime @default(now()) @db.Timestamptz()
   updated_at  DateTime @default(now()) @updatedAt @db.Timestamptz()
 
-  @@index([start_time])
   @@index([created_by])
   @@map("calendar_events")
 }
+
+model UserSettings {
+  id                      String   @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
+  userId                  String   @unique @db.Uuid
+  user                    User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+  emailNotifications      Boolean  @default(true)
+  pushNotifications       Boolean  @default(true)
+  attendanceAlerts        Boolean  @default(true)
+  examAlerts              Boolean  @default(true)
+  feeAlerts               Boolean  @default(true)
+  generalAnnouncements    Boolean  @default(true)
+  updated_at              DateTime @default(now()) @updatedAt @db.Timestamptz()
+
+  @@map("user_settings")
+}
diff --git a/apps/backend/src/modules/lost-found/lost-found.controller.ts b/apps/backend/src/modules/lost-found/lost-found.controller.ts
index 4256fb5..d54fa78 100644
--- a/apps/backend/src/modules/lost-found/lost-found.controller.ts
+++ b/apps/backend/src/modules/lost-found/lost-found.controller.ts
@@ -6,7 +6,8 @@ import {
   updateStatusSchema,
   updateReportStatusSchema,
   getItemsSchema,
-  getReportsSchema
+  getReportsSchema,
+  createCommentSchema
 } from './lost-found.schema';
 import { delCacheByPattern, getOrSetCache } from '../../common/utils/cache';
 
@@ -341,3 +342,120 @@ export const getAllReports = async (request: FastifyRequest, reply: FastifyReply
     reply.status(500).send({ success: false, message: 'Failed to fetch reports' });
   }
 };
+
+export const getCommunityBoard = async (request: FastifyRequest, reply: FastifyReply) => {
+  try {
+    const query = getItemsSchema.parse(request.query); // Reusing getItemsSchema for pagination
+    const skip = (query.page - 1) * query.limit;
+
+    // Fetch Found Items (unclaimed)
+    const foundItems = await prisma.lostFoundItem.findMany({
+      where: { status: 'unclaimed' },
+      include: {
+        poster: { select: { id: true, full_name: true, role: true, avatar_url: true } },
+        comments: {
+          include: { author: { select: { id: true, full_name: true, role: true, avatar_url: true } } },
+          orderBy: { created_at: 'asc' }
+        }
+      },
+      orderBy: { created_at: 'desc' },
+      take: query.limit
+    });
+
+    // Fetch Lost Reports (open)
+    const lostReports = await prisma.lostFoundReport.findMany({
+      where: { status: 'open' },
+      include: {
+        parent: { select: { id: true, full_name: true, avatar_url: true } },
+        student: { select: { id: true, full_name: true, student_id_no: true } },
+        comments: {
+          include: { author: { select: { id: true, full_name: true, role: true, avatar_url: true } } },
+          orderBy: { created_at: 'asc' }
+        }
+      },
+      orderBy: { created_at: 'desc' },
+      take: query.limit
+    });
+
+    // Map to a unified structure
+    const boardPosts = [
+      ...foundItems.map(item => ({
+        id: item.id,
+        type: 'found',
+        title: item.item_name,
+        description: item.description,
+        location: item.found_at,
+        timeAgo: item.created_at,
+        status: item.status,
+        authorName: item.poster.full_name || 'Staff',
+        role: item.poster.role,
+        classOrDept: item.poster.role === 'teacher' ? 'Staff' : 'Administration',
+        photo_url: item.photo_url,
+        comments: item.comments.map(c => ({
+          authorName: c.author.full_name,
+          role: c.author.role,
+          classOrDept: c.author.role === 'teacher' ? 'Staff' : 'Administration',
+          text: c.content,
+          timeAgo: c.created_at
+        }))
+      })),
+      ...lostReports.map(report => ({
+        id: report.id,
+        type: 'lost',
+        title: `LOST: ${report.item_name}`,
+        description: report.description,
+        location: 'Unknown',
+        timeAgo: report.created_at,
+        status: report.status,
+        authorName: report.parent.full_name || 'Parent',
+        role: 'parent',
+        classOrDept: `Parent · Student: ${report.student.full_name}`,
+        photo_url: report.photo_url,
+        comments: report.comments.map(c => ({
+          authorName: c.author.full_name,
+          role: c.author.role,
+          classOrDept: c.author.role === 'parent' ? 'Parent' : 'Staff',
+          text: c.content,
+          timeAgo: c.created_at
+        }))
+      }))
+    ].sort((a, b) => new Date(b.timeAgo).getTime() - new Date(a.timeAgo).getTime());
+
+    return reply.status(200).send({
+      success: true,
+      data: boardPosts.slice(0, query.limit),
+    });
+  } catch (error) {
+    request.log.error(error);
+    reply.status(500).send({ success: false, message: 'Failed to fetch community board' });
+  }
+};
+
+export const postComment = async (request: FastifyRequest, reply: FastifyReply) => {
+  try {
+    const data = createCommentSchema.parse(request.body);
+    const user = (request as any).user;
+
+    const comment = await prisma.lostFoundComment.create({
+      data: {
+        content: data.content,
+        author_id: user.userId,
+        item_id: data.item_id,
+        report_id: data.report_id
+      },
+      include: {
+        author: { select: { id: true, full_name: true, role: true, avatar_url: true } }
+      }
+    });
+
+    return reply.status(201).send({
+      success: true,
+      message: 'Comment posted successfully',
+      data: comment
+    });
+  } catch (error) {
+    if (error instanceof Error && error.name === 'ZodError') throw error;
+    request.log.error(error);
+    reply.status(500).send({ success: false, message: 'Failed to post comment' });
+  }
+};
diff --git a/apps/backend/src/modules/lost-found/lost-found.routes.ts b/apps/backend/src/modules/lost-found/lost-found.routes.ts
index 512c913..3ff7972 100644
--- a/apps/backend/src/modules/lost-found/lost-found.routes.ts
+++ b/apps/backend/src/modules/lost-found/lost-found.routes.ts
@@ -8,7 +8,9 @@ import {
   postReport,
   getMyReports,
   markRecovered,
-  getAllReports
+  getAllReports,
+  getCommunityBoard,
+  postComment
 } from './lost-found.controller';
 
 async function lostFoundRoutes(app: FastifyInstance) {
@@ -25,6 +27,8 @@ async function lostFoundRoutes(app: FastifyInstance) {
   app.get('/reports/my', getMyReports);
   app.put('/reports/:id/recovered', markRecovered);
   app.get('/reports', getAllReports);
+  app.get('/board', getCommunityBoard);
+  app.post('/comments', postComment);
 }
 
 export default lostFoundRoutes;
diff --git a/apps/backend/src/modules/lost-found/lost-found.schema.ts b/apps/backend/src/modules/lost-found/lost-found.schema.ts
index d9f8523..ce5145b 100644
--- a/apps/backend/src/modules/lost-found/lost-found.schema.ts
+++ b/apps/backend/src/modules/lost-found/lost-found.schema.ts
@@ -38,9 +38,18 @@ export const getReportsSchema = z.object({
   page: z.coerce.number().min(1).default(1)
 });
 
+export const createCommentSchema = z.object({
+  content: z.string().min(1, "Comment cannot be empty"),
+  item_id: z.string().uuid().optional(),
+  report_id: z.string().uuid().optional()
+}).refine(data => data.item_id || data.report_id, {
+  message: "Either item_id or report_id must be provided"
+});
+
 export type CreateItemInput = z.infer<typeof createItemSchema>;
 export type CreateReportInput = z.infer<typeof createReportSchema>;
 export type UpdateStatusInput = z.infer<typeof updateStatusSchema>;
 export type UpdateReportStatusInput = z.infer<typeof updateReportStatusSchema>;
 export type GetItemsInput = z.infer<typeof getItemsSchema>;
 export type GetReportsInput = z.infer<typeof getReportsSchema>;
+export type CreateCommentInput = z.infer<typeof createCommentSchema>;
diff --git a/apps/backend/src/modules/users/users.controller.ts b/apps/backend/src/modules/users/users.controller.ts
index 8584713..30da1d3 100644
--- a/apps/backend/src/modules/users/users.controller.ts
+++ b/apps/backend/src/modules/users/users.controller.ts
@@ -118,12 +118,12 @@ export const UsersController = {
 
   async getSettings(request: FastifyRequest, reply: FastifyReply) {
     const user = (request as any).user;
-    let settings = await (prisma as any).userSettings.findUnique({
+    let settings = await prisma.userSettings.findUnique({
       where: { userId: user.userId },
     });
 
     if (!settings) {
-      settings = await (prisma as any).userSettings.create({
+      settings = await prisma.userSettings.create({
         data: { userId: user.userId },
       });
     }
diff --git a/apps/flutter/lib/app.dart b/apps/flutter/lib/app.dart
index 6456e2a..9818167 100644
--- a/apps/flutter/lib/app.dart
+++ b/apps/flutter/lib/app.dart
@@ -12,6 +12,7 @@ import 'package:universe_app/features/results/viewmodels/results_viewmodel.dart'
 import 'package:universe_app/features/support/viewmodels/support_viewmodel.dart';
 import 'package:universe_app/features/notices/viewmodels/notices_viewmodel.dart';
 import 'package:universe_app/features/settings/viewmodels/settings_viewmodel.dart';
+import 'package:universe_app/features/lost_and_found/viewmodels/lost_found_viewmodel.dart';
 import 'package:universe_app/shared/themes/app_theme.dart';
 
 class UniverseApp extends StatefulWidget {
@@ -26,6 +27,7 @@ class UniverseApp extends StatefulWidget {
     required this.supportViewModel,
     required this.noticesViewModel,
     required this.settingsViewModel,
+    required this.lostFoundViewModel,
   });
 
   final AuthViewModel authViewModel;
@@ -37,6 +39,7 @@ class UniverseApp extends StatefulWidget {
   final SupportViewModel supportViewModel;
   final NoticesViewModel noticesViewModel;
   final SettingsViewModel settingsViewModel;
+  final LostFoundViewModel lostFoundViewModel;
 
   @override
   State<UniverseApp> createState() => _UniverseAppState();
@@ -76,6 +79,7 @@ class _UniverseAppState extends State<UniverseApp> with WidgetsBindingObserver {
         ChangeNotifierProvider<SupportViewModel>.value(value: widget.supportViewModel),
         ChangeNotifierProvider<NoticesViewModel>.value(value: widget.noticesViewModel),
         ChangeNotifierProvider<SettingsViewModel>.value(value: widget.settingsViewModel),
+        ChangeNotifierProvider<LostFoundViewModel>.value(value: widget.lostFoundViewModel),
       ],
       child: MaterialApp.router(
         title: AppStrings.appName,
diff --git a/apps/flutter/lib/core/di/service_locator.dart b/apps/flutter/lib/core/di/service_locator.dart
index 858e3b7..3915d65 100644
--- a/apps/flutter/lib/core/di/service_locator.dart
+++ b/apps/flutter/lib/core/di/service_locator.dart
@@ -19,6 +19,9 @@ import 'package:universe_app/features/support/repositories/support_repository.da
 import 'package:universe_app/features/support/viewmodels/support_viewmodel.dart';
 import 'package:universe_app/features/notices/repositories/notices_repository.dart';
 import 'package:universe_app/features/notices/viewmodels/notices_viewmodel.dart';
+import 'package:universe_app/features/notifications/viewmodels/notifications_viewmodel.dart';
+import 'package:universe_app/features/lost_and_found/repositories/lost_found_repository.dart';
+import 'package:universe_app/features/lost_and_found/viewmodels/lost_found_viewmodel.dart';
 import 'package:universe_app/features/settings/repositories/settings_repository.dart';
 import 'package:universe_app/features/settings/viewmodels/settings_viewmodel.dart';
 
@@ -48,6 +51,8 @@ class ServiceLocator {
   late NoticesViewModel noticesViewModel;
   late SettingsRepository settingsRepository;
   late SettingsViewModel settingsViewModel;
+  late LostFoundRepository lostFoundRepository;
+  late LostFoundViewModel lostFoundViewModel;
 
   Future<void> setup() async {
     apiClient = ApiClient(baseUrl: ApiConfig.baseUrl);
@@ -93,5 +98,7 @@ class ServiceLocator {
     noticesViewModel = NoticesViewModel(repository: noticesRepository);
     settingsRepository = SettingsRepository(apiClient.dio, secureStorageService);
     settingsViewModel = SettingsViewModel(settingsRepository);
+    lostFoundRepository = LostFoundRepository(apiClient.dio, secureStorageService);
+    lostFoundViewModel = LostFoundViewModel(lostFoundRepository);
   }
 }
diff --git a/apps/flutter/lib/features/lost_and_found/models/lost_found_model.dart b/apps/flutter/lib/features/lost_and_found/models/lost_found_model.dart
new file mode 100644
index 0000000..aba67b2
--- /dev/null
+++ b/apps/flutter/lib/features/lost_and_found/models/lost_found_model.dart
@@ -0,0 +1,121 @@
+import 'package:flutter/material.dart';
+
+enum LFPostType { lost, found }
+
+enum LFStatus { unclaimed, collected, open, recovered }
+
+extension LFStatusExtension on LFStatus {
+  String get label {
+    switch (this) {
+      case LFStatus.unclaimed:
+        return 'Unclaimed';
+      case LFStatus.collected:
+        return 'Collected';
+      case LFStatus.open:
+        return 'Open';
+      case LFStatus.recovered:
+        return 'Recovered';
+    }
+  }
+
+  Color get color {
+    switch (this) {
+      case LFStatus.unclaimed:
+      case LFStatus.open:
+        return const Color(0xFFE8845A);
+      case LFStatus.collected:
+      case LFStatus.recovered:
+        return const Color(0xFF16A34A);
+    }
+  }
+}
+
+class LFCommentModel {
+  final String authorName;
+  final String role;
+  final String classOrDept;
+  final String text;
+  final DateTime timeAgo;
+
+  LFCommentModel({
+    required this.authorName,
+    required this.role,
+    required this.classOrDept,
+    required this.text,
+    required this.timeAgo,
+  });
+
+  factory LFCommentModel.fromJson(Map<String, dynamic> json) {
+    return LFCommentModel(
+      authorName: json['authorName'],
+      role: json['role'],
+      classOrDept: json['classOrDept'],
+      text: json['text'],
+      timeAgo: DateTime.parse(json['timeAgo']),
+    );
+  }
+}
+
+class LFPostModel {
+  final String id;
+  final LFPostType type;
+  final String title;
+  final String description;
+  final String location;
+  final DateTime timeAgo;
+  final LFStatus status;
+  final String authorName;
+  final String role;
+  final String classOrDept;
+  final String? photoUrl;
+  final List<LFCommentModel> comments;
+
+  LFPostModel({
+    required this.id,
+    required this.type,
+    required this.title,
+    required this.description,
+    required this.location,
+    required this.timeAgo,
+    required this.status,
+    required this.authorName,
+    required this.role,
+    required this.classOrDept,
+    this.photoUrl,
+    required this.comments,
+  });
+
+  factory LFPostModel.fromJson(Map<String, dynamic> json) {
+    return LFPostModel(
+      id: json['id'],
+      type: json['type'] == 'lost' ? LFPostType.lost : LFPostType.found,
+      title: json['title'],
+      description: json['description'] ?? '',
+      location: json['location'] ?? 'Unknown',
+      timeAgo: DateTime.parse(json['timeAgo']),
+      status: _parseStatus(json['status']),
+      authorName: json['authorName'],
+      role: json['role'],
+      classOrDept: json['classOrDept'],
+      photoUrl: json['photo_url'],
+      comments: (json['comments'] as List? ?? [])
+          .map((c) => LFCommentModel.fromJson(c))
+          .toList(),
+    );
+  }
+
+  static LFStatus _parseStatus(String status) {
+    switch (status) {
+      case 'unclaimed':
+        return LFStatus.unclaimed;
+      case 'collected':
+        return LFStatus.collected;
+      case 'open':
+        return LFStatus.open;
+      case 'recovered':
+        return LFStatus.recovered;
+      default:
+        return LFStatus.open;
+    }
+  }
+}
diff --git a/apps/flutter/lib/features/lost_and_found/repositories/lost_found_repository.dart b/apps/flutter/lib/features/lost_and_found/repositories/lost_found_repository.dart
new file mode 100644
index 0000000..f299286
--- /dev/null
+++ b/apps/flutter/lib/features/lost_and_found/repositories/lost_found_repository.dart
@@ -0,0 +1,98 @@
+import 'package:dio/dio.dart';
+import 'package:universe_app/core/storage/secure_storage.dart';
+import 'package:universe_app/features/lost_and_found/models/lost_found_model.dart';
+
+class LostFoundRepository {
+  final Dio _dio;
+  final SecureStorageService _secureStorage;
+
+  LostFoundRepository(this._dio, this._secureStorage);
+
+  Future<Map<String, String>> _getAuthHeaders() async {
+    final token = await _secureStorage.getAccessToken();
+    return {
+      'Authorization': 'Bearer $token',
+    };
+  }
+
+  Future<List<LFPostModel>> getCommunityBoard() async {
+    try {
+      final response = await _dio.get(
+        '/api/lost-found/board',
+        options: Options(headers: await _getAuthHeaders()),
+      );
+      final List data = response.data['data'];
+      return data.map((json) => LFPostModel.fromJson(json)).toList();
+    } on DioException catch (e) {
+      throw Exception(e.response?.data['message'] ?? 'Failed to load community board');
+    }
+  }
+
+  Future<void> postLostReport({
+    required String itemName,
+    required String description,
+    required String studentId,
+    String? photoUrl,
+    String? dateLost,
+  }) async {
+    try {
+      await _dio.post(
+        '/api/lost-found/reports',
+        data: {
+          'item_name': itemName,
+          'description': description,
+          'student_id': studentId,
+          'photo_url': photoUrl,
+          'date_lost': dateLost,
+        },
+        options: Options(headers: await _getAuthHeaders()),
+      );
+    } on DioException catch (e) {
+      throw Exception(e.response?.data['message'] ?? 'Failed to post lost report');
+    }
+  }
+
+  Future<void> postFoundItem({
+    required String itemName,
+    required String description,
+    required String foundAt,
+    required String foundDate,
+    String? photoUrl,
+  }) async {
+    try {
+      await _dio.post(
+        '/api/lost-found/items',
+        data: {
+          'item_name': itemName,
+          'description': description,
+          'found_at': foundAt,
+          'found_date': foundDate,
+          'photo_url': photoUrl,
+        },
+        options: Options(headers: await _getAuthHeaders()),
+      );
+    } on DioException catch (e) {
+      throw Exception(e.response?.data['message'] ?? 'Failed to post found item');
+    }
+  }
+
+  Future<void> addComment({
+    required String content,
+    String? itemId,
+    String? reportId,
+  }) async {
+    try {
+      await _dio.post(
+        '/api/lost-found/comments',
+        data: {
+          'content': content,
+          'item_id': itemId,
+          'report_id': reportId,
+        },
+        options: Options(headers: await _getAuthHeaders()),
+      );
+    } on DioException catch (e) {
+      throw Exception(e.response?.data['message'] ?? 'Failed to post comment');
+    }
+  }
+}
diff --git a/apps/flutter/lib/features/lost_and_found/viewmodels/lost_found_viewmodel.dart b/apps/flutter/lib/features/lost_and_found/viewmodels/lost_found_viewmodel.dart
new file mode 100644
index 0000000..2f8a231
--- /dev/null
+++ b/apps/flutter/lib/features/lost_and_found/viewmodels/lost_found_viewmodel.dart
@@ -0,0 +1,85 @@
+import 'package:universe_app/core/viewmodels/base_viewmodel.dart';
+import 'package:universe_app/features/lost_and_found/models/lost_found_model.dart';
+import 'package:universe_app/features/lost_and_found/repositories/lost_found_repository.dart';
+
+class LostFoundViewModel extends BaseViewModel {
+  final LostFoundRepository _repository;
+
+  LostFoundViewModel(this._repository);
+
+  List<LFPostModel> _posts = [];
+  List<LFPostModel> get posts => _posts;
+
+  Future<void> loadBoard() async {
+    setLoading(true);
+    try {
+      _posts = await _repository.getCommunityBoard();
+      notifyListeners();
+    } catch (e) {
+      setError(e.toString());
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  Future<bool> createLostReport({
+    required String itemName,
+    required String description,
+    required String studentId,
+  }) async {
+    setLoading(true);
+    try {
+      await _repository.postLostReport(
+        itemName: itemName,
+        description: description,
+        studentId: studentId,
+      );
+      await loadBoard();
+      return true;
+    } catch (e) {
+      setError(e.toString());
+      return false;
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  Future<bool> createFoundItem({
+    required String itemName,
+    required String description,
+    required String foundAt,
+  }) async {
+    setLoading(true);
+    try {
+      await _repository.postFoundItem(
+        itemName: itemName,
+        description: description,
+        foundAt: foundAt,
+        foundDate: DateTime.now().toIso8601String(),
+      );
+      await loadBoard();
+      return true;
+    } catch (e) {
+      setError(e.toString());
+      return false;
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  Future<void> addComment({
+    required String content,
+    required LFPostModel post,
+  }) async {
+    try {
+      await _repository.addComment(
+        content: content,
+        itemId: post.type == LFPostType.found ? post.id : null,
+        reportId: post.type == LFPostType.lost ? post.id : null,
+      );
+      await loadBoard();
+    } catch (e) {
+      setError(e.toString());
+    }
+  }
+}
diff --git a/apps/flutter/lib/features/lost_and_found/views/lost_and_found_screen.dart b/apps/flutter/lib/features/lost_and_found/views/lost_and_found_screen.dart
index 47f58de..c0b7f62 100644
--- a/apps/flutter/lib/features/lost_and_found/views/lost_and_found_screen.dart
+++ b/apps/flutter/lib/features/lost_and_found/views/lost_and_found_screen.dart
@@ -1,5 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:provider/provider.dart';
+import 'package:universe_app/features/lost_and_found/models/lost_found_model.dart';
+import 'package:universe_app/features/lost_and_found/viewmodels/lost_found_viewmodel.dart';
+import 'package:universe_app/features/profile/viewmodels/profile_viewmodel.dart';
 
 // ─── Role ─────────────────────────────────────────────────────────────────────
 
@@ -234,6 +238,10 @@ class _LostAndFoundScreenState extends State<LostAndFoundScreen>
     ).animate(CurvedAnimation(parent: _entryController, curve: Curves.easeOutCubic));
     _fadeAnim = CurvedAnimation(parent: _entryController, curve: Curves.easeOut);
     _entryController.forward();
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      context.read<LostFoundViewModel>().loadBoard();
+    });
   }
 
   @override
@@ -242,9 +250,16 @@ class _LostAndFoundScreenState extends State<LostAndFoundScreen>
     super.dispose();
   }
 
-  List<_Post> get _filtered => _filter == null
-      ? _kPosts
-      : _kPosts.where((p) => p.status == _filter).toList();
+  List<LFPostModel> get _filtered {
+    final posts = context.watch<LostFoundViewModel>().posts;
+    if (_filter == null) return posts;
+    return posts.where((p) {
+      if (_filter == _Status.open) return p.status == LFStatus.open || p.status == LFStatus.unclaimed;
+      if (_filter == _Status.found) return p.type == LFPostType.found;
+      if (_filter == _Status.closed) return p.status == LFStatus.collected || p.status == LFStatus.recovered;
+      return true;
+    }).toList();
+  }
 
   void _setFilter(_Status? f) {
     if (_filter == f) return;
@@ -261,8 +276,18 @@ class _LostAndFoundScreenState extends State<LostAndFoundScreen>
         borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
       ),
       builder: (_) => _NewPostSheet(
-        onSubmit: (post) {
-          setState(() => _kPosts.insert(0, post));
+        onSubmit: (itemName, description, isFound, foundAt) async {
+          final vm = context.read<LostFoundViewModel>();
+          bool success;
+          if (isFound) {
+            success = await vm.createFoundItem(itemName: itemName, description: description, foundAt: foundAt ?? 'School');
+          } else {
+            // Get student ID from profile if parent
+            final profile = context.read<ProfileViewModel>().profile;
+            final studentId = profile?.students?.first.id ?? ''; 
+            success = await vm.createLostReport(itemName: itemName, description: description, studentId: studentId);
+          }
+          if (success && mounted) Navigator.pop(context);
         },
       ),
     );
@@ -385,8 +410,7 @@ class _LostAndFoundScreenState extends State<LostAndFoundScreen>
                             const SizedBox(height: 16),
                         itemBuilder: (ctx, i) => _PostCard(
                           post: _filtered[i],
-                          onStatusChanged: (s) =>
-                              setState(() => _filtered[i].status = s),
+                          onStatusChanged: (s) {}, // Disable for now or implement update
                         ),
                       ),
               ),
@@ -508,7 +532,7 @@ class _FilterChip extends StatelessWidget {
 
 class _PostCard extends StatefulWidget {
   const _PostCard({required this.post, required this.onStatusChanged});
-  final _Post post;
+  final LFPostModel post;
   final ValueChanged<_Status> onStatusChanged;
 
   @override
@@ -528,24 +552,23 @@ class _PostCardState extends State<_PostCard> {
   void _addComment() {
     final String text = _commentCtrl.text.trim();
     if (text.isEmpty) return;
-    setState(() {
-      widget.post.comments.add(
-        _Comment(
-          authorName: 'You',
-          role: _Role.parent,
-          classOrDept: 'Parent · Grade 8C',
-          text: text,
-          timeAgo: 'Just now',
-        ),
-      );
-    });
+    context.read<LostFoundViewModel>().addComment(content: text, post: widget.post);
     _commentCtrl.clear();
     FocusScope.of(context).unfocus();
   }
 
+  String _formatTime(DateTime dt) {
+    final diff = DateTime.now().difference(dt);
+    if (diff.inMinutes < 60) return '${diff.inMinutes} min ago';
+    if (diff.inHours < 24) return '${diff.inHours} hrs ago';
+    return '${diff.inDays} days ago';
+  }
+
   @override
   Widget build(BuildContext context) {
-    final _Post p = widget.post;
+    final p = widget.post;
+    final roleColor = p.role == 'teacher' ? const Color(0xFF2E6B7F) : p.role == 'parent' ? const Color(0xFF7A3D1A) : const Color(0xFF1A3A44);
+    
     return Container(
       decoration: BoxDecoration(
         color: Colors.white,
@@ -561,25 +584,22 @@ class _PostCardState extends State<_PostCard> {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          // ── Card body ────────────────────────────────────────────────
           Padding(
             padding: const EdgeInsets.all(16),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
-                // Author row
                 Row(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
-                    // Avatar
                     Container(
                       width: 40,
                       height: 40,
                       decoration: BoxDecoration(
-                        color: p.role.color.withValues(alpha: 0.12),
+                        color: roleColor.withValues(alpha: 0.12),
                         shape: BoxShape.circle,
                       ),
-                      child: Icon(p.role.icon, size: 20, color: p.role.color),
+                      child: Icon(p.role == 'teacher' ? Icons.school_rounded : p.role == 'parent' ? Icons.family_restroom_rounded : Icons.admin_panel_settings_rounded, size: 20, color: roleColor),
                     ),
                     const SizedBox(width: 10),
                     Expanded(
@@ -608,31 +628,29 @@ class _PostCardState extends State<_PostCard> {
                         ],
                       ),
                     ),
-                    // Role badge + time
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.end,
                       children: <Widget>[
                         Container(
-                          padding: const EdgeInsets.symmetric(
-                              horizontal: 8, vertical: 3),
+                          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
                           decoration: BoxDecoration(
-                            color: p.role.bgColor,
+                            color: roleColor.withValues(alpha: 0.10),
                             borderRadius: BorderRadius.circular(6),
                           ),
                           child: Text(
-                            p.role.label,
+                            p.role.toUpperCase(),
                             style: TextStyle(
                               fontFamily: 'Plus Jakarta Sans',
                               fontSize: 9,
                               fontWeight: FontWeight.w800,
-                              color: p.role.color,
+                              color: roleColor,
                               letterSpacing: 0.5,
                             ),
                           ),
                         ),
                         const SizedBox(height: 4),
                         Text(
-                          p.timeAgo,
+                          _formatTime(p.timeAgo),
                           style: const TextStyle(
                             fontFamily: 'Plus Jakarta Sans',
                             fontSize: 10,
@@ -644,10 +662,7 @@ class _PostCardState extends State<_PostCard> {
                     ),
                   ],
                 ),
-
                 const SizedBox(height: 14),
-
-                // Title + status
                 Row(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
@@ -664,10 +679,9 @@ class _PostCardState extends State<_PostCard> {
                     ),
                     const SizedBox(width: 8),
                     Container(
-                      padding: const EdgeInsets.symmetric(
-                          horizontal: 9, vertical: 4),
+                      padding: const EdgeInsets.symmetric(horizontal: 9, vertical: 4),
                       decoration: BoxDecoration(
-                        color: p.status.bgColor,
+                        color: p.status.color.withValues(alpha: 0.12),
                         borderRadius: BorderRadius.circular(8),
                       ),
                       child: Text(
@@ -683,10 +697,7 @@ class _PostCardState extends State<_PostCard> {
                     ),
                   ],
                 ),
-
                 const SizedBox(height: 8),
-
-                // Description
                 Text(
                   p.description,
                   style: const TextStyle(
@@ -697,17 +708,10 @@ class _PostCardState extends State<_PostCard> {
                     height: 1.55,
                   ),
                 ),
-
                 const SizedBox(height: 10),
-
-                // Location chip
                 Row(
                   children: <Widget>[
-                    Icon(
-                      Icons.location_on_rounded,
-                      size: 13,
-                      color: const Color(0xFFD47A2E),
-                    ),
+                    const Icon(Icons.location_on_rounded, size: 13, color: Color(0xFFD47A2E)),
                     const SizedBox(width: 4),
                     Text(
                       p.location,
@@ -720,19 +724,12 @@ class _PostCardState extends State<_PostCard> {
                     ),
                   ],
                 ),
-
                 const SizedBox(height: 14),
                 Container(height: 1, color: const Color(0xFFEBF3F6)),
                 const SizedBox(height: 12),
-
-                // Footer: comments count + expand toggle
                 Row(
                   children: <Widget>[
-                    Icon(
-                      Icons.chat_bubble_outline_rounded,
-                      size: 14,
-                      color: const Color(0xFF94A3B0),
-                    ),
+                    const Icon(Icons.chat_bubble_outline_rounded, size: 14, color: Color(0xFF94A3B0)),
                     const SizedBox(width: 5),
                     Text(
                       '${p.comments.length} comment${p.comments.length == 1 ? '' : 's'}',
@@ -758,13 +755,7 @@ class _PostCardState extends State<_PostCard> {
                             ),
                           ),
                           const SizedBox(width: 2),
-                          Icon(
-                            _expanded
-                                ? Icons.keyboard_arrow_up_rounded
-                                : Icons.keyboard_arrow_down_rounded,
-                            size: 16,
-                            color: const Color(0xFF7A3D1A),
-                          ),
+                          Icon(_expanded ? Icons.keyboard_arrow_up_rounded : Icons.keyboard_arrow_down_rounded, size: 16, color: const Color(0xFF7A3D1A)),
                         ],
                       ),
                     ),
@@ -773,24 +764,18 @@ class _PostCardState extends State<_PostCard> {
               ],
             ),
           ),
-
-          // ── Thread (expandable) ──────────────────────────────────────
           if (_expanded) ...<Widget>[
             Container(height: 1, color: const Color(0xFFF0F5F7)),
-            // Existing comments
             if (p.comments.isNotEmpty)
               ListView.separated(
                 shrinkWrap: true,
                 physics: const NeverScrollableScrollPhysics(),
                 padding: const EdgeInsets.fromLTRB(16, 12, 16, 0),
                 itemCount: p.comments.length,
-                separatorBuilder: (context, index) =>
-                    const SizedBox(height: 10),
-                itemBuilder: (ctx, i) =>
-                    _CommentTile(comment: p.comments[i]),
+                separatorBuilder: (context, index) => const SizedBox(height: 10),
+                itemBuilder: (ctx, i) => _CommentTile(comment: p.comments[i]),
               ),
             const SizedBox(height: 12),
-            // Comment input
             Padding(
               padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
               child: Row(
@@ -805,21 +790,12 @@ class _PostCardState extends State<_PostCard> {
                       ),
                       child: TextField(
                         controller: _commentCtrl,
-                        style: const TextStyle(
-                          fontFamily: 'Plus Jakarta Sans',
-                          fontSize: 13,
-                          color: Color(0xFF16212A),
-                        ),
+                        style: const TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 13, color: Color(0xFF16212A)),
                         decoration: const InputDecoration(
                           hintText: 'Add a comment…',
-                          hintStyle: TextStyle(
-                            fontFamily: 'Plus Jakarta Sans',
-                            fontSize: 13,
-                            color: Color(0xFF94A3B0),
-                          ),
+                          hintStyle: TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 13, color: Color(0xFF94A3B0)),
                           border: InputBorder.none,
-                          contentPadding: EdgeInsets.symmetric(
-                              horizontal: 14, vertical: 12),
+                          contentPadding: EdgeInsets.symmetric(horizontal: 14, vertical: 12),
                         ),
                         textInputAction: TextInputAction.send,
                         onSubmitted: (_) => _addComment(),
@@ -833,21 +809,10 @@ class _PostCardState extends State<_PostCard> {
                       width: 42,
                       height: 42,
                       decoration: BoxDecoration(
-                        gradient: const LinearGradient(
-                          colors: <Color>[
-                            Color(0xFF7A3D1A),
-                            Color(0xFFD47A2E),
-                          ],
-                          begin: Alignment.topLeft,
-                          end: Alignment.bottomRight,
-                        ),
+                        gradient: const LinearGradient(colors: <Color>[Color(0xFF7A3D1A), Color(0xFFD47A2E)], begin: Alignment.topLeft, end: Alignment.bottomRight),
                         borderRadius: BorderRadius.circular(12),
                       ),
-                      child: const Icon(
-                        Icons.send_rounded,
-                        color: Colors.white,
-                        size: 18,
-                      ),
+                      child: const Icon(Icons.send_rounded, color: Colors.white, size: 18),
                     ),
                   ),
                 ],
@@ -864,21 +829,26 @@ class _PostCardState extends State<_PostCard> {
 
 class _CommentTile extends StatelessWidget {
   const _CommentTile({required this.comment});
-  final _Comment comment;
+  final LFCommentModel comment;
+
+  String _formatTime(DateTime dt) {
+    final diff = DateTime.now().difference(dt);
+    if (diff.inMinutes < 60) return '${diff.inMinutes}m';
+    if (diff.inHours < 24) return '${diff.inHours}h';
+    return '${diff.inDays}d';
+  }
 
   @override
   Widget build(BuildContext context) {
+    final roleColor = comment.role == 'teacher' ? const Color(0xFF2E6B7F) : comment.role == 'parent' ? const Color(0xFF7A3D1A) : const Color(0xFF1A3A44);
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
         Container(
           width: 32,
           height: 32,
-          decoration: BoxDecoration(
-            color: comment.role.color.withValues(alpha: 0.10),
-            shape: BoxShape.circle,
-          ),
-          child: Icon(comment.role.icon, size: 16, color: comment.role.color),
+          decoration: BoxDecoration(color: roleColor.withValues(alpha: 0.10), shape: BoxShape.circle),
+          child: Icon(comment.role == 'teacher' ? Icons.school_rounded : comment.role == 'parent' ? Icons.family_restroom_rounded : Icons.admin_panel_settings_rounded, size: 16, color: roleColor),
         ),
         const SizedBox(width: 10),
         Expanded(
@@ -887,77 +857,28 @@ class _CommentTile extends StatelessWidget {
             children: <Widget>[
               Row(
                 children: <Widget>[
-                  Text(
-                    comment.authorName,
-                    style: const TextStyle(
-                      fontFamily: 'Plus Jakarta Sans',
-                      fontSize: 12,
-                      fontWeight: FontWeight.w800,
-                      color: Color(0xFF16212A),
-                    ),
-                  ),
+                  Text(comment.authorName, style: const TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 12, fontWeight: FontWeight.w800, color: Color(0xFF16212A))),
                   const SizedBox(width: 6),
                   Container(
-                    padding:
-                        const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
-                    decoration: BoxDecoration(
-                      color: comment.role.bgColor,
-                      borderRadius: BorderRadius.circular(5),
-                    ),
-                    child: Text(
-                      comment.role.label,
-                      style: TextStyle(
-                        fontFamily: 'Plus Jakarta Sans',
-                        fontSize: 8,
-                        fontWeight: FontWeight.w800,
-                        color: comment.role.color,
-                        letterSpacing: 0.4,
-                      ),
-                    ),
+                    padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+                    decoration: BoxDecoration(color: roleColor.withValues(alpha: 0.10), borderRadius: BorderRadius.circular(5)),
+                    child: Text(comment.role.toUpperCase(), style: TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 8, fontWeight: FontWeight.w800, color: roleColor, letterSpacing: 0.4)),
                   ),
                   const Spacer(),
-                  Text(
-                    comment.timeAgo,
-                    style: const TextStyle(
-                      fontFamily: 'Plus Jakarta Sans',
-                      fontSize: 10,
-                      color: Color(0xFF94A3B0),
-                    ),
-                  ),
+                  Text(_formatTime(comment.timeAgo), style: const TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 10, color: Color(0xFF94A3B0))),
                 ],
               ),
               const SizedBox(height: 2),
-              Text(
-                comment.classOrDept,
-                style: const TextStyle(
-                  fontFamily: 'Plus Jakarta Sans',
-                  fontSize: 10,
-                  fontWeight: FontWeight.w500,
-                  color: Color(0xFF94A3B0),
-                ),
-              ),
+              Text(comment.classOrDept, style: const TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 10, fontWeight: FontWeight.w500, color: Color(0xFF94A3B0))),
               const SizedBox(height: 5),
               Container(
                 width: double.infinity,
                 padding: const EdgeInsets.all(10),
-                decoration: BoxDecoration(
-                  color: const Color(0xFFF4FAFB),
-                  borderRadius: const BorderRadius.only(
-                    topRight: Radius.circular(12),
-                    bottomLeft: Radius.circular(12),
-                    bottomRight: Radius.circular(12),
-                  ),
-                ),
-                child: Text(
-                  comment.text,
-                  style: const TextStyle(
-                    fontFamily: 'Plus Jakarta Sans',
-                    fontSize: 13,
-                    fontWeight: FontWeight.w400,
-                    color: Color(0xFF4A6572),
-                    height: 1.5,
-                  ),
+                decoration: const BoxDecoration(
+                  color: Color(0xFFF4FAFB),
+                  borderRadius: BorderRadius.only(topRight: Radius.circular(12), bottomLeft: Radius.circular(12), bottomRight: Radius.circular(12)),
                 ),
+                child: Text(comment.text, style: const TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 13, fontWeight: FontWeight.w400, color: Color(0xFF4A6572), height: 1.5)),
               ),
             ],
           ),
@@ -971,7 +892,7 @@ class _CommentTile extends StatelessWidget {
 
 class _NewPostSheet extends StatefulWidget {
   const _NewPostSheet({required this.onSubmit});
-  final ValueChanged<_Post> onSubmit;
+  final Function(String, String, bool, String?) onSubmit;
 
   @override
   State<_NewPostSheet> createState() => _NewPostSheetState();
@@ -981,7 +902,7 @@ class _NewPostSheetState extends State<_NewPostSheet> {
   final TextEditingController _titleCtrl = TextEditingController();
   final TextEditingController _descCtrl = TextEditingController();
   final TextEditingController _locationCtrl = TextEditingController();
-  _Role _selectedRole = _Role.parent;
+  bool _isFound = false;
 
   @override
   void dispose() {
@@ -993,27 +914,7 @@ class _NewPostSheetState extends State<_NewPostSheet> {
 
   void _submit() {
     if (_titleCtrl.text.trim().isEmpty || _descCtrl.text.trim().isEmpty) return;
-    final String classOrDept = switch (_selectedRole) {
-      _Role.teacher => 'Grade 8 · Class Teacher',
-      _Role.parent => 'Parent · Grade 8C',
-      _Role.admin => 'Administration',
-    };
-    final _Post post = _Post(
-      id: DateTime.now().millisecondsSinceEpoch.toString(),
-      authorName: 'You',
-      role: _selectedRole,
-      classOrDept: classOrDept,
-      title: _titleCtrl.text.trim(),
-      description: _descCtrl.text.trim(),
-      location: _locationCtrl.text.trim().isEmpty
-          ? 'Unknown'
-          : _locationCtrl.text.trim(),
-      timeAgo: 'Just now',
-      status: _Status.open,
-      comments: <_Comment>[],
-    );
-    widget.onSubmit(post);
-    Navigator.of(context).pop();
+    widget.onSubmit(_titleCtrl.text.trim(), _descCtrl.text.trim(), _isFound, _locationCtrl.text.trim().isEmpty ? null : _locationCtrl.text.trim());
   }
 
   @override
@@ -1026,137 +927,38 @@ class _NewPostSheetState extends State<_NewPostSheet> {
           mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
-            // Handle
-            Center(
-              child: Container(
-                width: 40,
-                height: 4,
-                decoration: BoxDecoration(
-                  color: const Color(0xFFE0E0E0),
-                  borderRadius: BorderRadius.circular(2),
-                ),
-              ),
-            ),
+            Center(child: Container(width: 40, height: 4, decoration: BoxDecoration(color: const Color(0xFFE0E0E0), borderRadius: BorderRadius.circular(2)))),
             const SizedBox(height: 20),
-            const Text(
-              'New Post',
-              style: TextStyle(
-                fontFamily: 'Plus Jakarta Sans',
-                fontSize: 20,
-                fontWeight: FontWeight.w800,
-                color: Color(0xFF16212A),
-              ),
-            ),
+            const Text('New Post', style: TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 20, fontWeight: FontWeight.w800, color: Color(0xFF16212A))),
             const SizedBox(height: 4),
-            const Text(
-              'Let the community know what you lost or found',
-              style: TextStyle(
-                fontFamily: 'Plus Jakarta Sans',
-                fontSize: 13,
-                color: Color(0xFF94A3B0),
-              ),
-            ),
+            const Text('Let the community know what you lost or found', style: TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 13, color: Color(0xFF94A3B0))),
             const SizedBox(height: 20),
-
-            // Posted as (role)
-            const Text(
-              'Posting as',
-              style: TextStyle(
-                fontFamily: 'Plus Jakarta Sans',
-                fontSize: 12,
-                fontWeight: FontWeight.w700,
-                color: Color(0xFF4A6572),
-              ),
-            ),
+            const Text('Post type', style: TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 12, fontWeight: FontWeight.w700, color: Color(0xFF4A6572))),
             const SizedBox(height: 8),
             Row(
-              children: _Role.values
-                  .map(
-                    (r) => Padding(
-                      padding: const EdgeInsets.only(right: 8),
-                      child: GestureDetector(
-                        onTap: () => setState(() => _selectedRole = r),
-                        child: AnimatedContainer(
-                          duration: const Duration(milliseconds: 180),
-                          padding: const EdgeInsets.symmetric(
-                              horizontal: 12, vertical: 7),
-                          decoration: BoxDecoration(
-                            color: _selectedRole == r
-                                ? r.color
-                                : r.color.withValues(alpha: 0.08),
-                            borderRadius: BorderRadius.circular(10),
-                          ),
-                          child: Text(
-                            r.label,
-                            style: TextStyle(
-                              fontFamily: 'Plus Jakarta Sans',
-                              fontSize: 11,
-                              fontWeight: FontWeight.w800,
-                              color: _selectedRole == r
-                                  ? Colors.white
-                                  : r.color,
-                              letterSpacing: 0.4,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  )
-                  .toList(),
+              children: [
+                _TypeButton(label: 'I LOST SOMETHING', isActive: !_isFound, onTap: () => setState(() => _isFound = false), color: const Color(0xFF7A3D1A)),
+                const SizedBox(width: 10),
+                _TypeButton(label: 'I FOUND SOMETHING', isActive: _isFound, onTap: () => setState(() => _isFound = true), color: const Color(0xFF2E6B7F)),
+              ],
             ),
-
             const SizedBox(height: 18),
-            _FormField(
-              controller: _titleCtrl,
-              label: 'Title',
-              hint: 'e.g. Blue water bottle found near library',
-            ),
+            _FormField(controller: _titleCtrl, label: 'Item Name', hint: 'e.g. Blue water bottle'),
             const SizedBox(height: 12),
-            _FormField(
-              controller: _descCtrl,
-              label: 'Description',
-              hint: 'Describe the item and any identifying details…',
-              maxLines: 3,
-            ),
+            _FormField(controller: _descCtrl, label: 'Description', hint: 'Identifying details…', maxLines: 3),
             const SizedBox(height: 12),
-            _FormField(
-              controller: _locationCtrl,
-              label: 'Location (optional)',
-              hint: 'e.g. Canteen, Science Lab, Main Gate',
-            ),
+            _FormField(controller: _locationCtrl, label: _isFound ? 'Where did you find it?' : 'Where did you lose it? (Optional)', hint: 'e.g. Canteen, Science Lab'),
             const SizedBox(height: 24),
-
-            // Submit
             GestureDetector(
               onTap: _submit,
               child: Container(
                 height: 52,
                 decoration: BoxDecoration(
-                  gradient: const LinearGradient(
-                    colors: <Color>[Color(0xFF7A3D1A), Color(0xFFD47A2E)],
-                    begin: Alignment.centerLeft,
-                    end: Alignment.centerRight,
-                  ),
+                  gradient: const LinearGradient(colors: <Color>[Color(0xFF7A3D1A), Color(0xFFD47A2E)], begin: Alignment.centerLeft, end: Alignment.centerRight),
                   borderRadius: BorderRadius.circular(16),
-                  boxShadow: <BoxShadow>[
-                    BoxShadow(
-                      color: const Color(0xFF7A3D1A).withValues(alpha: 0.30),
-                      blurRadius: 14,
-                      offset: const Offset(0, 5),
-                    ),
-                  ],
-                ),
-                child: const Center(
-                  child: Text(
-                    'Post to Thread',
-                    style: TextStyle(
-                      fontFamily: 'Plus Jakarta Sans',
-                      fontSize: 15,
-                      fontWeight: FontWeight.w700,
-                      color: Colors.white,
-                    ),
-                  ),
+                  boxShadow: <BoxShadow>[BoxShadow(color: const Color(0xFF7A3D1A).withValues(alpha: 0.30), blurRadius: 14, offset: const Offset(0, 5))],
                 ),
+                child: const Center(child: Text('Post to Thread', style: TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 15, fontWeight: FontWeight.w700, color: Colors.white))),
               ),
             ),
           ],
@@ -1166,13 +968,29 @@ class _NewPostSheetState extends State<_NewPostSheet> {
   }
 }
 
+class _TypeButton extends StatelessWidget {
+  const _TypeButton({required this.label, required this.isActive, required this.onTap, required this.color});
+  final String label;
+  final bool isActive;
+  final VoidCallback onTap;
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onTap,
+      child: AnimatedContainer(
+        duration: const Duration(milliseconds: 180),
+        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+        decoration: BoxDecoration(color: isActive ? color : color.withValues(alpha: 0.08), borderRadius: BorderRadius.circular(10)),
+        child: Text(label, style: TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 10, fontWeight: FontWeight.w800, color: isActive ? Colors.white : color, letterSpacing: 0.4)),
+      ),
+    );
+  }
+}
+
 class _FormField extends StatelessWidget {
-  const _FormField({
-    required this.controller,
-    required this.label,
-    required this.hint,
-    this.maxLines = 1,
-  });
+  const _FormField({required this.controller, required this.label, required this.hint, this.maxLines = 1});
   final TextEditingController controller;
   final String label;
   final String hint;
@@ -1183,41 +1001,15 @@ class _FormField extends StatelessWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
-        Text(
-          label,
-          style: const TextStyle(
-            fontFamily: 'Plus Jakarta Sans',
-            fontSize: 12,
-            fontWeight: FontWeight.w700,
-            color: Color(0xFF4A6572),
-          ),
-        ),
+        Text(label, style: const TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 12, fontWeight: FontWeight.w700, color: Color(0xFF4A6572))),
         const SizedBox(height: 6),
         Container(
-          decoration: BoxDecoration(
-            color: const Color(0xFFF4FAFB),
-            borderRadius: BorderRadius.circular(12),
-            border: Border.all(color: const Color(0xFFDDE8ED)),
-          ),
+          decoration: BoxDecoration(color: const Color(0xFFF4FAFB), borderRadius: BorderRadius.circular(12), border: Border.all(color: const Color(0xFFDDE8ED))),
           child: TextField(
             controller: controller,
             maxLines: maxLines,
-            style: const TextStyle(
-              fontFamily: 'Plus Jakarta Sans',
-              fontSize: 13,
-              color: Color(0xFF16212A),
-            ),
-            decoration: InputDecoration(
-              hintText: hint,
-              hintStyle: const TextStyle(
-                fontFamily: 'Plus Jakarta Sans',
-                fontSize: 13,
-                color: Color(0xFF94A3B0),
-              ),
-              border: InputBorder.none,
-              contentPadding: const EdgeInsets.symmetric(
-                  horizontal: 14, vertical: 12),
-            ),
+            style: const TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 13, color: Color(0xFF16212A)),
+            decoration: InputDecoration(hintText: hint, hintStyle: const TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 13, color: Color(0xFF94A3B0)), border: InputBorder.none, contentPadding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12)),
           ),
         ),
       ],
diff --git a/apps/flutter/lib/main.dart b/apps/flutter/lib/main.dart
index 9cd6b20..795645b 100644
--- a/apps/flutter/lib/main.dart
+++ b/apps/flutter/lib/main.dart
@@ -41,5 +41,6 @@ void main() async {
     supportViewModel: sl.supportViewModel,
     noticesViewModel: sl.noticesViewModel,
     settingsViewModel: sl.settingsViewModel,
+    lostFoundViewModel: sl.lostFoundViewModel,
   ));
 }
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 476c90c..67a9e68 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -22,6 +22,7 @@
     "react": "19.2.3",
     "react-dom": "19.2.3",
     "react-hook-form": "^7.73.1",
+    "react-hot-toast": "^2.6.0",
     "react-qr-code": "^2.0.18",
     "recharts": "^3.8.1",
     "redis": "^5.11.0",
diff --git a/apps/frontend/src/app/admin/lost-and-found/page.tsx b/apps/frontend/src/app/admin/lost-and-found/page.tsx
new file mode 100644
index 0000000..315ebc9
--- /dev/null
+++ b/apps/frontend/src/app/admin/lost-and-found/page.tsx
@@ -0,0 +1,240 @@
+"use client";
+
+import { useState, useMemo, useEffect, useCallback } from "react";
+import { PageHeader } from "@/shared/components/layout/PageHeader";
+import { Search, Plus, MapPin, Calendar, Package, X, CheckCircle, RotateCcw, Loader2 } from "lucide-react";
+import clsx from "clsx";
+import { request } from "@/shared/lib/api-client";
+import { toast } from "react-hot-toast";
+
+type ItemType = "lost" | "found";
+type ItemStatus = "active" | "claimed";
+type TabFilter = "all" | "lost" | "found" | "claimed";
+
+interface LostFoundItem {
+  id: string;
+  type: ItemType;
+  title: string;
+  description: string;
+  location: string;
+  date: string;
+  postedBy: string;
+  postedByRole: string;
+  status: ItemStatus;
+  bgColor: string;
+}
+
+interface PostForm {
+  type: ItemType;
+  title: string;
+  location: string;
+  date: string;
+  description: string;
+}
+
+interface BoardPost {
+  id: string;
+  type: ItemType;
+  title: string;
+  description: string;
+  location: string;
+  timeAgo: string;
+  authorName: string;
+  role: string;
+  status: string;
+  photo_url?: string;
+}
+
+const EMPTY_FORM: PostForm = { type: "found", title: "", location: "", date: "", description: "" };
+
+export default function AdminLostAndFoundPage() {
+  const [items, setItems] = useState<LostFoundItem[]>([]);
+  const [tab, setTab] = useState<TabFilter>("all");
+  const [search, setSearch] = useState("");
+  const [showModal, setShowModal] = useState(false);
+  const [form, setForm] = useState<PostForm>(EMPTY_FORM);
+  const [isLoading, setIsLoading] = useState(true);
+
+  const fetchItems = useCallback(async () => {
+    const res = await request<BoardPost[]>("/api/lost-found/board");
+    if (res.ok) {
+      const mapped: LostFoundItem[] = res.data.map((item) => ({
+        id: item.id,
+        type: item.type,
+        title: item.title,
+        description: item.description,
+        location: item.location,
+        date: item.timeAgo,
+        postedBy: item.authorName,
+        postedByRole: item.role,
+        status: item.status === "unclaimed" || item.status === "open" ? "active" : "claimed",
+        bgColor: item.type === "lost" ? "bg-red-50" : "bg-emerald-50",
+      }));
+      setItems(mapped);
+    }
+    setIsLoading(false);
+  }, []);
+
+  useEffect(() => {
+    const timeout = setTimeout(() => {
+      void fetchItems();
+    }, 0);
+    return () => clearTimeout(timeout);
+  }, [fetchItems]);
+
+  const filtered = useMemo(() => {
+    return items.filter((item) => {
+      const matchTab =
+        tab === "all" ? true :
+        tab === "claimed" ? item.status === "claimed" :
+        item.type === tab && item.status === "active";
+      const matchSearch = search === "" || item.title.toLowerCase().includes(search.toLowerCase()) || item.location.toLowerCase().includes(search.toLowerCase());
+      return matchTab && matchSearch;
+    });
+  }, [items, tab, search]);
+
+  const handleToggleStatus = async (id: string, type: ItemType) => {
+    const endpoint = type === 'found' ? `/api/lost-found/items/${id}/collected` : `/api/lost-found/reports/${id}/recovered`;
+    const res = await request(endpoint, { method: 'PUT' });
+    if (res.ok) {
+      toast.success("Status updated");
+      void fetchItems();
+    } else {
+      toast.error("Failed to update status");
+    }
+  };
+
+  const handlePost = async () => {
+    if (!form.title || !form.location) return;
+    const endpoint = form.type === 'found' ? '/api/lost-found/items' : '/api/lost-found/reports';
+    const body = form.type === 'found' ? {
+      item_name: form.title,
+      description: form.description,
+      found_at: form.location,
+      found_date: form.date || new Date().toISOString()
+    } : {
+      item_name: form.title,
+      description: form.description,
+      student_id: "", // Admin might need to select a student if posting LOST.
+      date_lost: form.date || new Date().toISOString()
+    };
+
+    const res = await request(endpoint, { method: 'POST', body: JSON.stringify(body) });
+    if (res.ok) {
+      toast.success("Posted successfully");
+      setShowModal(false);
+      setForm(EMPTY_FORM);
+      window.location.reload();
+    } else {
+      toast.error(res.error || "Failed to post");
+    }
+  };
+
+  return (
+    <div className="flex flex-col gap-6 pb-12 w-full pr-2">
+      <PageHeader title="Lost & Found Management" subtitle="Overview of all items reported lost or found across the institution." />
+
+      {/* Filters */}
+      <div className="bg-white border border-gray-200 rounded-[20px] p-5 shadow-sm flex flex-col gap-4">
+        <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-3">
+          <div className="flex items-center gap-1 p-1 bg-gray-100 rounded-xl w-fit">
+            {[
+              { key: "all", label: "All Items" },
+              { key: "lost", label: "Lost" },
+              { key: "found", label: "Found" },
+              { key: "claimed", label: "Claimed" },
+            ].map(({ key, label }) => (
+              <button key={key} onClick={() => setTab(key as TabFilter)} className={clsx("px-4 py-2 rounded-lg text-[13px] font-bold transition-all", tab === key ? "bg-white text-[#0f172a] shadow-sm" : "text-gray-500 hover:text-gray-700")}>
+                {label}
+              </button>
+            ))}
+          </div>
+
+          <div className="flex items-center gap-3">
+            <div className="relative">
+              <Search className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-gray-400" />
+              <input value={search} onChange={(e) => setSearch(e.target.value)} placeholder="Search items..." className="pl-9 pr-4 py-2.5 rounded-xl border border-gray-200 text-[13px] font-medium outline-none focus:border-[#4f46e5] w-[200px]" />
+            </div>
+            <button onClick={() => setShowModal(true)} className="flex items-center gap-2 px-4 py-2.5 bg-[#4f46e5] text-white text-[13px] font-bold rounded-xl hover:bg-indigo-700 transition-colors">
+              <Plus className="w-4 h-4" /> Post Item
+            </button>
+          </div>
+        </div>
+      </div>
+
+      {/* Grid */}
+      <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-5">
+        {isLoading ? (
+          <div className="col-span-full py-20 flex justify-center"><Loader2 className="w-8 h-8 text-indigo-500 animate-spin" /></div>
+        ) : filtered.length === 0 ? (
+          <div className="col-span-full flex flex-col items-center justify-center py-20 text-center text-gray-400 bg-white border border-gray-200 rounded-[20px]">
+            <Package className="w-10 h-10 mb-3 text-gray-300" />
+            <p className="font-semibold text-[#334155]">No items found</p>
+          </div>
+        ) : (
+          filtered.map((item) => (
+            <div key={item.id} className="bg-white border border-gray-200 rounded-[20px] shadow-sm overflow-hidden flex flex-col hover:shadow-md transition-shadow">
+              <div className={clsx("w-full h-[120px] flex items-center justify-center relative", item.bgColor)}>
+                <Package className="w-10 h-10 text-white/60" />
+                <div className={clsx("absolute top-3 left-3 px-2.5 py-1 rounded-full text-[11px] font-bold", item.type === "lost" ? "bg-red-500 text-white" : "bg-emerald-500 text-white")}>
+                  {item.type === "lost" ? "Lost" : "Found"}
+                </div>
+                <div className="absolute top-3 right-3 px-2.5 py-1 rounded-full text-[11px] font-bold bg-white/90 text-gray-700">
+                  {item.status}
+                </div>
+              </div>
+              <div className="p-5 flex flex-col gap-3 flex-1">
+                <h3 className="text-[15px] font-bold text-[#0f172a] leading-tight">{item.title}</h3>
+                <p className="text-[13px] text-[#64748b] leading-relaxed line-clamp-2">{item.description}</p>
+                <div className="flex flex-col gap-1.5 text-[12px] text-[#64748b] font-medium">
+                  <div className="flex items-center gap-1.5"><MapPin className="w-3.5 h-3.5 text-gray-400" /> {item.location}</div>
+                  <div className="flex items-center gap-1.5"><Calendar className="w-3.5 h-3.5 text-gray-400" /> {new Date(item.date).toLocaleDateString()}</div>
+                </div>
+                <div className="flex items-center justify-between mt-auto pt-3 border-t border-gray-100">
+                  <div className="flex flex-col">
+                    <p className="text-[12px] font-bold text-[#334155]">{item.postedBy}</p>
+                    <span className="text-[10px] text-gray-400 uppercase font-bold">{item.postedByRole}</span>
+                  </div>
+                  <button onClick={() => handleToggleStatus(item.id, item.type)} className={clsx("flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-[12px] font-bold transition-colors", item.status === "active" ? "bg-emerald-50 text-emerald-600 hover:bg-emerald-100" : "bg-gray-100 text-gray-500")}>
+                    {item.status === "active" ? <><CheckCircle className="w-3.5 h-3.5" /> Close</> : <><RotateCcw className="w-3.5 h-3.5" /> Reopen</>}
+                  </button>
+                </div>
+              </div>
+            </div>
+          ))
+        )}
+      </div>
+
+      {/* Modal placeholder - similar to teacher modal */}
+      {showModal && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 backdrop-blur-sm p-4">
+           <div className="bg-white rounded-[24px] shadow-2xl w-full max-w-md p-8 flex flex-col gap-6">
+            <div className="flex items-center justify-between">
+              <h2 className="text-[18px] font-bold text-[#0f172a]">Post an Item</h2>
+              <button onClick={() => setShowModal(false)} className="p-2 rounded-lg hover:bg-gray-100 text-gray-500"><X className="w-5 h-5" /></button>
+            </div>
+            <div className="flex flex-col gap-2">
+              <label className="text-[13px] font-bold text-[#64748b]">Item Type</label>
+              <div className="flex gap-3">
+                {(["lost", "found"] as ItemType[]).map((t) => (
+                  <button key={t} onClick={() => setForm((p) => ({ ...p, type: t }))} className={clsx("flex-1 py-2.5 rounded-xl border-2 text-[13px] font-bold capitalize transition-all", form.type === t ? (t === "lost" ? "border-red-500 bg-red-50 text-red-600" : "border-emerald-500 bg-emerald-50 text-emerald-600") : "border-gray-200 text-gray-400 hover:border-gray-300")}>
+                    {t}
+                  </button>
+                ))}
+              </div>
+            </div>
+            <div className="flex flex-col gap-[6px]">
+              <label className="text-[13px] font-bold text-[#64748b]">Item Title</label>
+              <input value={form.title} onChange={(e) => setForm((p) => ({ ...p, title: e.target.value }))} placeholder="e.g. Black School Bag" className="px-4 py-3 rounded-xl border border-gray-200 text-[14px] outline-none focus:border-[#4f46e5]" />
+            </div>
+            <div className="flex flex-col gap-[6px]">
+              <label className="text-[13px] font-bold text-[#64748b]">Location</label>
+              <input value={form.location} onChange={(e) => setForm((p) => ({ ...p, location: e.target.value }))} placeholder="e.g. Library" className="px-4 py-3 rounded-xl border border-gray-200 text-[14px] outline-none focus:border-[#4f46e5]" />
+            </div>
+            <button onClick={handlePost} className="w-full py-3 rounded-xl bg-[#4f46e5] text-white font-bold hover:bg-indigo-700 transition-colors">Post Item</button>
+           </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/apps/frontend/src/app/layout.tsx b/apps/frontend/src/app/layout.tsx
index 2b6ca0a..a85043e 100644
--- a/apps/frontend/src/app/layout.tsx
+++ b/apps/frontend/src/app/layout.tsx
@@ -3,6 +3,7 @@ import { Kumbh_Sans } from "next/font/google";
 import "./globals.css";
 import { AuthProvider } from "@/features/auth/context/AuthContext";
 import { UnreadMessagesProvider } from "@/features/messages/context/UnreadMessagesContext";
+import { Toaster } from "react-hot-toast";
 
 const kumbhSans = Kumbh_Sans({
   variable: "--font-kumbh-sans",
@@ -27,7 +28,10 @@ export default function RootLayout({
         suppressHydrationWarning
       >
         <AuthProvider>
-          <UnreadMessagesProvider>{children}</UnreadMessagesProvider>
+          <UnreadMessagesProvider>
+            {children}
+            <Toaster position="bottom-right" reverseOrder={false} />
+          </UnreadMessagesProvider>
         </AuthProvider>
       </body>
     </html>
diff --git a/apps/frontend/src/app/teacher/lost-and-found/page.tsx b/apps/frontend/src/app/teacher/lost-and-found/page.tsx
index 5a5a03f..9163f20 100644
--- a/apps/frontend/src/app/teacher/lost-and-found/page.tsx
+++ b/apps/frontend/src/app/teacher/lost-and-found/page.tsx
@@ -1,9 +1,11 @@
 "use client";
 
-import { useState, useMemo } from "react";
+import { useState, useMemo, useEffect, useCallback, useRef } from "react";
 import { PageHeader } from "@/shared/components/layout/PageHeader";
-import { Search, Plus, MapPin, Calendar, Tag, Package, X, ImagePlus, CheckCircle, RotateCcw } from "lucide-react";
+import { Search, Plus, MapPin, Calendar, Tag, Package, X, ImagePlus, CheckCircle, RotateCcw, Loader2 } from "lucide-react";
 import clsx from "clsx";
+import { request } from "@/shared/lib/api-client";
+import { toast } from "react-hot-toast";
 
 type ItemType = "lost" | "found";
 type ItemStatus = "active" | "claimed";
@@ -23,31 +25,6 @@ interface LostFoundItem {
   bgColor: string;
   tags: string[];
 }
-
-const INITIAL_ITEMS: LostFoundItem[] = [
-  {
-    id: "1", type: "lost", title: "Black School Bag", description: "A black Jansport backpack with a broken zipper on the front pocket. Has a keychain attached.", location: "Grade 10-A Classroom", date: "2026-04-22", postedBy: "Samantha Perera", postedByRole: "teacher", status: "active", bgColor: "bg-slate-200", tags: ["bag", "uniform"],
-  },
-  {
-    id: "2", type: "found", title: "Water Bottle (Blue)", description: "Blue metal water bottle found near the canteen. Has stickers on the side.", location: "Canteen", date: "2026-04-21", postedBy: "Samantha Perera", postedByRole: "teacher", status: "active", bgColor: "bg-blue-100", tags: ["bottle"],
-  },
-  {
-    id: "3", type: "lost", title: "Scientific Calculator", description: "Casio fx-991EX scientific calculator. Student name written on the back.", location: "Library", date: "2026-04-20", postedBy: "Mr. De Silva", postedByRole: "principal", status: "active", bgColor: "bg-yellow-100", tags: ["stationery", "electronics"],
-  },
-  {
-    id: "4", type: "found", title: "Glasses Case", description: "Brown leather glasses case with a pair of prescription glasses inside.", location: "School Office", date: "2026-04-19", postedBy: "Mr. De Silva", postedByRole: "principal", status: "claimed", bgColor: "bg-amber-100", tags: ["accessories"],
-  },
-  {
-    id: "5", type: "found", title: "ID Card — Nimal Bandara", description: "Student ID card found near the sports ground. Grade 9 student.", location: "Sports Ground", date: "2026-04-18", postedBy: "Samantha Perera", postedByRole: "teacher", status: "active", bgColor: "bg-green-100", tags: ["id", "documents"],
-  },
-  {
-    id: "6", type: "lost", title: "PE Kit Bag", description: "White drawstring PE kit bag with red stripes. Contains shorts and a t-shirt.", location: "Changing Room", date: "2026-04-17", postedBy: "Samantha Perera", postedByRole: "teacher", status: "claimed", bgColor: "bg-red-100", tags: ["bag", "uniform"],
-  },
-  {
-    id: "7", type: "found", title: "Geometry Box", description: "Blue plastic geometry box containing compass, protractor, and rulers.", location: "Grade 8-B Classroom", date: "2026-04-16", postedBy: "Mr. De Silva", postedByRole: "principal", status: "active", bgColor: "bg-purple-100", tags: ["stationery"],
-  },
-];
-
 interface PostForm {
   type: ItemType;
   title: string;
@@ -56,14 +33,62 @@ interface PostForm {
   description: string;
 }
 
-const EMPTY_FORM: PostForm = { type: "lost", title: "", location: "", date: "", description: "" };
+const EMPTY_FORM: PostForm = { type: "found", title: "", location: "", date: "", description: "" };
+
+interface BoardPost {
+  id: string;
+  type: ItemType;
+  title: string;
+  description: string;
+  location: string;
+  timeAgo: string;
+  authorName: string;
+  role: string;
+  status: string;
+  photo_url?: string;
+}
 
 export default function TeacherLostAndFoundPage() {
-  const [items, setItems] = useState<LostFoundItem[]>(INITIAL_ITEMS);
+  const [items, setItems] = useState<LostFoundItem[]>([]);
   const [tab, setTab] = useState<TabFilter>("all");
   const [search, setSearch] = useState("");
   const [showModal, setShowModal] = useState(false);
   const [form, setForm] = useState<PostForm>(EMPTY_FORM);
+  const [isLoading, setIsLoading] = useState(true);
+
+  const mountedRef = useRef(false);
+
+  const fetchItems = useCallback(async () => {
+    const res = await request<BoardPost[]>("/api/lost-found/board");
+    if (res.ok && mountedRef.current) {
+      const mapped: LostFoundItem[] = res.data.map((item) => ({
+        id: item.id,
+        type: item.type,
+        title: item.title,
+        description: item.description,
+        location: item.location,
+        date: item.timeAgo,
+        postedBy: item.authorName,
+        postedByRole: item.role as PostedByRole,
+        status: item.status === "unclaimed" || item.status === "open" ? "active" : "claimed",
+        bgColor: item.type === "lost" ? "bg-red-50" : "bg-emerald-50",
+        tags: []
+      }));
+      setItems(mapped);
+      setIsLoading(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    mountedRef.current = true;
+    const timeout = setTimeout(() => {
+      if (mountedRef.current) void fetchItems();
+    }, 0);
+    return () => {
+      mountedRef.current = false;
+      clearTimeout(timeout);
+    };
+  }, [fetchItems]);
 
   const filtered = useMemo(() => {
     return items.filter((item) => {
@@ -82,29 +107,48 @@ export default function TeacherLostAndFoundPage() {
     found: items.filter((i) => i.type === "found" && i.status === "active").length,
   };
 
-  const handleToggleStatus = (id: string) => {
-    setItems((prev) => prev.map((item) => item.id === id ? { ...item, status: item.status === "active" ? "claimed" : "active" } : item));
+  const handleToggleStatus = async (id: string, currentStatus: ItemStatus, type: ItemType) => {
+    const endpoint = type === 'found' ? `/api/lost-found/items/${id}/collected` : `/api/lost-found/reports/${id}/recovered`;
+    const res = await request(endpoint, { method: 'PUT' });
+    if (res.ok) {
+      toast.success("Status updated");
+      fetchItems();
+    } else {
+      toast.error("Failed to update status");
+    }
   };
 
-  const handlePost = () => {
+  const handlePost = async () => {
     if (!form.title || !form.location) return;
-    const newItem: LostFoundItem = {
-      id: Date.now().toString(),
-      type: form.type,
-      title: form.title,
+    const endpoint = form.type === 'found' ? '/api/lost-found/items' : '/api/lost-found/reports';
+    const body = form.type === 'found' ? {
+      item_name: form.title,
+      description: form.description,
+      found_at: form.location,
+      found_date: form.date || new Date().toISOString()
+    } : {
+      item_name: form.title,
       description: form.description,
-      location: form.location,
-      date: form.date || new Date().toISOString().split("T")[0],
-      postedBy: "Samantha Perera",
-      postedByRole: "teacher",
-      status: "active",
-      bgColor: form.type === "lost" ? "bg-orange-100" : "bg-teal-100",
-      tags: [],
+      student_id: "", // Teacher posting lost report needs a student ID? Maybe only for parents.
+      date_lost: form.date || new Date().toISOString()
     };
-    setItems((prev) => [newItem, ...prev]);
-    setShowModal(false);
-    setForm(EMPTY_FORM);
-    setTab("all");
+
+    // Note: Teacher posting LOST might not work if backend strictly requires student_id for reports.
+    // However, teachers usually post FOUND items.
+    
+    const res = await request(endpoint, {
+      method: 'POST',
+      body: JSON.stringify(body)
+    });
+
+    if (res.ok) {
+      toast.success("Posted successfully");
+      setShowModal(false);
+      setForm(EMPTY_FORM);
+      fetchItems();
+    } else {
+      toast.error(res.error || "Failed to post");
+    }
   };
 
   const TABS: { key: TabFilter; label: string }[] = [
@@ -187,8 +231,12 @@ export default function TeacherLostAndFoundPage() {
         </div>
       ) : (
         <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-5">
-          {filtered.map((item) => (
-            <ItemCard key={item.id} item={item} onToggleStatus={handleToggleStatus} />
+          {isLoading ? (
+            <div className="col-span-full py-20 flex justify-center">
+              <Loader2 className="w-8 h-8 text-indigo-500 animate-spin" />
+            </div>
+          ) : filtered.map((item) => (
+            <ItemCard key={item.id} item={item} onToggleStatus={() => handleToggleStatus(item.id, item.status, item.type)} />
           ))}
         </div>
       )}
diff --git a/apps/frontend/src/shared/components/layout/sidebarConfig.ts b/apps/frontend/src/shared/components/layout/sidebarConfig.ts
index 477b2ff..efa51ec 100644
--- a/apps/frontend/src/shared/components/layout/sidebarConfig.ts
+++ b/apps/frontend/src/shared/components/layout/sidebarConfig.ts
@@ -35,6 +35,7 @@ export const SIDEBAR_MENU: Record<Role, MenuItem[]> = {
     { title: "Notice Board", icon: ClipboardList, path: "/admin/notices" },
     { title: "Calendar", icon: Calendar, path: "/admin/calendar" },
     { title: "Complain Management", icon: AlertOctagon, path: "/admin/complaints" },
+    { title: "Lost & Found", icon: Search, path: "/admin/lost-and-found" },
     { title: "Logs", icon: FileText, path: "/admin/logs" },
     { title: "Profile", icon: User, path: "/admin/profile" },
   ],
diff --git a/package-lock.json b/package-lock.json
index 5269e83..184e707 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -179,6 +179,7 @@
         "react": "19.2.3",
         "react-dom": "19.2.3",
         "react-hook-form": "^7.73.1",
+        "react-hot-toast": "^2.6.0",
         "react-qr-code": "^2.0.18",
         "recharts": "^3.8.1",
         "redis": "^5.11.0",
@@ -7252,8 +7253,8 @@
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
       "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
-      "devOptional": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/d3-array": {
       "version": "3.2.4",
@@ -10039,6 +10040,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/goober": {
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.19.tgz",
+      "integrity": "sha512-U7veizMqxyKlM58+Z5j2ngJBH/r9siDmxpvNxSw0PylF6WQvrASJEZrxh1hidRBJc2jqoBVSyOban5u8m+6Rxg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "csstype": "^3.0.10"
+      }
+    },
     "node_modules/google-auth-library": {
       "version": "10.6.2",
       "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.6.2.tgz",
@@ -15852,6 +15862,23 @@
         "react": "^16.8.0 || ^17 || ^18 || ^19"
       }
     },
+    "node_modules/react-hot-toast": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.6.0.tgz",
+      "integrity": "sha512-bH+2EBMZ4sdyou/DPrfgIouFpcRLCJ+HoCA32UoAYHn6T3Ur5yfcDCeSr5mwldl6pFOsiocmrXMuoCJ1vV8bWg==",
+      "license": "MIT",
+      "dependencies": {
+        "csstype": "^3.1.3",
+        "goober": "^2.1.16"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": ">=16",
+        "react-dom": ">=16"
+      }
+    },
     "node_modules/react-is": {
       "version": "19.2.5",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.5.tgz",
@@ -17726,6 +17753,7 @@
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",

From ac26c3ca1b7d1a2e32b39c04e9d59590254649b8 Mon Sep 17 00:00:00 2001
From: Methexx <methum.edu@gmail.com>
Date: Wed, 20 May 2026 02:32:18 +0530
Subject: [PATCH 6/7] fix: firebase fcm with os trigger and RAG pipleine issues

---
 .github/workflows/flutter-release.yml         |  25 +-
 apps/backend/coverage/coverage-final.json     |  11 -
 apps/backend/coverage/lcov.info               | 749 ------------------
 apps/backend/package.json                     |   1 -
 apps/backend/prisma/notifications_table.sql   |  26 +
 .../backend/prisma/policy_document_status.sql |  25 +
 apps/backend/prisma/rag_raw_sql.sql           |  16 +
 apps/backend/prisma/schema.prisma             |  20 +-
 apps/backend/src/app.ts                       |   2 +
 .../announcements/announcements.controller.ts |  64 +-
 .../attendance/attendance.controller.ts       |  95 ++-
 .../src/modules/gate/gate.controller.ts       |  36 +-
 .../src/modules/gate/gate.scheduler.ts        |  15 +
 .../lost-found/lost-found.controller.ts       |   4 +-
 .../modules/messages/messages.controller.ts   |  31 +-
 .../notifications/notifications.controller.ts |  92 +++
 .../notifications/notifications.routes.ts     |  16 +
 .../notifications/notifications.service.ts    | 140 ++++
 .../rag/controllers/documents.controller.ts   |   3 +-
 .../rag/controllers/ingest.controller.ts      |  15 +-
 .../rag/controllers/query.controller.ts       |  29 +-
 .../modules/rag/services/chunker.service.ts   |  14 +-
 .../rag/services/generation.service.ts        |  43 +-
 .../src/modules/results/results.service.ts    |  24 +-
 .../src/modules/school/school.service.ts      |   5 +-
 apps/flutter/android/.gitignore               |   3 +
 apps/flutter/android/app/build.gradle.kts     |  26 +-
 apps/flutter/android/app/google-services.json |  29 -
 apps/flutter/lib/app.dart                     |  36 +
 apps/flutter/lib/core/api/api_endpoints.dart  |   6 +
 apps/flutter/lib/core/di/service_locator.dart |  12 +-
 .../lib/core/navigation/app_router.dart       |   5 +
 .../lib/core/services/firebase_service.dart   |  53 +-
 .../attendance/views/attendance_screen.dart   |  16 +-
 .../chatbot/views/chatbot_screen.dart         |  72 +-
 .../views/teacher_chat_screen.dart            |  27 +-
 .../dashboard/views/dashboard_screen.dart     | 317 +++++---
 .../repositories/lost_found_repository.dart   |  10 +-
 .../views/lost_and_found_screen.dart          |  80 +-
 .../messages/models/message_models.dart       |  32 +
 .../viewmodels/messages_viewmodel.dart        |  19 +-
 .../messages/views/teacher_inbox_screen.dart  |  31 +-
 .../models/notification_model.dart            |  95 +++
 .../notifications_repository.dart             | 103 +++
 .../viewmodels/notifications_viewmodel.dart   | 107 +++
 .../views/notifications_screen.dart           | 359 ++++-----
 .../viewmodels/settings_viewmodel.dart        |  26 +-
 .../settings/views/settings_screen.dart       |  63 +-
 apps/flutter/lib/firebase_options.dart        |   8 +-
 apps/flutter/lib/main.dart                    |   2 +
 apps/flutter/pubspec.lock                     |   8 +
 apps/flutter/pubspec.yaml                     |   1 +
 apps/flutter/test/widget_test.dart            |  43 +-
 apps/frontend/src/app/admin/calendar/page.tsx |   1 +
 .../src/app/admin/overview/policies/page.tsx  |  14 +-
 apps/frontend/src/app/admin/profile/page.tsx  |  56 +-
 apps/frontend/src/app/admin/students/page.tsx |   6 +-
 .../src/app/security/profile/page.tsx         |  56 +-
 .../src/app/teacher/calendar/page.tsx         |   1 +
 .../src/app/teacher/overview/page.tsx         |   2 +-
 .../frontend/src/app/teacher/profile/page.tsx |  56 +-
 apps/frontend/src/features/rag/lib/rag-api.ts |   7 +-
 .../src/features/school/lib/school-api.ts     |   3 +-
 .../src/shared/components/layout/Sidebar.tsx  |   9 -
 firebase-debug.log                            |  35 -
 lint.log                                      | Bin 5502 -> 0 bytes
 66 files changed, 1813 insertions(+), 1523 deletions(-)
 delete mode 100644 apps/backend/coverage/coverage-final.json
 delete mode 100644 apps/backend/coverage/lcov.info
 create mode 100644 apps/backend/prisma/notifications_table.sql
 create mode 100644 apps/backend/prisma/policy_document_status.sql
 create mode 100644 apps/backend/src/modules/notifications/notifications.controller.ts
 create mode 100644 apps/backend/src/modules/notifications/notifications.routes.ts
 create mode 100644 apps/backend/src/modules/notifications/notifications.service.ts
 delete mode 100644 apps/flutter/android/app/google-services.json
 create mode 100644 apps/flutter/lib/features/notifications/models/notification_model.dart
 create mode 100644 apps/flutter/lib/features/notifications/repositories/notifications_repository.dart
 create mode 100644 apps/flutter/lib/features/notifications/viewmodels/notifications_viewmodel.dart
 delete mode 100644 firebase-debug.log
 delete mode 100644 lint.log

diff --git a/.github/workflows/flutter-release.yml b/.github/workflows/flutter-release.yml
index 5bb6423..6479308 100644
--- a/.github/workflows/flutter-release.yml
+++ b/.github/workflows/flutter-release.yml
@@ -27,13 +27,30 @@ jobs:
           channel: stable
           cache: true
 
+      - name: Inject google-services.json
+        run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > apps/flutter/android/app/google-services.json
+
+      - name: Decode and write release keystore
+        run: |
+          echo '${{ secrets.KEYSTORE_BASE64 }}' | base64 --decode > apps/flutter/android/app/universe-release.jks
+          cat > apps/flutter/android/key.properties <<EOF
+          storeFile=../app/universe-release.jks
+          storePassword=${{ secrets.KEYSTORE_PASSWORD }}
+          keyAlias=${{ secrets.KEY_ALIAS }}
+          keyPassword=${{ secrets.KEY_PASSWORD }}
+          EOF
+
       - name: Get dependencies
         working-directory: apps/flutter
         run: flutter pub get
 
-      - name: Build debug APK
+      - name: Build release APK
         working-directory: apps/flutter
-        run: flutter build apk --debug --dart-define=API_BASE_URL=${{ secrets.RAILWAY_BACKEND_URL }}
+        run: |
+          flutter build apk --release \
+            --dart-define=API_BASE_URL=${{ secrets.RAILWAY_BACKEND_URL }} \
+            --dart-define=FIREBASE_API_KEY=${{ secrets.FIREBASE_API_KEY_ANDROID }} \
+            --dart-define=FIREBASE_APP_ID=${{ secrets.FIREBASE_APP_ID_ANDROID }}
 
       - name: Get next version tag
         id: tag
@@ -52,7 +69,7 @@ jobs:
           tag_name: ${{ steps.tag.outputs.tag }}
           name: "Release ${{ steps.tag.outputs.tag }}"
           body: |
-            Debug APK — built from `release/development`
+            Release APK — built from `release/development`
             Commit: ${{ github.sha }}
-          files: apps/flutter/build/app/outputs/flutter-apk/app-debug.apk
+          files: apps/flutter/build/app/outputs/flutter-apk/app-release.apk
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/apps/backend/coverage/coverage-final.json b/apps/backend/coverage/coverage-final.json
deleted file mode 100644
index 8c81623..0000000
--- a/apps/backend/coverage/coverage-final.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\cache.ts": {"path":"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\cache.ts","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":1,"column":39}},"1":{"start":{"line":2,"column":0},"end":{"line":2,"column":43}},"2":{"start":{"line":4,"column":26},"end":{"line":4,"column":47}},"3":{"start":{"line":6,"column":24},"end":{"line":13,"column":1}},"4":{"start":{"line":7,"column":2},"end":{"line":7,"column":34}},"5":{"start":{"line":7,"column":22},"end":{"line":7,"column":34}},"6":{"start":{"line":9,"column":14},"end":{"line":9,"column":34}},"7":{"start":{"line":10,"column":2},"end":{"line":10,"column":24}},"8":{"start":{"line":10,"column":12},"end":{"line":10,"column":24}},"9":{"start":{"line":12,"column":2},"end":{"line":12,"column":30}},"10":{"start":{"line":6,"column":13},"end":{"line":6,"column":24}},"11":{"start":{"line":15,"column":24},"end":{"line":21,"column":1}},"12":{"start":{"line":16,"column":2},"end":{"line":16,"column":29}},"13":{"start":{"line":16,"column":22},"end":{"line":16,"column":29}},"14":{"start":{"line":18,"column":2},"end":{"line":20,"column":5}},"15":{"start":{"line":15,"column":13},"end":{"line":15,"column":24}},"16":{"start":{"line":23,"column":24},"end":{"line":27,"column":1}},"17":{"start":{"line":24,"column":2},"end":{"line":24,"column":29}},"18":{"start":{"line":24,"column":22},"end":{"line":24,"column":29}},"19":{"start":{"line":26,"column":2},"end":{"line":26,"column":23}},"20":{"start":{"line":23,"column":13},"end":{"line":23,"column":24}},"21":{"start":{"line":29,"column":33},"end":{"line":45,"column":1}},"22":{"start":{"line":30,"column":2},"end":{"line":30,"column":29}},"23":{"start":{"line":30,"column":22},"end":{"line":30,"column":29}},"24":{"start":{"line":32,"column":15},"end":{"line":32,"column":16}},"25":{"start":{"line":33,"column":2},"end":{"line":44,"column":25}},"26":{"start":{"line":34,"column":19},"end":{"line":37,"column":6}},"27":{"start":{"line":39,"column":4},"end":{"line":39,"column":27}},"28":{"start":{"line":41,"column":4},"end":{"line":43,"column":5}},"29":{"start":{"line":42,"column":6},"end":{"line":42,"column":35}},"30":{"start":{"line":29,"column":13},"end":{"line":29,"column":33}},"31":{"start":{"line":47,"column":29},"end":{"line":58,"column":1}},"32":{"start":{"line":52,"column":17},"end":{"line":52,"column":39}},"33":{"start":{"line":53,"column":2},"end":{"line":53,"column":37}},"34":{"start":{"line":53,"column":23},"end":{"line":53,"column":37}},"35":{"start":{"line":55,"column":16},"end":{"line":55,"column":31}},"36":{"start":{"line":56,"column":2},"end":{"line":56,"column":41}},"37":{"start":{"line":57,"column":2},"end":{"line":57,"column":15}},"38":{"start":{"line":47,"column":13},"end":{"line":47,"column":29}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":6,"column":24},"end":{"line":6,"column":29}},"loc":{"start":{"line":6,"column":68},"end":{"line":13,"column":1}}},"1":{"name":"(anonymous_1)","decl":{"start":{"line":15,"column":24},"end":{"line":15,"column":29}},"loc":{"start":{"line":15,"column":106},"end":{"line":21,"column":1}}},"2":{"name":"(anonymous_2)","decl":{"start":{"line":23,"column":24},"end":{"line":23,"column":29}},"loc":{"start":{"line":23,"column":61},"end":{"line":27,"column":1}}},"3":{"name":"(anonymous_3)","decl":{"start":{"line":29,"column":33},"end":{"line":29,"column":38}},"loc":{"start":{"line":29,"column":74},"end":{"line":45,"column":1}}},"4":{"name":"(anonymous_4)","decl":{"start":{"line":47,"column":29},"end":{"line":47,"column":34}},"loc":{"start":{"line":51,"column":16},"end":{"line":58,"column":1}}}},"branchMap":{"0":{"loc":{"start":{"line":7,"column":2},"end":{"line":7,"column":34}},"type":"if","locations":[{"start":{"line":7,"column":2},"end":{"line":7,"column":34}}]},"1":{"loc":{"start":{"line":10,"column":2},"end":{"line":10,"column":24}},"type":"if","locations":[{"start":{"line":10,"column":2},"end":{"line":10,"column":24}}]},"2":{"loc":{"start":{"line":15,"column":57},"end":{"line":15,"column":87}},"type":"default-arg","locations":[{"start":{"line":15,"column":70},"end":{"line":15,"column":87}}]},"3":{"loc":{"start":{"line":16,"column":2},"end":{"line":16,"column":29}},"type":"if","locations":[{"start":{"line":16,"column":2},"end":{"line":16,"column":29}}]},"4":{"loc":{"start":{"line":24,"column":2},"end":{"line":24,"column":29}},"type":"if","locations":[{"start":{"line":24,"column":2},"end":{"line":24,"column":29}}]},"5":{"loc":{"start":{"line":30,"column":2},"end":{"line":30,"column":29}},"type":"if","locations":[{"start":{"line":30,"column":2},"end":{"line":30,"column":29}}]},"6":{"loc":{"start":{"line":41,"column":4},"end":{"line":43,"column":5}},"type":"if","locations":[{"start":{"line":41,"column":4},"end":{"line":43,"column":5}}]},"7":{"loc":{"start":{"line":50,"column":2},"end":{"line":50,"column":32}},"type":"default-arg","locations":[{"start":{"line":50,"column":15},"end":{"line":50,"column":32}}]},"8":{"loc":{"start":{"line":53,"column":2},"end":{"line":53,"column":37}},"type":"if","locations":[{"start":{"line":53,"column":2},"end":{"line":53,"column":37}}]}},"s":{"0":4,"1":4,"2":4,"3":4,"4":1,"5":1,"6":0,"7":0,"8":0,"9":0,"10":4,"11":4,"12":1,"13":1,"14":0,"15":4,"16":4,"17":2,"18":2,"19":0,"20":4,"21":4,"22":3,"23":3,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":4,"31":4,"32":1,"33":1,"34":0,"35":1,"36":1,"37":1,"38":4},"f":{"0":1,"1":1,"2":2,"3":3,"4":1},"b":{"0":[1],"1":[0],"2":[0],"3":[1],"4":[2],"5":[3],"6":[0],"7":[0],"8":[0]}}
-,"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\email.ts": {"path":"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\email.ts","statementMap":{"0":{"start":{"line":23,"column":0},"end":{"line":23,"column":7}},"1":{"start":{"line":59,"column":0},"end":{"line":59,"column":7}},"2":{"start":{"line":1,"column":0},"end":{"line":1,"column":32}},"3":{"start":{"line":2,"column":0},"end":{"line":2,"column":39}},"4":{"start":{"line":4,"column":15},"end":{"line":4,"column":45}},"5":{"start":{"line":5,"column":13},"end":{"line":5,"column":56}},"6":{"start":{"line":7,"column":21},"end":{"line":7,"column":78}},"7":{"start":{"line":10,"column":14},"end":{"line":10,"column":24}},"8":{"start":{"line":11,"column":17},"end":{"line":11,"column":31}},"9":{"start":{"line":12,"column":16},"end":{"line":12,"column":39}},"10":{"start":{"line":13,"column":2},"end":{"line":16,"column":3}},"11":{"start":{"line":14,"column":4},"end":{"line":14,"column":60}},"12":{"start":{"line":15,"column":4},"end":{"line":15,"column":11}},"13":{"start":{"line":17,"column":2},"end":{"line":19,"column":3}},"14":{"start":{"line":18,"column":4},"end":{"line":18,"column":77}},"15":{"start":{"line":20,"column":2},"end":{"line":20,"column":19}},"16":{"start":{"line":24,"column":2},"end":{"line":24,"column":21}},"17":{"start":{"line":25,"column":2},"end":{"line":56,"column":5}},"18":{"start":{"line":60,"column":2},"end":{"line":60,"column":21}},"19":{"start":{"line":61,"column":2},"end":{"line":92,"column":5}}},"fnMap":{"0":{"name":"checkRateLimit","decl":{"start":{"line":9,"column":9},"end":{"line":9,"column":23}},"loc":{"start":{"line":9,"column":37},"end":{"line":21,"column":1}}},"1":{"name":"sendOtpEmail","decl":{"start":{"line":23,"column":22},"end":{"line":23,"column":34}},"loc":{"start":{"line":23,"column":58},"end":{"line":57,"column":1}}},"2":{"name":"sendApprovalEmail","decl":{"start":{"line":59,"column":22},"end":{"line":59,"column":39}},"loc":{"start":{"line":59,"column":82},"end":{"line":93,"column":1}}}},"branchMap":{"0":{"loc":{"start":{"line":13,"column":2},"end":{"line":16,"column":3}},"type":"if","locations":[{"start":{"line":13,"column":2},"end":{"line":16,"column":3}}]},"1":{"loc":{"start":{"line":13,"column":6},"end":{"line":13,"column":48}},"type":"binary-expr","locations":[{"start":{"line":13,"column":6},"end":{"line":13,"column":12}},{"start":{"line":13,"column":16},"end":{"line":13,"column":48}}]},"2":{"loc":{"start":{"line":17,"column":2},"end":{"line":19,"column":3}},"type":"if","locations":[{"start":{"line":17,"column":2},"end":{"line":19,"column":3}}]},"3":{"loc":{"start":{"line":77,"column":25},"end":{"line":77,"column":51}},"type":"binary-expr","locations":[{"start":{"line":77,"column":25},"end":{"line":77,"column":44}},{"start":{"line":77,"column":48},"end":{"line":77,"column":51}}]}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0},"f":{"0":0,"1":0,"2":0},"b":{"0":[0],"1":[0,0],"2":[0],"3":[0,0]}}
-,"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\hash.ts": {"path":"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\hash.ts","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":1,"column":30}},"1":{"start":{"line":3,"column":20},"end":{"line":3,"column":22}},"2":{"start":{"line":5,"column":28},"end":{"line":7,"column":1}},"3":{"start":{"line":6,"column":2},"end":{"line":6,"column":44}},"4":{"start":{"line":5,"column":13},"end":{"line":5,"column":28}},"5":{"start":{"line":9,"column":31},"end":{"line":11,"column":1}},"6":{"start":{"line":10,"column":2},"end":{"line":10,"column":40}},"7":{"start":{"line":9,"column":13},"end":{"line":9,"column":31}}},"fnMap":{"0":{"name":"(anonymous_1)","decl":{"start":{"line":5,"column":28},"end":{"line":5,"column":33}},"loc":{"start":{"line":5,"column":72},"end":{"line":7,"column":1}}},"1":{"name":"(anonymous_2)","decl":{"start":{"line":9,"column":31},"end":{"line":9,"column":36}},"loc":{"start":{"line":9,"column":90},"end":{"line":11,"column":1}}}},"branchMap":{},"s":{"0":4,"1":4,"2":4,"3":6,"4":4,"5":4,"6":2,"7":4},"f":{"0":6,"1":2},"b":{}}
-,"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\jwt.ts": {"path":"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\jwt.ts","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":1,"column":48}},"1":{"start":{"line":2,"column":0},"end":{"line":2,"column":39}},"2":{"start":{"line":4,"column":29},"end":{"line":6,"column":1}},"3":{"start":{"line":5,"column":2},"end":{"line":5,"column":97}},"4":{"start":{"line":4,"column":13},"end":{"line":4,"column":29}},"5":{"start":{"line":8,"column":27},"end":{"line":10,"column":1}},"6":{"start":{"line":9,"column":2},"end":{"line":9,"column":43}},"7":{"start":{"line":8,"column":13},"end":{"line":8,"column":27}}},"fnMap":{"0":{"name":"(anonymous_1)","decl":{"start":{"line":4,"column":29},"end":{"line":4,"column":30}},"loc":{"start":{"line":4,"column":83},"end":{"line":6,"column":1}}},"1":{"name":"(anonymous_2)","decl":{"start":{"line":8,"column":27},"end":{"line":8,"column":28}},"loc":{"start":{"line":8,"column":50},"end":{"line":10,"column":1}}}},"branchMap":{"0":{"loc":{"start":{"line":4,"column":47},"end":{"line":4,"column":71}},"type":"default-arg","locations":[{"start":{"line":4,"column":67},"end":{"line":4,"column":71}}]}},"s":{"0":5,"1":5,"2":5,"3":7,"4":5,"5":5,"6":12,"7":5},"f":{"0":7,"1":12},"b":{"0":[6]}}
-,"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\otp.ts": {"path":"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\otp.ts","statementMap":{"0":{"start":{"line":1,"column":27},"end":{"line":8,"column":1}},"1":{"start":{"line":2,"column":17},"end":{"line":2,"column":29}},"2":{"start":{"line":3,"column":12},"end":{"line":3,"column":14}},"3":{"start":{"line":4,"column":2},"end":{"line":6,"column":3}},"4":{"start":{"line":4,"column":15},"end":{"line":4,"column":16}},"5":{"start":{"line":5,"column":4},"end":{"line":5,"column":50}},"6":{"start":{"line":7,"column":2},"end":{"line":7,"column":13}},"7":{"start":{"line":1,"column":13},"end":{"line":1,"column":27}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":1,"column":27},"end":{"line":1,"column":28}},"loc":{"start":{"line":1,"column":58},"end":{"line":8,"column":1}}}},"branchMap":{"0":{"loc":{"start":{"line":1,"column":28},"end":{"line":1,"column":46}},"type":"default-arg","locations":[{"start":{"line":1,"column":45},"end":{"line":1,"column":46}}]}},"s":{"0":4,"1":8,"2":8,"3":8,"4":8,"5":48,"6":8,"7":4},"f":{"0":8},"b":{"0":[8]}}
-,"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\response.ts": {"path":"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\common\\utils\\response.ts","statementMap":{"0":{"start":{"line":1,"column":31},"end":{"line":3,"column":1}},"1":{"start":{"line":2,"column":2},"end":{"line":2,"column":42}},"2":{"start":{"line":1,"column":13},"end":{"line":1,"column":31}},"3":{"start":{"line":5,"column":29},"end":{"line":7,"column":1}},"4":{"start":{"line":6,"column":2},"end":{"line":6,"column":44}},"5":{"start":{"line":5,"column":13},"end":{"line":5,"column":29}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":1,"column":31},"end":{"line":1,"column":32}},"loc":{"start":{"line":1,"column":63},"end":{"line":3,"column":1}}},"1":{"name":"(anonymous_1)","decl":{"start":{"line":5,"column":29},"end":{"line":5,"column":30}},"loc":{"start":{"line":5,"column":62},"end":{"line":7,"column":1}}}},"branchMap":{},"s":{"0":3,"1":4,"2":3,"3":3,"4":3,"5":3},"f":{"0":4,"1":3},"b":{}}
-,"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\modules\\auth\\auth.controller.ts": {"path":"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\modules\\auth\\auth.controller.ts","statementMap":{"0":{"start":{"line":2,"column":0},"end":{"line":2,"column":45}},"1":{"start":{"line":15,"column":0},"end":{"line":15,"column":77}},"2":{"start":{"line":16,"column":0},"end":{"line":16,"column":39}},"3":{"start":{"line":18,"column":23},"end":{"line":24,"column":2}},"4":{"start":{"line":28,"column":4},"end":{"line":39,"column":5}},"5":{"start":{"line":29,"column":21},"end":{"line":29,"column":61}},"6":{"start":{"line":30,"column":6},"end":{"line":30,"column":57}},"7":{"start":{"line":32,"column":6},"end":{"line":34,"column":7}},"8":{"start":{"line":33,"column":8},"end":{"line":33,"column":69}},"9":{"start":{"line":35,"column":6},"end":{"line":37,"column":7}},"10":{"start":{"line":36,"column":8},"end":{"line":36,"column":67}},"11":{"start":{"line":38,"column":6},"end":{"line":38,"column":66}},"12":{"start":{"line":43,"column":4},"end":{"line":68,"column":5}},"13":{"start":{"line":44,"column":21},"end":{"line":44,"column":69}},"14":{"start":{"line":46,"column":6},"end":{"line":48,"column":7}},"15":{"start":{"line":47,"column":8},"end":{"line":47,"column":68}},"16":{"start":{"line":50,"column":6},"end":{"line":56,"column":10}},"17":{"start":{"line":58,"column":6},"end":{"line":60,"column":7}},"18":{"start":{"line":59,"column":8},"end":{"line":59,"column":68}},"19":{"start":{"line":61,"column":6},"end":{"line":63,"column":7}},"20":{"start":{"line":62,"column":8},"end":{"line":62,"column":68}},"21":{"start":{"line":64,"column":6},"end":{"line":66,"column":7}},"22":{"start":{"line":65,"column":8},"end":{"line":65,"column":69}},"23":{"start":{"line":67,"column":6},"end":{"line":67,"column":66}},"24":{"start":{"line":72,"column":4},"end":{"line":82,"column":5}},"25":{"start":{"line":73,"column":21},"end":{"line":73,"column":73}},"26":{"start":{"line":74,"column":6},"end":{"line":74,"column":66}},"27":{"start":{"line":75,"column":6},"end":{"line":79,"column":10}},"28":{"start":{"line":81,"column":6},"end":{"line":81,"column":66}},"29":{"start":{"line":86,"column":4},"end":{"line":105,"column":5}},"30":{"start":{"line":87,"column":21},"end":{"line":87,"column":58}},"31":{"start":{"line":88,"column":6},"end":{"line":88,"column":66}},"32":{"start":{"line":89,"column":6},"end":{"line":93,"column":10}},"33":{"start":{"line":95,"column":6},"end":{"line":97,"column":7}},"34":{"start":{"line":96,"column":8},"end":{"line":96,"column":72}},"35":{"start":{"line":98,"column":6},"end":{"line":100,"column":7}},"36":{"start":{"line":99,"column":8},"end":{"line":99,"column":76}},"37":{"start":{"line":101,"column":6},"end":{"line":103,"column":7}},"38":{"start":{"line":102,"column":8},"end":{"line":102,"column":73}},"39":{"start":{"line":104,"column":6},"end":{"line":104,"column":66}},"40":{"start":{"line":109,"column":24},"end":{"line":109,"column":95}},"41":{"start":{"line":110,"column":17},"end":{"line":120,"column":null}},"42":{"start":{"line":110,"column":23},"end":{"line":110,"column":53}},"43":{"start":{"line":111,"column":6},"end":{"line":120,"column":8}},"44":{"start":{"line":122,"column":4},"end":{"line":124,"column":5}},"45":{"start":{"line":123,"column":6},"end":{"line":123,"column":67}},"46":{"start":{"line":125,"column":4},"end":{"line":131,"column":8}},"47":{"start":{"line":135,"column":4},"end":{"line":143,"column":5}},"48":{"start":{"line":136,"column":21},"end":{"line":136,"column":62}},"49":{"start":{"line":137,"column":6},"end":{"line":137,"column":57}},"50":{"start":{"line":139,"column":6},"end":{"line":141,"column":7}},"51":{"start":{"line":140,"column":8},"end":{"line":140,"column":67}},"52":{"start":{"line":142,"column":6},"end":{"line":142,"column":66}},"53":{"start":{"line":147,"column":4},"end":{"line":152,"column":5}},"54":{"start":{"line":148,"column":21},"end":{"line":148,"column":67}},"55":{"start":{"line":149,"column":6},"end":{"line":149,"column":57}},"56":{"start":{"line":151,"column":6},"end":{"line":151,"column":66}},"57":{"start":{"line":156,"column":4},"end":{"line":161,"column":5}},"58":{"start":{"line":157,"column":21},"end":{"line":157,"column":66}},"59":{"start":{"line":158,"column":6},"end":{"line":158,"column":57}},"60":{"start":{"line":160,"column":6},"end":{"line":160,"column":66}},"61":{"start":{"line":165,"column":4},"end":{"line":171,"column":5}},"62":{"start":{"line":166,"column":26},"end":{"line":166,"column":68}},"63":{"start":{"line":167,"column":21},"end":{"line":167,"column":86}},"64":{"start":{"line":168,"column":6},"end":{"line":168,"column":57}},"65":{"start":{"line":170,"column":6},"end":{"line":170,"column":66}},"66":{"start":{"line":175,"column":4},"end":{"line":185,"column":5}},"67":{"start":{"line":176,"column":26},"end":{"line":176,"column":46}},"68":{"start":{"line":177,"column":21},"end":{"line":177,"column":58}},"69":{"start":{"line":178,"column":6},"end":{"line":178,"column":66}},"70":{"start":{"line":179,"column":6},"end":{"line":182,"column":10}},"71":{"start":{"line":184,"column":6},"end":{"line":184,"column":66}},"72":{"start":{"line":189,"column":24},"end":{"line":189,"column":44}},"73":{"start":{"line":190,"column":4},"end":{"line":190,"column":51}},"74":{"start":{"line":191,"column":19},"end":{"line":191,"column":63}},"75":{"start":{"line":192,"column":4},"end":{"line":192,"column":55}},"76":{"start":{"line":196,"column":4},"end":{"line":196,"column":51}},"77":{"start":{"line":197,"column":19},"end":{"line":197,"column":48}},"78":{"start":{"line":198,"column":4},"end":{"line":198,"column":55}},"79":{"start":{"line":202,"column":4},"end":{"line":211,"column":5}},"80":{"start":{"line":203,"column":26},"end":{"line":203,"column":82}},"81":{"start":{"line":204,"column":6},"end":{"line":206,"column":7}},"82":{"start":{"line":205,"column":8},"end":{"line":205,"column":66}},"83":{"start":{"line":207,"column":21},"end":{"line":207,"column":74}},"84":{"start":{"line":208,"column":6},"end":{"line":208,"column":55}},"85":{"start":{"line":210,"column":6},"end":{"line":210,"column":66}},"86":{"start":{"line":215,"column":4},"end":{"line":220,"column":5}},"87":{"start":{"line":216,"column":21},"end":{"line":216,"column":62}},"88":{"start":{"line":217,"column":6},"end":{"line":217,"column":73}},"89":{"start":{"line":219,"column":6},"end":{"line":219,"column":66}},"90":{"start":{"line":224,"column":4},"end":{"line":230,"column":5}},"91":{"start":{"line":225,"column":26},"end":{"line":225,"column":46}},"92":{"start":{"line":226,"column":21},"end":{"line":226,"column":86}},"93":{"start":{"line":227,"column":6},"end":{"line":227,"column":57}},"94":{"start":{"line":229,"column":6},"end":{"line":229,"column":66}},"95":{"start":{"line":26,"column":0},"end":{"line":26,"column":13}}},"fnMap":{"0":{"name":"(anonymous_9)","decl":{"start":{"line":27,"column":2},"end":{"line":27,"column":8}},"loc":{"start":{"line":27,"column":93},"end":{"line":40,"column":3}}},"1":{"name":"(anonymous_10)","decl":{"start":{"line":42,"column":2},"end":{"line":42,"column":8}},"loc":{"start":{"line":42,"column":95},"end":{"line":69,"column":3}}},"2":{"name":"(anonymous_11)","decl":{"start":{"line":71,"column":2},"end":{"line":71,"column":8}},"loc":{"start":{"line":71,"column":117},"end":{"line":83,"column":3}}},"3":{"name":"(anonymous_12)","decl":{"start":{"line":85,"column":2},"end":{"line":85,"column":8}},"loc":{"start":{"line":85,"column":87},"end":{"line":106,"column":3}}},"4":{"name":"(anonymous_13)","decl":{"start":{"line":108,"column":2},"end":{"line":108,"column":8}},"loc":{"start":{"line":108,"column":62},"end":{"line":132,"column":3}}},"5":{"name":"(anonymous_14)","decl":{"start":{"line":110,"column":23},"end":{"line":110,"column":30}},"loc":{"start":{"line":110,"column":23},"end":{"line":110,"column":53}}},"6":{"name":"(anonymous_15)","decl":{"start":{"line":110,"column":58},"end":{"line":110,"column":59}},"loc":{"start":{"line":111,"column":6},"end":{"line":120,"column":8}}},"7":{"name":"(anonymous_16)","decl":{"start":{"line":134,"column":2},"end":{"line":134,"column":8}},"loc":{"start":{"line":134,"column":95},"end":{"line":144,"column":3}}},"8":{"name":"(anonymous_17)","decl":{"start":{"line":146,"column":2},"end":{"line":146,"column":8}},"loc":{"start":{"line":146,"column":105},"end":{"line":153,"column":3}}},"9":{"name":"(anonymous_18)","decl":{"start":{"line":155,"column":2},"end":{"line":155,"column":8}},"loc":{"start":{"line":155,"column":103},"end":{"line":162,"column":3}}},"10":{"name":"(anonymous_19)","decl":{"start":{"line":164,"column":2},"end":{"line":164,"column":8}},"loc":{"start":{"line":164,"column":105},"end":{"line":172,"column":3}}},"11":{"name":"(anonymous_20)","decl":{"start":{"line":174,"column":2},"end":{"line":174,"column":8}},"loc":{"start":{"line":174,"column":67},"end":{"line":186,"column":3}}},"12":{"name":"(anonymous_21)","decl":{"start":{"line":188,"column":2},"end":{"line":188,"column":8}},"loc":{"start":{"line":188,"column":66},"end":{"line":193,"column":3}}},"13":{"name":"(anonymous_22)","decl":{"start":{"line":195,"column":2},"end":{"line":195,"column":8}},"loc":{"start":{"line":195,"column":70},"end":{"line":199,"column":3}}},"14":{"name":"(anonymous_23)","decl":{"start":{"line":201,"column":2},"end":{"line":201,"column":8}},"loc":{"start":{"line":201,"column":76},"end":{"line":212,"column":3}}},"15":{"name":"(anonymous_24)","decl":{"start":{"line":214,"column":2},"end":{"line":214,"column":8}},"loc":{"start":{"line":214,"column":95},"end":{"line":221,"column":3}}},"16":{"name":"(anonymous_25)","decl":{"start":{"line":223,"column":2},"end":{"line":223,"column":8}},"loc":{"start":{"line":223,"column":105},"end":{"line":231,"column":3}}}},"branchMap":{"0":{"loc":{"start":{"line":32,"column":6},"end":{"line":34,"column":7}},"type":"if","locations":[{"start":{"line":32,"column":6},"end":{"line":34,"column":7}}]},"1":{"loc":{"start":{"line":35,"column":6},"end":{"line":37,"column":7}},"type":"if","locations":[{"start":{"line":35,"column":6},"end":{"line":37,"column":7}}]},"2":{"loc":{"start":{"line":46,"column":6},"end":{"line":48,"column":7}},"type":"if","locations":[{"start":{"line":46,"column":6},"end":{"line":48,"column":7}}]},"3":{"loc":{"start":{"line":50,"column":40},"end":{"line":50,"column":81}},"type":"binary-expr","locations":[{"start":{"line":50,"column":40},"end":{"line":50,"column":54}},{"start":{"line":50,"column":58},"end":{"line":50,"column":81}}]},"4":{"loc":{"start":{"line":58,"column":6},"end":{"line":60,"column":7}},"type":"if","locations":[{"start":{"line":58,"column":6},"end":{"line":60,"column":7}}]},"5":{"loc":{"start":{"line":61,"column":6},"end":{"line":63,"column":7}},"type":"if","locations":[{"start":{"line":61,"column":6},"end":{"line":63,"column":7}}]},"6":{"loc":{"start":{"line":64,"column":6},"end":{"line":66,"column":7}},"type":"if","locations":[{"start":{"line":64,"column":6},"end":{"line":66,"column":7}}]},"7":{"loc":{"start":{"line":95,"column":6},"end":{"line":97,"column":7}},"type":"if","locations":[{"start":{"line":95,"column":6},"end":{"line":97,"column":7}}]},"8":{"loc":{"start":{"line":98,"column":6},"end":{"line":100,"column":7}},"type":"if","locations":[{"start":{"line":98,"column":6},"end":{"line":100,"column":7}}]},"9":{"loc":{"start":{"line":101,"column":6},"end":{"line":103,"column":7}},"type":"if","locations":[{"start":{"line":101,"column":6},"end":{"line":103,"column":7}}]},"10":{"loc":{"start":{"line":122,"column":4},"end":{"line":124,"column":5}},"type":"if","locations":[{"start":{"line":122,"column":4},"end":{"line":124,"column":5}}]},"11":{"loc":{"start":{"line":122,"column":8},"end":{"line":122,"column":53}},"type":"binary-expr","locations":[{"start":{"line":122,"column":8},"end":{"line":122,"column":13}},{"start":{"line":122,"column":17},"end":{"line":122,"column":32}},{"start":{"line":122,"column":36},"end":{"line":122,"column":53}}]},"12":{"loc":{"start":{"line":139,"column":6},"end":{"line":141,"column":7}},"type":"if","locations":[{"start":{"line":139,"column":6},"end":{"line":141,"column":7}}]},"13":{"loc":{"start":{"line":204,"column":6},"end":{"line":206,"column":7}},"type":"if","locations":[{"start":{"line":204,"column":6},"end":{"line":206,"column":7}}]}},"s":{"0":3,"1":3,"2":3,"3":3,"4":2,"5":2,"6":1,"7":1,"8":1,"9":0,"10":0,"11":0,"12":2,"13":2,"14":1,"15":1,"16":1,"17":1,"18":1,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":2,"30":2,"31":1,"32":1,"33":1,"34":0,"35":1,"36":1,"37":0,"38":0,"39":0,"40":0,"41":0,"42":0,"43":0,"44":0,"45":0,"46":0,"47":0,"48":0,"49":0,"50":0,"51":0,"52":0,"53":0,"54":0,"55":0,"56":0,"57":0,"58":0,"59":0,"60":0,"61":0,"62":0,"63":0,"64":0,"65":0,"66":0,"67":0,"68":0,"69":0,"70":0,"71":0,"72":1,"73":1,"74":1,"75":1,"76":0,"77":0,"78":0,"79":0,"80":0,"81":0,"82":0,"83":0,"84":0,"85":0,"86":0,"87":0,"88":0,"89":0,"90":0,"91":0,"92":0,"93":0,"94":0,"95":3},"f":{"0":2,"1":2,"2":0,"3":2,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":1,"13":0,"14":0,"15":0,"16":0},"b":{"0":[1],"1":[0],"2":[1],"3":[1,1],"4":[1],"5":[0],"6":[0],"7":[0],"8":[1],"9":[0],"10":[0],"11":[0,0,0],"12":[0],"13":[0]}}
-,"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\modules\\auth\\auth.routes.ts": {"path":"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\modules\\auth\\auth.routes.ts","statementMap":{"0":{"start":{"line":24,"column":0},"end":{"line":24,"column":15}},"1":{"start":{"line":2,"column":0},"end":{"line":2,"column":51}},"2":{"start":{"line":3,"column":0},"end":{"line":3,"column":null}},"3":{"start":{"line":15,"column":0},"end":{"line":15,"column":68}},"4":{"start":{"line":17,"column":24},"end":{"line":21,"column":1}},"5":{"start":{"line":20,"column":2},"end":{"line":20,"column":12}},"6":{"start":{"line":25,"column":2},"end":{"line":35,"column":30}},"7":{"start":{"line":33,"column":6},"end":{"line":33,"column":51}},"8":{"start":{"line":37,"column":2},"end":{"line":47,"column":31}},"9":{"start":{"line":45,"column":6},"end":{"line":45,"column":52}},"10":{"start":{"line":49,"column":2},"end":{"line":53,"column":42}},"11":{"start":{"line":51,"column":6},"end":{"line":51,"column":63}},"12":{"start":{"line":55,"column":2},"end":{"line":65,"column":27}},"13":{"start":{"line":63,"column":6},"end":{"line":63,"column":48}},"14":{"start":{"line":67,"column":2},"end":{"line":77,"column":31}},"15":{"start":{"line":75,"column":6},"end":{"line":75,"column":52}},"16":{"start":{"line":79,"column":2},"end":{"line":89,"column":36}},"17":{"start":{"line":87,"column":6},"end":{"line":87,"column":57}},"18":{"start":{"line":91,"column":2},"end":{"line":101,"column":35}},"19":{"start":{"line":99,"column":6},"end":{"line":99,"column":56}},"20":{"start":{"line":103,"column":2},"end":{"line":107,"column":31}},"21":{"start":{"line":105,"column":6},"end":{"line":105,"column":52}},"22":{"start":{"line":109,"column":2},"end":{"line":116,"column":36}},"23":{"start":{"line":113,"column":8},"end":{"line":113,"column":59}},"24":{"start":{"line":118,"column":2},"end":{"line":120,"column":29}},"25":{"start":{"line":122,"column":2},"end":{"line":124,"column":28}},"26":{"start":{"line":126,"column":2},"end":{"line":128,"column":31}},"27":{"start":{"line":130,"column":2},"end":{"line":137,"column":36}},"28":{"start":{"line":134,"column":8},"end":{"line":134,"column":59}},"29":{"start":{"line":139,"column":2},"end":{"line":141,"column":24}},"30":{"start":{"line":143,"column":2},"end":{"line":145,"column":38}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":17,"column":24},"end":{"line":17,"column":25}},"loc":{"start":{"line":17,"column":40},"end":{"line":21,"column":1}}},"1":{"name":"authRoutes","decl":{"start":{"line":24,"column":30},"end":{"line":24,"column":40}},"loc":{"start":{"line":24,"column":65},"end":{"line":146,"column":1}}},"2":{"name":"(anonymous_2)","decl":{"start":{"line":32,"column":16},"end":{"line":32,"column":21}},"loc":{"start":{"line":32,"column":34},"end":{"line":34,"column":5}}},"3":{"name":"(anonymous_3)","decl":{"start":{"line":44,"column":16},"end":{"line":44,"column":21}},"loc":{"start":{"line":44,"column":34},"end":{"line":46,"column":5}}},"4":{"name":"(anonymous_4)","decl":{"start":{"line":50,"column":16},"end":{"line":50,"column":21}},"loc":{"start":{"line":50,"column":34},"end":{"line":52,"column":5}}},"5":{"name":"(anonymous_5)","decl":{"start":{"line":62,"column":16},"end":{"line":62,"column":21}},"loc":{"start":{"line":62,"column":34},"end":{"line":64,"column":5}}},"6":{"name":"(anonymous_6)","decl":{"start":{"line":74,"column":16},"end":{"line":74,"column":21}},"loc":{"start":{"line":74,"column":34},"end":{"line":76,"column":5}}},"7":{"name":"(anonymous_7)","decl":{"start":{"line":86,"column":16},"end":{"line":86,"column":21}},"loc":{"start":{"line":86,"column":34},"end":{"line":88,"column":5}}},"8":{"name":"(anonymous_8)","decl":{"start":{"line":98,"column":16},"end":{"line":98,"column":21}},"loc":{"start":{"line":98,"column":34},"end":{"line":100,"column":5}}},"9":{"name":"(anonymous_9)","decl":{"start":{"line":104,"column":16},"end":{"line":104,"column":21}},"loc":{"start":{"line":104,"column":34},"end":{"line":106,"column":5}}},"10":{"name":"(anonymous_10)","decl":{"start":{"line":112,"column":6},"end":{"line":112,"column":11}},"loc":{"start":{"line":112,"column":24},"end":{"line":114,"column":7}}},"11":{"name":"(anonymous_11)","decl":{"start":{"line":133,"column":6},"end":{"line":133,"column":11}},"loc":{"start":{"line":133,"column":24},"end":{"line":135,"column":7}}}},"branchMap":{},"s":{"0":3,"1":3,"2":3,"3":3,"4":3,"5":0,"6":3,"7":3,"8":3,"9":2,"10":3,"11":0,"12":3,"13":2,"14":3,"15":0,"16":3,"17":0,"18":3,"19":0,"20":3,"21":0,"22":3,"23":0,"24":3,"25":3,"26":3,"27":3,"28":0,"29":3,"30":3},"f":{"0":0,"1":3,"2":3,"3":2,"4":0,"5":2,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0},"b":{}}
-,"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\modules\\auth\\auth.schema.ts": {"path":"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\modules\\auth\\auth.schema.ts","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":1,"column":24}},"1":{"start":{"line":3,"column":13},"end":{"line":11,"column":3}},"2":{"start":{"line":13,"column":13},"end":{"line":18,"column":3}},"3":{"start":{"line":20,"column":13},"end":{"line":25,"column":3}},"4":{"start":{"line":27,"column":13},"end":{"line":31,"column":3}},"5":{"start":{"line":33,"column":13},"end":{"line":37,"column":3}},"6":{"start":{"line":39,"column":13},"end":{"line":45,"column":3}},"7":{"start":{"line":47,"column":13},"end":{"line":52,"column":3}},"8":{"start":{"line":54,"column":13},"end":{"line":58,"column":3}},"9":{"start":{"line":60,"column":13},"end":{"line":65,"column":3}},"10":{"start":{"line":67,"column":13},"end":{"line":75,"column":3}}},"fnMap":{},"branchMap":{},"s":{"0":4,"1":4,"2":4,"3":4,"4":4,"5":4,"6":4,"7":4,"8":4,"9":4,"10":4},"f":{},"b":{}}
-,"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\modules\\auth\\auth.service.ts": {"path":"C:\\Users\\Methum-PC\\OneDrive\\Desktop\\Universe\\Universe-System\\apps\\backend\\src\\modules\\auth\\auth.service.ts","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":1,"column":45}},"1":{"start":{"line":3,"column":0},"end":{"line":3,"column":53}},"2":{"start":{"line":4,"column":0},"end":{"line":4,"column":72}},"3":{"start":{"line":16,"column":0},"end":{"line":16,"column":55}},"4":{"start":{"line":17,"column":0},"end":{"line":17,"column":72}},"5":{"start":{"line":18,"column":0},"end":{"line":18,"column":56}},"6":{"start":{"line":34,"column":22},"end":{"line":34,"column":36}},"7":{"start":{"line":35,"column":31},"end":{"line":35,"column":40}},"8":{"start":{"line":36,"column":34},"end":{"line":36,"column":72}},"9":{"start":{"line":38,"column":23},"end":{"line":38,"column":68}},"10":{"start":{"line":38,"column":42},"end":{"line":38,"column":68}},"11":{"start":{"line":39,"column":29},"end":{"line":39,"column":88}},"12":{"start":{"line":39,"column":48},"end":{"line":39,"column":88}},"13":{"start":{"line":41,"column":21},"end":{"line":56,"column":2}},"14":{"start":{"line":48,"column":7},"end":{"line":56,"column":2}},"15":{"start":{"line":58,"column":25},"end":{"line":69,"column":2}},"16":{"start":{"line":65,"column":7},"end":{"line":69,"column":2}},"17":{"start":{"line":73,"column":4},"end":{"line":73,"column":40}},"18":{"start":{"line":73,"column":33},"end":{"line":73,"column":40}},"19":{"start":{"line":75,"column":4},"end":{"line":77,"column":5}},"20":{"start":{"line":76,"column":6},"end":{"line":76,"column":75}},"21":{"start":{"line":79,"column":20},"end":{"line":95,"column":6}},"22":{"start":{"line":97,"column":4},"end":{"line":99,"column":5}},"23":{"start":{"line":98,"column":6},"end":{"line":98,"column":43}},"24":{"start":{"line":101,"column":4},"end":{"line":103,"column":5}},"25":{"start":{"line":102,"column":6},"end":{"line":102,"column":76}},"26":{"start":{"line":105,"column":4},"end":{"line":107,"column":5}},"27":{"start":{"line":106,"column":6},"end":{"line":106,"column":64}},"28":{"start":{"line":109,"column":4},"end":{"line":111,"column":5}},"29":{"start":{"line":110,"column":6},"end":{"line":110,"column":74}},"30":{"start":{"line":115,"column":22},"end":{"line":119,"column":6}},"31":{"start":{"line":121,"column":4},"end":{"line":121,"column":27}},"32":{"start":{"line":121,"column":20},"end":{"line":121,"column":27}},"33":{"start":{"line":123,"column":22},"end":{"line":123,"column":65}},"34":{"start":{"line":124,"column":4},"end":{"line":127,"column":5}},"35":{"start":{"line":125,"column":26},"end":{"line":125,"column":80}},"36":{"start":{"line":126,"column":6},"end":{"line":126,"column":81}},"37":{"start":{"line":131,"column":16},"end":{"line":131,"column":29}},"38":{"start":{"line":132,"column":22},"end":{"line":132,"column":58}},"39":{"start":{"line":134,"column":4},"end":{"line":140,"column":7}},"40":{"start":{"line":142,"column":4},"end":{"line":142,"column":35}},"41":{"start":{"line":146,"column":16},"end":{"line":146,"column":49}},"42":{"start":{"line":147,"column":4},"end":{"line":147,"column":86}},"43":{"start":{"line":148,"column":4},"end":{"line":148,"column":46}},"44":{"start":{"line":152,"column":16},"end":{"line":152,"column":43}},"45":{"start":{"line":153,"column":19},"end":{"line":153,"column":59}},"46":{"start":{"line":154,"column":4},"end":{"line":154,"column":30}},"47":{"start":{"line":154,"column":16},"end":{"line":154,"column":30}},"48":{"start":{"line":156,"column":4},"end":{"line":156,"column":54}},"49":{"start":{"line":160,"column":16},"end":{"line":160,"column":43}},"50":{"start":{"line":161,"column":4},"end":{"line":161,"column":24}},"51":{"start":{"line":162,"column":4},"end":{"line":162,"column":42}},"52":{"start":{"line":166,"column":22},"end":{"line":172,"column":6}},"53":{"start":{"line":174,"column":4},"end":{"line":176,"column":5}},"54":{"start":{"line":175,"column":6},"end":{"line":175,"column":55}},"55":{"start":{"line":178,"column":4},"end":{"line":180,"column":5}},"56":{"start":{"line":179,"column":6},"end":{"line":179,"column":41}},"57":{"start":{"line":182,"column":4},"end":{"line":184,"column":5}},"58":{"start":{"line":183,"column":6},"end":{"line":183,"column":82}},"59":{"start":{"line":186,"column":4},"end":{"line":192,"column":5}},"60":{"start":{"line":187,"column":6},"end":{"line":190,"column":9}},"61":{"start":{"line":191,"column":6},"end":{"line":191,"column":37}},"62":{"start":{"line":194,"column":4},"end":{"line":197,"column":7}},"63":{"start":{"line":201,"column":18},"end":{"line":201,"column":45}},"64":{"start":{"line":203,"column":25},"end":{"line":203,"column":75}},"65":{"start":{"line":205,"column":4},"end":{"line":212,"column":5}},"66":{"start":{"line":206,"column":6},"end":{"line":211,"column":7}},"67":{"start":{"line":208,"column":8},"end":{"line":208,"column":69}},"68":{"start":{"line":210,"column":8},"end":{"line":210,"column":47}},"69":{"start":{"line":214,"column":4},"end":{"line":214,"column":73}},"70":{"start":{"line":215,"column":4},"end":{"line":215,"column":50}},"71":{"start":{"line":217,"column":4},"end":{"line":223,"column":7}},"72":{"start":{"line":224,"column":4},"end":{"line":224,"column":39}},"73":{"start":{"line":226,"column":4},"end":{"line":226,"column":49}},"74":{"start":{"line":230,"column":18},"end":{"line":230,"column":45}},"75":{"start":{"line":231,"column":32},"end":{"line":231,"column":79}},"76":{"start":{"line":233,"column":4},"end":{"line":235,"column":5}},"77":{"start":{"line":234,"column":6},"end":{"line":234,"column":79}},"78":{"start":{"line":237,"column":4},"end":{"line":237,"column":59}},"79":{"start":{"line":239,"column":27},"end":{"line":239,"column":75}},"80":{"start":{"line":243,"column":4},"end":{"line":263,"column":5}},"81":{"start":{"line":245,"column":7},"end":{"line":245,"column":58}},"82":{"start":{"line":246,"column":6},"end":{"line":246,"column":68}},"83":{"start":{"line":248,"column":26},"end":{"line":255,"column":8}},"84":{"start":{"line":257,"column":6},"end":{"line":262,"column":8}},"85":{"start":{"line":265,"column":24},"end":{"line":275,"column":6}},"86":{"start":{"line":266,"column":6},"end":{"line":274,"column":9}},"87":{"start":{"line":277,"column":4},"end":{"line":277,"column":54}},"88":{"start":{"line":278,"column":4},"end":{"line":278,"column":41}},"89":{"start":{"line":282,"column":18},"end":{"line":282,"column":45}},"90":{"start":{"line":283,"column":20},"end":{"line":283,"column":67}},"91":{"start":{"line":285,"column":4},"end":{"line":287,"column":5}},"92":{"start":{"line":286,"column":6},"end":{"line":286,"column":84}},"93":{"start":{"line":289,"column":4},"end":{"line":291,"column":5}},"94":{"start":{"line":290,"column":6},"end":{"line":290,"column":58}},"95":{"start":{"line":294,"column":20},"end":{"line":301,"column":6}},"96":{"start":{"line":303,"column":4},"end":{"line":303,"column":63}},"97":{"start":{"line":303,"column":18},"end":{"line":303,"column":63}},"98":{"start":{"line":306,"column":24},"end":{"line":306,"column":78}},"99":{"start":{"line":307,"column":24},"end":{"line":307,"column":64}},"100":{"start":{"line":308,"column":25},"end":{"line":308,"column":60}},"101":{"start":{"line":311,"column":22},"end":{"line":311,"column":70}},"102":{"start":{"line":312,"column":4},"end":{"line":314,"column":5}},"103":{"start":{"line":313,"column":6},"end":{"line":313,"column":73}},"104":{"start":{"line":316,"column":23},"end":{"line":316,"column":64}},"105":{"start":{"line":317,"column":23},"end":{"line":318,"column":75}},"106":{"start":{"line":319,"column":22},"end":{"line":319,"column":57}},"107":{"start":{"line":320,"column":24},"end":{"line":320,"column":67}},"108":{"start":{"line":322,"column":4},"end":{"line":324,"column":5}},"109":{"start":{"line":323,"column":6},"end":{"line":323,"column":97}},"110":{"start":{"line":327,"column":27},"end":{"line":327,"column":63}},"111":{"start":{"line":328,"column":24},"end":{"line":356,"column":6}},"112":{"start":{"line":329,"column":26},"end":{"line":329,"column":76}},"113":{"start":{"line":330,"column":32},"end":{"line":330,"column":79}},"114":{"start":{"line":332,"column":21},"end":{"line":340,"column":8}},"115":{"start":{"line":342,"column":6},"end":{"line":348,"column":9}},"116":{"start":{"line":350,"column":6},"end":{"line":353,"column":9}},"117":{"start":{"line":355,"column":6},"end":{"line":355,"column":20}},"118":{"start":{"line":358,"column":4},"end":{"line":358,"column":54}},"119":{"start":{"line":359,"column":4},"end":{"line":359,"column":41}},"120":{"start":{"line":363,"column":18},"end":{"line":363,"column":45}},"121":{"start":{"line":365,"column":17},"end":{"line":372,"column":6}},"122":{"start":{"line":374,"column":4},"end":{"line":376,"column":5}},"123":{"start":{"line":375,"column":6},"end":{"line":375,"column":45}},"124":{"start":{"line":378,"column":20},"end":{"line":378,"column":77}},"125":{"start":{"line":379,"column":4},"end":{"line":381,"column":5}},"126":{"start":{"line":380,"column":6},"end":{"line":380,"column":45}},"127":{"start":{"line":383,"column":4},"end":{"line":385,"column":5}},"128":{"start":{"line":384,"column":6},"end":{"line":384,"column":55}},"129":{"start":{"line":387,"column":4},"end":{"line":387,"column":34}},"130":{"start":{"line":391,"column":18},"end":{"line":391,"column":45}},"131":{"start":{"line":392,"column":32},"end":{"line":392,"column":79}},"132":{"start":{"line":394,"column":4},"end":{"line":396,"column":5}},"133":{"start":{"line":395,"column":6},"end":{"line":395,"column":79}},"134":{"start":{"line":398,"column":4},"end":{"line":398,"column":50}},"135":{"start":{"line":399,"column":4},"end":{"line":399,"column":39}},"136":{"start":{"line":401,"column":4},"end":{"line":401,"column":50}},"137":{"start":{"line":405,"column":18},"end":{"line":405,"column":45}},"138":{"start":{"line":406,"column":17},"end":{"line":406,"column":67}},"139":{"start":{"line":408,"column":4},"end":{"line":410,"column":5}},"140":{"start":{"line":409,"column":6},"end":{"line":409,"column":66}},"141":{"start":{"line":412,"column":4},"end":{"line":412,"column":50}},"142":{"start":{"line":413,"column":4},"end":{"line":413,"column":39}},"143":{"start":{"line":415,"column":4},"end":{"line":415,"column":63}},"144":{"start":{"line":419,"column":18},"end":{"line":419,"column":45}},"145":{"start":{"line":420,"column":17},"end":{"line":420,"column":67}},"146":{"start":{"line":422,"column":4},"end":{"line":424,"column":5}},"147":{"start":{"line":423,"column":6},"end":{"line":423,"column":40}},"148":{"start":{"line":426,"column":4},"end":{"line":426,"column":59}},"149":{"start":{"line":427,"column":26},"end":{"line":427,"column":64}},"150":{"start":{"line":429,"column":4},"end":{"line":432,"column":7}},"151":{"start":{"line":434,"column":4},"end":{"line":434,"column":52}},"152":{"start":{"line":438,"column":17},"end":{"line":453,"column":6}},"153":{"start":{"line":455,"column":4},"end":{"line":457,"column":5}},"154":{"start":{"line":456,"column":6},"end":{"line":456,"column":52}},"155":{"start":{"line":459,"column":4},"end":{"line":459,"column":34}},"156":{"start":{"line":463,"column":4},"end":{"line":468,"column":5}},"157":{"start":{"line":464,"column":6},"end":{"line":467,"column":25}},"158":{"start":{"line":469,"column":4},"end":{"line":469,"column":44}},"159":{"start":{"line":473,"column":4},"end":{"line":473,"column":62}},"160":{"start":{"line":477,"column":20},"end":{"line":493,"column":6}},"161":{"start":{"line":495,"column":4},"end":{"line":497,"column":5}},"162":{"start":{"line":496,"column":6},"end":{"line":496,"column":43}},"163":{"start":{"line":499,"column":4},"end":{"line":501,"column":5}},"164":{"start":{"line":500,"column":6},"end":{"line":500,"column":76}},"165":{"start":{"line":503,"column":24},"end":{"line":503,"column":66}},"166":{"start":{"line":504,"column":4},"end":{"line":506,"column":5}},"167":{"start":{"line":505,"column":6},"end":{"line":505,"column":74}},"168":{"start":{"line":508,"column":4},"end":{"line":508,"column":56}},"169":{"start":{"line":509,"column":4},"end":{"line":509,"column":45}},"170":{"start":{"line":511,"column":4},"end":{"line":517,"column":6}},"171":{"start":{"line":521,"column":4},"end":{"line":524,"column":7}},"172":{"start":{"line":526,"column":4},"end":{"line":526,"column":44}},"173":{"start":{"line":530,"column":17},"end":{"line":550,"column":6}},"174":{"start":{"line":552,"column":19},"end":{"line":562,"column":6}},"175":{"start":{"line":564,"column":4},"end":{"line":564,"column":51}},"176":{"start":{"line":564,"column":17},"end":{"line":564,"column":51}},"177":{"start":{"line":566,"column":20},"end":{"line":566,"column":41}},"178":{"start":{"line":567,"column":16},"end":{"line":567,"column":38}},"179":{"start":{"line":568,"column":20},"end":{"line":568,"column":40}},"180":{"start":{"line":570,"column":26},"end":{"line":572,"column":12}},"181":{"start":{"line":574,"column":4},"end":{"line":602,"column":6}},"182":{"start":{"line":606,"column":17},"end":{"line":606,"column":72}},"183":{"start":{"line":607,"column":4},"end":{"line":607,"column":49}},"184":{"start":{"line":607,"column":15},"end":{"line":607,"column":49}},"185":{"start":{"line":609,"column":20},"end":{"line":609,"column":81}},"186":{"start":{"line":610,"column":4},"end":{"line":610,"column":60}},"187":{"start":{"line":610,"column":18},"end":{"line":610,"column":60}},"188":{"start":{"line":612,"column":20},"end":{"line":612,"column":58}},"189":{"start":{"line":613,"column":4},"end":{"line":616,"column":7}},"190":{"start":{"line":618,"column":4},"end":{"line":618,"column":56}},"191":{"start":{"line":71,"column":0},"end":{"line":71,"column":13}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":38,"column":23},"end":{"line":38,"column":24}},"loc":{"start":{"line":38,"column":42},"end":{"line":38,"column":68}}},"1":{"name":"(anonymous_1)","decl":{"start":{"line":39,"column":29},"end":{"line":39,"column":30}},"loc":{"start":{"line":39,"column":48},"end":{"line":39,"column":88}}},"2":{"name":"(anonymous_2)","decl":{"start":{"line":41,"column":21},"end":{"line":41,"column":22}},"loc":{"start":{"line":48,"column":7},"end":{"line":56,"column":2}}},"3":{"name":"(anonymous_3)","decl":{"start":{"line":58,"column":25},"end":{"line":58,"column":26}},"loc":{"start":{"line":65,"column":7},"end":{"line":69,"column":2}}},"4":{"name":"(anonymous_4)","decl":{"start":{"line":72,"column":10},"end":{"line":72,"column":16}},"loc":{"start":{"line":72,"column":73},"end":{"line":112,"column":3}}},"5":{"name":"(anonymous_5)","decl":{"start":{"line":114,"column":10},"end":{"line":114,"column":16}},"loc":{"start":{"line":114,"column":57},"end":{"line":128,"column":3}}},"6":{"name":"(anonymous_6)","decl":{"start":{"line":130,"column":10},"end":{"line":130,"column":16}},"loc":{"start":{"line":130,"column":46},"end":{"line":143,"column":3}}},"7":{"name":"(anonymous_7)","decl":{"start":{"line":145,"column":10},"end":{"line":145,"column":16}},"loc":{"start":{"line":145,"column":72},"end":{"line":149,"column":3}}},"8":{"name":"(anonymous_8)","decl":{"start":{"line":151,"column":10},"end":{"line":151,"column":16}},"loc":{"start":{"line":151,"column":59},"end":{"line":157,"column":3}}},"9":{"name":"(anonymous_9)","decl":{"start":{"line":159,"column":10},"end":{"line":159,"column":16}},"loc":{"start":{"line":159,"column":61},"end":{"line":163,"column":3}}},"10":{"name":"(anonymous_10)","decl":{"start":{"line":165,"column":10},"end":{"line":165,"column":16}},"loc":{"start":{"line":165,"column":63},"end":{"line":198,"column":3}}},"11":{"name":"(anonymous_11)","decl":{"start":{"line":200,"column":2},"end":{"line":200,"column":8}},"loc":{"start":{"line":200,"column":44},"end":{"line":227,"column":3}}},"12":{"name":"(anonymous_12)","decl":{"start":{"line":229,"column":2},"end":{"line":229,"column":8}},"loc":{"start":{"line":229,"column":46},"end":{"line":279,"column":3}}},"13":{"name":"(anonymous_13)","decl":{"start":{"line":265,"column":50},"end":{"line":265,"column":55}},"loc":{"start":{"line":265,"column":89},"end":{"line":275,"column":5}}},"14":{"name":"(anonymous_14)","decl":{"start":{"line":281,"column":2},"end":{"line":281,"column":8}},"loc":{"start":{"line":281,"column":68},"end":{"line":360,"column":3}}},"15":{"name":"(anonymous_15)","decl":{"start":{"line":328,"column":50},"end":{"line":328,"column":55}},"loc":{"start":{"line":328,"column":89},"end":{"line":356,"column":5}}},"16":{"name":"(anonymous_16)","decl":{"start":{"line":362,"column":2},"end":{"line":362,"column":8}},"loc":{"start":{"line":362,"column":38},"end":{"line":388,"column":3}}},"17":{"name":"(anonymous_17)","decl":{"start":{"line":390,"column":2},"end":{"line":390,"column":8}},"loc":{"start":{"line":390,"column":46},"end":{"line":402,"column":3}}},"18":{"name":"(anonymous_18)","decl":{"start":{"line":404,"column":2},"end":{"line":404,"column":8}},"loc":{"start":{"line":404,"column":56},"end":{"line":416,"column":3}}},"19":{"name":"(anonymous_19)","decl":{"start":{"line":418,"column":2},"end":{"line":418,"column":8}},"loc":{"start":{"line":418,"column":54},"end":{"line":435,"column":3}}},"20":{"name":"(anonymous_20)","decl":{"start":{"line":437,"column":2},"end":{"line":437,"column":8}},"loc":{"start":{"line":437,"column":44},"end":{"line":460,"column":3}}},"21":{"name":"(anonymous_21)","decl":{"start":{"line":462,"column":2},"end":{"line":462,"column":8}},"loc":{"start":{"line":462,"column":37},"end":{"line":470,"column":3}}},"22":{"name":"(anonymous_22)","decl":{"start":{"line":467,"column":15},"end":{"line":467,"column":18}},"loc":{"start":{"line":467,"column":20},"end":{"line":467,"column":23}}},"23":{"name":"(anonymous_23)","decl":{"start":{"line":472,"column":2},"end":{"line":472,"column":8}},"loc":{"start":{"line":472,"column":24},"end":{"line":474,"column":3}}},"24":{"name":"(anonymous_24)","decl":{"start":{"line":476,"column":2},"end":{"line":476,"column":8}},"loc":{"start":{"line":476,"column":46},"end":{"line":518,"column":3}}},"25":{"name":"(anonymous_25)","decl":{"start":{"line":520,"column":2},"end":{"line":520,"column":8}},"loc":{"start":{"line":520,"column":72},"end":{"line":527,"column":3}}},"26":{"name":"(anonymous_26)","decl":{"start":{"line":529,"column":2},"end":{"line":529,"column":8}},"loc":{"start":{"line":529,"column":46},"end":{"line":603,"column":3}}},"27":{"name":"(anonymous_27)","decl":{"start":{"line":605,"column":2},"end":{"line":605,"column":8}},"loc":{"start":{"line":605,"column":99},"end":{"line":619,"column":3}}}},"branchMap":{"0":{"loc":{"start":{"line":73,"column":4},"end":{"line":73,"column":40}},"type":"if","locations":[{"start":{"line":73,"column":4},"end":{"line":73,"column":40}}]},"1":{"loc":{"start":{"line":75,"column":4},"end":{"line":77,"column":5}},"type":"if","locations":[{"start":{"line":75,"column":4},"end":{"line":77,"column":5}}]},"2":{"loc":{"start":{"line":97,"column":4},"end":{"line":99,"column":5}},"type":"if","locations":[{"start":{"line":97,"column":4},"end":{"line":99,"column":5}}]},"3":{"loc":{"start":{"line":97,"column":8},"end":{"line":97,"column":38}},"type":"binary-expr","locations":[{"start":{"line":97,"column":8},"end":{"line":97,"column":16}},{"start":{"line":97,"column":20},"end":{"line":97,"column":38}}]},"4":{"loc":{"start":{"line":101,"column":4},"end":{"line":103,"column":5}},"type":"if","locations":[{"start":{"line":101,"column":4},"end":{"line":103,"column":5}}]},"5":{"loc":{"start":{"line":105,"column":4},"end":{"line":107,"column":5}},"type":"if","locations":[{"start":{"line":105,"column":4},"end":{"line":107,"column":5}}]},"6":{"loc":{"start":{"line":109,"column":4},"end":{"line":111,"column":5}},"type":"if","locations":[{"start":{"line":109,"column":4},"end":{"line":111,"column":5}}]},"7":{"loc":{"start":{"line":121,"column":4},"end":{"line":121,"column":27}},"type":"if","locations":[{"start":{"line":121,"column":4},"end":{"line":121,"column":27}}]},"8":{"loc":{"start":{"line":124,"column":4},"end":{"line":127,"column":5}},"type":"if","locations":[{"start":{"line":124,"column":4},"end":{"line":127,"column":5}}]},"9":{"loc":{"start":{"line":154,"column":4},"end":{"line":154,"column":30}},"type":"if","locations":[{"start":{"line":154,"column":4},"end":{"line":154,"column":30}}]},"10":{"loc":{"start":{"line":156,"column":11},"end":{"line":156,"column":53}},"type":"binary-expr","locations":[{"start":{"line":156,"column":11},"end":{"line":156,"column":45}},{"start":{"line":156,"column":49},"end":{"line":156,"column":53}}]},"11":{"loc":{"start":{"line":174,"column":4},"end":{"line":176,"column":5}},"type":"if","locations":[{"start":{"line":174,"column":4},"end":{"line":176,"column":5}}]},"12":{"loc":{"start":{"line":178,"column":4},"end":{"line":180,"column":5}},"type":"if","locations":[{"start":{"line":178,"column":4},"end":{"line":180,"column":5}}]},"13":{"loc":{"start":{"line":182,"column":4},"end":{"line":184,"column":5}},"type":"if","locations":[{"start":{"line":182,"column":4},"end":{"line":184,"column":5}}]},"14":{"loc":{"start":{"line":186,"column":4},"end":{"line":192,"column":5}},"type":"if","locations":[{"start":{"line":186,"column":4},"end":{"line":192,"column":5}}]},"15":{"loc":{"start":{"line":205,"column":4},"end":{"line":212,"column":5}},"type":"if","locations":[{"start":{"line":205,"column":4},"end":{"line":212,"column":5}}]},"16":{"loc":{"start":{"line":206,"column":6},"end":{"line":211,"column":7}},"type":"if","locations":[{"start":{"line":206,"column":6},"end":{"line":211,"column":7}},{"start":{"line":209,"column":13},"end":{"line":211,"column":7}}]},"17":{"loc":{"start":{"line":206,"column":10},"end":{"line":206,"column":87}},"type":"binary-expr","locations":[{"start":{"line":206,"column":10},"end":{"line":206,"column":41}},{"start":{"line":206,"column":45},"end":{"line":206,"column":87}}]},"18":{"loc":{"start":{"line":233,"column":4},"end":{"line":235,"column":5}},"type":"if","locations":[{"start":{"line":233,"column":4},"end":{"line":235,"column":5}}]},"19":{"loc":{"start":{"line":243,"column":4},"end":{"line":263,"column":5}},"type":"if","locations":[{"start":{"line":243,"column":4},"end":{"line":263,"column":5}}]},"20":{"loc":{"start":{"line":285,"column":4},"end":{"line":287,"column":5}},"type":"if","locations":[{"start":{"line":285,"column":4},"end":{"line":287,"column":5}}]},"21":{"loc":{"start":{"line":285,"column":8},"end":{"line":285,"column":53}},"type":"binary-expr","locations":[{"start":{"line":285,"column":8},"end":{"line":285,"column":16}},{"start":{"line":285,"column":20},"end":{"line":285,"column":53}}]},"22":{"loc":{"start":{"line":289,"column":4},"end":{"line":291,"column":5}},"type":"if","locations":[{"start":{"line":289,"column":4},"end":{"line":291,"column":5}}]},"23":{"loc":{"start":{"line":289,"column":8},"end":{"line":289,"column":59}},"type":"binary-expr","locations":[{"start":{"line":289,"column":8},"end":{"line":289,"column":33}},{"start":{"line":289,"column":37},"end":{"line":289,"column":59}}]},"24":{"loc":{"start":{"line":303,"column":4},"end":{"line":303,"column":63}},"type":"if","locations":[{"start":{"line":303,"column":4},"end":{"line":303,"column":63}}]},"25":{"loc":{"start":{"line":306,"column":24},"end":{"line":306,"column":78}},"type":"binary-expr","locations":[{"start":{"line":306,"column":24},"end":{"line":306,"column":72}},{"start":{"line":306,"column":76},"end":{"line":306,"column":78}}]},"26":{"loc":{"start":{"line":307,"column":24},"end":{"line":307,"column":64}},"type":"binary-expr","locations":[{"start":{"line":307,"column":24},"end":{"line":307,"column":58}},{"start":{"line":307,"column":62},"end":{"line":307,"column":64}}]},"27":{"loc":{"start":{"line":308,"column":25},"end":{"line":308,"column":60}},"type":"binary-expr","locations":[{"start":{"line":308,"column":25},"end":{"line":308,"column":54}},{"start":{"line":308,"column":58},"end":{"line":308,"column":60}}]},"28":{"loc":{"start":{"line":311,"column":22},"end":{"line":311,"column":70}},"type":"binary-expr","locations":[{"start":{"line":311,"column":22},"end":{"line":311,"column":64}},{"start":{"line":311,"column":68},"end":{"line":311,"column":70}}]},"29":{"loc":{"start":{"line":312,"column":4},"end":{"line":314,"column":5}},"type":"if","locations":[{"start":{"line":312,"column":4},"end":{"line":314,"column":5}}]},"30":{"loc":{"start":{"line":312,"column":8},"end":{"line":312,"column":41}},"type":"binary-expr","locations":[{"start":{"line":312,"column":8},"end":{"line":312,"column":19}},{"start":{"line":312,"column":23},"end":{"line":312,"column":41}}]},"31":{"loc":{"start":{"line":317,"column":23},"end":{"line":318,"column":75}},"type":"binary-expr","locations":[{"start":{"line":317,"column":23},"end":{"line":317,"column":64}},{"start":{"line":318,"column":23},"end":{"line":318,"column":75}}]},"32":{"loc":{"start":{"line":322,"column":4},"end":{"line":324,"column":5}},"type":"if","locations":[{"start":{"line":322,"column":4},"end":{"line":324,"column":5}}]},"33":{"loc":{"start":{"line":322,"column":8},"end":{"line":322,"column":64}},"type":"binary-expr","locations":[{"start":{"line":322,"column":8},"end":{"line":322,"column":19}},{"start":{"line":322,"column":23},"end":{"line":322,"column":34}},{"start":{"line":322,"column":38},"end":{"line":322,"column":48}},{"start":{"line":322,"column":52},"end":{"line":322,"column":64}}]},"34":{"loc":{"start":{"line":374,"column":4},"end":{"line":376,"column":5}},"type":"if","locations":[{"start":{"line":374,"column":4},"end":{"line":376,"column":5}}]},"35":{"loc":{"start":{"line":379,"column":4},"end":{"line":381,"column":5}},"type":"if","locations":[{"start":{"line":379,"column":4},"end":{"line":381,"column":5}}]},"36":{"loc":{"start":{"line":383,"column":4},"end":{"line":385,"column":5}},"type":"if","locations":[{"start":{"line":383,"column":4},"end":{"line":385,"column":5}}]},"37":{"loc":{"start":{"line":383,"column":8},"end":{"line":383,"column":44}},"type":"binary-expr","locations":[{"start":{"line":383,"column":8},"end":{"line":383,"column":23}},{"start":{"line":383,"column":27},"end":{"line":383,"column":44}}]},"38":{"loc":{"start":{"line":394,"column":4},"end":{"line":396,"column":5}},"type":"if","locations":[{"start":{"line":394,"column":4},"end":{"line":396,"column":5}}]},"39":{"loc":{"start":{"line":408,"column":4},"end":{"line":410,"column":5}},"type":"if","locations":[{"start":{"line":408,"column":4},"end":{"line":410,"column":5}}]},"40":{"loc":{"start":{"line":422,"column":4},"end":{"line":424,"column":5}},"type":"if","locations":[{"start":{"line":422,"column":4},"end":{"line":424,"column":5}}]},"41":{"loc":{"start":{"line":455,"column":4},"end":{"line":457,"column":5}},"type":"if","locations":[{"start":{"line":455,"column":4},"end":{"line":457,"column":5}}]},"42":{"loc":{"start":{"line":455,"column":8},"end":{"line":455,"column":80}},"type":"binary-expr","locations":[{"start":{"line":455,"column":8},"end":{"line":455,"column":13}},{"start":{"line":455,"column":17},"end":{"line":455,"column":32}},{"start":{"line":455,"column":36},"end":{"line":455,"column":53}},{"start":{"line":455,"column":57},"end":{"line":455,"column":80}}]},"43":{"loc":{"start":{"line":463,"column":4},"end":{"line":468,"column":5}},"type":"if","locations":[{"start":{"line":463,"column":4},"end":{"line":468,"column":5}}]},"44":{"loc":{"start":{"line":495,"column":4},"end":{"line":497,"column":5}},"type":"if","locations":[{"start":{"line":495,"column":4},"end":{"line":497,"column":5}}]},"45":{"loc":{"start":{"line":495,"column":8},"end":{"line":495,"column":38}},"type":"binary-expr","locations":[{"start":{"line":495,"column":8},"end":{"line":495,"column":16}},{"start":{"line":495,"column":20},"end":{"line":495,"column":38}}]},"46":{"loc":{"start":{"line":499,"column":4},"end":{"line":501,"column":5}},"type":"if","locations":[{"start":{"line":499,"column":4},"end":{"line":501,"column":5}}]},"47":{"loc":{"start":{"line":504,"column":4},"end":{"line":506,"column":5}},"type":"if","locations":[{"start":{"line":504,"column":4},"end":{"line":506,"column":5}}]},"48":{"loc":{"start":{"line":514,"column":15},"end":{"line":514,"column":96}},"type":"cond-expr","locations":[{"start":{"line":514,"column":31},"end":{"line":514,"column":89}},{"start":{"line":514,"column":92},"end":{"line":514,"column":96}}]},"49":{"loc":{"start":{"line":516,"column":37},"end":{"line":516,"column":101}},"type":"cond-expr","locations":[{"start":{"line":516,"column":75},"end":{"line":516,"column":91}},{"start":{"line":516,"column":94},"end":{"line":516,"column":101}}]},"50":{"loc":{"start":{"line":564,"column":4},"end":{"line":564,"column":51}},"type":"if","locations":[{"start":{"line":564,"column":4},"end":{"line":564,"column":51}}]},"51":{"loc":{"start":{"line":566,"column":20},"end":{"line":566,"column":41}},"type":"binary-expr","locations":[{"start":{"line":566,"column":20},"end":{"line":566,"column":33}},{"start":{"line":566,"column":37},"end":{"line":566,"column":41}}]},"52":{"loc":{"start":{"line":567,"column":16},"end":{"line":567,"column":38}},"type":"binary-expr","locations":[{"start":{"line":567,"column":16},"end":{"line":567,"column":30}},{"start":{"line":567,"column":34},"end":{"line":567,"column":38}}]},"53":{"loc":{"start":{"line":568,"column":20},"end":{"line":568,"column":40}},"type":"binary-expr","locations":[{"start":{"line":568,"column":20},"end":{"line":568,"column":32}},{"start":{"line":568,"column":36},"end":{"line":568,"column":40}}]},"54":{"loc":{"start":{"line":570,"column":26},"end":{"line":572,"column":12}},"type":"cond-expr","locations":[{"start":{"line":571,"column":8},"end":{"line":571,"column":61}},{"start":{"line":572,"column":8},"end":{"line":572,"column":12}}]},"55":{"loc":{"start":{"line":583,"column":15},"end":{"line":594,"column":14}},"type":"cond-expr","locations":[{"start":{"line":584,"column":10},"end":{"line":593,"column":null}},{"start":{"line":594,"column":10},"end":{"line":594,"column":14}}]},"56":{"loc":{"start":{"line":591,"column":19},"end":{"line":591,"column":50}},"type":"binary-expr","locations":[{"start":{"line":591,"column":19},"end":{"line":591,"column":42}},{"start":{"line":591,"column":46},"end":{"line":591,"column":50}}]},"57":{"loc":{"start":{"line":592,"column":24},"end":{"line":592,"column":41}},"type":"binary-expr","locations":[{"start":{"line":592,"column":24},"end":{"line":592,"column":33}},{"start":{"line":592,"column":37},"end":{"line":592,"column":41}}]},"58":{"loc":{"start":{"line":595,"column":15},"end":{"line":601,"column":14}},"type":"cond-expr","locations":[{"start":{"line":596,"column":10},"end":{"line":600,"column":null}},{"start":{"line":601,"column":10},"end":{"line":601,"column":14}}]},"59":{"loc":{"start":{"line":607,"column":4},"end":{"line":607,"column":49}},"type":"if","locations":[{"start":{"line":607,"column":4},"end":{"line":607,"column":49}}]},"60":{"loc":{"start":{"line":610,"column":4},"end":{"line":610,"column":60}},"type":"if","locations":[{"start":{"line":610,"column":4},"end":{"line":610,"column":60}}]}},"s":{"0":3,"1":3,"2":3,"3":3,"4":3,"5":3,"6":3,"7":3,"8":3,"9":3,"10":0,"11":3,"12":0,"13":3,"14":0,"15":3,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":0,"41":0,"42":0,"43":0,"44":0,"45":0,"46":0,"47":0,"48":0,"49":0,"50":0,"51":0,"52":0,"53":0,"54":0,"55":0,"56":0,"57":0,"58":0,"59":0,"60":0,"61":0,"62":0,"63":0,"64":0,"65":0,"66":0,"67":0,"68":0,"69":0,"70":0,"71":0,"72":0,"73":0,"74":0,"75":0,"76":0,"77":0,"78":0,"79":0,"80":0,"81":0,"82":0,"83":0,"84":0,"85":0,"86":0,"87":0,"88":0,"89":0,"90":0,"91":0,"92":0,"93":0,"94":0,"95":0,"96":0,"97":0,"98":0,"99":0,"100":0,"101":0,"102":0,"103":0,"104":0,"105":0,"106":0,"107":0,"108":0,"109":0,"110":0,"111":0,"112":0,"113":0,"114":0,"115":0,"116":0,"117":0,"118":0,"119":0,"120":0,"121":0,"122":0,"123":0,"124":0,"125":0,"126":0,"127":0,"128":0,"129":0,"130":0,"131":0,"132":0,"133":0,"134":0,"135":0,"136":0,"137":0,"138":0,"139":0,"140":0,"141":0,"142":0,"143":0,"144":0,"145":0,"146":0,"147":0,"148":0,"149":0,"150":0,"151":0,"152":0,"153":0,"154":0,"155":0,"156":0,"157":0,"158":0,"159":0,"160":0,"161":0,"162":0,"163":0,"164":0,"165":0,"166":0,"167":0,"168":0,"169":0,"170":0,"171":0,"172":0,"173":0,"174":0,"175":0,"176":0,"177":0,"178":0,"179":0,"180":0,"181":0,"182":0,"183":0,"184":0,"185":0,"186":0,"187":0,"188":0,"189":0,"190":0,"191":3},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0},"b":{"0":[0],"1":[0],"2":[0],"3":[0,0],"4":[0],"5":[0],"6":[0],"7":[0],"8":[0],"9":[0],"10":[0,0],"11":[0],"12":[0],"13":[0],"14":[0],"15":[0],"16":[0,0],"17":[0,0],"18":[0],"19":[0],"20":[0],"21":[0,0],"22":[0],"23":[0,0],"24":[0],"25":[0,0],"26":[0,0],"27":[0,0],"28":[0,0],"29":[0],"30":[0,0],"31":[0,0],"32":[0],"33":[0,0,0,0],"34":[0],"35":[0],"36":[0],"37":[0,0],"38":[0],"39":[0],"40":[0],"41":[0],"42":[0,0,0,0],"43":[0],"44":[0],"45":[0,0],"46":[0],"47":[0],"48":[0,0],"49":[0,0],"50":[0],"51":[0,0],"52":[0,0],"53":[0,0],"54":[0,0],"55":[0,0],"56":[0,0],"57":[0,0],"58":[0,0],"59":[0],"60":[0]}}
-}
diff --git a/apps/backend/coverage/lcov.info b/apps/backend/coverage/lcov.info
deleted file mode 100644
index c19e7c4..0000000
--- a/apps/backend/coverage/lcov.info
+++ /dev/null
@@ -1,749 +0,0 @@
-TN:
-SF:src\common\utils\cache.ts
-FN:6,(anonymous_0)
-FN:15,(anonymous_1)
-FN:23,(anonymous_2)
-FN:29,(anonymous_3)
-FN:47,(anonymous_4)
-FNF:5
-FNH:5
-FNDA:1,(anonymous_0)
-FNDA:1,(anonymous_1)
-FNDA:2,(anonymous_2)
-FNDA:3,(anonymous_3)
-FNDA:1,(anonymous_4)
-DA:1,4
-DA:2,4
-DA:4,4
-DA:6,4
-DA:7,1
-DA:9,0
-DA:10,0
-DA:12,0
-DA:15,4
-DA:16,1
-DA:18,0
-DA:23,4
-DA:24,2
-DA:26,0
-DA:29,4
-DA:30,3
-DA:32,0
-DA:33,0
-DA:34,0
-DA:39,0
-DA:41,0
-DA:42,0
-DA:47,4
-DA:52,1
-DA:53,1
-DA:55,1
-DA:56,1
-DA:57,1
-LF:28
-LH:17
-BRDA:7,0,0,1
-BRDA:10,1,0,0
-BRDA:15,2,0,0
-BRDA:16,3,0,1
-BRDA:24,4,0,2
-BRDA:30,5,0,3
-BRDA:41,6,0,0
-BRDA:50,7,0,0
-BRDA:53,8,0,0
-BRF:9
-BRH:4
-end_of_record
-TN:
-SF:src\common\utils\email.ts
-FN:9,checkRateLimit
-FN:23,sendOtpEmail
-FN:59,sendApprovalEmail
-FNF:3
-FNH:0
-FNDA:0,checkRateLimit
-FNDA:0,sendOtpEmail
-FNDA:0,sendApprovalEmail
-DA:1,0
-DA:2,0
-DA:4,0
-DA:5,0
-DA:7,0
-DA:10,0
-DA:11,0
-DA:12,0
-DA:13,0
-DA:14,0
-DA:15,0
-DA:17,0
-DA:18,0
-DA:20,0
-DA:23,0
-DA:24,0
-DA:25,0
-DA:59,0
-DA:60,0
-DA:61,0
-LF:20
-LH:0
-BRDA:13,0,0,0
-BRDA:13,1,0,0
-BRDA:13,1,1,0
-BRDA:17,2,0,0
-BRDA:77,3,0,0
-BRDA:77,3,1,0
-BRF:6
-BRH:0
-end_of_record
-TN:
-SF:src\common\utils\hash.ts
-FN:5,(anonymous_1)
-FN:9,(anonymous_2)
-FNF:2
-FNH:2
-FNDA:6,(anonymous_1)
-FNDA:2,(anonymous_2)
-DA:1,4
-DA:3,4
-DA:5,4
-DA:6,6
-DA:9,4
-DA:10,2
-LF:6
-LH:6
-BRF:0
-BRH:0
-end_of_record
-TN:
-SF:src\common\utils\jwt.ts
-FN:4,(anonymous_1)
-FN:8,(anonymous_2)
-FNF:2
-FNH:2
-FNDA:7,(anonymous_1)
-FNDA:12,(anonymous_2)
-DA:1,5
-DA:2,5
-DA:4,5
-DA:5,7
-DA:8,5
-DA:9,12
-LF:6
-LH:6
-BRDA:4,0,0,6
-BRF:1
-BRH:1
-end_of_record
-TN:
-SF:src\common\utils\otp.ts
-FN:1,(anonymous_0)
-FNF:1
-FNH:1
-FNDA:8,(anonymous_0)
-DA:1,4
-DA:2,8
-DA:3,8
-DA:4,8
-DA:5,48
-DA:7,8
-LF:6
-LH:6
-BRDA:1,0,0,8
-BRF:1
-BRH:1
-end_of_record
-TN:
-SF:src\common\utils\response.ts
-FN:1,(anonymous_0)
-FN:5,(anonymous_1)
-FNF:2
-FNH:2
-FNDA:4,(anonymous_0)
-FNDA:3,(anonymous_1)
-DA:1,3
-DA:2,4
-DA:5,3
-DA:6,3
-LF:4
-LH:4
-BRF:0
-BRH:0
-end_of_record
-TN:
-SF:src\modules\auth\auth.controller.ts
-FN:27,(anonymous_9)
-FN:42,(anonymous_10)
-FN:71,(anonymous_11)
-FN:85,(anonymous_12)
-FN:108,(anonymous_13)
-FN:110,(anonymous_14)
-FN:110,(anonymous_15)
-FN:134,(anonymous_16)
-FN:146,(anonymous_17)
-FN:155,(anonymous_18)
-FN:164,(anonymous_19)
-FN:174,(anonymous_20)
-FN:188,(anonymous_21)
-FN:195,(anonymous_22)
-FN:201,(anonymous_23)
-FN:214,(anonymous_24)
-FN:223,(anonymous_25)
-FNF:17
-FNH:4
-FNDA:2,(anonymous_9)
-FNDA:2,(anonymous_10)
-FNDA:0,(anonymous_11)
-FNDA:2,(anonymous_12)
-FNDA:0,(anonymous_13)
-FNDA:0,(anonymous_14)
-FNDA:0,(anonymous_15)
-FNDA:0,(anonymous_16)
-FNDA:0,(anonymous_17)
-FNDA:0,(anonymous_18)
-FNDA:0,(anonymous_19)
-FNDA:0,(anonymous_20)
-FNDA:1,(anonymous_21)
-FNDA:0,(anonymous_22)
-FNDA:0,(anonymous_23)
-FNDA:0,(anonymous_24)
-FNDA:0,(anonymous_25)
-DA:2,3
-DA:15,3
-DA:16,3
-DA:18,3
-DA:26,3
-DA:28,2
-DA:29,2
-DA:30,1
-DA:32,1
-DA:33,1
-DA:35,0
-DA:36,0
-DA:38,0
-DA:43,2
-DA:44,2
-DA:46,1
-DA:47,1
-DA:50,1
-DA:58,1
-DA:59,1
-DA:61,0
-DA:62,0
-DA:64,0
-DA:65,0
-DA:67,0
-DA:72,0
-DA:73,0
-DA:74,0
-DA:75,0
-DA:81,0
-DA:86,2
-DA:87,2
-DA:88,1
-DA:89,1
-DA:95,1
-DA:96,0
-DA:98,1
-DA:99,1
-DA:101,0
-DA:102,0
-DA:104,0
-DA:109,0
-DA:110,0
-DA:111,0
-DA:122,0
-DA:123,0
-DA:125,0
-DA:135,0
-DA:136,0
-DA:137,0
-DA:139,0
-DA:140,0
-DA:142,0
-DA:147,0
-DA:148,0
-DA:149,0
-DA:151,0
-DA:156,0
-DA:157,0
-DA:158,0
-DA:160,0
-DA:165,0
-DA:166,0
-DA:167,0
-DA:168,0
-DA:170,0
-DA:175,0
-DA:176,0
-DA:177,0
-DA:178,0
-DA:179,0
-DA:184,0
-DA:189,1
-DA:190,1
-DA:191,1
-DA:192,1
-DA:196,0
-DA:197,0
-DA:198,0
-DA:202,0
-DA:203,0
-DA:204,0
-DA:205,0
-DA:207,0
-DA:208,0
-DA:210,0
-DA:215,0
-DA:216,0
-DA:217,0
-DA:219,0
-DA:224,0
-DA:225,0
-DA:226,0
-DA:227,0
-DA:229,0
-LF:95
-LH:28
-BRDA:32,0,0,1
-BRDA:35,1,0,0
-BRDA:46,2,0,1
-BRDA:50,3,0,1
-BRDA:50,3,1,1
-BRDA:58,4,0,1
-BRDA:61,5,0,0
-BRDA:64,6,0,0
-BRDA:95,7,0,0
-BRDA:98,8,0,1
-BRDA:101,9,0,0
-BRDA:122,10,0,0
-BRDA:122,11,0,0
-BRDA:122,11,1,0
-BRDA:122,11,2,0
-BRDA:139,12,0,0
-BRDA:204,13,0,0
-BRF:17
-BRH:6
-end_of_record
-TN:
-SF:src\modules\auth\auth.routes.ts
-FN:17,(anonymous_0)
-FN:24,authRoutes
-FN:32,(anonymous_2)
-FN:44,(anonymous_3)
-FN:50,(anonymous_4)
-FN:62,(anonymous_5)
-FN:74,(anonymous_6)
-FN:86,(anonymous_7)
-FN:98,(anonymous_8)
-FN:104,(anonymous_9)
-FN:112,(anonymous_10)
-FN:133,(anonymous_11)
-FNF:12
-FNH:4
-FNDA:0,(anonymous_0)
-FNDA:3,authRoutes
-FNDA:3,(anonymous_2)
-FNDA:2,(anonymous_3)
-FNDA:0,(anonymous_4)
-FNDA:2,(anonymous_5)
-FNDA:0,(anonymous_6)
-FNDA:0,(anonymous_7)
-FNDA:0,(anonymous_8)
-FNDA:0,(anonymous_9)
-FNDA:0,(anonymous_10)
-FNDA:0,(anonymous_11)
-DA:2,3
-DA:3,3
-DA:15,3
-DA:17,3
-DA:20,0
-DA:24,3
-DA:25,3
-DA:33,3
-DA:37,3
-DA:45,2
-DA:49,3
-DA:51,0
-DA:55,3
-DA:63,2
-DA:67,3
-DA:75,0
-DA:79,3
-DA:87,0
-DA:91,3
-DA:99,0
-DA:103,3
-DA:105,0
-DA:109,3
-DA:113,0
-DA:118,3
-DA:122,3
-DA:126,3
-DA:130,3
-DA:134,0
-DA:139,3
-DA:143,3
-LF:31
-LH:23
-BRF:0
-BRH:0
-end_of_record
-TN:
-SF:src\modules\auth\auth.schema.ts
-FNF:0
-FNH:0
-DA:1,4
-DA:3,4
-DA:13,4
-DA:20,4
-DA:27,4
-DA:33,4
-DA:39,4
-DA:47,4
-DA:54,4
-DA:60,4
-DA:67,4
-LF:11
-LH:11
-BRF:0
-BRH:0
-end_of_record
-TN:
-SF:src\modules\auth\auth.service.ts
-FN:38,(anonymous_0)
-FN:39,(anonymous_1)
-FN:41,(anonymous_2)
-FN:58,(anonymous_3)
-FN:72,(anonymous_4)
-FN:114,(anonymous_5)
-FN:130,(anonymous_6)
-FN:145,(anonymous_7)
-FN:151,(anonymous_8)
-FN:159,(anonymous_9)
-FN:165,(anonymous_10)
-FN:200,(anonymous_11)
-FN:229,(anonymous_12)
-FN:265,(anonymous_13)
-FN:281,(anonymous_14)
-FN:328,(anonymous_15)
-FN:362,(anonymous_16)
-FN:390,(anonymous_17)
-FN:404,(anonymous_18)
-FN:418,(anonymous_19)
-FN:437,(anonymous_20)
-FN:462,(anonymous_21)
-FN:467,(anonymous_22)
-FN:472,(anonymous_23)
-FN:476,(anonymous_24)
-FN:520,(anonymous_25)
-FN:529,(anonymous_26)
-FN:605,(anonymous_27)
-FNF:28
-FNH:0
-FNDA:0,(anonymous_0)
-FNDA:0,(anonymous_1)
-FNDA:0,(anonymous_2)
-FNDA:0,(anonymous_3)
-FNDA:0,(anonymous_4)
-FNDA:0,(anonymous_5)
-FNDA:0,(anonymous_6)
-FNDA:0,(anonymous_7)
-FNDA:0,(anonymous_8)
-FNDA:0,(anonymous_9)
-FNDA:0,(anonymous_10)
-FNDA:0,(anonymous_11)
-FNDA:0,(anonymous_12)
-FNDA:0,(anonymous_13)
-FNDA:0,(anonymous_14)
-FNDA:0,(anonymous_15)
-FNDA:0,(anonymous_16)
-FNDA:0,(anonymous_17)
-FNDA:0,(anonymous_18)
-FNDA:0,(anonymous_19)
-FNDA:0,(anonymous_20)
-FNDA:0,(anonymous_21)
-FNDA:0,(anonymous_22)
-FNDA:0,(anonymous_23)
-FNDA:0,(anonymous_24)
-FNDA:0,(anonymous_25)
-FNDA:0,(anonymous_26)
-FNDA:0,(anonymous_27)
-DA:1,3
-DA:3,3
-DA:4,3
-DA:16,3
-DA:17,3
-DA:18,3
-DA:34,3
-DA:35,3
-DA:36,3
-DA:38,3
-DA:39,3
-DA:41,3
-DA:48,0
-DA:58,3
-DA:65,0
-DA:71,3
-DA:73,0
-DA:75,0
-DA:76,0
-DA:79,0
-DA:97,0
-DA:98,0
-DA:101,0
-DA:102,0
-DA:105,0
-DA:106,0
-DA:109,0
-DA:110,0
-DA:115,0
-DA:121,0
-DA:123,0
-DA:124,0
-DA:125,0
-DA:126,0
-DA:131,0
-DA:132,0
-DA:134,0
-DA:142,0
-DA:146,0
-DA:147,0
-DA:148,0
-DA:152,0
-DA:153,0
-DA:154,0
-DA:156,0
-DA:160,0
-DA:161,0
-DA:162,0
-DA:166,0
-DA:174,0
-DA:175,0
-DA:178,0
-DA:179,0
-DA:182,0
-DA:183,0
-DA:186,0
-DA:187,0
-DA:191,0
-DA:194,0
-DA:201,0
-DA:203,0
-DA:205,0
-DA:206,0
-DA:208,0
-DA:210,0
-DA:214,0
-DA:215,0
-DA:217,0
-DA:224,0
-DA:226,0
-DA:230,0
-DA:231,0
-DA:233,0
-DA:234,0
-DA:237,0
-DA:239,0
-DA:243,0
-DA:245,0
-DA:246,0
-DA:248,0
-DA:257,0
-DA:265,0
-DA:266,0
-DA:277,0
-DA:278,0
-DA:282,0
-DA:283,0
-DA:285,0
-DA:286,0
-DA:289,0
-DA:290,0
-DA:294,0
-DA:303,0
-DA:306,0
-DA:307,0
-DA:308,0
-DA:311,0
-DA:312,0
-DA:313,0
-DA:316,0
-DA:317,0
-DA:319,0
-DA:320,0
-DA:322,0
-DA:323,0
-DA:327,0
-DA:328,0
-DA:329,0
-DA:330,0
-DA:332,0
-DA:342,0
-DA:350,0
-DA:355,0
-DA:358,0
-DA:359,0
-DA:363,0
-DA:365,0
-DA:374,0
-DA:375,0
-DA:378,0
-DA:379,0
-DA:380,0
-DA:383,0
-DA:384,0
-DA:387,0
-DA:391,0
-DA:392,0
-DA:394,0
-DA:395,0
-DA:398,0
-DA:399,0
-DA:401,0
-DA:405,0
-DA:406,0
-DA:408,0
-DA:409,0
-DA:412,0
-DA:413,0
-DA:415,0
-DA:419,0
-DA:420,0
-DA:422,0
-DA:423,0
-DA:426,0
-DA:427,0
-DA:429,0
-DA:434,0
-DA:438,0
-DA:455,0
-DA:456,0
-DA:459,0
-DA:463,0
-DA:464,0
-DA:469,0
-DA:473,0
-DA:477,0
-DA:495,0
-DA:496,0
-DA:499,0
-DA:500,0
-DA:503,0
-DA:504,0
-DA:505,0
-DA:508,0
-DA:509,0
-DA:511,0
-DA:521,0
-DA:526,0
-DA:530,0
-DA:552,0
-DA:564,0
-DA:566,0
-DA:567,0
-DA:568,0
-DA:570,0
-DA:574,0
-DA:606,0
-DA:607,0
-DA:609,0
-DA:610,0
-DA:612,0
-DA:613,0
-DA:618,0
-LF:183
-LH:14
-BRDA:73,0,0,0
-BRDA:75,1,0,0
-BRDA:97,2,0,0
-BRDA:97,3,0,0
-BRDA:97,3,1,0
-BRDA:101,4,0,0
-BRDA:105,5,0,0
-BRDA:109,6,0,0
-BRDA:121,7,0,0
-BRDA:124,8,0,0
-BRDA:154,9,0,0
-BRDA:156,10,0,0
-BRDA:156,10,1,0
-BRDA:174,11,0,0
-BRDA:178,12,0,0
-BRDA:182,13,0,0
-BRDA:186,14,0,0
-BRDA:205,15,0,0
-BRDA:206,16,0,0
-BRDA:206,16,1,0
-BRDA:206,17,0,0
-BRDA:206,17,1,0
-BRDA:233,18,0,0
-BRDA:243,19,0,0
-BRDA:285,20,0,0
-BRDA:285,21,0,0
-BRDA:285,21,1,0
-BRDA:289,22,0,0
-BRDA:289,23,0,0
-BRDA:289,23,1,0
-BRDA:303,24,0,0
-BRDA:306,25,0,0
-BRDA:306,25,1,0
-BRDA:307,26,0,0
-BRDA:307,26,1,0
-BRDA:308,27,0,0
-BRDA:308,27,1,0
-BRDA:311,28,0,0
-BRDA:311,28,1,0
-BRDA:312,29,0,0
-BRDA:312,30,0,0
-BRDA:312,30,1,0
-BRDA:317,31,0,0
-BRDA:317,31,1,0
-BRDA:322,32,0,0
-BRDA:322,33,0,0
-BRDA:322,33,1,0
-BRDA:322,33,2,0
-BRDA:322,33,3,0
-BRDA:374,34,0,0
-BRDA:379,35,0,0
-BRDA:383,36,0,0
-BRDA:383,37,0,0
-BRDA:383,37,1,0
-BRDA:394,38,0,0
-BRDA:408,39,0,0
-BRDA:422,40,0,0
-BRDA:455,41,0,0
-BRDA:455,42,0,0
-BRDA:455,42,1,0
-BRDA:455,42,2,0
-BRDA:455,42,3,0
-BRDA:463,43,0,0
-BRDA:495,44,0,0
-BRDA:495,45,0,0
-BRDA:495,45,1,0
-BRDA:499,46,0,0
-BRDA:504,47,0,0
-BRDA:514,48,0,0
-BRDA:514,48,1,0
-BRDA:516,49,0,0
-BRDA:516,49,1,0
-BRDA:564,50,0,0
-BRDA:566,51,0,0
-BRDA:566,51,1,0
-BRDA:567,52,0,0
-BRDA:567,52,1,0
-BRDA:568,53,0,0
-BRDA:568,53,1,0
-BRDA:570,54,0,0
-BRDA:570,54,1,0
-BRDA:583,55,0,0
-BRDA:583,55,1,0
-BRDA:591,56,0,0
-BRDA:591,56,1,0
-BRDA:592,57,0,0
-BRDA:592,57,1,0
-BRDA:595,58,0,0
-BRDA:595,58,1,0
-BRDA:607,59,0,0
-BRDA:610,60,0,0
-BRF:91
-BRH:0
-end_of_record
diff --git a/apps/backend/package.json b/apps/backend/package.json
index fbb41a5..aee4ecf 100644
--- a/apps/backend/package.json
+++ b/apps/backend/package.json
@@ -55,7 +55,6 @@
     "@types/jsonwebtoken": "^9.0.10",
     "@types/node": "^25.5.0",
     "@types/node-cron": "^3.0.11",
-    "@types/pdf-parse": "^1.1.5",
     "@types/supertest": "^7.2.0",
     "jest": "^29.7.0",
     "ndb": "^1.1.5",
diff --git a/apps/backend/prisma/notifications_table.sql b/apps/backend/prisma/notifications_table.sql
new file mode 100644
index 0000000..09fe2c8
--- /dev/null
+++ b/apps/backend/prisma/notifications_table.sql
@@ -0,0 +1,26 @@
+-- ============================================================
+-- Creates the notifications table (in-app notification centre).
+-- Run via:
+--   npx prisma db execute --file prisma/notifications_table.sql --schema prisma/schema.prisma
+-- Idempotent: safe to re-run.
+-- ============================================================
+
+CREATE TABLE IF NOT EXISTS "notifications" (
+  "id"           uuid        NOT NULL DEFAULT uuid_generate_v4(),
+  "recipient_id" uuid        NOT NULL,
+  "type"         text        NOT NULL,
+  "title"        text        NOT NULL,
+  "body"         text        NOT NULL,
+  "data"         jsonb,
+  "is_read"      boolean     NOT NULL DEFAULT false,
+  "created_at"   timestamptz NOT NULL DEFAULT now(),
+  CONSTRAINT "notifications_pkey" PRIMARY KEY ("id"),
+  CONSTRAINT "notifications_recipient_id_fkey" FOREIGN KEY ("recipient_id")
+    REFERENCES "users" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS "notifications_recipient_id_is_read_idx"
+  ON "notifications" ("recipient_id", "is_read");
+
+CREATE INDEX IF NOT EXISTS "notifications_recipient_id_created_at_idx"
+  ON "notifications" ("recipient_id", "created_at");
diff --git a/apps/backend/prisma/policy_document_status.sql b/apps/backend/prisma/policy_document_status.sql
new file mode 100644
index 0000000..997bc59
--- /dev/null
+++ b/apps/backend/prisma/policy_document_status.sql
@@ -0,0 +1,25 @@
+-- ============================================================
+-- Migrate policy_documents: boolean is_processed -> 3-state status string
+-- Run via:
+--   npx prisma db execute --file prisma/policy_document_status.sql --schema prisma/schema.prisma
+-- Idempotent: safe to re-run.
+-- ============================================================
+
+ALTER TABLE "policy_documents"
+  ADD COLUMN IF NOT EXISTS "status" text NOT NULL DEFAULT 'processing';
+
+ALTER TABLE "policy_documents"
+  ADD COLUMN IF NOT EXISTS "error_message" text;
+
+-- Backfill status from the old boolean, then drop it — only on the first run.
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1 FROM information_schema.columns
+    WHERE table_name = 'policy_documents' AND column_name = 'is_processed'
+  ) THEN
+    UPDATE "policy_documents"
+      SET "status" = CASE WHEN "is_processed" THEN 'completed' ELSE 'processing' END;
+    ALTER TABLE "policy_documents" DROP COLUMN "is_processed";
+  END IF;
+END $$;
diff --git a/apps/backend/prisma/rag_raw_sql.sql b/apps/backend/prisma/rag_raw_sql.sql
index a0de493..c86786c 100644
--- a/apps/backend/prisma/rag_raw_sql.sql
+++ b/apps/backend/prisma/rag_raw_sql.sql
@@ -77,3 +77,19 @@ CREATE POLICY "admins_full_access_eval_logs" ON evaluation_logs
   USING (
     EXISTS (SELECT 1 FROM users WHERE id = auth.uid()::uuid AND role = 'admin')
   );
+
+-- 4. Table & function privileges for Supabase API roles.
+--    These tables are created by Prisma migrations and do NOT inherit Supabase's
+--    default GRANTs, so service_role (used by supabaseAdmin via PostgREST) gets
+--    "permission denied for table" despite having BYPASSRLS. Grant explicitly.
+GRANT SELECT, INSERT, UPDATE, DELETE ON policy_documents TO service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON document_chunks  TO service_role;
+GRANT SELECT, INSERT, UPDATE, DELETE ON evaluation_logs  TO service_role;
+
+-- authenticated users only read (matches the RLS SELECT policies above)
+GRANT SELECT ON policy_documents TO authenticated;
+GRANT SELECT ON document_chunks  TO authenticated;
+
+-- hybrid_search runs with caller privileges (plain SQL, not SECURITY DEFINER)
+GRANT EXECUTE ON FUNCTION hybrid_search(vector, text, integer)
+  TO service_role, authenticated;
diff --git a/apps/backend/prisma/schema.prisma b/apps/backend/prisma/schema.prisma
index fb7581a..9aa08bb 100644
--- a/apps/backend/prisma/schema.prisma
+++ b/apps/backend/prisma/schema.prisma
@@ -51,6 +51,7 @@ model User {
   events_created        CalendarEvent[]    @relation("EventsCreated")
   lost_found_comments   LostFoundComment[]
   settings              UserSettings?
+  notifications         Notification[]     @relation("UserNotifications")
 
   @@index([email])
   @@index([role])
@@ -59,6 +60,22 @@ model User {
   @@map("users")
 }
 
+model Notification {
+  id           String   @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
+  recipient_id String   @db.Uuid
+  recipient    User     @relation("UserNotifications", fields: [recipient_id], references: [id], onDelete: Cascade)
+  type         String   // 'gate' | 'message' | 'announcement' | 'attendance' | 'result'
+  title        String
+  body         String   @db.Text
+  data         Json?    // deep-link payload, e.g. { route, studentId, ... }
+  is_read      Boolean  @default(false)
+  created_at   DateTime @default(now()) @db.Timestamptz()
+
+  @@index([recipient_id, is_read])
+  @@index([recipient_id, created_at])
+  @@map("notifications")
+}
+
 model OtpVerification {
   id         String   @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
   email      String
@@ -355,7 +372,8 @@ model PolicyDocument {
   display_name String
   storage_path String
   file_hash    String?         @unique
-  is_processed Boolean         @default(false)
+  status       String          @default("processing") // 'processing' | 'completed' | 'failed'
+  error_message String?        @db.Text
   chunk_count  Int             @default(0)
   created_at   DateTime        @default(now()) @db.Timestamptz()
   updated_at   DateTime        @default(now()) @db.Timestamptz()
diff --git a/apps/backend/src/app.ts b/apps/backend/src/app.ts
index b1e0e49..88fd32a 100644
--- a/apps/backend/src/app.ts
+++ b/apps/backend/src/app.ts
@@ -16,6 +16,7 @@ import lostFoundRoutes from './modules/lost-found/lost-found.routes';
 import ragRoutes from './modules/rag/rag.routes';
 import resultsRoutes from './modules/results/results.routes';
 import calendarRoutes from './modules/calendar/calendar.routes';
+import notificationRoutes from './modules/notifications/notifications.routes';
 import { errorHandler } from './common/middleware/errorHandler';
 import { env } from './config/env';
 
@@ -71,6 +72,7 @@ app.register(lostFoundRoutes, { prefix: '/api/lost-found' });
 app.register(ragRoutes, { prefix: '/api/rag' });
 app.register(resultsRoutes, { prefix: '/api/results' });
 app.register(calendarRoutes, { prefix: '/api/calendar' });
+app.register(notificationRoutes, { prefix: '/api/notifications' });
 
 app.get('/health', async () => {
   return { status: 'ok', message: 'Universe API is running' };
diff --git a/apps/backend/src/modules/announcements/announcements.controller.ts b/apps/backend/src/modules/announcements/announcements.controller.ts
index a4c9061..da89f33 100644
--- a/apps/backend/src/modules/announcements/announcements.controller.ts
+++ b/apps/backend/src/modules/announcements/announcements.controller.ts
@@ -3,6 +3,7 @@ import { prisma } from '../../config/prisma';
 import { createAnnouncementSchema, getAnnouncementsSchema } from './announcements.schema';
 import { delCacheByPattern, getOrSetCache } from '../../common/utils/cache';
 import { sendMulticastFcmNotification } from '../../config/firebase';
+import { notifyUsers } from '../notifications/notifications.service';
 
 export const createAnnouncement = async (request: FastifyRequest, reply: FastifyReply) => {
   try {
@@ -28,48 +29,55 @@ export const createAnnouncement = async (request: FastifyRequest, reply: Fastify
 
     await delCacheByPattern('announcements:*');
 
-    // Trigger Firebase Push Notifications (FCM) based on scope/target
+    // Notify recipients — persists in-app notifications + FCM push for app
+    // users (parents/teachers); students get push only (not app users).
     try {
-      const tokens: string[] = [];
-
       if (data.scope === 'school_wide') {
-        if (data.target === 'all' || data.target === 'students') {
-          const students = await prisma.student.findMany({
-            select: { fcm_token: true },
-            where: { fcm_token: { not: null } }
-          });
-          tokens.push(...students.map((s: { fcm_token: string | null }) => s.fcm_token).filter(Boolean) as string[]);
-        }
+        const userIds: string[] = [];
+
         if (data.target === 'all' || data.target === 'parents_only') {
           const parents = await prisma.user.findMany({
-            select: { fcm_token: true },
-            where: { role: 'parent', fcm_token: { not: null } }
+            select: { id: true },
+            where: { role: 'parent', is_active: true },
           });
-          tokens.push(...parents.map((p: { fcm_token: string | null }) => p.fcm_token).filter(Boolean) as string[]);
+          userIds.push(...parents.map((p: { id: string }) => p.id));
         }
         if (data.target === 'all' || data.target === 'teachers') {
           const teachers = await prisma.user.findMany({
-            select: { fcm_token: true },
-            where: { role: 'teacher', fcm_token: { not: null } }
+            select: { id: true },
+            where: { role: 'teacher', is_active: true },
           });
-          tokens.push(...teachers.map((t: { fcm_token: string | null }) => t.fcm_token).filter(Boolean) as string[]);
+          userIds.push(...teachers.map((t: { id: string }) => t.id));
         }
-      }
 
-      if (tokens.length > 0) {
-        await sendMulticastFcmNotification(
-          tokens,
-          announcement.title,
-          announcement.content,
-          {
-            announcementId: announcement.id,
-            scope: announcement.scope,
-            target: announcement.target
+        if (userIds.length > 0) {
+          await notifyUsers(userIds, {
+            type: 'announcement',
+            title: announcement.title,
+            body: announcement.content,
+            data: { route: '/notices', announcementId: announcement.id },
+          });
+        }
+
+        // Students are not app users — push only, no in-app record.
+        if (data.target === 'all' || data.target === 'students') {
+          const students = await prisma.student.findMany({
+            select: { fcm_token: true },
+            where: { fcm_token: { not: null } },
+          });
+          const tokens = students
+            .map((s: { fcm_token: string | null }) => s.fcm_token)
+            .filter(Boolean) as string[];
+          if (tokens.length > 0) {
+            await sendMulticastFcmNotification(tokens, announcement.title, announcement.content, {
+              type: 'announcement',
+              announcementId: announcement.id,
+            });
           }
-        );
+        }
       }
     } catch (fcmError) {
-      console.error('FCM notification failed (non-blocking):', fcmError);
+      console.error('Announcement notification failed (non-blocking):', fcmError);
     }
 
     return reply.status(201).send({
diff --git a/apps/backend/src/modules/attendance/attendance.controller.ts b/apps/backend/src/modules/attendance/attendance.controller.ts
index 88ce017..7b57463 100644
--- a/apps/backend/src/modules/attendance/attendance.controller.ts
+++ b/apps/backend/src/modules/attendance/attendance.controller.ts
@@ -10,6 +10,7 @@ import {
   getAttendanceSummarySchema,
 } from './attendance.schema';
 import { delCacheByPattern, getOrSetCache, getCache, setCache, delCache } from '../../common/utils/cache';
+import { notifyUser } from '../notifications/notifications.service';
 
 export const getMyChildAttendance = async (request: FastifyRequest, reply: FastifyReply) => {
   try {
@@ -30,35 +31,57 @@ export const getMyChildAttendance = async (request: FastifyRequest, reply: Fasti
 
     const studentId = parentLink.student_id;
 
-    // 2. Fetch paginated attendance records
-    const total = await prisma.attendanceRecord.count({ where: { student_id: studentId } });
-    const records = await prisma.attendanceRecord.findMany({
-      where: { student_id: studentId },
-      orderBy: { date: 'desc' },
-      skip: (pageNum - 1) * limitNum,
-      take: limitNum,
-    });
-
-    // 3. For each record, check if there was a Gate IN event on that day
-    const recordsWithGate = await Promise.all(records.map(async (record) => {
-      const dateStart = new Date(record.date);
+    // 2. Fetch paginated distinct dates from both tables
+    const countQuery = await prisma.$queryRaw<{count: bigint}[]>`
+      SELECT COUNT(*) as count FROM (
+        SELECT DATE(date) as d FROM attendance_records WHERE student_id = ${studentId}::uuid
+        UNION
+        SELECT DATE(timestamp) as d FROM gate_events WHERE student_id = ${studentId}::uuid
+      ) as sub
+    `;
+    const total = Number(countQuery[0]?.count || 0);
+
+    const datesQuery = await prisma.$queryRaw<{d: Date}[]>`
+      SELECT d FROM (
+        SELECT DATE(date) as d FROM attendance_records WHERE student_id = ${studentId}::uuid
+        UNION
+        SELECT DATE(timestamp) as d FROM gate_events WHERE student_id = ${studentId}::uuid
+      ) as sub
+      ORDER BY d DESC
+      LIMIT ${limitNum} OFFSET ${(pageNum - 1) * limitNum}
+    `;
+
+    // 3. For each date, fetch the attendance record and gate event status
+    const recordsWithGate = await Promise.all(datesQuery.map(async (row) => {
+      // row.d is the date (midnight). We query between start and end of that day.
+      const dateStart = new Date(row.d);
       dateStart.setUTCHours(0, 0, 0, 0);
       const dateEnd = new Date(dateStart);
       dateEnd.setUTCDate(dateEnd.getUTCDate() + 1);
 
+      // Check attendance record
+      const attRecord = await prisma.attendanceRecord.findFirst({
+        where: {
+          student_id: studentId,
+          date: { gte: dateStart, lt: dateEnd },
+        },
+      });
+
+      // Check gate in event
       const gateInEvent = await prisma.gateEvent.findFirst({
         where: {
           student_id: studentId,
           direction: 'IN',
-          timestamp: {
-            gte: dateStart,
-            lt: dateEnd,
-          },
+          timestamp: { gte: dateStart, lt: dateEnd },
         },
       });
 
       return {
-        ...record,
+        id: attRecord?.id || `gate_${dateStart.getTime()}`,
+        student_id: studentId,
+        date: dateStart.toISOString(),
+        status: attRecord?.status || (gateInEvent ? 'unmarked' : 'absent'),
+        remarks: attRecord?.remarks || null,
         gateIn: !!gateInEvent,
       };
     }));
@@ -119,6 +142,24 @@ export const markAttendance = async (request: FastifyRequest, reply: FastifyRepl
 
     await delCacheByPattern('attendance:*');
 
+    // Notify the linked parent (in-app notification + push)
+    try {
+      const link = await prisma.parentStudent.findFirst({
+        where: { student_id: data.student_id },
+        select: { parent_id: true, student: { select: { full_name: true } } },
+      });
+      if (link?.parent_id) {
+        await notifyUser(link.parent_id, {
+          type: 'attendance',
+          title: 'Attendance Updated',
+          body: `${link.student?.full_name ?? 'Your child'} was marked ${data.status} today.`,
+          data: { route: '/attendance' },
+        });
+      }
+    } catch (notifyErr) {
+      request.log.error(notifyErr);
+    }
+
     return reply.status(200).send({
       success: true,
       message: `Attendance marked as ${data.status} successfully`,
@@ -304,6 +345,26 @@ export const submitSession = async (request: FastifyRequest, reply: FastifyReply
       delCacheByPattern(`attendance-summary:${session.class_id}:*`),
     ]);
 
+    // Notify the linked parent of each marked student (in-app notification + push)
+    try {
+      const studentIds = marks.map((m) => m.student_id);
+      const links = await prisma.parentStudent.findMany({
+        where: { student_id: { in: studentIds } },
+        select: { parent_id: true, student_id: true, student: { select: { full_name: true } } },
+      });
+      const statusByStudent = new Map(marks.map((m) => [m.student_id, m.status]));
+      for (const link of links) {
+        await notifyUser(link.parent_id, {
+          type: 'attendance',
+          title: 'Attendance Updated',
+          body: `${link.student?.full_name ?? 'Your child'} was marked ${statusByStudent.get(link.student_id)} today.`,
+          data: { route: '/attendance' },
+        });
+      }
+    } catch (notifyErr) {
+      request.log.error(notifyErr);
+    }
+
     return reply.status(200).send({
       success: true,
       data: { saved: marks.length, date: sessionDateStr, class_id: session.class_id },
diff --git a/apps/backend/src/modules/gate/gate.controller.ts b/apps/backend/src/modules/gate/gate.controller.ts
index 5ffa5ec..835373a 100644
--- a/apps/backend/src/modules/gate/gate.controller.ts
+++ b/apps/backend/src/modules/gate/gate.controller.ts
@@ -2,7 +2,7 @@ import { FastifyRequest, FastifyReply } from 'fastify';
 import { prisma } from '../../config/prisma';
 import { ScanQrInput } from './gate.schema';
 import { getOrSetCache, delCacheByPattern } from '../../common/utils/cache';
-import { sendFcmNotification } from '../../config/firebase';
+import { notifyUser } from '../notifications/notifications.service';
 
 export class GateController {
   
@@ -58,26 +58,22 @@ export class GateController {
       // Invalidate gate caches on every scan
       await delCacheByPattern('gate:*');
 
-      // 4. Notify linked parent via FCM (fire-and-forget — never block the scan response)
-      try {
-        const parentLink = await prisma.parentStudent.findFirst({
-          where: { student_id: student.id },
-          select: { parent: { select: { fcm_token: true } } },
+      // 4. Notify the linked parent — persists an in-app notification + FCM push.
+      //    notifyUser never throws, so the scan response is never blocked.
+      const parentLink = await prisma.parentStudent.findFirst({
+        where: { student_id: student.id },
+        select: { parent_id: true },
+      });
+      if (parentLink?.parent_id) {
+        const isIn = direction === 'IN';
+        await notifyUser(parentLink.parent_id, {
+          type: 'gate',
+          title: isIn ? '✅ Student Arrived' : '🚶 Student Left School',
+          body: isIn
+            ? `${student.full_name} has entered the school.`
+            : `${student.full_name} has left the school.`,
+          data: { route: '/gate-status', direction, studentId: student.id },
         });
-        const fcmToken = (parentLink as any)?.parent?.fcm_token;
-        if (fcmToken) {
-          const isIn = direction === 'IN';
-          await sendFcmNotification(
-            fcmToken,
-            isIn ? '✅ Student Arrived' : '🚶 Student Left School',
-            isIn
-              ? `${student.full_name} has entered the school.`
-              : `${student.full_name} has left the school.`,
-            { type: 'gate_event', direction, student_id: student.id }
-          );
-        }
-      } catch (_notifErr) {
-        // Notification failure must never fail the scan response
       }
 
       // 5. Return success to display on the security app screen
diff --git a/apps/backend/src/modules/gate/gate.scheduler.ts b/apps/backend/src/modules/gate/gate.scheduler.ts
index 8c7af27..250b990 100644
--- a/apps/backend/src/modules/gate/gate.scheduler.ts
+++ b/apps/backend/src/modules/gate/gate.scheduler.ts
@@ -1,5 +1,6 @@
 import cron from 'node-cron';
 import { prisma } from '../../config/prisma';
+import { notifyUser } from '../notifications/notifications.service';
 
 /**
  * Runs every day at 18:00 (6 PM server local time).
@@ -57,6 +58,20 @@ export function startGateScheduler() {
       });
 
       console.log(`[GateScheduler] Auto-checked out ${stillInside.length} student(s) at 6 PM.`);
+
+      // Notify the linked parent of each auto-checked-out student
+      const parentLinks = await prisma.parentStudent.findMany({
+        where: { student_id: { in: stillInside } },
+        select: { parent_id: true, student_id: true, student: { select: { full_name: true } } },
+      });
+      for (const link of parentLinks) {
+        await notifyUser(link.parent_id, {
+          type: 'gate',
+          title: '🚶 Student Auto-Checked Out',
+          body: `${link.student?.full_name ?? 'Your child'} was automatically checked out at 6 PM.`,
+          data: { route: '/gate-status', direction: 'OUT', studentId: link.student_id },
+        });
+      }
     } catch (err) {
       console.error('[GateScheduler] Auto-checkout failed:', err);
     }
diff --git a/apps/backend/src/modules/lost-found/lost-found.controller.ts b/apps/backend/src/modules/lost-found/lost-found.controller.ts
index d54fa78..3d97ab3 100644
--- a/apps/backend/src/modules/lost-found/lost-found.controller.ts
+++ b/apps/backend/src/modules/lost-found/lost-found.controller.ts
@@ -96,7 +96,7 @@ export const getItems = async (request: FastifyRequest, reply: FastifyReply) =>
 export const markCollected = async (request: FastifyRequest, reply: FastifyReply) => {
   try {
     const { id } = request.params as { id: string };
-    const data = updateStatusSchema.parse(request.body);
+    const data = updateStatusSchema.parse(request.body || { status: 'collected' });
     const user = (request as any).user;
 
     const item = await prisma.lostFoundItem.findUnique({ where: { id } });
@@ -255,7 +255,7 @@ export const getMyReports = async (request: FastifyRequest, reply: FastifyReply)
 export const markRecovered = async (request: FastifyRequest, reply: FastifyReply) => {
   try {
     const { id } = request.params as { id: string };
-    const data = updateReportStatusSchema.parse(request.body);
+    const data = updateReportStatusSchema.parse(request.body || { status: 'recovered' });
     const user = (request as any).user;
 
     const report = await prisma.lostFoundReport.findUnique({ where: { id } });
diff --git a/apps/backend/src/modules/messages/messages.controller.ts b/apps/backend/src/modules/messages/messages.controller.ts
index b6b9d6e..b4a1bfc 100644
--- a/apps/backend/src/modules/messages/messages.controller.ts
+++ b/apps/backend/src/modules/messages/messages.controller.ts
@@ -3,7 +3,7 @@ import { prisma } from '../../config/prisma';
 import { sendSchema, aiDraftSchema } from './messages.schema';
 import { z } from 'zod';
 import { delCacheByPattern, getOrSetCache } from '../../common/utils/cache';
-import { sendFcmNotification } from '../../config/firebase';
+import { notifyUser } from '../notifications/notifications.service';
 import { redis } from '../../config/redis';
 
 async function isOnline(userId: string): Promise<boolean> {
@@ -338,28 +338,13 @@ export const sendMessage = async (request: FastifyRequest, reply: FastifyReply)
       },
     });
 
-    // Send FCM notification to receiver
-    try {
-      const receiverUser = await prisma.user.findUnique({
-        where: { id: data.receiver_id },
-        select: { fcm_token: true, full_name: true },
-      });
-
-      if (receiverUser?.fcm_token) {
-        await sendFcmNotification(
-          receiverUser.fcm_token,
-          `New Message from ${user.full_name}`,
-          data.content.length > 50 ? data.content.substring(0, 47) + '...' : data.content,
-          { 
-            type: 'message', 
-            sender_id: senderId, 
-            message_id: message.id 
-          }
-        );
-      }
-    } catch (fcmErr) {
-      console.error('Failed to send FCM message notification:', fcmErr);
-    }
+    // Notify the receiver — persists an in-app notification + FCM push.
+    await notifyUser(data.receiver_id, {
+      type: 'message',
+      title: `New Message from ${user.full_name ?? 'Someone'}`,
+      body: data.content.length > 50 ? data.content.substring(0, 47) + '...' : data.content,
+      data: { route: '/messages', senderId, messageId: message.id },
+    });
 
     await delCacheByPattern(`messages:inbox:${senderId}`);
     await delCacheByPattern(`messages:inbox:${data.receiver_id}`);
diff --git a/apps/backend/src/modules/notifications/notifications.controller.ts b/apps/backend/src/modules/notifications/notifications.controller.ts
new file mode 100644
index 0000000..0f0cdf3
--- /dev/null
+++ b/apps/backend/src/modules/notifications/notifications.controller.ts
@@ -0,0 +1,92 @@
+import { FastifyRequest, FastifyReply } from 'fastify';
+import { prisma } from '../../config/prisma';
+
+export class NotificationsController {
+  // GET /api/notifications?limit=30&before=<ISO date>
+  static async list(request: FastifyRequest, reply: FastifyReply) {
+    try {
+      const user = (request as any).user as { userId: string };
+      const { limit = '30', before } = request.query as { limit?: string; before?: string };
+      const take = Math.min(100, Math.max(1, parseInt(limit) || 30));
+
+      const where: any = { recipient_id: user.userId };
+      if (before) {
+        const beforeDate = new Date(before);
+        if (!isNaN(beforeDate.getTime())) where.created_at = { lt: beforeDate };
+      }
+
+      const [notifications, unreadCount] = await Promise.all([
+        prisma.notification.findMany({
+          where,
+          orderBy: { created_at: 'desc' },
+          take,
+        }),
+        prisma.notification.count({
+          where: { recipient_id: user.userId, is_read: false },
+        }),
+      ]);
+
+      return reply.status(200).send({
+        success: true,
+        data: { notifications, unread_count: unreadCount },
+      });
+    } catch (error: any) {
+      request.log.error(error);
+      return reply.status(500).send({ success: false, message: 'Failed to fetch notifications' });
+    }
+  }
+
+  // GET /api/notifications/unread-count
+  static async unreadCount(request: FastifyRequest, reply: FastifyReply) {
+    try {
+      const user = (request as any).user as { userId: string };
+      const count = await prisma.notification.count({
+        where: { recipient_id: user.userId, is_read: false },
+      });
+      return reply.status(200).send({ success: true, data: { count } });
+    } catch (error: any) {
+      request.log.error(error);
+      return reply.status(500).send({ success: false, message: 'Failed to fetch unread count' });
+    }
+  }
+
+  // PATCH /api/notifications/:id/read
+  static async markRead(
+    request: FastifyRequest<{ Params: { id: string } }>,
+    reply: FastifyReply
+  ) {
+    try {
+      const user = (request as any).user as { userId: string };
+      const { id } = request.params;
+
+      // updateMany scoped to recipient_id so a user can only mark their own
+      const result = await prisma.notification.updateMany({
+        where: { id, recipient_id: user.userId },
+        data: { is_read: true },
+      });
+
+      if (result.count === 0) {
+        return reply.status(404).send({ success: false, message: 'Notification not found' });
+      }
+      return reply.status(200).send({ success: true });
+    } catch (error: any) {
+      request.log.error(error);
+      return reply.status(500).send({ success: false, message: 'Failed to update notification' });
+    }
+  }
+
+  // POST /api/notifications/read-all
+  static async markAllRead(request: FastifyRequest, reply: FastifyReply) {
+    try {
+      const user = (request as any).user as { userId: string };
+      await prisma.notification.updateMany({
+        where: { recipient_id: user.userId, is_read: false },
+        data: { is_read: true },
+      });
+      return reply.status(200).send({ success: true });
+    } catch (error: any) {
+      request.log.error(error);
+      return reply.status(500).send({ success: false, message: 'Failed to update notifications' });
+    }
+  }
+}
diff --git a/apps/backend/src/modules/notifications/notifications.routes.ts b/apps/backend/src/modules/notifications/notifications.routes.ts
new file mode 100644
index 0000000..d51d299
--- /dev/null
+++ b/apps/backend/src/modules/notifications/notifications.routes.ts
@@ -0,0 +1,16 @@
+import { FastifyInstance } from 'fastify';
+import { authenticate } from '../../common/middleware/authenticate';
+import { NotificationsController } from './notifications.controller';
+
+/**
+ * In-app notification centre. Every authenticated user manages their own
+ * notifications — no role restriction beyond authentication.
+ */
+export default async function notificationRoutes(fastify: FastifyInstance) {
+  fastify.addHook('preHandler', authenticate);
+
+  fastify.get('/', NotificationsController.list);
+  fastify.get('/unread-count', NotificationsController.unreadCount);
+  fastify.patch<{ Params: { id: string } }>('/:id/read', NotificationsController.markRead);
+  fastify.post('/read-all', NotificationsController.markAllRead);
+}
diff --git a/apps/backend/src/modules/notifications/notifications.service.ts b/apps/backend/src/modules/notifications/notifications.service.ts
new file mode 100644
index 0000000..050f134
--- /dev/null
+++ b/apps/backend/src/modules/notifications/notifications.service.ts
@@ -0,0 +1,140 @@
+import { prisma } from '../../config/prisma';
+import { sendFcmNotification, sendMulticastFcmNotification } from '../../config/firebase';
+
+export type NotifType = 'gate' | 'message' | 'announcement' | 'attendance' | 'result';
+
+export interface NotifPayload {
+  type: NotifType;
+  title: string;
+  body: string;
+  /** Deep-link / metadata payload. All values must be strings (FCM requirement). */
+  data?: Record<string, string>;
+}
+
+interface NotifSettings {
+  pushNotifications: boolean;
+  attendanceAlerts: boolean;
+  examAlerts: boolean;
+  generalAnnouncements: boolean;
+}
+
+/**
+ * Maps a notification type to the UserSettings flag that gates its PUSH.
+ * `null` means only the global `pushNotifications` toggle applies.
+ * The in-app notification row is ALWAYS stored regardless of settings —
+ * toggles only suppress the push, never the record.
+ */
+const PUSH_TOGGLE: Record<NotifType, keyof NotifSettings | null> = {
+  gate: null,
+  message: null,
+  announcement: 'generalAnnouncements',
+  attendance: 'attendanceAlerts',
+  result: 'examAlerts',
+};
+
+function pushAllowed(type: NotifType, settings: NotifSettings | null): boolean {
+  if (!settings) return true; // no settings row → all defaults are on
+  if (!settings.pushNotifications) return false;
+  const toggle = PUSH_TOGGLE[type];
+  if (toggle && settings[toggle] === false) return false;
+  return true;
+}
+
+const SETTINGS_SELECT = {
+  pushNotifications: true,
+  attendanceAlerts: true,
+  examAlerts: true,
+  generalAnnouncements: true,
+} as const;
+
+/**
+ * Persists an in-app notification for a single user and sends an FCM push
+ * (push gated by the user's settings). Never throws — failures are logged so
+ * the calling event handler is never blocked.
+ */
+export async function notifyUser(recipientId: string, payload: NotifPayload): Promise<void> {
+  if (!recipientId) return;
+
+  let notificationId: string | undefined;
+  try {
+    const record = await prisma.notification.create({
+      data: {
+        recipient_id: recipientId,
+        type: payload.type,
+        title: payload.title,
+        body: payload.body,
+        data: payload.data ?? undefined,
+      },
+      select: { id: true },
+    });
+    notificationId = record.id;
+  } catch (err) {
+    console.error('[notifications] failed to persist notification:', err);
+  }
+
+  try {
+    const user = await prisma.user.findUnique({
+      where: { id: recipientId },
+      select: { fcm_token: true, settings: { select: SETTINGS_SELECT } },
+    });
+    if (user?.fcm_token && pushAllowed(payload.type, user.settings)) {
+      await sendFcmNotification(user.fcm_token, payload.title, payload.body, {
+        type: payload.type,
+        ...(notificationId ? { notificationId } : {}),
+        ...(payload.data ?? {}),
+      });
+    }
+  } catch (err) {
+    console.error('[notifications] failed to send push:', err);
+  }
+}
+
+/**
+ * Persists in-app notifications for many users and sends a multicast FCM push
+ * (per-user push gated by settings). Never throws.
+ */
+export async function notifyUsers(recipientIds: string[], payload: NotifPayload): Promise<void> {
+  const uniqueIds = [...new Set(recipientIds.filter(Boolean))];
+  if (uniqueIds.length === 0) return;
+
+  // createManyAndReturn gives us the IDs back so we can include them in FCM.
+  // We build a map from recipientId → notificationId for the FCM step.
+  const recipientToNotifId = new Map<string, string>();
+  try {
+    const records = await prisma.notification.createManyAndReturn({
+      data: uniqueIds.map((id) => ({
+        recipient_id: id,
+        type: payload.type,
+        title: payload.title,
+        body: payload.body,
+        data: payload.data ?? undefined,
+      })),
+      select: { id: true, recipient_id: true },
+    });
+    for (const r of records) {
+      recipientToNotifId.set(r.recipient_id, r.id);
+    }
+  } catch (err) {
+    console.error('[notifications] failed to persist notifications:', err);
+  }
+
+  try {
+    const users = await prisma.user.findMany({
+      where: { id: { in: uniqueIds } },
+      select: { id: true, fcm_token: true, settings: { select: SETTINGS_SELECT } },
+    });
+    const tokens = users
+      .filter((u) => u.fcm_token && pushAllowed(payload.type, u.settings))
+      .map((u) => u.fcm_token as string);
+    if (tokens.length > 0) {
+      // For multicast we cannot attach per-user notificationId, so we omit it.
+      // Individual pushes (notifyUser) carry the notificationId.
+      await sendMulticastFcmNotification(tokens, payload.title, payload.body, {
+        type: payload.type,
+        ...(payload.data ?? {}),
+      });
+    }
+  } catch (err) {
+    console.error('[notifications] failed to send multicast push:', err);
+  }
+}
diff --git a/apps/backend/src/modules/rag/controllers/documents.controller.ts b/apps/backend/src/modules/rag/controllers/documents.controller.ts
index 17586f3..516f900 100644
--- a/apps/backend/src/modules/rag/controllers/documents.controller.ts
+++ b/apps/backend/src/modules/rag/controllers/documents.controller.ts
@@ -13,7 +13,8 @@ export async function listDocuments(_request: FastifyRequest, reply: FastifyRepl
       id: true,
       file_name: true,
       display_name: true,
-      is_processed: true,
+      status: true,
+      error_message: true,
       chunk_count: true,
       created_at: true,
     },
diff --git a/apps/backend/src/modules/rag/controllers/ingest.controller.ts b/apps/backend/src/modules/rag/controllers/ingest.controller.ts
index 4628d60..67f283b 100644
--- a/apps/backend/src/modules/rag/controllers/ingest.controller.ts
+++ b/apps/backend/src/modules/rag/controllers/ingest.controller.ts
@@ -60,7 +60,7 @@ export async function ingestDocument(request: FastifyRequest, reply: FastifyRepl
     return reply.status(500).send({ error: `Storage upload failed: ${storageError.message}` });
   }
 
-  // Create DB record as unprocessed first so admin sees it immediately
+  // Create DB record in 'processing' state first so admin sees it immediately
   const doc = await prisma.policyDocument.create({
     data: {
       uploader: { connect: { id: userId } },
@@ -68,14 +68,14 @@ export async function ingestDocument(request: FastifyRequest, reply: FastifyRepl
       display_name: displayName,
       storage_path: storagePath,
       file_hash: fileHash,
-      is_processed: false,
+      status: 'processing',
     },
   });
 
   processingJobs.add(doc.id);
 
   // Run ingestion pipeline asynchronously — reply immediately so admin UI isn't blocked
-  reply.status(202).send({ id: doc.id, display_name: displayName, is_processed: false });
+  reply.status(202).send({ id: doc.id, display_name: displayName, status: 'processing' });
 
   try {
     const chunks = isPdf ? await chunkPdf(buffer) : await chunkText(buffer);
@@ -98,13 +98,16 @@ export async function ingestDocument(request: FastifyRequest, reply: FastifyRepl
 
     await prisma.policyDocument.update({
       where: { id: doc.id },
-      data: { is_processed: true, chunk_count: chunks.length },
+      data: { status: 'completed', chunk_count: chunks.length },
     });
   } catch (err) {
-    // Mark as failed so admin knows processing didn't complete
+    // Mark as failed and store the reason so admin knows processing didn't complete
     await prisma.policyDocument.update({
       where: { id: doc.id },
-      data: { is_processed: false },
+      data: {
+        status: 'failed',
+        error_message: err instanceof Error ? err.message : String(err),
+      },
     });
     request.log.error({ err }, 'Ingestion pipeline failed for document ' + doc.id);
   } finally {
diff --git a/apps/backend/src/modules/rag/controllers/query.controller.ts b/apps/backend/src/modules/rag/controllers/query.controller.ts
index b335fba..e11dc47 100644
--- a/apps/backend/src/modules/rag/controllers/query.controller.ts
+++ b/apps/backend/src/modules/rag/controllers/query.controller.ts
@@ -2,8 +2,8 @@ import type { FastifyRequest, FastifyReply } from 'fastify';
 import crypto from 'crypto';
 import { redis } from '../../../config/redis';
 import { embedText } from '../services/embedder.service';
-import { hybridSearch, rerankChunks } from '../services/retrieval.service';
-import { generateAnswer } from '../services/generation.service';
+import { hybridSearch, rerankChunks, type RetrievedChunk } from '../services/retrieval.service';
+import { generateAnswer, generateGeneralAnswer, type GenerationResult } from '../services/generation.service';
 import { logEvaluation } from '../services/eval.service';
 
 const CACHE_TTL_SECONDS = 3600; // 1 hour — school policy answers are stable
@@ -46,23 +46,20 @@ export async function queryRag(
   // Step 2: hybrid search (pgvector + tsvector)
   const rawChunks = await hybridSearch(queryEmbedding, normalised, top_k);
 
+  // Step 3: generate an answer.
+  // When retrieval finds no relevant policy chunks, fall back to general
+  // knowledge instead of refusing — still helpful for school-related questions.
+  let result: GenerationResult;
+  let loggedChunks: RetrievedChunk[] = [];
   if (rawChunks.length === 0) {
-    return reply.send({
-      answer: "I don't have enough information in the school policy documents to answer that.",
-      sources: [],
-      confidence: 0,
-      cached: false,
-    });
+    result = await generateGeneralAnswer(question);
+  } else {
+    loggedChunks = rerankChunks(rawChunks, normalised);
+    result = await generateAnswer(loggedChunks, question);
   }
 
-  // Step 3: re-rank by term frequency boost
-  const chunks = rerankChunks(rawChunks, normalised);
-
-  // Step 4: generate answer with Claude Haiku
-  const result = await generateAnswer(chunks, question);
-
-  // Step 5: log to evaluation_logs (non-blocking — don't await)
-  logEvaluation(question, chunks, result).catch((err) =>
+  // Step 4: log to evaluation_logs (non-blocking — don't await)
+  logEvaluation(question, loggedChunks, result).catch((err) =>
     request.log.error({ err }, 'Eval logging failed')
   );
 
diff --git a/apps/backend/src/modules/rag/services/chunker.service.ts b/apps/backend/src/modules/rag/services/chunker.service.ts
index 30e533c..0eb1b51 100644
--- a/apps/backend/src/modules/rag/services/chunker.service.ts
+++ b/apps/backend/src/modules/rag/services/chunker.service.ts
@@ -1,5 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const pdfParse = require('pdf-parse') as (buffer: Buffer) => Promise<{ text: string }>;
+import { PDFParse } from 'pdf-parse';
 
 export interface TextChunk {
   text: string;
@@ -70,9 +69,16 @@ function buildChunks(sentences: string[]): string[] {
  * Cleans up hyphenation artifacts and extra whitespace common in PDF-extracted text.
  */
 export async function chunkPdf(buffer: Buffer): Promise<TextChunk[]> {
-  const data = await pdfParse(buffer);
+  const parser = new PDFParse({ data: buffer });
+  let rawText: string;
+  try {
+    const result = await parser.getText();
+    rawText = result.text;
+  } finally {
+    await parser.destroy(); // always release the pdf.js worker
+  }
 
-  const cleaned = data.text
+  const cleaned = rawText
     .replace(/-\n/g, '')     // rejoin hyphenated line breaks
     .replace(/\n+/g, ' ')   // flatten newlines to spaces
     .replace(/\s{2,}/g, ' ') // collapse multiple spaces
diff --git a/apps/backend/src/modules/rag/services/generation.service.ts b/apps/backend/src/modules/rag/services/generation.service.ts
index 4556593..9061367 100644
--- a/apps/backend/src/modules/rag/services/generation.service.ts
+++ b/apps/backend/src/modules/rag/services/generation.service.ts
@@ -3,9 +3,9 @@ import { env } from '../../../config/env';
 import type { RetrievedChunk } from './retrieval.service';
 
 const genAI = new GoogleGenerativeAI(env.GEMINI_API_KEY);
-const generationModel = genAI.getGenerativeModel({ model: 'gemini-2.5-flash-lite' });
+const generationModel = genAI.getGenerativeModel({ model: 'gemini-2.5-flash' });
 
-const MAX_CONTEXT_CHARS = 3000;
+const MAX_CONTEXT_CHARS = 16000;
 
 export interface GenerationResult {
   answer: string;
@@ -15,14 +15,24 @@ export interface GenerationResult {
 
 const DONT_KNOW_MARKER = "I don't have enough information";
 
+// Prepended (general-knowledge path) or appended by the model (mixed answers)
+// so users don't mistake general guidance for the school's official policy.
+const GENERAL_DISCLAIMER =
+  "ℹ️ General guidance — this is not from your school's official policy documents.";
+
 function buildPrompt(chunks: RetrievedChunk[], question: string): string {
   let contextText = chunks.map((c) => c.chunk_text).join('\n\n');
   if (contextText.length > MAX_CONTEXT_CHARS) {
     contextText = contextText.slice(0, MAX_CONTEXT_CHARS) + '\n[...context truncated]';
   }
 
-  return `You are a helpful assistant for a school. Answer the question using ONLY the school policy documents provided below.
-If the context does not contain enough information to answer, respond with exactly: "${DONT_KNOW_MARKER} in the school policy documents to answer that."
+  return `You are a helpful assistant for a school. Answer the user's question.
+
+Use the school policy excerpts below as your primary, authoritative source.
+- If the excerpts fully answer the question, answer directly from them.
+- If the excerpts only partially cover it, answer from them AND supplement with general knowledge of how schools commonly operate, so the answer is helpful.
+- If any part of your answer is NOT taken from the excerpts, append this exact line at the very end: "${GENERAL_DISCLAIMER}"
+- Only if the question is not about school or education at all, reply with exactly: "${DONT_KNOW_MARKER} in the school policy documents to answer that."
 
 [CONTEXT]
 ${contextText}
@@ -52,3 +62,28 @@ export async function generateAnswer(
 
   return { answer, sources, confidence };
 }
+
+/**
+ * Fallback used when retrieval finds no relevant policy chunks.
+ * Answers school/education questions from the model's general knowledge so the
+ * bot stays helpful, with a disclaimer that it is not official school policy.
+ * Genuinely non-school questions still get the standard refusal.
+ */
+export async function generateGeneralAnswer(question: string): Promise<GenerationResult> {
+  const prompt = `You are a helpful assistant for a school. The school's policy documents do not contain information relevant to this question.
+If the question is about school, education, students, or related matters, answer it helpfully using general knowledge of how schools commonly operate.
+If the question is NOT about school or education at all, reply with exactly: "${DONT_KNOW_MARKER} in the school policy documents to answer that."
+
+[QUESTION]
+${question}`;
+
+  const result = await generationModel.generateContent(prompt);
+  let answer = result.response.text().trim();
+
+  const didntKnow = answer.includes(DONT_KNOW_MARKER);
+  if (!didntKnow) {
+    answer = `${GENERAL_DISCLAIMER}\n\n${answer}`;
+  }
+
+  return { answer, sources: [], confidence: didntKnow ? 0 : 0.3 };
+}
diff --git a/apps/backend/src/modules/results/results.service.ts b/apps/backend/src/modules/results/results.service.ts
index 9f40737..1098b48 100644
--- a/apps/backend/src/modules/results/results.service.ts
+++ b/apps/backend/src/modules/results/results.service.ts
@@ -1,5 +1,6 @@
 import { prisma } from '../../config/prisma';
 import { CreateTermInput, UpdateTermInput, CreateResultSetInput, SaveResultSetInput } from './results.schema';
+import { notifyUsers } from '../notifications/notifications.service';
 
 export class ResultsService {
 
@@ -117,11 +118,32 @@ export class ResultsService {
 
   static async publishResultSet(resultSetId: string, teacherId: string) {
     await ResultsService.assertTeacherOwnsResultSet(resultSetId, teacherId);
-    return prisma.resultSet.update({
+    const resultSet = await prisma.resultSet.update({
       where: { id: resultSetId },
       data: { status: 'published', published_at: new Date() },
       include: { term: true, modules: { orderBy: { order_index: 'asc' } }, grades: true },
     });
+
+    // Notify the parents of every student in the class (in-app notification + push)
+    try {
+      const links = await prisma.parentStudent.findMany({
+        where: { student: { class_id: resultSet.class_id } },
+        select: { parent_id: true },
+      });
+      const parentIds = links.map((l) => l.parent_id);
+      if (parentIds.length > 0) {
+        await notifyUsers(parentIds, {
+          type: 'result',
+          title: 'Results Published',
+          body: `${resultSet.term?.label ?? 'New'} results have been published. Tap to view.`,
+          data: { route: '/results' },
+        });
+      }
+    } catch (notifyErr) {
+      console.error('[results] publish notification failed:', notifyErr);
+    }
+
+    return resultSet;
   }
 
   static async unpublishResultSet(resultSetId: string, teacherId: string) {
diff --git a/apps/backend/src/modules/school/school.service.ts b/apps/backend/src/modules/school/school.service.ts
index e7d6ae0..aced993 100644
--- a/apps/backend/src/modules/school/school.service.ts
+++ b/apps/backend/src/modules/school/school.service.ts
@@ -256,13 +256,15 @@ export class SchoolService {
     const yesterday = new Date(today);
     yesterday.setDate(yesterday.getDate() - 1);
 
-    const [activeStudents, suspendedStudents, todayGateCheckIns, yesterdayGateCheckIns] = await Promise.all([
+    const [activeStudents, suspendedStudents, todayGateCheckIns, yesterdayGateCheckIns, todayClassroomPresent] = await Promise.all([
       prisma.student.count({ where: { is_active: true, ...(classId ? { class_id: classId } : {}) } }),
       // Suspended students = students with is_active: false
       prisma.student.count({ where: { is_active: false, ...(classId ? { class_id: classId } : {}) } }),
       // Gate check-ins as the attendance figure (matches attendance page stat card)
       prisma.gateEvent.count({ where: { direction: 'IN', timestamp: { gte: today }, ...(classId ? { student: { class_id: classId } } : {}) } }),
       prisma.gateEvent.count({ where: { direction: 'IN', timestamp: { gte: yesterday, lt: today }, ...(classId ? { student: { class_id: classId } } : {}) } }),
+      // Classroom present/late marks
+      prisma.attendanceRecord.count({ where: { date: { gte: today }, status: { in: ['present', 'late'] }, ...(classId ? { student: { class_id: classId } } : {}) } }),
     ]);
 
     return {
@@ -272,6 +274,7 @@ export class SchoolService {
       lockedAccounts: suspendedStudents,
       todayAttendance: todayGateCheckIns,
       yesterdayAttendance: yesterdayGateCheckIns,
+      todayClassroomPresent,
     };
   }
 
diff --git a/apps/flutter/android/.gitignore b/apps/flutter/android/.gitignore
index be3943c..db9ecf9 100644
--- a/apps/flutter/android/.gitignore
+++ b/apps/flutter/android/.gitignore
@@ -12,3 +12,6 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+
+# Firebase config — injected by CI from GitHub Secrets, never committed
+google-services.json
diff --git a/apps/flutter/android/app/build.gradle.kts b/apps/flutter/android/app/build.gradle.kts
index 18bbb42..12776a7 100644
--- a/apps/flutter/android/app/build.gradle.kts
+++ b/apps/flutter/android/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -6,6 +8,10 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keyProps = Properties()
+val keyPropsFile = rootProject.file("key.properties")
+if (keyPropsFile.exists()) keyProps.load(keyPropsFile.inputStream())
+
 android {
     namespace = "com.example.universe_app"
     compileSdk = flutter.compileSdkVersion
@@ -22,21 +28,29 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "com.example.universe_app"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
     }
 
+    signingConfigs {
+        create("release") {
+            storeFile = (keyProps["storeFile"] as String?)?.let { file(it) }
+            storePassword = keyProps["storePassword"] as String?
+            keyAlias = keyProps["keyAlias"] as String?
+            keyPassword = keyProps["keyPassword"] as String?
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.getByName("debug")
+            signingConfig = if ((keyProps["storeFile"] as String?).isNullOrEmpty()) {
+                signingConfigs.getByName("debug")
+            } else {
+                signingConfigs.getByName("release")
+            }
         }
     }
 }
diff --git a/apps/flutter/android/app/google-services.json b/apps/flutter/android/app/google-services.json
deleted file mode 100644
index ff2a622..0000000
--- a/apps/flutter/android/app/google-services.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "project_info": {
-    "project_number": "451261949462",
-    "project_id": "universe-fireabse",
-    "storage_bucket": "universe-fireabse.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:451261949462:android:abc123def456ghi789jkl",
-        "android_client_info": {
-          "package_name": "com.example.universe_app"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDummy1234567890ABCDEFGHIJKLMNOPQRS"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
diff --git a/apps/flutter/lib/app.dart b/apps/flutter/lib/app.dart
index 9818167..1fb1917 100644
--- a/apps/flutter/lib/app.dart
+++ b/apps/flutter/lib/app.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
+import 'package:universe_app/core/constants/app_routes.dart';
 import 'package:universe_app/core/constants/app_strings.dart';
 import 'package:universe_app/core/navigation/app_router.dart';
+import 'package:universe_app/core/services/firebase_service.dart';
 import 'package:universe_app/features/auth/viewmodels/auth_viewmodel.dart';
 import 'package:universe_app/features/gate/viewmodels/gate_viewmodel.dart';
 import 'package:universe_app/features/messages/viewmodels/messages_viewmodel.dart';
@@ -13,6 +15,7 @@ import 'package:universe_app/features/support/viewmodels/support_viewmodel.dart'
 import 'package:universe_app/features/notices/viewmodels/notices_viewmodel.dart';
 import 'package:universe_app/features/settings/viewmodels/settings_viewmodel.dart';
 import 'package:universe_app/features/lost_and_found/viewmodels/lost_found_viewmodel.dart';
+import 'package:universe_app/features/notifications/viewmodels/notifications_viewmodel.dart';
 import 'package:universe_app/shared/themes/app_theme.dart';
 
 class UniverseApp extends StatefulWidget {
@@ -28,6 +31,8 @@ class UniverseApp extends StatefulWidget {
     required this.noticesViewModel,
     required this.settingsViewModel,
     required this.lostFoundViewModel,
+    required this.notificationsViewModel,
+    required this.firebaseService,
   });
 
   final AuthViewModel authViewModel;
@@ -40,6 +45,8 @@ class UniverseApp extends StatefulWidget {
   final NoticesViewModel noticesViewModel;
   final SettingsViewModel settingsViewModel;
   final LostFoundViewModel lostFoundViewModel;
+  final NotificationsViewModel notificationsViewModel;
+  final FirebaseService firebaseService;
 
   @override
   State<UniverseApp> createState() => _UniverseAppState();
@@ -53,6 +60,34 @@ class _UniverseAppState extends State<UniverseApp> with WidgetsBindingObserver {
     super.initState();
     WidgetsBinding.instance.addObserver(this);
     _router = AppRouter.createRouter(widget.authViewModel);
+    _wireNotifications();
+  }
+
+  /// Connects FCM events to the notification viewmodel + router so the in-app
+  /// list, unread badge, and deep links all stay live.
+  void _wireNotifications() {
+    // Foreground push → refresh the in-app list + badge.
+    widget.firebaseService.onMessageReceived = (_) {
+      widget.notificationsViewModel.refresh();
+    };
+
+    // Tapped push (background/terminated) → refresh + deep-link.
+    widget.firebaseService.onNotificationTap = (message) async {
+      await widget.notificationsViewModel.refresh();
+
+      // Mark the tapped notification as read using the ID sent in the FCM payload.
+      final notificationId = message.data['notificationId'];
+      if (notificationId is String && notificationId.isNotEmpty) {
+        widget.notificationsViewModel.markRead(notificationId);
+      }
+
+      final dynamic route = message.data['route'];
+      if (route is String && route.isNotEmpty) {
+        _router.go(route);
+      } else {
+        _router.go(AppRoutes.notifications);
+      }
+    };
   }
 
   @override
@@ -80,6 +115,7 @@ class _UniverseAppState extends State<UniverseApp> with WidgetsBindingObserver {
         ChangeNotifierProvider<NoticesViewModel>.value(value: widget.noticesViewModel),
         ChangeNotifierProvider<SettingsViewModel>.value(value: widget.settingsViewModel),
         ChangeNotifierProvider<LostFoundViewModel>.value(value: widget.lostFoundViewModel),
+        ChangeNotifierProvider<NotificationsViewModel>.value(value: widget.notificationsViewModel),
       ],
       child: MaterialApp.router(
         title: AppStrings.appName,
diff --git a/apps/flutter/lib/core/api/api_endpoints.dart b/apps/flutter/lib/core/api/api_endpoints.dart
index f625397..6d88ea1 100644
--- a/apps/flutter/lib/core/api/api_endpoints.dart
+++ b/apps/flutter/lib/core/api/api_endpoints.dart
@@ -30,4 +30,10 @@ class ApiEndpoints {
 
   // RAG / Chatbot
   static const String ragQuery = '$basePath/rag/query';
+
+  // Notifications
+  static const String notifications = '$basePath/notifications';
+  static const String notificationsUnreadCount = '$basePath/notifications/unread-count';
+  static const String notificationsReadAll = '$basePath/notifications/read-all';
+  static String notificationRead(String id) => '$basePath/notifications/$id/read';
 }
diff --git a/apps/flutter/lib/core/di/service_locator.dart b/apps/flutter/lib/core/di/service_locator.dart
index 3915d65..7a6fdd6 100644
--- a/apps/flutter/lib/core/di/service_locator.dart
+++ b/apps/flutter/lib/core/di/service_locator.dart
@@ -19,11 +19,12 @@ import 'package:universe_app/features/support/repositories/support_repository.da
 import 'package:universe_app/features/support/viewmodels/support_viewmodel.dart';
 import 'package:universe_app/features/notices/repositories/notices_repository.dart';
 import 'package:universe_app/features/notices/viewmodels/notices_viewmodel.dart';
-import 'package:universe_app/features/notifications/viewmodels/notifications_viewmodel.dart';
 import 'package:universe_app/features/lost_and_found/repositories/lost_found_repository.dart';
 import 'package:universe_app/features/lost_and_found/viewmodels/lost_found_viewmodel.dart';
 import 'package:universe_app/features/settings/repositories/settings_repository.dart';
 import 'package:universe_app/features/settings/viewmodels/settings_viewmodel.dart';
+import 'package:universe_app/features/notifications/repositories/notifications_repository.dart';
+import 'package:universe_app/features/notifications/viewmodels/notifications_viewmodel.dart';
 
 class ServiceLocator {
   ServiceLocator._();
@@ -53,6 +54,8 @@ class ServiceLocator {
   late SettingsViewModel settingsViewModel;
   late LostFoundRepository lostFoundRepository;
   late LostFoundViewModel lostFoundViewModel;
+  late NotificationsRepository notificationsRepository;
+  late NotificationsViewModel notificationsViewModel;
 
   Future<void> setup() async {
     apiClient = ApiClient(baseUrl: ApiConfig.baseUrl);
@@ -97,8 +100,13 @@ class ServiceLocator {
     );
     noticesViewModel = NoticesViewModel(repository: noticesRepository);
     settingsRepository = SettingsRepository(apiClient.dio, secureStorageService);
-    settingsViewModel = SettingsViewModel(settingsRepository);
+    settingsViewModel = SettingsViewModel(settingsRepository, firebaseService);
     lostFoundRepository = LostFoundRepository(apiClient.dio, secureStorageService);
     lostFoundViewModel = LostFoundViewModel(lostFoundRepository);
+    notificationsRepository = NotificationsRepository(
+      dio: apiClient.dio,
+      secureStorage: secureStorageService,
+    );
+    notificationsViewModel = NotificationsViewModel(notificationsRepository);
   }
 }
diff --git a/apps/flutter/lib/core/navigation/app_router.dart b/apps/flutter/lib/core/navigation/app_router.dart
index a4a6765..a282620 100644
--- a/apps/flutter/lib/core/navigation/app_router.dart
+++ b/apps/flutter/lib/core/navigation/app_router.dart
@@ -207,6 +207,11 @@ class AppRouter {
           child: const NoticesScreen(),
         ),
       ),
+      GoRoute(
+        path: AppRoutes.notifications,
+        pageBuilder: (context, state) => _slideTransition(
+          key: state.pageKey,
+          child: const NotificationsScreen(),
         ),
       ),
       GoRoute(
diff --git a/apps/flutter/lib/core/services/firebase_service.dart b/apps/flutter/lib/core/services/firebase_service.dart
index cb58982..e58d770 100644
--- a/apps/flutter/lib/core/services/firebase_service.dart
+++ b/apps/flutter/lib/core/services/firebase_service.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
@@ -14,8 +15,13 @@ class FirebaseService {
   FirebaseMessaging? _messaging;
   late FlutterLocalNotificationsPlugin _localNotifications;
 
+  /// Called when the app opens from a tapped notification (background/terminated).
   void Function(RemoteMessage)? onNotificationTap;
 
+  /// Called for every foreground message — lets the UI refresh live (e.g. the
+  /// in-app notification list and unread badge).
+  void Function(RemoteMessage)? onMessageReceived;
+
   static const AndroidNotificationChannel _channel = AndroidNotificationChannel(
     'high_importance_channel',
     'High Importance Notifications',
@@ -43,7 +49,17 @@ class FirebaseService {
         const androidInit = AndroidInitializationSettings('@mipmap/ic_launcher');
         const iosInit = DarwinInitializationSettings();
         const initSettings = InitializationSettings(android: androidInit, iOS: iosInit);
-        await _localNotifications.initialize(settings: initSettings);
+        await _localNotifications.initialize(
+          settings: initSettings,
+          onDidReceiveNotificationResponse: (details) {
+            if (details.payload != null) {
+              try {
+                final message = RemoteMessage.fromMap(jsonDecode(details.payload!));
+                onNotificationTap?.call(message);
+              } catch (_) {}
+            }
+          },
+        );
 
         await _localNotifications
             .resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>()
@@ -86,6 +102,9 @@ class FirebaseService {
   void _handleForegroundMessage(RemoteMessage message) {
     print('Gate notification: ${message.notification?.title} — ${message.notification?.body}');
 
+    // Let the UI update the in-app list / unread badge live.
+    onMessageReceived?.call(message);
+
     final notification = message.notification;
     if (notification == null) return;
 
@@ -93,6 +112,7 @@ class FirebaseService {
       id: notification.hashCode,
       title: notification.title,
       body: notification.body,
+      payload: jsonEncode(message.toMap()),
       notificationDetails: NotificationDetails(
         android: AndroidNotificationDetails(
           _channel.id,
@@ -134,4 +154,35 @@ class FirebaseService {
   Future<String?> getFcmToken() async {
     return _messaging?.getToken();
   }
+
+  /// Checks the current OS notification permission and requests it if not yet
+  /// determined. Returns `true` if permission is granted or provisional,
+  /// `false` if permanently denied (caller should show "open device settings" UI).
+  Future<bool> requestOrCheckPermission() async {
+    try {
+      final messaging = _messaging ?? FirebaseMessaging.instance;
+      final settings = await messaging.getNotificationSettings();
+      final status = settings.authorizationStatus;
+
+      if (status == AuthorizationStatus.authorized ||
+          status == AuthorizationStatus.provisional) {
+        return true;
+      }
+
+      if (status == AuthorizationStatus.notDetermined) {
+        final result = await messaging.requestPermission(
+          alert: true,
+          badge: true,
+          sound: true,
+        );
+        return result.authorizationStatus == AuthorizationStatus.authorized ||
+            result.authorizationStatus == AuthorizationStatus.provisional;
+      }
+
+      // AuthorizationStatus.denied — permanently denied by user.
+      return false;
+    } catch (_) {
+      return false;
+    }
+  }
 }
diff --git a/apps/flutter/lib/features/attendance/views/attendance_screen.dart b/apps/flutter/lib/features/attendance/views/attendance_screen.dart
index 854e72a..a944148 100644
--- a/apps/flutter/lib/features/attendance/views/attendance_screen.dart
+++ b/apps/flutter/lib/features/attendance/views/attendance_screen.dart
@@ -480,9 +480,19 @@ class _TableRow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final Color statusColor = record.isPresent
-        ? const Color(0xFF16A34A)
-        : const Color(0xFFDC2626);
+    final String normalizedStatus = record.status.toLowerCase();
+    
+    Color statusColor;
+    if (normalizedStatus == 'present') {
+      statusColor = const Color(0xFF16A34A);
+    } else if (normalizedStatus == 'absent') {
+      statusColor = const Color(0xFFDC2626);
+    } else if (normalizedStatus == 'late') {
+      statusColor = const Color(0xFFF59E0B);
+    } else {
+      statusColor = const Color(0xFF94A3B8); // unmarked / pending
+    }
+
     final String statusText = record.status[0].toUpperCase() + record.status.substring(1);
     final Color dotColor = record.gateIn
         ? const Color(0xFF22C55E)
diff --git a/apps/flutter/lib/features/chatbot/views/chatbot_screen.dart b/apps/flutter/lib/features/chatbot/views/chatbot_screen.dart
index 5d73361..1dc45b6 100644
--- a/apps/flutter/lib/features/chatbot/views/chatbot_screen.dart
+++ b/apps/flutter/lib/features/chatbot/views/chatbot_screen.dart
@@ -19,11 +19,13 @@ class _ChatMessage {
     required this.isMine,
     required this.time,
     this.isBot = false,
+    this.isThinking = false,
   });
   final String text;
   final bool isMine;
   final String time;
   final bool isBot;
+  final bool isThinking;
 }
 
 const _ChatMessage _kWelcomeMessage = _ChatMessage(
@@ -93,7 +95,8 @@ class _ChatBotScreenState extends State<ChatBotScreen>
     setState(() {
       _isLoading = true;
       _messages = List<_ChatMessage>.from(_messages)
-        ..add(_ChatMessage(text: text, isMine: true, time: time));
+        ..add(_ChatMessage(text: text, isMine: true, time: time))
+        ..add(const _ChatMessage(text: '', isMine: false, time: '', isBot: true, isThinking: true));
     });
     _inputController.clear();
     _scrollToBottom();
@@ -111,12 +114,14 @@ class _ChatBotScreenState extends State<ChatBotScreen>
 
       setState(() {
         _messages = List<_ChatMessage>.from(_messages)
+          ..removeLast() // remove thinking placeholder
           ..add(_ChatMessage(text: replyText, isMine: false, time: _formatTime(), isBot: true));
       });
     } catch (_) {
       if (!mounted) return;
       setState(() {
         _messages = List<_ChatMessage>.from(_messages)
+          ..removeLast() // remove thinking placeholder
           ..add(_ChatMessage(
             text: 'Sorry, I couldn\'t reach the server. Please check your connection and try again.',
             isMine: false,
@@ -400,16 +405,18 @@ class _MessageBubble extends StatelessWidget {
                       ),
                     ],
                   ),
-                  child: Text(
-                    message.text,
-                    style: TextStyle(
-                      fontFamily: 'Plus Jakarta Sans',
-                      fontSize: 14,
-                      fontWeight: FontWeight.w500,
-                      color: mine ? Colors.white : const Color(0xFF16212A),
-                      height: 1.5,
-                    ),
-                  ),
+                  child: message.isThinking 
+                    ? const _ThinkingIndicator()
+                    : Text(
+                        message.text,
+                        style: TextStyle(
+                          fontFamily: 'Plus Jakarta Sans',
+                          fontSize: 14,
+                          fontWeight: FontWeight.w500,
+                          color: mine ? Colors.white : const Color(0xFF16212A),
+                          height: 1.5,
+                        ),
+                      ),
                 ),
                 const SizedBox(height: 6),
                 Text(
@@ -530,9 +537,7 @@ class _InputBar extends StatelessWidget {
                   ),
                 ],
               ),
-              child: isLoading
-                  ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2))
-                  : const Icon(Icons.send_rounded, color: Colors.white, size: 22),
+              child: const Icon(Icons.send_rounded, color: Colors.white, size: 22),
             ),
           ),
         ],
@@ -540,3 +545,42 @@ class _InputBar extends StatelessWidget {
     );
   }
 }
+
+// ─── Thinking Indicator ───────────────────────────────────────────────────────
+
+class _ThinkingIndicator extends StatefulWidget {
+  const _ThinkingIndicator();
+  @override
+  State<_ThinkingIndicator> createState() => _ThinkingIndicatorState();
+}
+
+class _ThinkingIndicatorState extends State<_ThinkingIndicator> with SingleTickerProviderStateMixin {
+  late final AnimationController _ctrl = AnimationController(vsync: this, duration: const Duration(milliseconds: 1000))..repeat();
+  
+  @override
+  void dispose() {
+    _ctrl.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: _ctrl,
+      builder: (context, _) {
+        final i = (_ctrl.value * 4).floor();
+        final dots = '.' * i;
+        return Text(
+          'Thinking${dots.padRight(3, '\u00A0')}',
+          style: const TextStyle(
+            fontFamily: 'Plus Jakarta Sans',
+            fontSize: 14,
+            fontWeight: FontWeight.w500,
+            color: Color(0xFF16212A),
+            height: 1.5,
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/apps/flutter/lib/features/contact_teacher/views/teacher_chat_screen.dart b/apps/flutter/lib/features/contact_teacher/views/teacher_chat_screen.dart
index 6b85f56..7609995 100644
--- a/apps/flutter/lib/features/contact_teacher/views/teacher_chat_screen.dart
+++ b/apps/flutter/lib/features/contact_teacher/views/teacher_chat_screen.dart
@@ -113,6 +113,9 @@ class _TeacherChatScreenState extends State<TeacherChatScreen>
     final messagesVm = context.read<MessagesViewModel>();
     final profileVm = context.read<ProfileViewModel>();
     
+    _inputController.clear();
+    _scrollToBottom();
+    
     final success = await messagesVm.sendMessage(
       receiverId: _targetTeacher!.id,
       content: text,
@@ -120,9 +123,10 @@ class _TeacherChatScreenState extends State<TeacherChatScreen>
       userId: _userId,
     );
 
-    if (success) {
-      _inputController.clear();
-      _scrollToBottom();
+    if (!success && mounted) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(messagesVm.error ?? 'Failed to send message')),
+      );
     }
   }
 
@@ -604,11 +608,18 @@ class _MessageBubble extends StatelessWidget {
                     ),
                     if (mine) ...<Widget>[
                       const SizedBox(width: 4),
-                      Icon(
-                        Icons.done_all_rounded,
-                        size: 14,
-                        color: message.isRead ? const Color(0xFF3EA8D8) : const Color(0xFF94A3B0),
-                      ),
+                      if (message.isPending)
+                        const Icon(
+                          Icons.schedule_rounded,
+                          size: 12,
+                          color: Color(0xFF94A3B0),
+                        )
+                      else
+                        Icon(
+                          Icons.done_all_rounded,
+                          size: 14,
+                          color: message.isRead ? const Color(0xFF3EA8D8) : const Color(0xFF94A3B0),
+                        ),
                     ],
                   ],
                 ),
diff --git a/apps/flutter/lib/features/dashboard/views/dashboard_screen.dart b/apps/flutter/lib/features/dashboard/views/dashboard_screen.dart
index 37ced90..dc76692 100644
--- a/apps/flutter/lib/features/dashboard/views/dashboard_screen.dart
+++ b/apps/flutter/lib/features/dashboard/views/dashboard_screen.dart
@@ -9,6 +9,8 @@ import 'package:provider/provider.dart';
 import 'package:universe_app/core/constants/app_routes.dart';
 import 'package:universe_app/core/constants/app_colors.dart';
 import 'package:universe_app/features/auth/viewmodels/auth_viewmodel.dart';
+import 'package:universe_app/features/notifications/models/notification_model.dart';
+import 'package:universe_app/features/notifications/viewmodels/notifications_viewmodel.dart';
 import 'package:universe_app/features/notifications/views/notifications_screen.dart';
 import 'package:universe_app/features/gate/viewmodels/gate_viewmodel.dart';
 import 'package:universe_app/features/profile/viewmodels/profile_viewmodel.dart';
@@ -42,6 +44,7 @@ class _DashboardScreenState extends State<DashboardScreen>
   late final AnimationController _entryController;
   late final Animation<Offset> _slideAnim;
   late final Animation<double> _fadeAnim;
+  bool _isRefreshing = false;
 
   OverlayEntry? _bellOverlay;
 
@@ -65,11 +68,12 @@ class _DashboardScreenState extends State<DashboardScreen>
     );
     _entryController.forward();
 
-    // Fetch fresh profile data and gate status
+    // Fetch fresh profile data, gate status and notifications
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (mounted) {
         context.read<ProfileViewModel>().loadProfile();
         context.read<GateViewModel>().loadGateStatus();
+        context.read<NotificationsViewModel>().load();
       }
     });
   }
@@ -83,8 +87,26 @@ class _DashboardScreenState extends State<DashboardScreen>
     _entryController.forward(from: 0);
   }
 
+  Future<void> _refreshHome() async {
+    if (_isRefreshing) return;
+
+    setState(() => _isRefreshing = true);
+    try {
+      await Future.wait(<Future<void>>[
+        context.read<ProfileViewModel>().loadProfile(),
+        context.read<GateViewModel>().loadGateStatus(),
+        context.read<NoticesViewModel>().refresh(),
+      ]);
+    } finally {
+      if (mounted) {
+        setState(() => _isRefreshing = false);
+      }
+    }
+  }
+
   void _showBellPopup() {
-    final unread = kNotifications.where((n) => !n.isRead).toList();
+    final List<NotificationModel> unread =
+        context.read<NotificationsViewModel>().unread;
     if (unread.isEmpty) {
       context.push(AppRoutes.notifications);
       return;
@@ -97,6 +119,7 @@ class _DashboardScreenState extends State<DashboardScreen>
     _bellOverlay = OverlayEntry(
       builder: (_) => _BellOverlay(
         topInset: topInset,
+        unread: unread,
         onViewAll: () {
           _dismissBellPopup();
           context.push(AppRoutes.notifications);
@@ -134,6 +157,9 @@ class _DashboardScreenState extends State<DashboardScreen>
     final bool? isInsideSchool = context.select<GateViewModel, bool?>(
       (GateViewModel vm) => vm.isInsideSchool,
     );
+    final int unreadCount = context.select<NotificationsViewModel, int>(
+      (NotificationsViewModel vm) => vm.unreadCount,
+    );
     final String displayName = studentName ?? _displayNameFromEmail(userEmail);
     final double topInset = MediaQuery.paddingOf(context).top;
     final double bottomInset = MediaQuery.paddingOf(context).bottom;
@@ -144,66 +170,74 @@ class _DashboardScreenState extends State<DashboardScreen>
       body: Stack(
         children: <Widget>[
           // Scrollable content
-          SingleChildScrollView(
-            physics: const BouncingScrollPhysics(),
-            child: Column(
-              children: <Widget>[
-                _TopHeader(
-                  displayName: displayName,
-                  photoUrl: photoUrl,
-                  isInsideSchool: isInsideSchool,
-                  topInset: topInset,
-                  onBellTap: _showBellPopup,
-                ),
-                // Slide-up + fade for white card section
-                SlideTransition(
-                  position: _slideAnim,
-                  child: FadeTransition(
-                    opacity: _fadeAnim,
-                    child: Container(
-                      width: double.infinity,
-                      clipBehavior: Clip.none,
-                      decoration: const BoxDecoration(
-                        color: Color(0xFFF4FAFB),
-                        borderRadius: BorderRadius.only(
-                          topLeft: Radius.circular(32),
-                          topRight: Radius.circular(32),
-                        ),
-                      ),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: <Widget>[
-                          Padding(
-                            padding: const EdgeInsets.fromLTRB(18, 24, 18, 0),
-                            child: const _NoticesSection(),
+          RefreshIndicator(
+            onRefresh: _refreshHome,
+            color: AppColors.primary,
+            child: SingleChildScrollView(
+              physics: const AlwaysScrollableScrollPhysics(
+                parent: BouncingScrollPhysics(),
+              ),
+              child: Column(
+                children: <Widget>[
+                  _TopHeader(
+                    displayName: displayName,
+                    photoUrl: photoUrl,
+                    isInsideSchool: isInsideSchool,
+                    isRefreshing: _isRefreshing,
+                    topInset: topInset,
+                    unreadCount: unreadCount,
+                    onBellTap: _showBellPopup,
+                  ),
+                  // Slide-up + fade for white card section
+                  SlideTransition(
+                    position: _slideAnim,
+                    child: FadeTransition(
+                      opacity: _fadeAnim,
+                      child: Container(
+                        width: double.infinity,
+                        clipBehavior: Clip.none,
+                        decoration: const BoxDecoration(
+                          color: Color(0xFFF4FAFB),
+                          borderRadius: BorderRadius.only(
+                            topLeft: Radius.circular(32),
+                            topRight: Radius.circular(32),
                           ),
-                          Padding(
-                            padding: const EdgeInsets.fromLTRB(18, 28, 18, 24),
-                            child: Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: <Widget>[
-                                const _SectionLabel('Quick Actions'),
-                                const SizedBox(height: 6),
-                                _ActionGrid(
-                                  onGateTap: () async {
-                                    await context.push(AppRoutes.gateStatus);
-                                    _playEntryAnimation();
-                                  },
-                                  onAttendanceTap: () async {
-                                    await context.push(AppRoutes.attendance);
-                                    _playEntryAnimation();
-                                  },
-                                ),
-                                SizedBox(height: bottomInset + navBarHeight + 16),
-                              ],
+                        ),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: <Widget>[
+                            Padding(
+                              padding: const EdgeInsets.fromLTRB(18, 24, 18, 0),
+                              child: const _NoticesSection(),
                             ),
-                          ),
-                        ],
+                            Padding(
+                              padding: const EdgeInsets.fromLTRB(18, 28, 18, 24),
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: <Widget>[
+                                  const _SectionLabel('Quick Actions'),
+                                  const SizedBox(height: 6),
+                                  _ActionGrid(
+                                    onGateTap: () async {
+                                      await context.push(AppRoutes.gateStatus);
+                                      _playEntryAnimation();
+                                    },
+                                    onAttendanceTap: () async {
+                                      await context.push(AppRoutes.attendance);
+                                      _playEntryAnimation();
+                                    },
+                                  ),
+                                  SizedBox(height: bottomInset + navBarHeight + 16),
+                                ],
+                              ),
+                            ),
+                          ],
+                        ),
                       ),
                     ),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
           ),
           // Bottom nav — also slides up
@@ -219,7 +253,10 @@ class _DashboardScreenState extends State<DashboardScreen>
                 parent: _entryController,
                 curve: const Interval(0.2, 1.0, curve: Curves.easeOutCubic),
               )),
-              child: _BottomNavBar(bottomInset: bottomInset),
+              child: _BottomNavBar(
+                bottomInset: bottomInset,
+                unreadCount: unreadCount,
+              ),
             ),
           ),
         ],
@@ -247,6 +284,8 @@ class _TopHeader extends StatefulWidget {
     required this.displayName,
     required this.topInset,
     required this.onBellTap,
+    required this.isRefreshing,
+    required this.unreadCount,
     this.photoUrl,
     this.isInsideSchool,
   });
@@ -254,7 +293,9 @@ class _TopHeader extends StatefulWidget {
   final String displayName;
   final String? photoUrl;
   final bool? isInsideSchool;
+  final bool isRefreshing;
   final double topInset;
+  final int unreadCount;
   final VoidCallback onBellTap;
 
   @override
@@ -320,7 +361,7 @@ class _TopHeaderState extends State<_TopHeader> with TickerProviderStateMixin {
       color: AppColors.primary,
       child: Column(
         children: <Widget>[
-          // Row: avatar + greeting | notification bell
+          // Row: avatar + greeting | status badge | notification bell
           Row(
             children: <Widget>[
               GestureDetector(
@@ -365,7 +406,25 @@ class _TopHeaderState extends State<_TopHeader> with TickerProviderStateMixin {
                 ],
               ),
               const Spacer(),
-              // Notification bell
+              if (widget.isRefreshing) ...<Widget>[
+                Container(
+                  margin: const EdgeInsets.only(right: 10),
+                  padding: const EdgeInsets.all(8),
+                  decoration: BoxDecoration(
+                    color: Colors.white.withValues(alpha: 0.14),
+                    borderRadius: BorderRadius.circular(999),
+                    border: Border.all(color: Colors.white.withValues(alpha: 0.2)),
+                  ),
+                  child: const SizedBox(
+                    width: 16,
+                    height: 16,
+                    child: CircularProgressIndicator(
+                      strokeWidth: 2,
+                      valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
+                    ),
+                  ),
+                ),
+              ],
               GestureDetector(
                 onTap: widget.onBellTap,
                 child: Stack(
@@ -383,19 +442,35 @@ class _TopHeaderState extends State<_TopHeader> with TickerProviderStateMixin {
                         size: 24,
                       ),
                     ),
-                    Positioned(
-                      top: 8,
-                      right: 8,
-                      child: Container(
-                        width: 10,
-                        height: 10,
-                        decoration: BoxDecoration(
-                          color: const Color(0xFFDF5B6D),
-                          shape: BoxShape.circle,
-                          border: Border.all(color: Colors.white, width: 1.5),
+                    if (widget.unreadCount > 0)
+                      Positioned(
+                        top: -2,
+                        right: -2,
+                        child: Container(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: 5, vertical: 1),
+                          constraints: const BoxConstraints(minWidth: 18),
+                          decoration: BoxDecoration(
+                            color: const Color(0xFFDF5B6D),
+                            borderRadius: BorderRadius.circular(9),
+                            border:
+                                Border.all(color: Colors.white, width: 1.5),
+                          ),
+                          child: Text(
+                            widget.unreadCount > 99
+                                ? '99+'
+                                : '${widget.unreadCount}',
+                            textAlign: TextAlign.center,
+                            style: const TextStyle(
+                              fontFamily: 'Plus Jakarta Sans',
+                              fontSize: 9,
+                              fontWeight: FontWeight.w800,
+                              color: Colors.white,
+                              height: 1.3,
+                            ),
+                          ),
                         ),
                       ),
-                    ),
                   ],
                 ),
               ),
@@ -662,19 +737,22 @@ class _NoticeCard extends StatelessWidget {
                     ),
                   ],
                 ),
-                Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 7),
-                  decoration: BoxDecoration(
-                    color: Colors.white,
-                    borderRadius: BorderRadius.circular(20),
-                  ),
-                  child: Text(
-                    'Read More',
-                    style: TextStyle(
-                      fontFamily: 'Plus Jakarta Sans',
-                      fontSize: 12,
-                      fontWeight: FontWeight.w700,
-                      color: announcement.gradientColors.last,
+                GestureDetector(
+                  onTap: () => context.push(AppRoutes.notices),
+                  child: Container(
+                    padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 7),
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.circular(20),
+                    ),
+                    child: Text(
+                      'Read More',
+                      style: TextStyle(
+                        fontFamily: 'Plus Jakarta Sans',
+                        fontSize: 12,
+                        fontWeight: FontWeight.w700,
+                        color: announcement.gradientColors.last,
+                      ),
                     ),
                   ),
                 ),
@@ -916,9 +994,10 @@ class _AttendanceBadge extends StatelessWidget {
 // ─── Bottom nav ───────────────────────────────────────────────────────────────
 
 class _BottomNavBar extends StatelessWidget {
-  const _BottomNavBar({required this.bottomInset});
+  const _BottomNavBar({required this.bottomInset, required this.unreadCount});
 
   final double bottomInset;
+  final int unreadCount;
 
   @override
   Widget build(BuildContext context) {
@@ -943,6 +1022,7 @@ class _BottomNavBar extends StatelessWidget {
             _NavItem(
               icon: Icons.notifications_rounded,
               label: 'Notifications',
+              badgeCount: unreadCount,
               onTap: () => context.push(AppRoutes.notifications),
             ),
             _NavItem(
@@ -967,12 +1047,14 @@ class _BottomNavBar extends StatelessWidget {
 class _BellOverlay extends StatelessWidget {
   const _BellOverlay({
     required this.topInset,
+    required this.unread,
     required this.onViewAll,
     required this.onDismiss,
     required this.onBarrierTap,
   });
 
   final double topInset;
+  final List<NotificationModel> unread;
   final VoidCallback onViewAll;
   final VoidCallback onDismiss;
   final VoidCallback onBarrierTap;
@@ -996,6 +1078,7 @@ class _BellOverlay extends StatelessWidget {
           top: topInset + 66,
           right: 18,
           child: UnreadNotificationPopup(
+            unread: unread,
             onViewAll: onViewAll,
             onDismiss: onDismiss,
           ),
@@ -1012,12 +1095,14 @@ class _NavItem extends StatelessWidget {
     required this.icon,
     required this.label,
     this.isActive = false,
+    this.badgeCount = 0,
     this.onTap,
   });
 
   final IconData icon;
   final String label;
   final bool isActive;
+  final int badgeCount;
   final VoidCallback? onTap;
 
   @override
@@ -1030,18 +1115,56 @@ class _NavItem extends StatelessWidget {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
-            if (isActive)
-              Container(
-                width: 40,
-                height: 40,
-                decoration: BoxDecoration(
-                  color: Colors.white.withValues(alpha: 0.15),
-                  shape: BoxShape.circle,
-                ),
-                child: Icon(icon, size: 22, color: Colors.white),
-              )
-            else
-              Icon(icon, size: 22, color: Colors.white.withValues(alpha: 0.55)),
+            Stack(
+              clipBehavior: Clip.none,
+              children: <Widget>[
+                if (isActive)
+                  Container(
+                    width: 40,
+                    height: 40,
+                    decoration: BoxDecoration(
+                      color: Colors.white.withValues(alpha: 0.15),
+                      shape: BoxShape.circle,
+                    ),
+                    child: Icon(icon, size: 22, color: Colors.white),
+                  )
+                else
+                  SizedBox(
+                    width: 40,
+                    height: 40,
+                    child: Icon(icon,
+                        size: 22,
+                        color: Colors.white.withValues(alpha: 0.55)),
+                  ),
+                if (badgeCount > 0)
+                  Positioned(
+                    top: 0,
+                    right: 0,
+                    child: Container(
+                      padding: const EdgeInsets.symmetric(
+                          horizontal: 4, vertical: 1),
+                      constraints: const BoxConstraints(minWidth: 16),
+                      decoration: BoxDecoration(
+                        color: const Color(0xFFDF5B6D),
+                        borderRadius: BorderRadius.circular(8),
+                        border: Border.all(
+                            color: const Color(0xFF1A3A44), width: 1.5),
+                      ),
+                      child: Text(
+                        badgeCount > 99 ? '99+' : '$badgeCount',
+                        textAlign: TextAlign.center,
+                        style: const TextStyle(
+                          fontFamily: 'Plus Jakarta Sans',
+                          fontSize: 8,
+                          fontWeight: FontWeight.w800,
+                          color: Colors.white,
+                          height: 1.4,
+                        ),
+                      ),
+                    ),
+                  ),
+              ],
+            ),
             const SizedBox(height: 4),
             Text(
               label,
diff --git a/apps/flutter/lib/features/lost_and_found/repositories/lost_found_repository.dart b/apps/flutter/lib/features/lost_and_found/repositories/lost_found_repository.dart
index f299286..131107c 100644
--- a/apps/flutter/lib/features/lost_and_found/repositories/lost_found_repository.dart
+++ b/apps/flutter/lib/features/lost_and_found/repositories/lost_found_repository.dart
@@ -42,8 +42,8 @@ class LostFoundRepository {
           'item_name': itemName,
           'description': description,
           'student_id': studentId,
-          'photo_url': photoUrl,
-          'date_lost': dateLost,
+          if (photoUrl != null) 'photo_url': photoUrl,
+          if (dateLost != null) 'date_lost': dateLost,
         },
         options: Options(headers: await _getAuthHeaders()),
       );
@@ -67,7 +67,7 @@ class LostFoundRepository {
           'description': description,
           'found_at': foundAt,
           'found_date': foundDate,
-          'photo_url': photoUrl,
+          if (photoUrl != null) 'photo_url': photoUrl,
         },
         options: Options(headers: await _getAuthHeaders()),
       );
@@ -86,8 +86,8 @@ class LostFoundRepository {
         '/api/lost-found/comments',
         data: {
           'content': content,
-          'item_id': itemId,
-          'report_id': reportId,
+          if (itemId != null) 'item_id': itemId,
+          if (reportId != null) 'report_id': reportId,
         },
         options: Options(headers: await _getAuthHeaders()),
       );
diff --git a/apps/flutter/lib/features/lost_and_found/views/lost_and_found_screen.dart b/apps/flutter/lib/features/lost_and_found/views/lost_and_found_screen.dart
index c0b7f62..cc52723 100644
--- a/apps/flutter/lib/features/lost_and_found/views/lost_and_found_screen.dart
+++ b/apps/flutter/lib/features/lost_and_found/views/lost_and_found_screen.dart
@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:universe_app/features/lost_and_found/models/lost_found_model.dart';
 import 'package:universe_app/features/lost_and_found/viewmodels/lost_found_viewmodel.dart';
 import 'package:universe_app/features/profile/viewmodels/profile_viewmodel.dart';
+import 'package:universe_app/features/auth/viewmodels/auth_viewmodel.dart';
 
 // ─── Role ─────────────────────────────────────────────────────────────────────
 
@@ -268,6 +269,8 @@ class _LostAndFoundScreenState extends State<LostAndFoundScreen>
   }
 
   void _openNewPost() {
+    final role = context.read<AuthViewModel>().currentUser?.role ?? '';
+    
     showModalBottomSheet<void>(
       context: context,
       isScrollControlled: true,
@@ -276,6 +279,7 @@ class _LostAndFoundScreenState extends State<LostAndFoundScreen>
         borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
       ),
       builder: (_) => _NewPostSheet(
+        role: role,
         onSubmit: (itemName, description, isFound, foundAt) async {
           final vm = context.read<LostFoundViewModel>();
           bool success;
@@ -284,10 +288,30 @@ class _LostAndFoundScreenState extends State<LostAndFoundScreen>
           } else {
             // Get student ID from profile if parent
             final profile = context.read<ProfileViewModel>().profile;
-            final studentId = profile?.students?.first.id ?? ''; 
+            final studentId = profile?.student?.id ?? '';
+            
+            if (studentId.isEmpty) {
+              if (mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(content: Text('Your child profile is still loading — try again')),
+                );
+              }
+              return false;
+            }
+            
             success = await vm.createLostReport(itemName: itemName, description: description, studentId: studentId);
           }
-          if (success && mounted) Navigator.pop(context);
+          
+          if (mounted) {
+            if (success) {
+              Navigator.pop(context);
+            } else {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(content: Text(vm.errorMessage ?? 'Failed to post')),
+              );
+            }
+          }
+          return success;
         },
       ),
     );
@@ -891,8 +915,9 @@ class _CommentTile extends StatelessWidget {
 // ─── New post bottom sheet ────────────────────────────────────────────────────
 
 class _NewPostSheet extends StatefulWidget {
-  const _NewPostSheet({required this.onSubmit});
-  final Function(String, String, bool, String?) onSubmit;
+  const _NewPostSheet({required this.onSubmit, required this.role});
+  final Future<bool> Function(String, String, bool, String?) onSubmit;
+  final String role;
 
   @override
   State<_NewPostSheet> createState() => _NewPostSheetState();
@@ -902,7 +927,15 @@ class _NewPostSheetState extends State<_NewPostSheet> {
   final TextEditingController _titleCtrl = TextEditingController();
   final TextEditingController _descCtrl = TextEditingController();
   final TextEditingController _locationCtrl = TextEditingController();
-  bool _isFound = false;
+  late bool _isFound;
+  bool _isSubmitting = false;
+
+  @override
+  void initState() {
+    super.initState();
+    // Default to 'I FOUND' if not a parent
+    _isFound = widget.role != 'parent';
+  }
 
   @override
   void dispose() {
@@ -912,9 +945,16 @@ class _NewPostSheetState extends State<_NewPostSheet> {
     super.dispose();
   }
 
-  void _submit() {
+  Future<void> _submit() async {
     if (_titleCtrl.text.trim().isEmpty || _descCtrl.text.trim().isEmpty) return;
-    widget.onSubmit(_titleCtrl.text.trim(), _descCtrl.text.trim(), _isFound, _locationCtrl.text.trim().isEmpty ? null : _locationCtrl.text.trim());
+    setState(() => _isSubmitting = true);
+    await widget.onSubmit(
+      _titleCtrl.text.trim(),
+      _descCtrl.text.trim(),
+      _isFound,
+      _locationCtrl.text.trim().isEmpty ? null : _locationCtrl.text.trim(),
+    );
+    if (mounted) setState(() => _isSubmitting = false);
   }
 
   @override
@@ -937,9 +977,12 @@ class _NewPostSheetState extends State<_NewPostSheet> {
             const SizedBox(height: 8),
             Row(
               children: [
-                _TypeButton(label: 'I LOST SOMETHING', isActive: !_isFound, onTap: () => setState(() => _isFound = false), color: const Color(0xFF7A3D1A)),
-                const SizedBox(width: 10),
-                _TypeButton(label: 'I FOUND SOMETHING', isActive: _isFound, onTap: () => setState(() => _isFound = true), color: const Color(0xFF2E6B7F)),
+                if (widget.role == 'parent')
+                  _TypeButton(label: 'I LOST SOMETHING', isActive: !_isFound, onTap: () => setState(() => _isFound = false), color: const Color(0xFF7A3D1A)),
+                if (widget.role == 'parent' && widget.role != 'parent') // Just spacing if multiple exist, but only one will show per role
+                  const SizedBox(width: 10),
+                if (widget.role != 'parent')
+                  _TypeButton(label: 'I FOUND SOMETHING', isActive: _isFound, onTap: () => setState(() => _isFound = true), color: const Color(0xFF2E6B7F)),
               ],
             ),
             const SizedBox(height: 18),
@@ -950,15 +993,28 @@ class _NewPostSheetState extends State<_NewPostSheet> {
             _FormField(controller: _locationCtrl, label: _isFound ? 'Where did you find it?' : 'Where did you lose it? (Optional)', hint: 'e.g. Canteen, Science Lab'),
             const SizedBox(height: 24),
             GestureDetector(
-              onTap: _submit,
+              onTap: _isSubmitting ? null : () {
+                if (_titleCtrl.text.trim().isEmpty || _descCtrl.text.trim().isEmpty) {
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    const SnackBar(content: Text('Please fill in the item name and description')),
+                  );
+                  return;
+                }
+                _submit();
+              },
               child: Container(
                 height: 52,
+                width: double.infinity,
                 decoration: BoxDecoration(
                   gradient: const LinearGradient(colors: <Color>[Color(0xFF7A3D1A), Color(0xFFD47A2E)], begin: Alignment.centerLeft, end: Alignment.centerRight),
                   borderRadius: BorderRadius.circular(16),
                   boxShadow: <BoxShadow>[BoxShadow(color: const Color(0xFF7A3D1A).withValues(alpha: 0.30), blurRadius: 14, offset: const Offset(0, 5))],
                 ),
-                child: const Center(child: Text('Post to Thread', style: TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 15, fontWeight: FontWeight.w700, color: Colors.white))),
+                child: Center(
+                  child: _isSubmitting 
+                    ? const SizedBox(height: 20, width: 20, child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2.5))
+                    : const Text('Post to Thread', style: TextStyle(fontFamily: 'Plus Jakarta Sans', fontSize: 15, fontWeight: FontWeight.w700, color: Colors.white)),
+                ),
               ),
             ),
           ],
diff --git a/apps/flutter/lib/features/messages/models/message_models.dart b/apps/flutter/lib/features/messages/models/message_models.dart
index e6a8a9d..3796926 100644
--- a/apps/flutter/lib/features/messages/models/message_models.dart
+++ b/apps/flutter/lib/features/messages/models/message_models.dart
@@ -11,6 +11,7 @@ class MessageModel {
   final MessageUser sender;
   final MessageUser receiver;
   final MessageStudent? student;
+  final bool isPending;
 
   MessageModel({
     required this.id,
@@ -23,8 +24,37 @@ class MessageModel {
     required this.sender,
     required this.receiver,
     this.student,
+    this.isPending = false,
   });
 
+  MessageModel copyWith({
+    String? id,
+    String? senderId,
+    String? receiverId,
+    String? studentId,
+    String? content,
+    bool? isRead,
+    DateTime? createdAt,
+    MessageUser? sender,
+    MessageUser? receiver,
+    MessageStudent? student,
+    bool? isPending,
+  }) {
+    return MessageModel(
+      id: id ?? this.id,
+      senderId: senderId ?? this.senderId,
+      receiverId: receiverId ?? this.receiverId,
+      studentId: studentId ?? this.studentId,
+      content: content ?? this.content,
+      isRead: isRead ?? this.isRead,
+      createdAt: createdAt ?? this.createdAt,
+      sender: sender ?? this.sender,
+      receiver: receiver ?? this.receiver,
+      student: student ?? this.student,
+      isPending: isPending ?? this.isPending,
+    );
+  }
+
   factory MessageModel.fromJson(Map<String, dynamic> json) {
     return MessageModel(
       id: json['id'],
@@ -37,6 +67,7 @@ class MessageModel {
       sender: MessageUser.fromJson(json['sender']),
       receiver: MessageUser.fromJson(json['receiver']),
       student: json['student'] != null ? MessageStudent.fromJson(json['student']) : null,
+      isPending: false, // Do not read from JSON so cached threads don't persist it
     );
   }
 
@@ -51,6 +82,7 @@ class MessageModel {
         'sender': sender.toJson(),
         'receiver': receiver.toJson(),
         if (student != null) 'student': student!.toJson(),
+        // isPending is intentionally omitted from toJson so it's not cached
       };
 
   static List<MessageModel> listFromJsonString(String jsonString) {
diff --git a/apps/flutter/lib/features/messages/viewmodels/messages_viewmodel.dart b/apps/flutter/lib/features/messages/viewmodels/messages_viewmodel.dart
index ded452b..c00cf8f 100644
--- a/apps/flutter/lib/features/messages/viewmodels/messages_viewmodel.dart
+++ b/apps/flutter/lib/features/messages/viewmodels/messages_viewmodel.dart
@@ -105,17 +105,34 @@ class MessagesViewModel extends ChangeNotifier {
     String? studentId,
     String? userId,
   }) async {
+    final temp = MessageModel(
+      id: 'temp_${DateTime.now().microsecondsSinceEpoch}',
+      senderId: userId ?? '',
+      receiverId: receiverId,
+      studentId: studentId,
+      content: content,
+      isRead: false,
+      createdAt: DateTime.now(),
+      sender: MessageUser(id: userId ?? '', role: ''),
+      receiver: MessageUser(id: receiverId, role: ''),
+      isPending: true,
+    );
+
+    _messages = [..._messages, temp];
+    notifyListeners();
+
     try {
       await _repository.sendMessage(
         receiverId: receiverId,
         content: content,
         studentId: studentId,
       );
-      await fetchThread(receiverId, userId: userId);
+      await fetchThread(receiverId, userId: userId); // real list replaces temp
       // Refresh inbox list so last message and unread counts update
       await fetchInbox(userId: userId);
       return true;
     } catch (e) {
+      _messages = _messages.where((m) => m.id != temp.id).toList(); // roll back
       _error = e.toString();
       notifyListeners();
       return false;
diff --git a/apps/flutter/lib/features/messages/views/teacher_inbox_screen.dart b/apps/flutter/lib/features/messages/views/teacher_inbox_screen.dart
index 5390b81..426f46c 100644
--- a/apps/flutter/lib/features/messages/views/teacher_inbox_screen.dart
+++ b/apps/flutter/lib/features/messages/views/teacher_inbox_screen.dart
@@ -90,6 +90,9 @@ class _TeacherInboxScreenState extends State<TeacherInboxScreen> {
     if (text.isEmpty || _activeContact == null || _isSending) return;
     setState(() => _isSending = true);
 
+    _inputCtrl.clear();
+    _scrollToBottom();
+
     final success = await context.read<MessagesViewModel>().sendMessage(
           receiverId: _activeContact!.id,
           content: text,
@@ -99,9 +102,10 @@ class _TeacherInboxScreenState extends State<TeacherInboxScreen> {
 
     if (mounted) {
       setState(() => _isSending = false);
-      if (success) {
-        _inputCtrl.clear();
-        _scrollToBottom();
+      if (!success) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(context.read<MessagesViewModel>().error ?? 'Failed to send message')),
+        );
       }
     }
   }
@@ -761,13 +765,20 @@ class _MessageBubble extends StatelessWidget {
                     ),
                     if (mine) ...[
                       const SizedBox(width: 4),
-                      Icon(
-                        Icons.done_all_rounded,
-                        size: 14,
-                        color: message.isRead
-                            ? const Color(0xFF3EA8D8)
-                            : const Color(0xFF94A3B0),
-                      ),
+                      if (message.isPending)
+                        const Icon(
+                          Icons.schedule_rounded,
+                          size: 12,
+                          color: Color(0xFF94A3B0),
+                        )
+                      else
+                        Icon(
+                          Icons.done_all_rounded,
+                          size: 14,
+                          color: message.isRead
+                              ? const Color(0xFF3EA8D8)
+                              : const Color(0xFF94A3B0),
+                        ),
                     ],
                   ],
                 ),
diff --git a/apps/flutter/lib/features/notifications/models/notification_model.dart b/apps/flutter/lib/features/notifications/models/notification_model.dart
new file mode 100644
index 0000000..cfdcf17
--- /dev/null
+++ b/apps/flutter/lib/features/notifications/models/notification_model.dart
@@ -0,0 +1,95 @@
+import 'package:flutter/material.dart';
+
+/// Visual styling for a notification type (icon, category label, gradient).
+class _NotifMeta {
+  const _NotifMeta(this.category, this.icon, this.colors);
+  final String category;
+  final IconData icon;
+  final List<Color> colors;
+}
+
+const Map<String, _NotifMeta> _kMeta = {
+  'gate': _NotifMeta('Gate', Icons.sensor_door_rounded,
+      [Color(0xFF77C8A8), Color(0xFF3DAA82)]),
+  'message': _NotifMeta('Message', Icons.chat_bubble_rounded,
+      [Color(0xFF8CB2FF), Color(0xFF5B82F0)]),
+  'announcement': _NotifMeta('Announcement', Icons.campaign_rounded,
+      [Color(0xFFD4AAFF), Color(0xFF9067C6)]),
+  'attendance': _NotifMeta('Attendance', Icons.event_available_rounded,
+      [Color(0xFF64C4E6), Color(0xFF3EA8D8)]),
+  'result': _NotifMeta('Result', Icons.bar_chart_rounded,
+      [Color(0xFF80E8B8), Color(0xFF2EAA75)]),
+};
+
+const _NotifMeta _kFallbackMeta = _NotifMeta('Update',
+    Icons.notifications_rounded, [Color(0xFFFFB38A), Color(0xFFE8845A)]);
+
+/// A single in-app notification, as returned by `GET /api/notifications`.
+class NotificationModel {
+  NotificationModel({
+    required this.id,
+    required this.type,
+    required this.title,
+    required this.body,
+    required this.data,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  final String id;
+  final String type;
+  final String title;
+  final String body;
+  final Map<String, dynamic> data;
+  final bool isRead;
+  final DateTime createdAt;
+
+  factory NotificationModel.fromJson(Map<String, dynamic> json) {
+    return NotificationModel(
+      id: json['id'] as String? ?? '',
+      type: json['type'] as String? ?? 'update',
+      title: json['title'] as String? ?? '',
+      body: json['body'] as String? ?? '',
+      data: (json['data'] as Map?)?.cast<String, dynamic>() ?? const {},
+      isRead: json['is_read'] as bool? ?? false,
+      createdAt:
+          DateTime.tryParse(json['created_at'] as String? ?? '')?.toLocal() ??
+              DateTime.now(),
+    );
+  }
+
+  NotificationModel copyWith({bool? isRead}) => NotificationModel(
+        id: id,
+        type: type,
+        title: title,
+        body: body,
+        data: data,
+        isRead: isRead ?? this.isRead,
+        createdAt: createdAt,
+      );
+
+  _NotifMeta get _meta => _kMeta[type] ?? _kFallbackMeta;
+
+  String get category => _meta.category;
+  IconData get icon => _meta.icon;
+  List<Color> get gradientColors => _meta.colors;
+
+  /// Deep-link route carried in the payload (e.g. '/gate-status'), if any.
+  String? get route {
+    final dynamic r = data['route'];
+    return r is String && r.isNotEmpty ? r : null;
+  }
+
+  /// Human-friendly relative time, e.g. "5 min ago".
+  String get time {
+    final Duration diff = DateTime.now().difference(createdAt);
+    if (diff.inSeconds < 60) return 'Just now';
+    if (diff.inMinutes < 60) return '${diff.inMinutes} min ago';
+    if (diff.inHours < 24) {
+      return '${diff.inHours} h ago';
+    }
+    if (diff.inDays == 1) return 'Yesterday';
+    if (diff.inDays < 7) return '${diff.inDays} days ago';
+    return '${createdAt.day}/${createdAt.month}/${createdAt.year}';
+  }
+}
diff --git a/apps/flutter/lib/features/notifications/repositories/notifications_repository.dart b/apps/flutter/lib/features/notifications/repositories/notifications_repository.dart
new file mode 100644
index 0000000..bd4b28a
--- /dev/null
+++ b/apps/flutter/lib/features/notifications/repositories/notifications_repository.dart
@@ -0,0 +1,103 @@
+import 'package:dio/dio.dart';
+import 'package:universe_app/core/api/api_endpoints.dart';
+import 'package:universe_app/core/storage/secure_storage.dart';
+import 'package:universe_app/features/notifications/models/notification_model.dart';
+
+/// Result of fetching the notification list: the items + the unread count.
+class NotificationsPage {
+  const NotificationsPage({required this.notifications, required this.unreadCount});
+  final List<NotificationModel> notifications;
+  final int unreadCount;
+}
+
+class NotificationsRepository {
+  final Dio _dio;
+  final SecureStorageService _secureStorage;
+
+  NotificationsRepository({
+    required Dio dio,
+    required SecureStorageService secureStorage,
+  })  : _dio = dio,
+        _secureStorage = secureStorage;
+
+  Future<String> _getToken() async {
+    final String? token = await _secureStorage.getAccessToken();
+    if (token == null || token.isEmpty) throw Exception('Not authenticated');
+    return token;
+  }
+
+  Future<Options> _authOptions() async =>
+      Options(headers: {'Authorization': 'Bearer ${await _getToken()}'});
+
+  Future<NotificationsPage> fetchNotifications() async {
+    try {
+      final Response<dynamic> response = await _dio.get(
+        ApiEndpoints.notifications,
+        options: await _authOptions(),
+      );
+
+      final dynamic data = (response.data as Map<String, dynamic>?)?['data'];
+      if (data is! Map<String, dynamic>) {
+        throw Exception('Unexpected server response.');
+      }
+
+      final List<dynamic> list = (data['notifications'] as List?) ?? const [];
+      return NotificationsPage(
+        notifications: list
+            .map((dynamic e) =>
+                NotificationModel.fromJson(e as Map<String, dynamic>))
+            .toList(),
+        unreadCount: (data['unread_count'] as num?)?.toInt() ?? 0,
+      );
+    } on DioException catch (e) {
+      throw Exception(_handleDioError(e, 'Failed to load notifications.'));
+    }
+  }
+
+  Future<int> fetchUnreadCount() async {
+    try {
+      final Response<dynamic> response = await _dio.get(
+        ApiEndpoints.notificationsUnreadCount,
+        options: await _authOptions(),
+      );
+      final dynamic data = (response.data as Map<String, dynamic>?)?['data'];
+      if (data is Map<String, dynamic>) {
+        return (data['count'] as num?)?.toInt() ?? 0;
+      }
+      return 0;
+    } on DioException catch (e) {
+      throw Exception(_handleDioError(e, 'Failed to load unread count.'));
+    }
+  }
+
+  Future<void> markRead(String id) async {
+    try {
+      await _dio.patch(
+        ApiEndpoints.notificationRead(id),
+        options: await _authOptions(),
+      );
+    } on DioException catch (e) {
+      throw Exception(_handleDioError(e, 'Failed to update notification.'));
+    }
+  }
+
+  Future<void> markAllRead() async {
+    try {
+      await _dio.post(
+        ApiEndpoints.notificationsReadAll,
+        options: await _authOptions(),
+      );
+    } on DioException catch (e) {
+      throw Exception(_handleDioError(e, 'Failed to update notifications.'));
+    }
+  }
+
+  String _handleDioError(DioException e, String defaultMessage) {
+    final dynamic data = e.response?.data;
+    if (data is Map<String, dynamic>) {
+      final dynamic msg = data['message'] ?? data['error'];
+      if (msg is String && msg.isNotEmpty) return msg;
+    }
+    return defaultMessage;
+  }
+}
diff --git a/apps/flutter/lib/features/notifications/viewmodels/notifications_viewmodel.dart b/apps/flutter/lib/features/notifications/viewmodels/notifications_viewmodel.dart
new file mode 100644
index 0000000..db605a2
--- /dev/null
+++ b/apps/flutter/lib/features/notifications/viewmodels/notifications_viewmodel.dart
@@ -0,0 +1,107 @@
+import 'package:flutter/foundation.dart';
+import 'package:universe_app/features/notifications/models/notification_model.dart';
+import 'package:universe_app/features/notifications/repositories/notifications_repository.dart';
+
+/// Holds the in-app notification list + unread count. Backs the notifications
+/// screen, the dashboard bell badge, and the bottom-nav badge.
+class NotificationsViewModel extends ChangeNotifier {
+  final NotificationsRepository _repository;
+
+  NotificationsViewModel(this._repository);
+
+  bool _isLoading = false;
+  bool get isLoading => _isLoading;
+
+  String? _error;
+  String? get error => _error;
+
+  bool _hasLoaded = false;
+
+  List<NotificationModel> _items = [];
+  List<NotificationModel> get notifications => _items;
+  List<NotificationModel> get unread =>
+      _items.where((NotificationModel n) => !n.isRead).toList();
+  List<NotificationModel> get read =>
+      _items.where((NotificationModel n) => n.isRead).toList();
+
+  int _unreadCount = 0;
+  int get unreadCount => _unreadCount;
+  bool get hasUnread => _unreadCount > 0;
+
+  /// Initial load — shows a spinner on first call only. Subsequent calls use
+  /// cached state so optimistic mark-as-read updates are not overwritten.
+  Future<void> load() async {
+    if (_hasLoaded && _items.isNotEmpty) {
+      notifyListeners();
+      return;
+    }
+    _isLoading = true;
+    _error = null;
+    notifyListeners();
+    await _fetch();
+    _hasLoaded = true;
+    _isLoading = false;
+    notifyListeners();
+  }
+
+  /// Silent refresh — always re-fetches from server. Used for pull-to-refresh
+  /// and when a new push notification arrives.
+  Future<void> refresh() async {
+    await _fetch();
+    _hasLoaded = true;
+    notifyListeners();
+  }
+
+  Future<void> _fetch() async {
+    try {
+      final NotificationsPage page = await _repository.fetchNotifications();
+      _items = page.notifications;
+      _unreadCount = page.unreadCount;
+      _error = null;
+    } catch (e) {
+      _error = e.toString().replaceFirst('Exception: ', '');
+    }
+  }
+
+  /// Optimistically mark one notification read, then sync with the server.
+  Future<void> markRead(String id) async {
+    final int idx = _items.indexWhere((NotificationModel n) => n.id == id);
+    if (idx == -1 || _items[idx].isRead) return;
+
+    _items[idx] = _items[idx].copyWith(isRead: true);
+    if (_unreadCount > 0) _unreadCount--;
+    notifyListeners();
+
+    try {
+      await _repository.markRead(id);
+    } catch (_) {
+      // Keep the optimistic state; a later refresh will reconcile.
+    }
+  }
+
+  /// Optimistically mark every notification read.
+  Future<void> markAllRead() async {
+    if (_unreadCount == 0) return;
+    _items = _items
+        .map((NotificationModel n) => n.isRead ? n : n.copyWith(isRead: true))
+        .toList();
+    _unreadCount = 0;
+    notifyListeners();
+
+    try {
+      await _repository.markAllRead();
+    } catch (_) {
+      // Keep the optimistic state.
+    }
+  }
+
+  /// Clears state on logout.
+  void clear() {
+    _items = [];
+    _unreadCount = 0;
+    _error = null;
+    _isLoading = false;
+    _hasLoaded = false;
+    notifyListeners();
+  }
+}
diff --git a/apps/flutter/lib/features/notifications/views/notifications_screen.dart b/apps/flutter/lib/features/notifications/views/notifications_screen.dart
index b9f3ffb..ec52b17 100644
--- a/apps/flutter/lib/features/notifications/views/notifications_screen.dart
+++ b/apps/flutter/lib/features/notifications/views/notifications_screen.dart
@@ -2,114 +2,10 @@ import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:provider/provider.dart';
 import 'package:universe_app/core/constants/app_colors.dart';
-
-// ─── Model ────────────────────────────────────────────────────────────────────
-
-class NotificationItem {
-  NotificationItem({
-    required this.id,
-    required this.category,
-    required this.title,
-    required this.body,
-    required this.time,
-    required this.icon,
-    required this.gradientColors,
-    this.isRead = false,
-  });
-
-  final String id;
-  final String category;
-  final String title;
-  final String body;
-  final String time;
-  final IconData icon;
-  final List<Color> gradientColors;
-  bool isRead;
-}
-
-List<NotificationItem> kNotifications = [
-  NotificationItem(
-    id: '1',
-    category: 'Payment',
-    title: 'Canteen balance low',
-    body: 'Your canteen balance is below Rs. 200. Top up now to avoid disruption during lunch.',
-    time: '5 min ago',
-    icon: Icons.account_balance_wallet_rounded,
-    gradientColors: const [Color(0xFF64C4E6), Color(0xFF3EA8D8)],
-    isRead: false,
-  ),
-  NotificationItem(
-    id: '2',
-    category: 'Academic',
-    title: 'Assignment deadline today',
-    body: 'SE2045 – Software Architecture assignment is due at 11:59 PM tonight. Submit via the portal.',
-    time: '18 min ago',
-    icon: Icons.assignment_rounded,
-    gradientColors: const [Color(0xFF8CB2FF), Color(0xFF5B82F0)],
-    isRead: false,
-  ),
-  NotificationItem(
-    id: '3',
-    category: 'Security',
-    title: 'New login detected',
-    body: "A new login to your account was detected from a new device. If this wasn't you, contact support immediately.",
-    time: '52 min ago',
-    icon: Icons.security_rounded,
-    gradientColors: const [Color(0xFFFF8FAB), Color(0xFFD94F72)],
-    isRead: false,
-  ),
-  NotificationItem(
-    id: '4',
-    category: 'Gate',
-    title: 'Gate out recorded',
-    body: 'Your gate-out was recorded at 12:34 PM today. If this is incorrect, please contact the front office.',
-    time: '2 h ago',
-    icon: Icons.sensor_door_rounded,
-    gradientColors: const [Color(0xFF77C8A8), Color(0xFF3DAA82)],
-    isRead: false,
-  ),
-  NotificationItem(
-    id: '5',
-    category: 'Reminder',
-    title: 'Library book due tomorrow',
-    body: '"Clean Code" borrowed on 24 Apr is due for return tomorrow. Renew online to avoid fines.',
-    time: '3 h ago',
-    icon: Icons.menu_book_rounded,
-    gradientColors: const [Color(0xFFFFB38A), Color(0xFFE8845A)],
-    isRead: true,
-  ),
-  NotificationItem(
-    id: '6',
-    category: 'Event',
-    title: 'Hackathon registration confirmed',
-    body: 'You have successfully registered for Hackathon 2026. Check your email for team details and venue info.',
-    time: 'Yesterday',
-    icon: Icons.code_rounded,
-    gradientColors: const [Color(0xFFD4AAFF), Color(0xFF9067C6)],
-    isRead: true,
-  ),
-  NotificationItem(
-    id: '7',
-    category: 'Result',
-    title: 'Mid-term results published',
-    body: 'Your mid-term results for Semester 2 are now available. Log in to the portal to view your grades.',
-    time: 'Yesterday',
-    icon: Icons.bar_chart_rounded,
-    gradientColors: const [Color(0xFF80E8B8), Color(0xFF2EAA75)],
-    isRead: true,
-  ),
-  NotificationItem(
-    id: '8',
-    category: 'Reminder',
-    title: 'Attendance below threshold',
-    body: 'Your attendance for SE1095 has dropped to 74%, below the 75% requirement. Please attend upcoming classes.',
-    time: '2 days ago',
-    icon: Icons.warning_amber_rounded,
-    gradientColors: const [Color(0xFFFFCC80), Color(0xFFD47A2E)],
-    isRead: true,
-  ),
-];
+import 'package:universe_app/features/notifications/models/notification_model.dart';
+import 'package:universe_app/features/notifications/viewmodels/notifications_viewmodel.dart';
 
 // ─── Screen ───────────────────────────────────────────────────────────────────
 
@@ -139,6 +35,10 @@ class _NotificationsScreenState extends State<NotificationsScreen>
     _fadeAnim = CurvedAnimation(parent: _entryCtrl, curve: Curves.easeOut);
     _tabCtrl = TabController(length: 2, vsync: this);
     _entryCtrl.forward();
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      context.read<NotificationsViewModel>().load();
+    });
   }
 
   @override
@@ -148,35 +48,20 @@ class _NotificationsScreenState extends State<NotificationsScreen>
     super.dispose();
   }
 
-  List<NotificationItem> get _unread =>
-      kNotifications.where((n) => !n.isRead).toList();
-  List<NotificationItem> get _read =>
-      kNotifications.where((n) => n.isRead).toList();
-
-  void _markAllRead() {
-    setState(() {
-      for (final n in kNotifications) {
-        n.isRead = true;
-      }
-    });
-  }
-
-  void _markRead(String id) {
-    setState(() {
-      kNotifications.firstWhere((n) => n.id == id).isRead = true;
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
     final double topInset = MediaQuery.paddingOf(context).top;
     final double bottomInset = MediaQuery.paddingOf(context).bottom;
+    final NotificationsViewModel vm = context.watch<NotificationsViewModel>();
+
+    final List<NotificationModel> unread = vm.unread;
+    final List<NotificationModel> read = vm.read;
 
     return Scaffold(
       backgroundColor: AppColors.primary,
       body: Column(
         children: [
-          _buildHeader(topInset),
+          _buildHeader(topInset, vm, unread.length),
           Expanded(
             child: SlideTransition(
               position: _slideAnim,
@@ -192,29 +77,9 @@ class _NotificationsScreenState extends State<NotificationsScreen>
                   ),
                   child: Column(
                     children: [
-                      _buildTabBar(),
+                      _buildTabBar(unread.length),
                       Expanded(
-                        child: TabBarView(
-                          controller: _tabCtrl,
-                          children: [
-                            _NotificationList(
-                              items: _unread,
-                              emptyMessage: 'You\'re all caught up!',
-                              emptyIcon: Icons.done_all_rounded,
-                              controller: _entryCtrl,
-                              onMarkRead: _markRead,
-                              bottomInset: bottomInset,
-                            ),
-                            _NotificationList(
-                              items: _read,
-                              emptyMessage: 'No read notifications',
-                              emptyIcon: Icons.notifications_off_rounded,
-                              controller: _entryCtrl,
-                              onMarkRead: _markRead,
-                              bottomInset: bottomInset,
-                            ),
-                          ],
-                        ),
+                        child: _buildBody(vm, unread, read, bottomInset),
                       ),
                     ],
                   ),
@@ -227,8 +92,98 @@ class _NotificationsScreenState extends State<NotificationsScreen>
     );
   }
 
-  Widget _buildHeader(double topInset) {
-    final int unreadCount = _unread.length;
+  Widget _buildBody(
+    NotificationsViewModel vm,
+    List<NotificationModel> unread,
+    List<NotificationModel> read,
+    double bottomInset,
+  ) {
+    if (vm.isLoading && vm.notifications.isEmpty) {
+      return const Center(
+        child: CircularProgressIndicator(color: AppColors.primary),
+      );
+    }
+
+    if (vm.error != null && vm.notifications.isEmpty) {
+      return Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            const Icon(Icons.cloud_off_rounded,
+                size: 56, color: Color(0xFFCDD9DC)),
+            const SizedBox(height: 14),
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 32),
+              child: Text(
+                vm.error!,
+                textAlign: TextAlign.center,
+                style: const TextStyle(
+                  fontFamily: 'Plus Jakarta Sans',
+                  fontSize: 14,
+                  fontWeight: FontWeight.w600,
+                  color: Color(0xFF90A4AE),
+                ),
+              ),
+            ),
+            const SizedBox(height: 14),
+            GestureDetector(
+              onTap: () => vm.load(),
+              child: Container(
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+                decoration: BoxDecoration(
+                  color: AppColors.primary,
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                child: const Text(
+                  'Retry',
+                  style: TextStyle(
+                    fontFamily: 'Plus Jakarta Sans',
+                    fontSize: 13,
+                    fontWeight: FontWeight.w700,
+                    color: Colors.white,
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      );
+    }
+
+    return TabBarView(
+      controller: _tabCtrl,
+      children: [
+        RefreshIndicator(
+          color: AppColors.primary,
+          onRefresh: vm.refresh,
+          child: _NotificationList(
+            items: unread,
+            emptyMessage: 'You\'re all caught up!',
+            emptyIcon: Icons.done_all_rounded,
+            controller: _entryCtrl,
+            onMarkRead: vm.markRead,
+            bottomInset: bottomInset,
+          ),
+        ),
+        RefreshIndicator(
+          color: AppColors.primary,
+          onRefresh: vm.refresh,
+          child: _NotificationList(
+            items: read,
+            emptyMessage: 'No read notifications',
+            emptyIcon: Icons.notifications_off_rounded,
+            controller: _entryCtrl,
+            onMarkRead: vm.markRead,
+            bottomInset: bottomInset,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildHeader(
+      double topInset, NotificationsViewModel vm, int unreadCount) {
     return Container(
       width: double.infinity,
       padding: EdgeInsets.fromLTRB(18, 14 + topInset, 18, 24),
@@ -289,7 +244,7 @@ class _NotificationsScreenState extends State<NotificationsScreen>
                 const SizedBox(height: 2),
                 Text(
                   unreadCount > 0
-                      ? '$unreadCount unread messages'
+                      ? '$unreadCount unread notification${unreadCount > 1 ? 's' : ''}'
                       : 'All caught up',
                   style: const TextStyle(
                     fontFamily: 'Plus Jakarta Sans',
@@ -301,9 +256,9 @@ class _NotificationsScreenState extends State<NotificationsScreen>
               ],
             ),
           ),
-          if (_unread.isNotEmpty)
+          if (unreadCount > 0)
             GestureDetector(
-              onTap: _markAllRead,
+              onTap: () => vm.markAllRead(),
               child: Container(
                 padding:
                     const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
@@ -327,7 +282,7 @@ class _NotificationsScreenState extends State<NotificationsScreen>
     );
   }
 
-  Widget _buildTabBar() {
+  Widget _buildTabBar(int unreadCount) {
     return Padding(
       padding: const EdgeInsets.fromLTRB(18, 16, 18, 4),
       child: Container(
@@ -362,7 +317,7 @@ class _NotificationsScreenState extends State<NotificationsScreen>
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   const Text('Unread'),
-                  if (_unread.isNotEmpty) ...[
+                  if (unreadCount > 0) ...[
                     const SizedBox(width: 6),
                     Container(
                       padding: const EdgeInsets.symmetric(
@@ -372,7 +327,7 @@ class _NotificationsScreenState extends State<NotificationsScreen>
                         borderRadius: BorderRadius.circular(8),
                       ),
                       child: Text(
-                        '${_unread.length}',
+                        '$unreadCount',
                         style: const TextStyle(
                           fontFamily: 'Plus Jakarta Sans',
                           fontSize: 10,
@@ -405,7 +360,7 @@ class _NotificationList extends StatelessWidget {
     required this.bottomInset,
   });
 
-  final List<NotificationItem> items;
+  final List<NotificationModel> items;
   final String emptyMessage;
   final IconData emptyIcon;
   final AnimationController controller;
@@ -415,28 +370,37 @@ class _NotificationList extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     if (items.isEmpty) {
-      return Center(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Icon(emptyIcon, size: 56, color: const Color(0xFFCDD9DC)),
-            const SizedBox(height: 14),
-            Text(
-              emptyMessage,
-              style: const TextStyle(
-                fontFamily: 'Plus Jakarta Sans',
-                fontSize: 15,
-                fontWeight: FontWeight.w700,
-                color: Color(0xFF90A4AE),
+      // ListView keeps RefreshIndicator pull-to-refresh working when empty.
+      return ListView(
+        physics: const AlwaysScrollableScrollPhysics(),
+        children: [
+          SizedBox(
+            height: MediaQuery.sizeOf(context).height * 0.5,
+            child: Center(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Icon(emptyIcon, size: 56, color: const Color(0xFFCDD9DC)),
+                  const SizedBox(height: 14),
+                  Text(
+                    emptyMessage,
+                    style: const TextStyle(
+                      fontFamily: 'Plus Jakarta Sans',
+                      fontSize: 15,
+                      fontWeight: FontWeight.w700,
+                      color: Color(0xFF90A4AE),
+                    ),
+                  ),
+                ],
               ),
             ),
-          ],
-        ),
+          ),
+        ],
       );
     }
 
     return ListView.builder(
-      physics: const BouncingScrollPhysics(),
+      physics: const AlwaysScrollableScrollPhysics(parent: BouncingScrollPhysics()),
       padding: EdgeInsets.fromLTRB(18, 10, 18, bottomInset + 100),
       itemCount: items.length,
       itemBuilder: (context, i) => _NotificationCard(
@@ -459,7 +423,7 @@ class _NotificationCard extends StatefulWidget {
     required this.onMarkRead,
   });
 
-  final NotificationItem item;
+  final NotificationModel item;
   final int index;
   final AnimationController controller;
   final ValueChanged<String> onMarkRead;
@@ -471,6 +435,19 @@ class _NotificationCard extends StatefulWidget {
 class _NotificationCardState extends State<_NotificationCard> {
   bool _expanded = false;
 
+  void _handleTap() {
+    if (!widget.item.isRead) {
+      widget.onMarkRead(widget.item.id);
+    }
+    final String? route = widget.item.route;
+    if (route != null) {
+      // Deep-link to the relevant screen.
+      context.push(route);
+    } else {
+      setState(() => _expanded = !_expanded);
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final Animation<double> stagger = CurvedAnimation(
@@ -488,18 +465,11 @@ class _NotificationCardState extends State<_NotificationCard> {
         position: Tween<Offset>(begin: const Offset(0, 0.3), end: Offset.zero)
             .animate(stagger),
         child: GestureDetector(
-          onTap: () {
-            setState(() => _expanded = !_expanded);
-            if (!widget.item.isRead) {
-              widget.onMarkRead(widget.item.id);
-            }
-          },
+          onTap: _handleTap,
           child: Container(
             margin: const EdgeInsets.only(bottom: 12),
             decoration: BoxDecoration(
-              color: widget.item.isRead
-                  ? Colors.white
-                  : Colors.white,
+              color: Colors.white,
               borderRadius: BorderRadius.circular(22),
               boxShadow: [
                 BoxShadow(
@@ -640,16 +610,19 @@ class _NotificationCardState extends State<_NotificationCard> {
                           ),
                         ),
                         const SizedBox(width: 4),
-                        AnimatedRotation(
-                          turns: _expanded ? 0.5 : 0,
-                          duration: const Duration(milliseconds: 260),
-                          child: const Icon(Icons.keyboard_arrow_down_rounded,
-                              color: Color(0xFFB0BEC5), size: 20),
+                        Icon(
+                          widget.item.route != null
+                              ? Icons.chevron_right_rounded
+                              : (_expanded
+                                  ? Icons.keyboard_arrow_up_rounded
+                                  : Icons.keyboard_arrow_down_rounded),
+                          color: const Color(0xFFB0BEC5),
+                          size: 20,
                         ),
                       ],
                     ),
                   ),
-                  // Expanded body
+                  // Expanded body (only for notifications without a deep link)
                   AnimatedCrossFade(
                     firstChild: const SizedBox(width: double.infinity),
                     secondChild: Column(
@@ -714,10 +687,12 @@ class _NotificationCardState extends State<_NotificationCard> {
 class UnreadNotificationPopup extends StatefulWidget {
   const UnreadNotificationPopup({
     super.key,
+    required this.unread,
     required this.onViewAll,
     required this.onDismiss,
   });
 
+  final List<NotificationModel> unread;
   final VoidCallback onViewAll;
   final VoidCallback onDismiss;
 
@@ -755,9 +730,9 @@ class _UnreadNotificationPopupState extends State<UnreadNotificationPopup>
 
   @override
   Widget build(BuildContext context) {
-    final unread = kNotifications.where((n) => !n.isRead).toList();
+    final List<NotificationModel> unread = widget.unread;
     if (unread.isEmpty) return const SizedBox.shrink();
-    final latest = unread.first;
+    final NotificationModel latest = unread.first;
 
     return FadeTransition(
       opacity: _fade,
diff --git a/apps/flutter/lib/features/settings/viewmodels/settings_viewmodel.dart b/apps/flutter/lib/features/settings/viewmodels/settings_viewmodel.dart
index 3105481..456c8e2 100644
--- a/apps/flutter/lib/features/settings/viewmodels/settings_viewmodel.dart
+++ b/apps/flutter/lib/features/settings/viewmodels/settings_viewmodel.dart
@@ -1,11 +1,13 @@
+import 'package:universe_app/core/services/firebase_service.dart';
 import 'package:universe_app/core/viewmodels/base_viewmodel.dart';
 import 'package:universe_app/features/settings/models/settings_model.dart';
 import 'package:universe_app/features/settings/repositories/settings_repository.dart';
 
 class SettingsViewModel extends BaseViewModel {
   final SettingsRepository _repository;
+  final FirebaseService _firebaseService;
 
-  SettingsViewModel(this._repository) {
+  SettingsViewModel(this._repository, this._firebaseService) {
     // Initialize with defaults to allow interaction immediately
     _settings = UserSettingsModel(
       id: '',
@@ -20,6 +22,16 @@ class SettingsViewModel extends BaseViewModel {
   UserSettingsModel? _settings;
   UserSettingsModel? get settings => _settings;
 
+  /// Set to `true` after the user tries to enable push notifications but
+  /// device-level permission is permanently denied. The UI checks this to
+  /// show a "Go to device Settings" dialog, then clears it.
+  bool _permissionDenied = false;
+  bool get permissionDenied => _permissionDenied;
+
+  void clearPermissionDenied() {
+    _permissionDenied = false;
+  }
+
   Future<void> loadSettings() async {
     setLoading(true);
     try {
@@ -48,6 +60,18 @@ class SettingsViewModel extends BaseViewModel {
 
   Future<void> updatePushNotifications(bool value) async {
     if (_settings == null) return;
+
+    if (value) {
+      final granted = await _firebaseService.requestOrCheckPermission();
+      if (!granted) {
+        _permissionDenied = true;
+        notifyListeners();
+        return;
+      }
+      // Ensure FCM token is registered now that permission is confirmed.
+      await _firebaseService.uploadTokenIfLoggedIn();
+    }
+
     _settings = _settings!.copyWith(pushNotifications: value);
     notifyListeners();
     await _updateRemote();
diff --git a/apps/flutter/lib/features/settings/views/settings_screen.dart b/apps/flutter/lib/features/settings/views/settings_screen.dart
index 444a663..ce78d9d 100644
--- a/apps/flutter/lib/features/settings/views/settings_screen.dart
+++ b/apps/flutter/lib/features/settings/views/settings_screen.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:typed_data';
 import 'dart:ui';
 
+import 'package:app_settings/app_settings.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
@@ -132,7 +133,63 @@ class _SettingsScreenState extends State<SettingsScreen>
                                 subtitle: 'Receive app alerts',
                                 icon: Icons.notifications_none_rounded,
                                 value: context.watch<SettingsViewModel>().settings?.pushNotifications ?? true,
-                                onChanged: (v) => context.read<SettingsViewModel>().updatePushNotifications(v),
+                                onChanged: (v) async {
+                                  final vm = context.read<SettingsViewModel>();
+                                  await vm.updatePushNotifications(v);
+                                  if (vm.permissionDenied && context.mounted) {
+                                    vm.clearPermissionDenied();
+                                    await showDialog<void>(
+                                      context: context,
+                                      builder: (_) => AlertDialog(
+                                        shape: RoundedRectangleBorder(
+                                          borderRadius: BorderRadius.circular(20),
+                                        ),
+                                        title: const Text(
+                                          'Notifications Blocked',
+                                          style: TextStyle(
+                                            fontFamily: 'Plus Jakarta Sans',
+                                            fontWeight: FontWeight.w800,
+                                            fontSize: 16,
+                                          ),
+                                        ),
+                                        content: const Text(
+                                          'To receive push notifications, go to your device Settings → App → Notifications and enable them for Universe.',
+                                          style: TextStyle(
+                                            fontFamily: 'Plus Jakarta Sans',
+                                            fontSize: 13,
+                                            color: Color(0xFF546E7A),
+                                          ),
+                                        ),
+                                        actions: [
+                                          TextButton(
+                                            onPressed: () => Navigator.of(context).pop(),
+                                            child: const Text(
+                                              'Cancel',
+                                              style: TextStyle(
+                                                fontFamily: 'Plus Jakarta Sans',
+                                                color: Color(0xFF90A4AE),
+                                              ),
+                                            ),
+                                          ),
+                                          TextButton(
+                                            onPressed: () {
+                                              Navigator.of(context).pop();
+                                              AppSettings.openAppSettings();
+                                            },
+                                            child: Text(
+                                              'Open Settings',
+                                              style: TextStyle(
+                                                fontFamily: 'Plus Jakarta Sans',
+                                                fontWeight: FontWeight.w700,
+                                                color: AppColors.primary,
+                                              ),
+                                            ),
+                                          ),
+                                        ],
+                                      ),
+                                    );
+                                  }
+                                },
                               ),
                             ],
                           ),
@@ -613,7 +670,7 @@ class _ToggleRow extends StatelessWidget {
   final String subtitle;
   final IconData icon;
   final bool value;
-  final ValueChanged<bool> onChanged;
+  final Function(bool) onChanged;
   final Color? activeColor;
 
   @override
@@ -694,7 +751,7 @@ class _AnimatedToggle extends StatefulWidget {
   });
 
   final bool value;
-  final ValueChanged<bool> onChanged;
+  final Function(bool) onChanged;
   final Color? activeColor;
 
   @override
diff --git a/apps/flutter/lib/firebase_options.dart b/apps/flutter/lib/firebase_options.dart
index 2661ff9..6f3ff22 100644
--- a/apps/flutter/lib/firebase_options.dart
+++ b/apps/flutter/lib/firebase_options.dart
@@ -8,11 +8,11 @@ class DefaultFirebaseOptions {
   }
 
   static const FirebaseOptions android = FirebaseOptions(
-    apiKey: 'AIzaSyDummy1234567890ABCDEFGHIJKLMNOPQRS',
-    appId: '1:451261949462:android:abc123def456ghi789jkl',
-    messagingSenderId: '451261949462',
+    apiKey: String.fromEnvironment('FIREBASE_API_KEY', defaultValue: 'AIzaSyA26E5DcOTTE-tDHurMeU6j7d6A1QPgrvs'),
+    appId: String.fromEnvironment('FIREBASE_APP_ID', defaultValue: '1:746560263890:android:2ef9040c8213ecf5e53f0b'),
+    messagingSenderId: '746560263890',
     projectId: 'universe-fireabse',
-    storageBucket: 'universe-fireabse.appspot.com',
+    storageBucket: 'universe-fireabse.firebasestorage.app',
   );
 
   static const FirebaseOptions ios = FirebaseOptions(
diff --git a/apps/flutter/lib/main.dart b/apps/flutter/lib/main.dart
index 795645b..5da7cc3 100644
--- a/apps/flutter/lib/main.dart
+++ b/apps/flutter/lib/main.dart
@@ -42,5 +42,7 @@ void main() async {
     noticesViewModel: sl.noticesViewModel,
     settingsViewModel: sl.settingsViewModel,
     lostFoundViewModel: sl.lostFoundViewModel,
+    notificationsViewModel: sl.notificationsViewModel,
+    firebaseService: sl.firebaseService,
   ));
 }
diff --git a/apps/flutter/pubspec.lock b/apps/flutter/pubspec.lock
index 03fcf09..c362a59 100644
--- a/apps/flutter/pubspec.lock
+++ b/apps/flutter/pubspec.lock
@@ -17,6 +17,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
+  app_settings:
+    dependency: "direct main"
+    description:
+      name: app_settings
+      sha256: "476df1d85cec143c3d27dd1c7451629a59c0c5ccf70a0adcbfa92a0a2d928705"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.2.0"
   args:
     dependency: transitive
     description:
diff --git a/apps/flutter/pubspec.yaml b/apps/flutter/pubspec.yaml
index fa8c781..0630d34 100644
--- a/apps/flutter/pubspec.yaml
+++ b/apps/flutter/pubspec.yaml
@@ -46,6 +46,7 @@ dependencies:
   pinput: ^6.0.2
   flutter_local_notifications: ^21.0.0
   local_auth: ^3.0.1
+  app_settings: ^5.1.1
 
 dev_dependencies:
   flutter_test:
diff --git a/apps/flutter/test/widget_test.dart b/apps/flutter/test/widget_test.dart
index 304af94..932a45a 100644
--- a/apps/flutter/test/widget_test.dart
+++ b/apps/flutter/test/widget_test.dart
@@ -1,34 +1,23 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:universe_app/app.dart';
-import 'package:universe_app/core/di/service_locator.dart';
-import 'package:universe_app/features/auth/viewmodels/auth_viewmodel.dart';
-import 'package:universe_app/features/messages/viewmodels/messages_viewmodel.dart';
-import 'package:universe_app/features/profile/viewmodels/profile_viewmodel.dart';
+import 'package:universe_app/features/notifications/models/notification_model.dart';
 
 void main() {
-  testWidgets('App boots and shows splash', (WidgetTester tester) async {
-    final sl = ServiceLocator.instance;
-    await sl.setup();
+  test('NotificationModel.fromJson maps fields and derives view metadata', () {
+    final NotificationModel n = NotificationModel.fromJson(<String, dynamic>{
+      'id': 'n1',
+      'type': 'gate',
+      'title': 'Student Arrived',
+      'body': 'Alex has entered the school.',
+      'data': <String, dynamic>{'route': '/gate-status'},
+      'is_read': false,
+      'created_at': DateTime.now().toIso8601String(),
+    });
 
-    await tester.pumpWidget(UniverseApp(
-      authViewModel: AuthViewModel(
-        sl.authRepository,
-        sl.localStorageService,
-        sl.firebaseService,
-        sl.secureStorageService,
-        sl.biometricService,
-      ),
-      messagesViewModel: MessagesViewModel(sl.messagesRepository),
-      profileViewModel: ProfileViewModel(
-        repository: sl.profileRepository,
-        localStorage: sl.localStorageService,
-      ),
-      gateViewModel: sl.gateViewModel,
-      attendanceViewModel: sl.attendanceViewModel,
-      resultsViewModel: sl.resultsViewModel,
-      supportViewModel: sl.supportViewModel,
-    ));
+    expect(n.id, 'n1');
+    expect(n.isRead, isFalse);
+    expect(n.route, '/gate-status');
+    expect(n.category, 'Gate');
 
-    expect(find.text('UniVerse'), findsOneWidget);
+    expect(n.copyWith(isRead: true).isRead, isTrue);
   });
 }
diff --git a/apps/frontend/src/app/admin/calendar/page.tsx b/apps/frontend/src/app/admin/calendar/page.tsx
index ada577f..4dc272e 100644
--- a/apps/frontend/src/app/admin/calendar/page.tsx
+++ b/apps/frontend/src/app/admin/calendar/page.tsx
@@ -182,6 +182,7 @@ export default function CalendarPage() {
       <PageHeader 
         title="Calendar"
         subtitle="Manage your schedules and events"
+        onRefresh={fetchEvents}
       />
 
       <div className="grid grid-cols-1 lg:grid-cols-12 gap-6 w-full items-start">
diff --git a/apps/frontend/src/app/admin/overview/policies/page.tsx b/apps/frontend/src/app/admin/overview/policies/page.tsx
index 493b9b3..b1ec37c 100644
--- a/apps/frontend/src/app/admin/overview/policies/page.tsx
+++ b/apps/frontend/src/app/admin/overview/policies/page.tsx
@@ -12,6 +12,7 @@ import {
   Search,
   Trash2,
   X,
+  XCircle,
 } from "lucide-react";
 import {
   createClass,
@@ -457,7 +458,7 @@ export default function PoliciesPage() {
     if (!res.ok) { alert(res.error); return; }
     // Add optimistic row — will show as processing until page refresh
     setDocuments((prev) => [
-      { id: res.data.id, file_name: file.name, display_name: res.data.display_name, is_processed: false, chunk_count: 0, created_at: new Date().toISOString() },
+      { id: res.data.id, file_name: file.name, display_name: res.data.display_name, status: "processing", error_message: null, chunk_count: 0, created_at: new Date().toISOString() },
       ...prev,
     ]);
     // Poll once after 5s to update processed status
@@ -646,16 +647,23 @@ export default function PoliciesPage() {
                       <p className="text-[11px] font-semibold text-[#94a3b8]">{doc.file_name}</p>
                     </td>
                     <td className="px-6 py-[18px] text-[13px] font-semibold text-[#64748b]">
-                      {doc.is_processed ? doc.chunk_count : "—"}
+                      {doc.status === "completed" ? doc.chunk_count : "—"}
                     </td>
                     <td className="px-6 py-[18px] text-[13px] font-semibold text-[#64748b]">
                       {new Date(doc.created_at).toLocaleDateString()}
                     </td>
                     <td className="px-6 py-[18px]">
-                      {doc.is_processed ? (
+                      {doc.status === "completed" ? (
                         <span className="flex items-center gap-1 text-[11px] font-bold text-[#16a34a]">
                           <CheckCircle className="h-3.5 w-3.5" /> Ready
                         </span>
+                      ) : doc.status === "failed" ? (
+                        <span
+                          title={doc.error_message ?? "Processing failed"}
+                          className="flex items-center gap-1 text-[11px] font-bold text-[#dc2626] cursor-help"
+                        >
+                          <XCircle className="h-3.5 w-3.5" /> Failed
+                        </span>
                       ) : (
                         <span className="flex items-center gap-1 text-[11px] font-bold text-[#d97706]">
                           <Clock className="h-3.5 w-3.5" /> Processing
diff --git a/apps/frontend/src/app/admin/profile/page.tsx b/apps/frontend/src/app/admin/profile/page.tsx
index 299b203..abd26a2 100644
--- a/apps/frontend/src/app/admin/profile/page.tsx
+++ b/apps/frontend/src/app/admin/profile/page.tsx
@@ -3,7 +3,7 @@
 import React, { useState, useRef, useEffect } from 'react';
 import { PageHeader } from '@/shared/components/layout/PageHeader';
 import { TextInput } from '@/shared/components/ui/forms/TextInput';
-import { Eye, Edit2, Loader2, Check } from 'lucide-react';
+import { Edit2, Loader2, Check } from 'lucide-react';
 import { useAuth } from '@/features/auth/context/AuthContext';
 import { updateProfile, changePassword, deleteMe } from '@/features/auth/lib/auth-api';
 
@@ -26,10 +26,6 @@ export default function ProfilePage() {
   });
 
   const [isSaving, setIsSaving] = useState(false);
-  const [preferences, setPreferences] = useState({
-    darkMode: false,
-    emailNotifications: false,
-  });
 
   // Modals state
   const [isPasswordModalOpen, setPasswordModalOpen] = useState(false);
@@ -71,10 +67,6 @@ export default function ProfilePage() {
     setFormData(prev => ({ ...prev, [name]: value }));
   };
 
-  const handleToggle = (key: keyof typeof preferences) => {
-    setPreferences(prev => ({ ...prev, [key]: !prev[key] }));
-  };
-
   const handleImageUpload = (e: React.ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0];
     if (file) {
@@ -205,52 +197,6 @@ export default function ProfilePage() {
             <p className="text-[13px] font-medium text-[var(--muted)]">{user.email}</p>
           </div>
 
-          {/* Preferences Card */}
-          <div className="bg-[var(--surface)] border border-[var(--line)] rounded-[20px] p-6 w-full shadow-sm">
-            <h3 className="text-[16px] font-bold text-[#0f172a] mb-1">Preferences</h3>
-            <p className="text-[12px] font-medium text-[var(--muted)] mb-6">Customize ur web experience</p>
-
-            <div className="flex flex-col gap-6">
-              {/* Dark Mode Toggle */}
-              <div className="flex items-center justify-between">
-                <div className="flex items-center gap-4">
-                  <div className="w-10 h-10 rounded-full bg-gray-50 flex items-center justify-center text-[var(--muted)]">
-                    <Eye className="w-5 h-5" />
-                  </div>
-                  <div>
-                    <h4 className="text-[14px] font-bold text-[#0f172a]">Dark Mode</h4>
-                    <p className="text-[12px] font-medium text-[var(--muted)]">Customize ur web experience</p>
-                  </div>
-                </div>
-                <button
-                  onClick={() => handleToggle('darkMode')}
-                  className={`w-11 h-6 rounded-full transition-colors relative ${preferences.darkMode ? 'bg-[#3b82f6]' : 'bg-gray-200'}`}
-                >
-                  <div className={`w-5 h-5 bg-white rounded-full absolute top-[2px] transition-all shadow-sm ${preferences.darkMode ? 'left-[22px]' : 'left-[2px]'}`} />
-                </button>
-              </div>
-
-              {/* Email Notifications Toggle */}
-              <div className="flex items-center justify-between">
-                <div className="flex items-center gap-4">
-                  <div className="w-10 h-10 rounded-full bg-gray-50 flex items-center justify-center text-[var(--muted)]">
-                    <Eye className="w-5 h-5" />
-                  </div>
-                  <div>
-                    <h4 className="text-[14px] font-bold text-[#0f172a]">Email Notifications</h4>
-                    <p className="text-[12px] font-medium text-[var(--muted)]">Customize ur web experience</p>
-                  </div>
-                </div>
-                <button
-                  onClick={() => handleToggle('emailNotifications')}
-                  className={`w-11 h-6 rounded-full transition-colors relative ${preferences.emailNotifications ? 'bg-[#3b82f6]' : 'bg-gray-200'}`}
-                >
-                  <div className={`w-5 h-5 bg-white rounded-full absolute top-[2px] transition-all shadow-sm ${preferences.emailNotifications ? 'left-[22px]' : 'left-[2px]'}`} />
-                </button>
-              </div>
-            </div>
-          </div>
-
         </div>
 
         {/* Right Column */}
diff --git a/apps/frontend/src/app/admin/students/page.tsx b/apps/frontend/src/app/admin/students/page.tsx
index 9892f2c..bc142c6 100644
--- a/apps/frontend/src/app/admin/students/page.tsx
+++ b/apps/frontend/src/app/admin/students/page.tsx
@@ -62,7 +62,7 @@ export default function StudentsPage() {
     const cached = cacheGet<Student[]>('students');
     if (cached && cached.length > 0) {
       setStudents(cached);
-      setSelectedStudentId(cached[0].id);
+      setSelectedStudentId(prev => prev || cached[0].id);
       setIsLoading(false);
     } else {
       setIsLoading(true);
@@ -74,10 +74,10 @@ export default function StudentsPage() {
       const mapped = res.data.map(mapApiStudentToStudent);
       setStudents(mapped);
       cacheSet('students', mapped, 300);
-      if (mapped.length > 0 && !selectedStudentId) setSelectedStudentId(mapped[0].id);
+      if (mapped.length > 0) setSelectedStudentId(prev => prev || mapped[0].id);
     }
     setIsLoading(false);
-  }, [selectedStudentId]);
+  }, []);
 
   // eslint-disable-next-line react-hooks/set-state-in-effect
   useEffect(() => { void fetchData(); }, [fetchData]);
diff --git a/apps/frontend/src/app/security/profile/page.tsx b/apps/frontend/src/app/security/profile/page.tsx
index abd6be3..23a95ed 100644
--- a/apps/frontend/src/app/security/profile/page.tsx
+++ b/apps/frontend/src/app/security/profile/page.tsx
@@ -3,7 +3,7 @@
 import React, { useState, useRef, useEffect } from 'react';
 import { PageHeader } from '@/shared/components/layout/PageHeader';
 import { TextInput } from '@/shared/components/ui/forms/TextInput';
-import { Eye, Edit2, Loader2, Check, Shield } from 'lucide-react';
+import { Edit2, Loader2, Check, Shield } from 'lucide-react';
 import { useAuth } from '@/features/auth/context/AuthContext';
 import { updateProfile, changePassword, deleteMe } from '@/features/auth/lib/auth-api';
 
@@ -26,10 +26,6 @@ export default function SecurityProfilePage() {
   });
 
   const [isSaving, setIsSaving] = useState(false);
-  const [preferences, setPreferences] = useState({
-    darkMode: false,
-    emailNotifications: true,
-  });
 
   // Modals state
   const [isPasswordModalOpen, setPasswordModalOpen] = useState(false);
@@ -71,10 +67,6 @@ export default function SecurityProfilePage() {
     setFormData(prev => ({ ...prev, [name]: value }));
   };
 
-  const handleToggle = (key: keyof typeof preferences) => {
-    setPreferences(prev => ({ ...prev, [key]: !prev[key] }));
-  };
-
   const handleImageUpload = (e: React.ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0];
     if (file) {
@@ -209,52 +201,6 @@ export default function SecurityProfilePage() {
             </span>
           </div>
 
-          {/* Preferences Card */}
-          <div className="bg-[var(--surface)] border border-[var(--line)] rounded-[20px] p-6 w-full shadow-sm">
-            <h3 className="text-[16px] font-bold text-[#0f172a] mb-1">Preferences</h3>
-            <p className="text-[12px] font-medium text-[var(--muted)] mb-6">Customize your dashboard</p>
-
-            <div className="flex flex-col gap-6">
-              {/* Dark Mode Toggle */}
-              <div className="flex items-center justify-between">
-                <div className="flex items-center gap-4">
-                  <div className="w-10 h-10 rounded-full bg-gray-50 flex items-center justify-center text-[var(--muted)]">
-                    <Eye className="w-5 h-5" />
-                  </div>
-                  <div>
-                    <h4 className="text-[14px] font-bold text-[#0f172a]">Dark Mode</h4>
-                    <p className="text-[12px] font-medium text-[var(--muted)]">Enable dark theme</p>
-                  </div>
-                </div>
-                <button
-                  onClick={() => handleToggle('darkMode')}
-                  className={`w-11 h-6 rounded-full transition-colors relative ${preferences.darkMode ? 'bg-[#0f172a]' : 'bg-gray-200'}`}
-                >
-                  <div className={`w-5 h-5 bg-white rounded-full absolute top-[2px] transition-all shadow-sm ${preferences.darkMode ? 'left-[22px]' : 'left-[2px]'}`} />
-                </button>
-              </div>
-
-              {/* Email Notifications Toggle */}
-              <div className="flex items-center justify-between">
-                <div className="flex items-center gap-4">
-                  <div className="w-10 h-10 rounded-full bg-gray-50 flex items-center justify-center text-[var(--muted)]">
-                    <Shield className="w-5 h-5" />
-                  </div>
-                  <div>
-                    <h4 className="text-[14px] font-bold text-[#0f172a]">Security Alerts</h4>
-                    <p className="text-[12px] font-medium text-[var(--muted)]">Receive critical updates</p>
-                  </div>
-                </div>
-                <button
-                  onClick={() => handleToggle('emailNotifications')}
-                  className={`w-11 h-6 rounded-full transition-colors relative ${preferences.emailNotifications ? 'bg-[#0f172a]' : 'bg-gray-200'}`}
-                >
-                  <div className={`w-5 h-5 bg-white rounded-full absolute top-[2px] transition-all shadow-sm ${preferences.emailNotifications ? 'left-[22px]' : 'left-[2px]'}`} />
-                </button>
-              </div>
-            </div>
-          </div>
-
         </div>
 
         {/* Right Column */}
diff --git a/apps/frontend/src/app/teacher/calendar/page.tsx b/apps/frontend/src/app/teacher/calendar/page.tsx
index fd6d5a0..c9c2f9f 100644
--- a/apps/frontend/src/app/teacher/calendar/page.tsx
+++ b/apps/frontend/src/app/teacher/calendar/page.tsx
@@ -178,6 +178,7 @@ export default function TeacherCalendarPage() {
       <PageHeader
         title="Calendar"
         subtitle="Track school events, principal meetings, and your own schedule."
+        onRefresh={fetchEvents}
       />
 
       {/* ── Main two-panel area ──────────────────────────────────────────────── */}
diff --git a/apps/frontend/src/app/teacher/overview/page.tsx b/apps/frontend/src/app/teacher/overview/page.tsx
index e7124d0..cdb6245 100644
--- a/apps/frontend/src/app/teacher/overview/page.tsx
+++ b/apps/frontend/src/app/teacher/overview/page.tsx
@@ -96,7 +96,7 @@ export default function TeacherOverviewPage() {
                   />
                   <StatCard title="Today's Gate Attendance" value={stats?.todayAttendance?.toString() ?? "0"} icon={Eye} />
                   <StatCard title="Late Attendance" value="0" icon={Eye} variant="danger" />
-                  <StatCard title="Today Absentees" value={Math.max(0, (stats?.activeStudents ?? 0) - (stats?.todayAttendance ?? 0)).toString()} icon={Eye} variant="danger" />
+                  <StatCard title="Today Absentees" value={Math.max(0, (stats?.activeStudents ?? 0) - (stats?.todayClassroomPresent ?? 0)).toString()} icon={Eye} variant="danger" />
                 </div>
 
                 <div className="bg-white rounded-2xl border border-[#e2e8f0] shadow-[0_2px_10px_rgba(0,0,0,0.02)] overflow-hidden">
diff --git a/apps/frontend/src/app/teacher/profile/page.tsx b/apps/frontend/src/app/teacher/profile/page.tsx
index 9d447e6..a71eec7 100644
--- a/apps/frontend/src/app/teacher/profile/page.tsx
+++ b/apps/frontend/src/app/teacher/profile/page.tsx
@@ -3,7 +3,7 @@
 import React, { useState, useRef, useEffect } from 'react';
 import { PageHeader } from '@/shared/components/layout/PageHeader';
 import { TextInput } from '@/shared/components/ui/forms/TextInput';
-import { Eye, Edit2, Loader2, Check, Bell } from 'lucide-react';
+import { Edit2, Loader2, Check } from 'lucide-react';
 import { useAuth } from '@/features/auth/context/AuthContext';
 import { updateProfile, changePassword, deleteMe } from '@/features/auth/lib/auth-api';
 
@@ -28,10 +28,6 @@ export default function TeacherProfilePage() {
   });
 
   const [isSaving, setIsSaving] = useState(false);
-  const [preferences, setPreferences] = useState({
-    darkMode: false,
-    emailNotifications: true,
-  });
 
   // Modals state
   const [isPasswordModalOpen, setPasswordModalOpen] = useState(false);
@@ -75,10 +71,6 @@ export default function TeacherProfilePage() {
     setFormData(prev => ({ ...prev, [name]: value }));
   };
 
-  const handleToggle = (key: keyof typeof preferences) => {
-    setPreferences(prev => ({ ...prev, [key]: !prev[key] }));
-  };
-
   const handleImageUpload = (e: React.ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0];
     if (file) {
@@ -214,52 +206,6 @@ export default function TeacherProfilePage() {
             </span>
           </div>
 
-          {/* Preferences Card */}
-          <div className="bg-[var(--surface)] border border-[var(--line)] rounded-[20px] p-6 w-full shadow-sm">
-            <h3 className="text-[16px] font-bold text-[#0f172a] mb-1">Preferences</h3>
-            <p className="text-[12px] font-medium text-[var(--muted)] mb-6">Customize your experience</p>
-
-            <div className="flex flex-col gap-6">
-              {/* Dark Mode Toggle */}
-              <div className="flex items-center justify-between">
-                <div className="flex items-center gap-4">
-                  <div className="w-10 h-10 rounded-full bg-gray-50 flex items-center justify-center text-[var(--muted)]">
-                    <Eye className="w-5 h-5" />
-                  </div>
-                  <div>
-                    <h4 className="text-[14px] font-bold text-[#0f172a]">Dark Mode</h4>
-                    <p className="text-[12px] font-medium text-[var(--muted)]">Enable dark theme</p>
-                  </div>
-                </div>
-                <button
-                  onClick={() => handleToggle('darkMode')}
-                  className={`w-11 h-6 rounded-full transition-colors relative ${preferences.darkMode ? 'bg-[#4f46e5]' : 'bg-gray-200'}`}
-                >
-                  <div className={`w-5 h-5 bg-white rounded-full absolute top-[2px] transition-all shadow-sm ${preferences.darkMode ? 'left-[22px]' : 'left-[2px]'}`} />
-                </button>
-              </div>
-
-              {/* Email Notifications Toggle */}
-              <div className="flex items-center justify-between">
-                <div className="flex items-center gap-4">
-                  <div className="w-10 h-10 rounded-full bg-gray-50 flex items-center justify-center text-[var(--muted)]">
-                    <Bell className="w-5 h-5" />
-                  </div>
-                  <div>
-                    <h4 className="text-[14px] font-bold text-[#0f172a]">Email Notifications</h4>
-                    <p className="text-[12px] font-medium text-[var(--muted)]">Receive daily updates</p>
-                  </div>
-                </div>
-                <button
-                  onClick={() => handleToggle('emailNotifications')}
-                  className={`w-11 h-6 rounded-full transition-colors relative ${preferences.emailNotifications ? 'bg-[#4f46e5]' : 'bg-gray-200'}`}
-                >
-                  <div className={`w-5 h-5 bg-white rounded-full absolute top-[2px] transition-all shadow-sm ${preferences.emailNotifications ? 'left-[22px]' : 'left-[2px]'}`} />
-                </button>
-              </div>
-            </div>
-          </div>
-
         </div>
 
         {/* Right Column */}
diff --git a/apps/frontend/src/features/rag/lib/rag-api.ts b/apps/frontend/src/features/rag/lib/rag-api.ts
index 8ccf37a..f468b36 100644
--- a/apps/frontend/src/features/rag/lib/rag-api.ts
+++ b/apps/frontend/src/features/rag/lib/rag-api.ts
@@ -15,11 +15,14 @@ async function request<T>(path: string, options: RequestInit = {}): Promise<ApiR
   }
 }
 
+export type DocumentStatus = 'processing' | 'completed' | 'failed';
+
 export type PolicyDocument = {
   id: string;
   file_name: string;
   display_name: string;
-  is_processed: boolean;
+  status: DocumentStatus;
+  error_message: string | null;
   chunk_count: number;
   created_at: string;
 };
@@ -30,7 +33,7 @@ export async function listDocuments(): Promise<ApiResult<PolicyDocument[]>> {
   return { ok: true, data: res.data.documents };
 }
 
-export async function uploadDocument(file: File): Promise<ApiResult<{ id: string; display_name: string; is_processed: boolean }>> {
+export async function uploadDocument(file: File): Promise<ApiResult<{ id: string; display_name: string; status: DocumentStatus }>> {
   const form = new FormData();
   form.append('file', file);
   return request('/api/rag/documents', { method: 'POST', body: form });
diff --git a/apps/frontend/src/features/school/lib/school-api.ts b/apps/frontend/src/features/school/lib/school-api.ts
index 1babb6f..ce87d1b 100644
--- a/apps/frontend/src/features/school/lib/school-api.ts
+++ b/apps/frontend/src/features/school/lib/school-api.ts
@@ -168,12 +168,13 @@ export function deleteStudent(id: string) {
   });
 }
 
-export type OverviewStats = {
+export interface OverviewStats {
   activeStudents: number;
   suspendedStudents: number;
   lockedAccounts: number;
   todayAttendance: number;
   yesterdayAttendance: number;
+  todayClassroomPresent?: number;
 };
 
 export function getOverviewStats(classId?: string) {
diff --git a/apps/frontend/src/shared/components/layout/Sidebar.tsx b/apps/frontend/src/shared/components/layout/Sidebar.tsx
index 87a7213..788261c 100644
--- a/apps/frontend/src/shared/components/layout/Sidebar.tsx
+++ b/apps/frontend/src/shared/components/layout/Sidebar.tsx
@@ -136,15 +136,6 @@ export function Sidebar({ role, isOpen, onClose }: SidebarProps) {
 
         {/* Bottom Actions / Footer */}
         <div className="shrink-0 p-4 border-t border-[#ecece8]">
-          <div className="mb-4 flex items-center justify-between px-2">
-            <span className="text-sm font-semibold text-gray-600">Dark Mode</span>
-            {/* Simple styling placeholder for a toggle switch */}
-            <div className="relative inline-flex h-5 w-9 cursor-pointer items-center rounded-full bg-gray-200">
-              <span className="sr-only">Toggle Dark Mode</span>
-              <span className="inline-block h-4 w-4 transform rounded-full bg-white transition-transform ease-in-out translate-x-1" />
-            </div>
-          </div>
-          
           <button 
             onClick={() => setIsLogoutModalOpen(true)}
             className="flex w-full items-center justify-center gap-2 rounded-xl bg-[#e31f26] px-4 py-2.5 text-sm font-bold text-white transition-colors hover:bg-[#c9181f]"
diff --git a/firebase-debug.log b/firebase-debug.log
deleted file mode 100644
index f803104..0000000
--- a/firebase-debug.log
+++ /dev/null
@@ -1,35 +0,0 @@
-[debug] [2026-04-29T21:50:40.244Z] ----------------------------------------------------------------------
-[debug] [2026-04-29T21:50:40.245Z] Command:       C:\Program Files\nodejs\node.exe C:\Users\Methum-PC\AppData\Roaming\npm\node_modules\firebase-tools\lib\bin\firebase.js projects:list
-[debug] [2026-04-29T21:50:40.245Z] CLI Version:   15.0.0
-[debug] [2026-04-29T21:50:40.245Z] Platform:      win32
-[debug] [2026-04-29T21:50:40.245Z] Node Version:  v24.11.1
-[debug] [2026-04-29T21:50:40.246Z] Time:          Thu Apr 30 2026 03:20:40 GMT+0530 (India Standard Time)
-[debug] [2026-04-29T21:50:40.246Z] ----------------------------------------------------------------------
-[debug] 
-[debug] [2026-04-29T21:50:40.253Z] > command requires scopes: ["email","openid","https://www.googleapis.com/auth/cloudplatformprojects.readonly","https://www.googleapis.com/auth/firebase","https://www.googleapis.com/auth/cloud-platform"]
-[debug] [2026-04-29T21:50:40.253Z] > authorizing via signed-in user (methum.edu@gmail.com)
-[debug] [2026-04-29T21:50:40.255Z] Checked if tokens are valid: false, expires at: 1765643677246
-[debug] [2026-04-29T21:50:40.255Z] Checked if tokens are valid: false, expires at: 1765643677246
-[debug] [2026-04-29T21:50:40.255Z] > refreshing access token with scopes: []
-[debug] [2026-04-29T21:50:40.257Z] >>> [apiv2][query] POST https://www.googleapis.com/oauth2/v3/token [none]
-[debug] [2026-04-29T21:50:40.257Z] >>> [apiv2][body] POST https://www.googleapis.com/oauth2/v3/token [omitted]
-[debug] [2026-04-29T21:50:40.411Z] <<< [apiv2][status] POST https://www.googleapis.com/oauth2/v3/token 400
-[debug] [2026-04-29T21:50:40.411Z] <<< [apiv2][body] POST https://www.googleapis.com/oauth2/v3/token [omitted]
-[debug] [2026-04-29T21:50:40.411Z] >>> [apiv2][query] GET https://firebase.googleapis.com/v1beta1/projects pageSize=1000
-[debug] [2026-04-29T21:50:40.850Z] <<< [apiv2][status] GET https://firebase.googleapis.com/v1beta1/projects 401
-[debug] [2026-04-29T21:50:40.850Z] <<< [apiv2][body] GET https://firebase.googleapis.com/v1beta1/projects [omitted]
-[debug] [2026-04-29T21:50:40.850Z] Got a 401 Unauthenticated error for a call that required authentication. Refreshing tokens.
-[debug] [2026-04-29T21:50:40.851Z] Checked if tokens are valid: false, expires at: 1765643677246
-[debug] [2026-04-29T21:50:40.851Z] Checked if tokens are valid: false, expires at: 1765643677246
-[debug] [2026-04-29T21:50:40.851Z] > refreshing access token with scopes: []
-[debug] [2026-04-29T21:50:40.851Z] >>> [apiv2][query] POST https://www.googleapis.com/oauth2/v3/token [none]
-[debug] [2026-04-29T21:50:40.851Z] >>> [apiv2][body] POST https://www.googleapis.com/oauth2/v3/token [omitted]
-[debug] [2026-04-29T21:50:40.900Z] <<< [apiv2][status] POST https://www.googleapis.com/oauth2/v3/token 400
-[debug] [2026-04-29T21:50:40.900Z] <<< [apiv2][body] POST https://www.googleapis.com/oauth2/v3/token [omitted]
-[debug] [2026-04-29T21:50:40.901Z] Request to https://firebase.googleapis.com/v1beta1/projects?pageSize=1000 had HTTP Error: 401, Request had invalid authentication credentials. Expected OAuth 2 access token, login cookie or other valid authentication credential. See https://developers.google.com/identity/sign-in/web/devconsole-project.
-[debug] [2026-04-29T21:50:41.023Z] FirebaseError: Request to https://firebase.googleapis.com/v1beta1/projects?pageSize=1000 had HTTP Error: 401, Request had invalid authentication credentials. Expected OAuth 2 access token, login cookie or other valid authentication credential. See https://developers.google.com/identity/sign-in/web/devconsole-project.
-    at responseToError (C:\Users\Methum-PC\AppData\Roaming\npm\node_modules\firebase-tools\lib\responseToError.js:53:12)
-    at RetryOperation._fn (C:\Users\Methum-PC\AppData\Roaming\npm\node_modules\firebase-tools\lib\apiv2.js:322:77)
-    at process.processTicksAndRejections (node:internal/process/task_queues:103:5)
-[error] 
-[error] Error: Failed to list Firebase projects. See firebase-debug.log for more info.
diff --git a/lint.log b/lint.log
deleted file mode 100644
index 8e45585a0425b82d489426204d71333358d4330a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5502
zcmeI0+m0JW5Qa<Q4vBXdZip9Q?~<^9jX*@3T;w7OV%e)~P<&cE!uD96*<=IcDe?$B
zCKB*}UGC}eA-fT$3u0Ned%COZ@YkVh`j6k=vv=()%k09IR@mGs8|!yuU)zy&>|=e8
zv^upstVQavmGxYv@zRENXspKXiS_K<&a^hxYN_!<jVhbirOm8u-`I)f9*OJN?ujC|
zXBwSr4DTOBS=b_Qn6K900>zp3IJM8T?bKdq4b5j-?`z*8NZhpPT(f8zY0kr*zGf!c
zyVU$pR`o@NBy?Wr=?9HFqAcwySeFTpW1-TsI~wtME~;hFYA$MK(D5>G8R@BsR$JKS
zTIt(Bvc_8Fd8yG*GTg4rTH0S|ZK0K7MLE+hWT7eh_+4mq8LU8#+dI?fR#?TdN?1=s
zRS45kKEg8Qz^fm2wk370nX&d?=$AdW?4V)m9ohPsxbi_dIxSbvncc5vdYU^C*Xb%Y
zz{2I7*3y`HA$ef#5myAHrkcgNT$GcbQ6^4v%{BGPw9jWN?aqZZ-a!}U%kT@H?gtPe
zmZ2!?$h_aM6GZVHczT4#9pFg}ZtI)dPk}xmn8`z+if`DT*|++4^xX=Nf-BLW%Uo;I
z73UbYXi^FZaA6P6GyM}sjwtwC%HtzF6De*ZXrcW*<<dj@NTa4+&cS1N7IdpbK{gMh
z2bSlWEyF(dX(8U84MZQ=Pzf*Ah^xEG+XtfWX#5~p3jX9U+@^s~)M%hxqu|v-9CmxN
zlq~!|6(yMf-c%tha(&<eN1ovlxuX+tR)m-Vi(c^XhoU*FQG(A{d3!zXG3pX`w;N=@
ztBGjJvE<`UE%{Wo3`9Q+$PyJ~rCXAG2j6D4mZHErH|dIZiSz68i^u@&L_5&aQ2CF{
zORajP0cSD}Z!_A3Q>+p2nurTHqrF>9t^c?4Jw*|gdrbwsoAcehN&GrBHgft<FNtkp
zHbyp<4K)M8jEP37bfz)!=hb!?{N#B=RT+gmXo+j34`)tK74}ekWA=AMGuFv=D4#J$
z?jI^Ai21gBP6cCkdnJc|YRE`4=&@dv57u!1Kc25WoveP^5L=u#$Lc{c`z4I2f1D@H
z3f|ILd7#xVLl^UN<J7v{*axRP)Q^_EFJ#kM`<<Q!TKzyD;-q>0cY@c5d9Oh9Nk>7N
z%i$S)lYV|iQZYCW?rzCxZAf@5eoy4pTpmBLFKX?bPqaF6{oZzesLRh3Q*iNEzpg?!
zUd^uK&CcHBkxw=(ep%~%EIbk#FGD^(-muwoY|{fz*6csFPisCYoBm2C6SeNz?YE|5
z>&go~<qa7?UEg<X`;M)nNZ5C5>0G8R&@1jcwtxB!ZQrq__vp8wV@sz^I%}If(VO>d
zUEAy|V$ZhSvC;FTE({$~-x2$z)Dv;9QK=7^DBmk}k#yzUb(QKKck#Zd6N?hE*K}m`
zY5#3k)@^i5u3hTNy5aUFc9XFy+qRp|?Da^kcW7Pvd<Wt#`R{jZMAEBwezo5ugP7R9
z2Wy4yCiOOche5})ej8V+uZ(fYO=fdPde_^v52?KSd8Fiu6S`_{VJ_5ZUxoJuzrowS
YKX|G)xAuzesdjLe$(;@F-09u<PiCaB!T<mO


From 301e0a1b8479d5306f5a6f5190c5bb88f005b428 Mon Sep 17 00:00:00 2001
From: Methexx <methum.edu@gmail.com>
Date: Wed, 20 May 2026 02:40:48 +0530
Subject: [PATCH 7/7] fix: CI pipleine failed error

---
 apps/backend/.env.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/backend/.env.test b/apps/backend/.env.test
index 2f486bd..0067a50 100644
--- a/apps/backend/.env.test
+++ b/apps/backend/.env.test
@@ -13,3 +13,5 @@ RESEND_API_KEY=re_test_key
 RESEND_FROM_EMAIL=test@test.com
 WEB_URL=http://localhost:3000
 FLUTTER_ORIGIN=http://localhost:3001
+GEMINI_API_KEY=test_gemini_key
+ANTHROPIC_API_KEY=test_anthropic_key