diff --git a/docs/backend-vs-ui-gaps.md b/docs/backend-vs-ui-gaps.md
new file mode 100644
index 0000000..75970b5
--- /dev/null
+++ b/docs/backend-vs-ui-gaps.md
@@ -0,0 +1,216 @@
+# Backend (Postman) vs Frontend — fields & endpoints to decide on
+
+Source of truth: the Postman collection covering Terms, Courses, Sessions, Exams, Homeworks, Media (2026-05). This doc lists every place where backend and FE disagree on shape, plus FE-side concepts the backend doc has no slot for. Each item needs a product/design call before we wire it up.
+
+Conventions in the rest of this doc:
+- **B → FE** means the backend exposes a field/endpoint that the FE doesn't surface yet.
+- **FE → B** means the FE shows/sends a field the backend doc doesn't accept.
+- **shape diff** means both sides handle the concept but in different shapes (enum values, nesting, naming).
+
+---
+
+## Terms
+
+### Endpoints
+
+| Backend | FE today | Status |
+|---|---|---|
+| `GET /terms?per_page&active_only` | `getTermsList` | aligned |
+| `GET /terms/:id` | `showTerm` | aligned |
+| `POST /terms` | `addNewTerm` | aligned |
+| `PATCH /terms/:id` | `updateTerm` | aligned |
+| `DELETE /terms/:id` | `deleteTerm` | aligned |
+| — | `cloneTerm` (`POST /admin/terms/:id/clone`) | **FE-only; backend has nothing.** Decide: drop the clone button, or ask backend to add it. |
+| — | `changeStatusTerm` (`POST /admin/terms/:id/status`) | **Use `PATCH /terms/:id` with `is_active`** — dedicated status endpoint dropped. |
+| — | `listUserTerm`, `addUserTerm`, `removeUserTerm`, `changeLeaveStatus` | **FE-only.** Term-students subtab + leave toggle. Backend exposes nothing equivalent. Keep mock-only until backend adds. |
+| — | `listCourseTerm`, `addCourseTerm`, `removeCourseTerm` | **FE-only.** Can be replaced by `GET /courses?term_id=` for the list; the attach/detach side has no backend equivalent (course `term_id` is set at create-time). |
+
+### Fields
+
+| Backend → FE | FE has it as | Notes |
+|---|---|---|
+| `starts_at`, `ends_at` (ISO datetime) | `startDate`, `endDate` | Naming diff; we send `starts_at`/`ends_at` in the mock already — confirm the FE form should rename or keep an adapter. |
+| `cover_url` (read) + `cover_media_id` (write) | `coverUrl` / `coverMediaId` | aligned in shape, just camelCase. |
+| `created_at` | `createdAt` | aligned. |
+| `is_active` | `isActive` | aligned. |
+| `description` | `description` | aligned. |
+
+**FE → B** (need decision):
+- `studentsCount`, `coursesCount` — computed UI counts. Backend response doesn't include them. Either compute client-side or ask backend for `?include=counts`.
+- `image` (UI alias of cover) — FE keeps this for a fallback. Backend response only has `cover_url`.
+
+---
+
+## Courses
+
+### Endpoints
+
+| Backend | FE today | Status |
+|---|---|---|
+| `GET /courses?term_id&per_page` | `getCoursesList` | aligned (drop `/admin/` prefix in `endpoints.js`). |
+| `GET /courses/:id` | `showCourse` | aligned. Backend response includes nested `term` and `teacher` — FE already reads `course.term` / `course.teacher`, good. |
+| `POST /courses` | `addNewCourse` | aligned. Backend currently requires `term_id` (422 example), but per user instruction the standalone (template-tab) flow must allow `term_id: null`. **Decide:** ask backend to make `term_id` nullable, or refuse to submit until a term is picked. |
+| `PATCH /courses/:id` | `updateCourse` | aligned. Used now for status toggle too (drops dedicated `/status` endpoint). |
+| `DELETE /courses/:id` | `deleteCourse` | aligned. |
+| — | `changeStatusCourse` (`/admin/courses/:id/status`) | **Dropped.** Use `PATCH /courses/:id { is_active }`. |
+| — | `listCourseStudents`, `addCourseStudent`, `removeCourseStudent` | **FE-only.** CourseDetailsModal "students" tab + `AddCourseStudentModal`. Backend doesn't expose course-students; either add a sub-resource or remove the UI. Kept mock-only for now. |
+| — | `listCourseSessions`, `attachCourseSession`, `detachCourseSession` | **FE-only.** CourseDetailsModal "sessions" tab can be served by `GET /sessions?course_id=`. The attach/detach side (M:N) has no backend equivalent — backend uses session.course_id (1:N). Kept mock-only for now; recommend swapping the list tab to the regular sessions query. |
+
+### Fields
+
+| Backend ↔ FE | Notes |
+|---|---|
+| `term_id` ⇄ `termId` | aligned. Nullable in CourseFormPage, required in AddOfferedCourseModal — schema reflects this. |
+| `teacher_id` ⇄ `teacherId` | aligned. |
+| `capacity` ⇄ `capacity` | aligned. |
+| `is_active` ⇄ `isActive` | aligned. |
+| `cover_media_id` (write) / `cover_url` (read) ⇄ `coverMediaId` / `coverUrl` | aligned. |
+| `description` ⇄ `description` | aligned. |
+| Nested `term`, `teacher` on show response | FE already reads. |
+
+**FE → B** (need decision):
+- `sessionsCount` — number-of-sessions field on the create form. Backend has nothing. Either compute server-side from related sessions, or drop the field.
+- `prerequisites` (array of { courseId, course }) — backend has no prerequisite relation. Drop or ask backend for it.
+- `contentType` (video/voice/text) + `contentMediaId` — single course-level content file. Backend treats files only as session media. Decide whether course-level content should move to "intro session" or stay a course concept.
+- `image` (UI alias of cover_url) — kept as a fallback alongside `coverUrl`.
+
+---
+
+## Sessions
+
+### Endpoints
+
+| Backend | FE today | Status |
+|---|---|---|
+| `GET /sessions?course_id&per_page` | `getSessionsList` | aligned. |
+| `GET /sessions/:id` | `showSession` | aligned. |
+| `POST /sessions` | `addNewSession` | aligned. |
+| `PATCH /sessions/:id` | `updateSession` | aligned. Used for status toggle now. |
+| `DELETE /sessions/:id` | `deleteSession` | aligned. |
+| — | `changeStatusSession` (`/admin/sessions/:id/toggle-status`) | **Dropped.** Use PATCH with `is_active`. |
+| — | `getSessionsAttendance` (`/admin/sessions/:sessionId/attendances`) | **FE-only.** `SessionAttendanceModal` depends on this. Kept mock-only. |
+
+### Fields — biggest gap of all five resources
+
+| Backend | FE today | Notes |
+|---|---|---|
+| `type` enum: `online \| offline \| content` | `sessionType` enum: `in_person`, `online`, `video`, `audio`, `text`, `slide`, `pdf` | **Shape diff.** FE has 7 values; backend has 3. There's an existing `SESSION_TYPE_TO_SPEC` mapper in `services/mock/fixtures/admin-sessions.js`. Decide whether the FE keeps the richer 7-value enum (and we map down to backend's 3) or collapses. |
+| `starts_at`, `location`, `link` | All three live **inside** `form.sessionConfig.*` plus also derived to top-level `startsAt` / `location` / `link` in the mock | **Structural diff.** Backend wants flat fields; FE form nests them under `sessionConfig` keyed by `sessionType`. The mock derives top-level from `sessionConfig.*` for show payloads. Decide whether the FE form should flatten the schema to match backend or keep the conditional-by-type config UI. |
+| `media_ids[]` (write) / `media[]` (read with `collection_name`, `file_name`, `mime_type`, `file_size`, `url`, `download_url`) | `materials[]` with `{ fileId, isRequired, type, title, order }` | **Shape diff.** Backend's media rows are typed by upload-purpose (video/voice/pdf/slide/attachment); FE has its own `type` enum. Decide which shape the FE keeps. |
+| — | `durationMinutes`, `order`, `sessionConfig.minWatchedPercent`, `sessionConfig.minReadPercent`, `sessionConfig.mustCompleteBeforeNext`, `sessionConfig.platform` | **FE → B**, all UI-only fields. Backend has nothing equivalent. Drop, move into a `metadata` JSON, or ask backend to add. |
+| — | `usedInTerms` | UI-only count, no backend. |
+| — | `image` (vs `media`) | UI-only thumbnail; backend doesn't separate. |
+
+---
+
+## Exams
+
+### Endpoints
+
+| Backend | FE today | Status |
+|---|---|---|
+| `GET /exams/:id` (with questions+options) | `showExam` | aligned. |
+| `POST /exams` | `addNewExam` | aligned. |
+| `PATCH /exams/:id` | `updateExam` | aligned. |
+| `DELETE /exams/:id` | `deleteExam` | aligned. |
+| `POST /exams/:examId/questions` | — | **Backend → FE.** New endpoint. Today the FE submits the whole question list inside the exam create/update payload. Decide whether to keep "all-in-one" submission (and ask backend to accept it) or switch to add-questions-after-create. |
+| `POST /questions/:questionId/options` | — | **Backend → FE.** Same as above — backend lets you add options one at a time. FE today bundles all options with the question. |
+| `POST /exams/:examId/submit` | — (student-side feature) | **Backend → FE.** Student-side; not in current admin UI. |
+| — | `getExamsList` (`/admin/exams`) | **FE-only.** ExamsListPage depends on it. Kept mock-only; ask backend to add a list endpoint. |
+| — | `getExamParticipants`, `showExamParticipant` | **FE-only.** ExamParticipantsModal + ExamParticipantDetailsModal depend on these. Kept mock-only. |
+
+### Fields
+
+| Backend ↔ FE | Notes |
+|---|---|
+| `session_id` ⇄ `sessionId` | aligned. |
+| `title` ⇄ `title` | aligned. |
+| `description` ⇄ `description` | aligned. |
+| `pass_score` ⇄ `passingScore` | aligned (naming diff). |
+| `is_active` | **Backend → FE.** Exam form has no active toggle. Decide whether to add it. |
+| Backend question shape: `{ question_text, position, options: [{ option_text, is_correct }] }` | FE: `{ title, score, correctAnswerId, answers: [{ id, title }] }` | **Shape diff.** Backend hides `is_correct` from public reads (only on add). FE concept of `score` (per-question weighting) has no backend slot. Decide: keep FE scoring (ask backend to store) or drop. |
+
+**FE → B** (need decision):
+- `durationMinutes` — no backend slot.
+- `randomize` — no backend slot.
+- `endDate` / `startDate` — exam validity window, no backend slot.
+- `usedInTerms` — derived UI count.
+
+---
+
+## Homeworks (FE calls them "assignments")
+
+### Endpoints
+
+| Backend | FE today | Status |
+|---|---|---|
+| `POST /homeworks` | `addNewAssignment` | aligned (URL renamed to `/homeworks`; FE key name kept). |
+| `PATCH /homeworks/:id` | `updateAssignment` | aligned. |
+| `DELETE /homeworks/:id` | `deleteAssignment` | aligned. |
+| `POST /homeworks/:homeworkId/submit` (student) | — | **Backend → FE.** Student submit, not in admin UI yet. |
+| `PATCH /homework-submissions/:submissionId/review` | `reviewAssignmentSubmission` | aligned (URL renamed). |
+| — | `getAssignmentsList` | **FE-only.** AssignmentsListPage depends on it. Kept mock-only. |
+| — | `showAssignment`, `getAssignmentSubmissions`, `showAssignmentSubmission` | **FE-only.** Detail + submissions list — kept mock-only. |
+
+### Fields
+
+| Backend ↔ FE | Notes |
+|---|---|
+| `session_id` ⇄ `sessionId` | aligned. |
+| `title`, `description` | aligned. |
+| `deadline` (single datetime) | FE: `startDate` + `endDate` + computed `durationDays` | **Shape diff.** Backend has one deadline; FE has a window. Decide: drop start/end and use single deadline, or ask backend to add a window. |
+| `is_active` | **Backend → FE.** FE form has no active toggle. |
+| Submission `status`: `accepted \| denied` | FE: `pending \| approved \| rejected \| needs_revision` | **Shape diff.** Backend has two states; FE has four. The FE `pending/needs_revision` have no backend slot. |
+| Submission `media_id` (single) | FE `attachments[]` (multiple) | **Shape diff.** Backend allows one file per submission; FE expects many. |
+| Submission `teacher_feedback` ⇄ `reviewerNote` | naming diff. |
+| Submission `reviewed_at` (read) | — | Backend provides; FE doesn't surface. |
+
+**FE → B** (need decision):
+- `priority` enum (`mandatory \| optional`) — no backend slot.
+- `submissionsCount` — derived count, no backend slot.
+
+---
+
+## Media
+
+### Endpoints
+
+| Backend | FE today | Status |
+|---|---|---|
+| `POST /media` (multipart with `purpose` + `file`) | `uploadMedia` | aligned URL & method. |
+| `GET /media/:id/download` | — | **Backend → FE.** Add as `downloadMedia`. |
+| `DELETE /media/:id` | — | **Backend → FE.** Add as `deleteMedia`. |
+
+### Fields
+
+- Backend response: `{ id, collection_name, file_name, mime_type, file_size, url, download_url }`. FE today reads `payload.id`, `payload.url`, sometimes `payload.uploadId` (a now-stale field). **Cleanup needed:** drop `uploadId`, use `id` everywhere.
+- Backend `purpose` enum: `avatar | cover | video | voice | pdf | slide | attachment | homework_file`. FE upload calls currently hardcode `purpose: 'cover'` or `purpose: 'content'`. **`content` is not in the backend enum.** Decide which of the backend purposes each FE uploader should send (e.g., session video → `video`, course PDF → `pdf`, homework upload → `homework_file`).
+- Pending media TTL: backend deletes unreferenced pending uploads after 24h. FE doesn't track this; if a user uploads a cover, abandons the form, and comes back next day, the `cover_media_id` reference will 404 on submit. Document the failure mode.
+
+---
+
+## Cross-cutting
+
+### Snake_case vs camelCase
+
+Backend wire format is snake_case throughout. FE today reads camelCase (e.g., the mock returns `coverUrl`, `isActive`). When the real backend lands, the FE will either need:
+- a HTTP-layer transformer (camelize on response, snake_case on request), or
+- camelCase field aliases on the backend serializer.
+
+Decide before swapping the mock for the real API. Affects every screen.
+
+### `/admin/` URL prefix
+
+Backend doc has none — endpoints live at `/terms`, `/courses`, etc. The FE previously had `/admin/courses`, `/admin/sessions`, `/admin/exams`, `/admin/assignments`. **Aligned to backend (prefix dropped).** Auth context (admin role) is implicit in the token, not the URL.
+
+### Sub-features that depend on missing backend endpoints
+
+UI screens that work today against the mock but have no backend equivalent in the current doc (kept mock-only with TODOs in `endpoints.js`):
+
+- Term: clone term, term status toggle, students-in-term subtab, leave toggle, courses-in-term subtab (could swap to `GET /courses?term_id=`)
+- Course: status toggle (swapped to PATCH), students-in-course subtab, attach/detach sessions (M:N), `AddCourseStudentModal`, `AddSessionToCourseModal`
+- Session: status toggle (swapped to PATCH), attendance roster
+- Exam: list page, participants list, participant detail
+- Assignment/Homework: list page, detail show, submissions list, submission detail
+
+For each of these we need to either (a) ask backend to expose the endpoint, or (b) drop the UI surface.
diff --git a/src/global-components/Badge.vue b/src/components/Badge.vue
similarity index 95%
rename from src/global-components/Badge.vue
rename to src/components/Badge.vue
index dbf2a4d..7a0aad1 100644
--- a/src/global-components/Badge.vue
+++ b/src/components/Badge.vue
@@ -21,7 +21,7 @@ import { computed } from 'vue'
 import SvgIcon from '@/components/icons/SvgIcon.vue'
 
 const props = defineProps({
-  /** @type {import('vue').PropType<'neutral' | 'success' | 'danger' | 'warning' | 'primary' | 'info'>} */
+  /** @type {import('vue').PropType<'neutral' | 'success' | 'danger' | 'warning' | 'primary' | 'info' | 'cyan'>} */
   variant: { type: String, default: 'neutral' },
   /** @type {import('vue').PropType<'sm' | 'md' | 'lg'>} */
   size: { type: String, default: 'md' },
@@ -133,5 +133,10 @@ const onClick = (event) => {
     background: rgba(104, 104, 104, 10%);
     color: #686868;
   }
+
+  &--cyan {
+    background: rgba(104, 104, 104, 10%);
+    color: #686868;
+  }
 }
 </style>
diff --git a/src/global-components/Tinymce.vue b/src/components/Tinymce.vue
similarity index 92%
rename from src/global-components/Tinymce.vue
rename to src/components/Tinymce.vue
index b46451e..ee54bf0 100644
--- a/src/global-components/Tinymce.vue
+++ b/src/components/Tinymce.vue
@@ -5,14 +5,12 @@
 </template>
 
 <script setup>
-import { onMounted, toRefs, ref, reactive, defineProps, defineEmits, watch } from 'vue'
 import axios from 'axios'
-// Introducing tinymce editor
-import Editor from '@tinymce/tinymce-vue'
-import tinymce from 'tinymce/tinymce' // tinymce defaults to hidden. If it is not introduced, the editor will not be displayed.
-// Import configuration file
+import tinymce from 'tinymce/tinymce'
 import '@/plugins/tinymce/importTinymce'
+import Editor from '@tinymce/tinymce-vue'
 import { initTiny } from '@/plugins/tinymce/tinymce'
+import { onMounted, toRefs, ref, reactive, defineProps, defineEmits, watch } from 'vue'
 
 const props = defineProps({
   modelValue: {
@@ -106,7 +104,7 @@ const imgUploadFn = async (blobInfo, success, failure) => {
   const formData = new FormData()
   formData.append('file', blobInfo.blob(), blobInfo.filename())
   formData.append('batch_id', props.batchId)
-  const response = await axios.post("https://api.madomotor.ir".props.imgUploadUrl, formData)
+  const response = await axios.post('https://api.madomotor.ir'.props.imgUploadUrl, formData)
 
   if (response && response.status == 200) {
     return success(response.data.data.url)
diff --git a/src/constants/fields.js b/src/constants/fields.js
index b7cdd14..6904b50 100644
--- a/src/constants/fields.js
+++ b/src/constants/fields.js
@@ -42,7 +42,6 @@ export const fields = {
   role: 'نقش',
   roleId: 'نقش',
   isActive: 'فعال',
-  isActiveByDefault: 'فعال به‌صورت پیش‌فرض',
   randomize: 'تصادفی',
 
   startDate: 'تاریخ شروع',
@@ -53,7 +52,6 @@ export const fields = {
   capacity: 'ظرفیت',
   minCapacity: 'حداقل ظرفیت',
   maxCapacity: 'حداکثر ظرفیت',
-  defaultCapacity: 'ظرفیت پیش‌فرض',
 
   order: 'ترتیب',
   priority: 'اولویت',
@@ -64,13 +62,10 @@ export const fields = {
   minAssignments: 'حداقل تکالیف',
 
   termId: 'ترم',
-  templateId: 'قالب',
   courseId: 'دوره',
-  courseTemplateId: 'قالب دوره',
   sessionId: 'جلسه',
   sessionType: 'نوع جلسه',
   teacherId: 'مدرس',
-  defaultTeacherId: 'مدرس پیش‌فرض',
   studentIds: 'دانش‌آموزان',
 
   educationStatus: 'وضعیت تحصیلی',
diff --git a/src/enums/index.js b/src/enums/index.js
index d49a795..ff7082f 100644
--- a/src/enums/index.js
+++ b/src/enums/index.js
@@ -168,7 +168,7 @@ export const ASSIGNMENT_PRIORITY = Object.freeze({
 })
 
 export const TICKET_STATUS = Object.freeze({
-  pending: 'در انتظار پاسخ',
+  open: 'باز',
   answered: 'پاسخ داده شده',
   closed: 'بسته شده',
 })
diff --git a/src/features/admin/assignments/components/AssignmentItem.vue b/src/features/admin/assignments/components/AssignmentItem.vue
index 75121e9..f85175f 100644
--- a/src/features/admin/assignments/components/AssignmentItem.vue
+++ b/src/features/admin/assignments/components/AssignmentItem.vue
@@ -5,7 +5,7 @@
       <div class="assignment-item__sub">
         <span class="assignment-item__sub-label">دوره:</span>
         <span class="assignment-item__sub-value">
-          {{ assignment.courseTemplate?.title || assignment.courseTemplateTitle || '—' }}
+          {{ assignment.course?.title || assignment.courseTitle || '—' }}
         </span>
         <span class="assignment-item__dot">|</span>
         <span class="assignment-item__sub-label">جلسه:</span>
diff --git a/src/features/admin/assignments/components/AssignmentsFilters.vue b/src/features/admin/assignments/components/AssignmentsFilters.vue
index 05ce8af..e8f7700 100644
--- a/src/features/admin/assignments/components/AssignmentsFilters.vue
+++ b/src/features/admin/assignments/components/AssignmentsFilters.vue
@@ -7,9 +7,9 @@
         </template>
       </TextField>
       <SelectField
-        v-model="form.courseTemplateId"
-        name="courseTemplateId"
-        label="دوره الگو"
+        v-model="form.courseId"
+        name="courseId"
+        label="دوره"
         :options="templateOptions"
         option-label="title"
         option-value="id"
@@ -65,15 +65,15 @@ import TextField from '@/components/form/TextField.vue'
 import CircleButton from '@/components/CircleButton.vue'
 import SelectField from '@/components/form/SelectField.vue'
 import DatePickerField from '@/components/form/DatePickerField.vue'
+import { useAdminCoursesListQuery } from '@/services/query/admin-courses'
 import { useAdminSessionsListQuery } from '@/services/query/admin-sessions'
-import { useAdminCourseTemplatesListQuery } from '@/services/query/admin-course-templates'
 
 const props = defineProps({
   modelValue: {
     type: Object,
     default: () => ({
       title: '',
-      courseTemplateId: '',
+      courseId: '',
       sessionId: '',
       fromDate: '',
       toDate: '',
@@ -85,7 +85,7 @@ const emit = defineEmits(['update:modelValue', 'apply', 'reset'])
 
 const emptyForm = () => ({
   title: '',
-  courseTemplateId: '',
+  courseId: '',
   sessionId: '',
   fromDate: '',
   toDate: '',
@@ -105,16 +105,13 @@ const todayIso = new Date().toISOString()
 const templateSearch = ref('')
 const templateFilters = computed(() => ({ title: templateSearch.value }))
 const templatePagination = ref({ page: 1, perPage: 30 })
-const { data: templatesResponse } = useAdminCourseTemplatesListQuery(
-  templateFilters,
-  templatePagination
-)
+const { data: templatesResponse } = useAdminCoursesListQuery(templateFilters, templatePagination)
 const templateOptions = computed(() => templatesResponse.value?.data ?? [])
 
 const sessionSearch = ref('')
 const sessionListFilters = computed(() => ({
   title: sessionSearch.value,
-  courseTemplateId: form.value.courseTemplateId || undefined,
+  courseId: form.value.courseId || undefined,
 }))
 const sessionPagination = ref({ page: 1, perPage: 30 })
 const { data: sessionsResponse } = useAdminSessionsListQuery(sessionListFilters, sessionPagination)
diff --git a/src/features/admin/assignments/components/modals/AddAssignmentModal.vue b/src/features/admin/assignments/components/modals/AddAssignmentModal.vue
index ce5195f..4263209 100644
--- a/src/features/admin/assignments/components/modals/AddAssignmentModal.vue
+++ b/src/features/admin/assignments/components/modals/AddAssignmentModal.vue
@@ -20,15 +20,15 @@
             </template>
           </TextField>
           <SelectField
-            v-model="form.courseTemplateId"
-            name="courseTemplateId"
+            v-model="form.courseId"
+            name="courseId"
             label="دوره مرتبط"
             :options="templateOptions"
             option-label="title"
             option-value="id"
             :searchable="true"
             :on-search="searchTemplates"
-            :error="errors.courseTemplateId"
+            :error="errors.courseId"
             @update:model-value="onCourseChange"
           />
           <SelectField
@@ -40,7 +40,7 @@
             option-value="id"
             :searchable="true"
             :on-search="searchSessions"
-            :disabled="!form.courseTemplateId"
+            :disabled="!form.courseId"
             :error="errors.sessionId"
           />
           <DatePickerField
@@ -131,8 +131,8 @@ import FileUploader from '@/components/form/FileUploader.vue'
 import TextareaField from '@/components/form/TextareaField.vue'
 import DatePickerField from '@/components/form/DatePickerField.vue'
 import { assignmentSchema } from '@/features/admin/assignments/schema'
+import { useAdminCoursesListQuery } from '@/services/query/admin-courses'
 import { useAdminSessionsListQuery } from '@/services/query/admin-sessions'
-import { useAdminCourseTemplatesListQuery } from '@/services/query/admin-course-templates'
 import {
   adminAssignmentsKeys,
   useAddAdminAssignmentMutation,
@@ -156,7 +156,7 @@ const priorityOptions = Object.entries(ASSIGNMENT_PRIORITY).map(([value, label])
 
 const form = ref({
   title: '',
-  courseTemplateId: '',
+  courseId: '',
   sessionId: '',
   startDate: '',
   endDate: '',
@@ -173,10 +173,7 @@ const { validate, validateAt, errors, resetErrors } = useYup(schema)
 const templateSearch = ref('')
 const templateFilters = computed(() => ({ title: templateSearch.value }))
 const templatePagination = ref({ page: 1, perPage: 30 })
-const { data: templatesResponse } = useAdminCourseTemplatesListQuery(
-  templateFilters,
-  templatePagination
-)
+const { data: templatesResponse } = useAdminCoursesListQuery(templateFilters, templatePagination)
 const selectedTemplate = ref(null)
 const templateOptions = computed(() => {
   const base = templatesResponse.value?.data ?? []
@@ -189,11 +186,11 @@ const templateOptions = computed(() => {
 const sessionSearch = ref('')
 const sessionFilters = computed(() => ({
   title: sessionSearch.value,
-  courseTemplateId: form.value.courseTemplateId,
+  courseId: form.value.courseId,
 }))
 const sessionPagination = ref({ page: 1, perPage: 30 })
 const { data: sessionsResponse } = useAdminSessionsListQuery(sessionFilters, sessionPagination, {
-  enabled: () => !!form.value.courseTemplateId,
+  enabled: () => !!form.value.courseId,
 })
 const selectedSession = ref(null)
 const sessionOptions = computed(() => {
@@ -212,7 +209,7 @@ const searchSessions = useDebounce((q) => {
 }, 400)
 
 const onCourseChange = (value) => {
-  form.value.courseTemplateId = value
+  form.value.courseId = value
   form.value.sessionId = ''
   selectedSession.value = null
 }
@@ -223,13 +220,13 @@ const { data: existingAssignment } = useAdminAssignmentQuery(assignmentId, {
 
 watch(existingAssignment, (assignment) => {
   if (!assignment) return
-  const tpl = assignment.courseTemplate
+  const tpl = assignment.course
   const sessionEntity = assignment.session
   if (tpl) selectedTemplate.value = tpl
   if (sessionEntity) selectedSession.value = sessionEntity
   form.value = {
     title: assignment.title || '',
-    courseTemplateId: tpl?.id || assignment.courseTemplateId || '',
+    courseId: tpl?.id || assignment.courseId || '',
     sessionId: sessionEntity?.id || assignment.sessionId || '',
     startDate: assignment.startDate || '',
     endDate: assignment.endDate || '',
diff --git a/src/features/admin/assignments/components/modals/AssignmentDetailsModal.vue b/src/features/admin/assignments/components/modals/AssignmentDetailsModal.vue
index 04afdd1..309ad4a 100644
--- a/src/features/admin/assignments/components/modals/AssignmentDetailsModal.vue
+++ b/src/features/admin/assignments/components/modals/AssignmentDetailsModal.vue
@@ -16,7 +16,7 @@
             <p class="assignment-details__sub">
               <span>
                 دوره:
-                {{ assignment.courseTemplate?.title || assignment.courseTemplateTitle || '—' }}
+                {{ assignment.course?.title || assignment.courseTitle || '—' }}
               </span>
               <span class="assignment-details__sep">|</span>
               <span>جلسه: {{ assignment.session?.title || assignment.sessionTitle || '—' }}</span>
diff --git a/src/features/admin/assignments/components/modals/AssignmentSubmissionDetailsModal.vue b/src/features/admin/assignments/components/modals/AssignmentSubmissionDetailsModal.vue
index 983be93..cb79e03 100644
--- a/src/features/admin/assignments/components/modals/AssignmentSubmissionDetailsModal.vue
+++ b/src/features/admin/assignments/components/modals/AssignmentSubmissionDetailsModal.vue
@@ -35,7 +35,7 @@
             <div class="submission-details__assignment-meta">
               <span>ترم: {{ submission.termTitle || '—' }}</span>
               <span class="submission-details__sep">|</span>
-              <span>دوره: {{ submission.courseTemplateTitle || '—' }}</span>
+              <span>دوره: {{ submission.courseTitle || '—' }}</span>
               <span class="submission-details__sep">|</span>
               <span>جلسه: {{ submission.sessionTitle || '—' }}</span>
               <span class="submission-details__sep">|</span>
diff --git a/src/features/admin/assignments/pages/AssignmentsListPage.vue b/src/features/admin/assignments/pages/AssignmentsListPage.vue
index 7eafa7a..6910b51 100644
--- a/src/features/admin/assignments/pages/AssignmentsListPage.vue
+++ b/src/features/admin/assignments/pages/AssignmentsListPage.vue
@@ -77,7 +77,7 @@ const { openModal, isModal } = useModal()
 
 const filters = ref({
   title: '',
-  courseTemplateId: '',
+  courseId: '',
   sessionId: '',
   fromDate: '',
   toDate: '',
diff --git a/src/features/admin/assignments/schema/index.js b/src/features/admin/assignments/schema/index.js
index 7fb4b00..219e9d6 100644
--- a/src/features/admin/assignments/schema/index.js
+++ b/src/features/admin/assignments/schema/index.js
@@ -2,7 +2,7 @@ import { number, object, string } from 'yup'
 
 export const assignmentSchema = object().shape({
   title: string().required().min(3),
-  courseTemplateId: string().required(),
+  courseId: string().required(),
   sessionId: string().required(),
   startDate: string().required(),
   endDate: string().required(),
diff --git a/src/features/admin/courses/components/CourseItem.vue b/src/features/admin/courses/components/CourseItem.vue
index bede255..89e6f2f 100644
--- a/src/features/admin/courses/components/CourseItem.vue
+++ b/src/features/admin/courses/components/CourseItem.vue
@@ -21,18 +21,13 @@
     </div>
 
     <div class="course-item__meta">
-      <div v-if="course.term?.title" class="course-item__pill">
-        <span class="course-item__pill-label">مختص به:</span>
-        <span class="course-item__pill-value">{{ course.term.title }}</span>
-      </div>
-      <div class="course-item__pill">
-        <span class="course-item__pill-label">ظرفیت:</span>
-        <span class="course-item__pill-value">{{ capacity || '—' }}</span>
-      </div>
-      <div v-if="course.prerequisitesCount" class="course-item__pill">
-        <span class="course-item__pill-label">پیش‌نیاز:</span>
-        <span class="course-item__pill-value">{{ course.prerequisitesCount }}</span>
-      </div>
+      <Badge v-if="course.term?.title" label="مختص به:" :value="course.term.title" />
+      <Badge label="ظرفیت:" :value="capacity || '—'" />
+      <Badge
+        v-if="course.prerequisitesCount"
+        label="پیش‌نیاز:"
+        :value="course.prerequisitesCount"
+      />
     </div>
 
     <div v-if="!isActive" class="course-item__status">
@@ -82,6 +77,7 @@
 
 <script setup>
 import { computed } from 'vue'
+import Badge from '@/components/Badge.vue'
 import BaseButton from '@/components/BaseButton.vue'
 import SvgIcon from '@/components/icons/SvgIcon.vue'
 import CircleButton from '@/components/CircleButton.vue'
@@ -94,14 +90,14 @@ const props = defineProps({
 const emit = defineEmits(['edit', 'delete', 'change-status', 'show-details'])
 
 const teacherName = computed(() => {
-  const t = props.course.teacher || props.course.defaultTeacher
+  const t = props.course.teacher
   if (!t) return '—'
-  return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
+  return t.name
 })
 
-const capacity = computed(() => props.course.capacity ?? props.course.defaultCapacity ?? '')
+const capacity = computed(() => props.course.capacity ?? '')
 
-const isActive = computed(() => props.course.isActive ?? props.course.isActiveByDefault ?? false)
+const isActive = computed(() => props.course.isActive ?? false)
 </script>
 
 <style lang="scss" scoped>
@@ -193,28 +189,7 @@ const isActive = computed(() => props.course.isActive ?? props.course.isActiveBy
     flex-wrap: wrap;
     gap: 0.375rem;
     flex: 1 1 33%;
-    justify-content: flex-end;
-  }
-
-  &__pill {
-    background: rgba(107, 107, 107, 5%);
-    padding: 0.25rem 1rem;
-    border-radius: 0.875rem;
-    line-height: 1.5;
-    white-space: nowrap;
-  }
-
-  &__pill-label {
-    font-family: var(--font-family-fa);
-    font-weight: 300;
-    font-size: 0.75rem;
-    color: #848484;
-    margin-inline-end: 0.25rem;
-  }
-
-  &__pill-value {
-    font-family: var(--font-family-en);
-    font-size: 0.75rem;
+    justify-content: flex-start;
   }
 
   &__status {
diff --git a/src/features/admin/courses/components/modals/AddCourseStudentModal.vue b/src/features/admin/courses/components/modals/AddCourseStudentModal.vue
index 83176e9..88650b4 100644
--- a/src/features/admin/courses/components/modals/AddCourseStudentModal.vue
+++ b/src/features/admin/courses/components/modals/AddCourseStudentModal.vue
@@ -1,9 +1,14 @@
 <template>
-  <BasicModal width="95%" max-width="42rem" min-width="auto" :show-close-button="true">
+  <BasicModal
+    title="افزودن دانشجو"
+    title-en="Add Student"
+    width="95%"
+    max-width="42rem"
+    min-width="auto"
+    :show-close-button="true"
+  >
     <template #default="{ close }">
       <div class="add-course-student">
-        <LineTitleBlock title="افزودن دانشجو" title-en="Add Student" />
-
         <div class="add-course-student__search">
           <SvgIcon name="user" :size="18" color="var(--color-thd-gray)" />
           <input
@@ -21,7 +26,7 @@
           <div v-for="user in users" :key="user.id" class="add-course-student__row">
             <div class="add-course-student__main">
               <div v-if="user.avatarUrl" class="add-course-student__avatar">
-                <img :src="user.avatarUrl" :alt="userLabel(user)" />
+                <img :src="user.avatarUrl" :alt="user?.name" />
               </div>
               <div
                 v-else
@@ -30,7 +35,7 @@
                 <SvgIcon name="user" :size="20" color="#bcbcbc" />
               </div>
               <div class="add-course-student__text">
-                <p class="add-course-student__name">{{ userLabel(user) }}</p>
+                <p class="add-course-student__name">{{ user?.name }}</p>
                 <p class="add-course-student__meta">
                   <span>{{ user.address?.province?.name || '—' }}</span>
                   <span class="add-course-student__sep">،</span>
@@ -98,11 +103,11 @@ import LineTitleBlock from '@/components/LineTitleBlock.vue'
 import { useAdminUsersListQuery } from '@/services/query/admin-users'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import {
-  adminCourseTemplatesKeys,
-  useAddAdminTemplateStudentMutation,
-  useAdminTemplateStudentsQuery,
-  useRemoveAdminTemplateStudentMutation,
-} from '@/services/query/admin-course-templates'
+  adminCoursesKeys,
+  useAddAdminCourseStudentMutation,
+  useAdminCourseStudentsQuery,
+  useRemoveAdminCourseStudentMutation,
+} from '@/services/query/admin-courses'
 
 defineOptions({ name: 'AddCourseStudentModal' })
 
@@ -110,7 +115,7 @@ const queryClient = useQueryClient()
 const { getModal } = useModal()
 
 const modalData = computed(() => getModal('AddCourseStudentModal')?.data ?? {})
-const templateId = computed(() => modalData.value.templateId ?? null)
+const courseId = computed(() => modalData.value.courseId ?? null)
 
 const searchInput = ref('')
 const searchQuery = ref('')
@@ -122,22 +127,16 @@ const users = computed(() => usersResponse.value?.data ?? [])
 
 const attachedFilters = computed(() => ({}))
 const attachedPagination = ref({ page: 1, perPage: 200 })
-const { data: attachedResponse } = useAdminTemplateStudentsQuery(
-  templateId,
+const { data: attachedResponse } = useAdminCourseStudentsQuery(
+  courseId,
   attachedFilters,
   attachedPagination,
-  { enabled: () => !!templateId.value }
+  { enabled: () => !!courseId.value }
 )
 const attachedIds = computed(() => new Set((attachedResponse.value?.data ?? []).map((u) => u.id)))
 
 const isAttached = (id) => attachedIds.value.has(id)
 
-const userLabel = (user) =>
-  `${user.firstName || ''} ${user.lastName || ''}`.trim() ||
-  user.fullName ||
-  user.phoneNumber ||
-  '—'
-
 const onSearchInput = useDebounce(() => {
   searchQuery.value = searchInput.value || ''
   userPagination.value = { ...userPagination.value, page: 1 }
@@ -145,17 +144,17 @@ const onSearchInput = useDebounce(() => {
 
 const pendingId = ref(null)
 
-const addMutation = useAddAdminTemplateStudentMutation()
-const removeMutation = useRemoveAdminTemplateStudentMutation()
+const addMutation = useAddAdminCourseStudentMutation()
+const removeMutation = useRemoveAdminCourseStudentMutation()
 
-const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCourseTemplatesKeys.all })
+const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
 
 const onAttach = async (user) => {
-  if (!templateId.value) return
+  if (!courseId.value) return
   pendingId.value = user.id
   try {
     await addMutation.mutateAsync({
-      templateId: templateId.value,
+      courseId: courseId.value,
       payload: { userIds: [user.id] },
     })
     invalidate()
@@ -165,17 +164,17 @@ const onAttach = async (user) => {
 }
 
 const onDetach = async (user) => {
-  if (!templateId.value) return
+  if (!courseId.value) return
   pendingId.value = user.id
   try {
-    await removeMutation.mutateAsync({ templateId: templateId.value, userId: user.id })
+    await removeMutation.mutateAsync({ courseId: courseId.value, userId: user.id })
     invalidate()
   } finally {
     pendingId.value = null
   }
 }
 
-watch(templateId, () => {
+watch(courseId, () => {
   searchInput.value = ''
   searchQuery.value = ''
   pendingId.value = null
diff --git a/src/features/admin/courses/components/modals/AddOfferedCourseModal.vue b/src/features/admin/courses/components/modals/AddOfferedCourseModal.vue
index cbb7325..32dd203 100644
--- a/src/features/admin/courses/components/modals/AddOfferedCourseModal.vue
+++ b/src/features/admin/courses/components/modals/AddOfferedCourseModal.vue
@@ -122,11 +122,11 @@ import { objectToFormData } from '@/utils/object-to-formdata'
 import { useUploadMediaMutation } from '@/services/query/auth'
 import { useAdminTermsListQuery } from '@/services/query/admin-terms'
 import { offeredCourseSchema } from '@/features/admin/courses/schema'
-import { useAdminCourseTemplatesListQuery } from '@/services/query/admin-course-templates'
 import {
   adminCoursesKeys,
   useAddAdminCourseMutation,
   useAdminCourseQuery,
+  useAdminCoursesListQuery,
   useUpdateAdminCourseMutation,
 } from '@/services/query/admin-courses'
 
@@ -139,19 +139,24 @@ const modalData = computed(() => getModal('AddOfferedCourseModal')?.data ?? {})
 const mode = computed(() => modalData.value.mode || 'add')
 const courseId = computed(() => modalData.value.courseId ?? null)
 const isEditMode = computed(() => mode.value === 'edit')
+const presetTermId = computed(() => modalData.value.termId ?? '')
 
 const modeTitle = computed(() =>
   isEditMode.value ? 'ویرایش دوره ارائه شده' : 'افزودن دوره ارائه شده'
 )
 
 const form = ref({
-  termId: '',
+  termId: presetTermId.value,
   templateId: '',
   title: '',
   capacity: '',
   imageId: null,
   isActive: false,
 })
+
+watch(presetTermId, (val) => {
+  if (val && !form.value.termId) form.value.termId = val
+})
 const image = ref(null)
 
 const schema = offeredCourseSchema
@@ -172,12 +177,9 @@ const termOptions = computed(() => {
 })
 
 const templateSearch = ref('')
-const templateFilters = computed(() => ({ title: templateSearch.value }))
+const templateFilters = computed(() => ({ title: templateSearch.value, termId: 'null' }))
 const templatePagination = ref({ page: 1, perPage: 30 })
-const { data: templatesResponse } = useAdminCourseTemplatesListQuery(
-  templateFilters,
-  templatePagination
-)
+const { data: templatesResponse } = useAdminCoursesListQuery(templateFilters, templatePagination)
 const selectedTemplate = ref(null)
 const templateOptions = computed(() => {
   const base = templatesResponse.value?.data ?? []
@@ -201,10 +203,9 @@ const { data: existingCourse } = useAdminCourseQuery(courseId, {
 watch(existingCourse, (course) => {
   if (!course) return
   if (course.term) selectedTerm.value = course.term
-  if (course.template) selectedTemplate.value = course.template
   form.value = {
     termId: course.term?.id || course.termId || '',
-    templateId: course.template?.id || course.templateId || '',
+    templateId: '',
     title: course.title || '',
     capacity: course.capacity ?? '',
     imageId: course.imageId || null,
@@ -237,10 +238,11 @@ const submitting = computed(() => addMutation.isPending.value || updateMutation.
 const onSubmit = async (close) => {
   const { isValid, payload } = await validate(form.value)
   if (!isValid) return
+  const { templateId: _ignored, ...submitPayload } = payload
   if (isEditMode.value) {
-    await updateMutation.mutateAsync({ id: courseId.value, payload })
+    await updateMutation.mutateAsync({ id: courseId.value, payload: submitPayload })
   } else {
-    await addMutation.mutateAsync(payload)
+    await addMutation.mutateAsync(submitPayload)
   }
   await queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
   resetErrors()
diff --git a/src/features/admin/courses/components/modals/AddSessionToCourseModal.vue b/src/features/admin/courses/components/modals/AddSessionToCourseModal.vue
index 61f7fb8..879b37f 100644
--- a/src/features/admin/courses/components/modals/AddSessionToCourseModal.vue
+++ b/src/features/admin/courses/components/modals/AddSessionToCourseModal.vue
@@ -95,11 +95,11 @@ import LineTitleBlock from '@/components/LineTitleBlock.vue'
 import { useAdminSessionsListQuery } from '@/services/query/admin-sessions'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import {
-  adminCourseTemplatesKeys,
-  useAdminTemplateSessionsQuery,
-  useAttachAdminTemplateSessionMutation,
-  useDetachAdminTemplateSessionMutation,
-} from '@/services/query/admin-course-templates'
+  adminCoursesKeys,
+  useAdminCourseSessionsQuery,
+  useAttachAdminCourseSessionMutation,
+  useDetachAdminCourseSessionMutation,
+} from '@/services/query/admin-courses'
 
 defineOptions({ name: 'AddSessionToCourseModal' })
 
@@ -107,7 +107,7 @@ const queryClient = useQueryClient()
 const { getModal } = useModal()
 
 const modalData = computed(() => getModal('AddSessionToCourseModal')?.data ?? {})
-const templateId = computed(() => modalData.value.templateId ?? null)
+const courseId = computed(() => modalData.value.courseId ?? null)
 
 const searchInput = ref('')
 const searchQuery = ref('')
@@ -122,18 +122,18 @@ const sessions = computed(() => sessionsResponse.value?.data ?? [])
 
 const attachedFilters = computed(() => ({}))
 const attachedPagination = ref({ page: 1, perPage: 200 })
-const { data: attachedResponse } = useAdminTemplateSessionsQuery(
-  templateId,
+const { data: attachedResponse } = useAdminCourseSessionsQuery(
+  courseId,
   attachedFilters,
   attachedPagination,
-  { enabled: () => !!templateId.value }
+  { enabled: () => !!courseId.value }
 )
 const attachedIds = computed(() => new Set((attachedResponse.value?.data ?? []).map((s) => s.id)))
 
 const isAttached = (id) => attachedIds.value.has(id)
 
 const teacherName = (session) => {
-  const t = session.teacher || session.defaultTeacher
+  const t = session.teacher
   if (!t) return '—'
   return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
 }
@@ -145,17 +145,17 @@ const onSearchInput = useDebounce(() => {
 
 const pendingId = ref(null)
 
-const attachMutation = useAttachAdminTemplateSessionMutation()
-const detachMutation = useDetachAdminTemplateSessionMutation()
+const attachMutation = useAttachAdminCourseSessionMutation()
+const detachMutation = useDetachAdminCourseSessionMutation()
 
-const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCourseTemplatesKeys.all })
+const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
 
 const onAttach = async (session) => {
-  if (!templateId.value) return
+  if (!courseId.value) return
   pendingId.value = session.id
   try {
     await attachMutation.mutateAsync({
-      templateId: templateId.value,
+      courseId: courseId.value,
       payload: { sessionIds: [session.id] },
     })
     invalidate()
@@ -165,17 +165,17 @@ const onAttach = async (session) => {
 }
 
 const onDetach = async (session) => {
-  if (!templateId.value) return
+  if (!courseId.value) return
   pendingId.value = session.id
   try {
-    await detachMutation.mutateAsync({ templateId: templateId.value, sessionId: session.id })
+    await detachMutation.mutateAsync({ courseId: courseId.value, sessionId: session.id })
     invalidate()
   } finally {
     pendingId.value = null
   }
 }
 
-watch(templateId, () => {
+watch(courseId, () => {
   searchInput.value = ''
   searchQuery.value = ''
   pendingId.value = null
diff --git a/src/features/admin/courses/components/modals/CourseDetailsModal.vue b/src/features/admin/courses/components/modals/CourseDetailsModal.vue
index 7c6a81d..1564466 100644
--- a/src/features/admin/courses/components/modals/CourseDetailsModal.vue
+++ b/src/features/admin/courses/components/modals/CourseDetailsModal.vue
@@ -166,12 +166,12 @@ import PaginationBlock from '@/components/blocks/PaginationBlock.vue'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import CourseSessionItem from '@/features/admin/courses/components/CourseSessionItem.vue'
 import {
-  adminCourseTemplatesKeys,
-  useAdminCourseTemplateQuery,
-  useAdminTemplateSessionsQuery,
-  useAdminTemplateStudentsQuery,
-  useRemoveAdminTemplateStudentMutation,
-} from '@/services/query/admin-course-templates'
+  adminCoursesKeys,
+  useAdminCourseQuery,
+  useAdminCourseSessionsQuery,
+  useAdminCourseStudentsQuery,
+  useRemoveAdminCourseStudentMutation,
+} from '@/services/query/admin-courses'
 
 defineOptions({ name: 'CourseDetailsModal' })
 
@@ -179,14 +179,14 @@ const queryClient = useQueryClient()
 const { openModal, getModal } = useModal()
 
 const modalData = computed(() => getModal('CourseDetailsModal')?.data ?? {})
-const templateId = computed(() => modalData.value.id ?? null)
+const courseId = computed(() => modalData.value.id ?? null)
 
-const { data: course, isLoading } = useAdminCourseTemplateQuery(templateId, {
-  enabled: () => !!templateId.value,
+const { data: course, isLoading } = useAdminCourseQuery(courseId, {
+  enabled: () => !!courseId.value,
 })
 
 const teacherName = computed(() => {
-  const t = course.value?.defaultTeacher || course.value?.teacher
+  const t = course.value?.teacher
   if (!t) return '—'
   return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
 })
@@ -203,12 +203,12 @@ const { pagination: sessionsPagination, setPage: setSessionsPage } = usePaginati
   perPage: 10,
 })
 
-const { data: sessionsData, isLoading: sessionsPending } = useAdminTemplateSessionsQuery(
-  templateId,
+const { data: sessionsData, isLoading: sessionsPending } = useAdminCourseSessionsQuery(
+  courseId,
   sessionsFilters,
   sessionsPagination,
   {
-    enabled: () => !!templateId.value && activeTab.value === 'sessions',
+    enabled: () => !!courseId.value && activeTab.value === 'sessions',
     keepPreviousData: true,
   }
 )
@@ -226,12 +226,12 @@ const { pagination: studentsPagination, setPage: setStudentsPage } = usePaginati
   perPage: 10,
 })
 
-const { data: studentsData, isLoading: studentsPending } = useAdminTemplateStudentsQuery(
-  templateId,
+const { data: studentsData, isLoading: studentsPending } = useAdminCourseStudentsQuery(
+  courseId,
   studentsFilters,
   studentsPagination,
   {
-    enabled: () => !!templateId.value && activeTab.value === 'students',
+    enabled: () => !!courseId.value && activeTab.value === 'students',
     keepPreviousData: true,
   }
 )
@@ -249,16 +249,16 @@ const studentName = (student) =>
   student.phoneNumber ||
   '—'
 
-const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCourseTemplatesKeys.all })
+const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
 
-const removeStudentMutation = useRemoveAdminTemplateStudentMutation()
+const removeStudentMutation = useRemoveAdminCourseStudentMutation()
 
 const onOpenAddSession = () => {
-  openModal('AddSessionToCourseModal', { templateId: templateId.value })
+  openModal('AddSessionToCourseModal', { courseId: courseId.value })
 }
 
 const onOpenAddStudent = () => {
-  openModal('AddCourseStudentModal', { templateId: templateId.value })
+  openModal('AddCourseStudentModal', { courseId: courseId.value })
 }
 
 const onAskRemoveStudent = (student) => {
@@ -267,7 +267,7 @@ const onAskRemoveStudent = (student) => {
     message: `آیا از حذف <strong>${studentName(student)}</strong> از این دوره اطمینان دارید؟`,
     onConfirm: () =>
       removeStudentMutation.mutate(
-        { templateId: templateId.value, userId: student.id },
+        { courseId: courseId.value, userId: student.id },
         { onSuccess: invalidate }
       ),
   })
diff --git a/src/features/admin/courses/pages/CourseTemplateFormPage.vue b/src/features/admin/courses/pages/CourseFormPage.vue
similarity index 88%
rename from src/features/admin/courses/pages/CourseTemplateFormPage.vue
rename to src/features/admin/courses/pages/CourseFormPage.vue
index 9445ed9..b35b3ea 100644
--- a/src/features/admin/courses/pages/CourseTemplateFormPage.vue
+++ b/src/features/admin/courses/pages/CourseFormPage.vue
@@ -2,11 +2,9 @@
   <div class="course-form">
     <BoxedIconTitleBlock
       class="course-form__heading"
-      :title="isEditMode ? 'ویرایش دوره الگو' : 'افزودن دوره الگوی جدید'"
+      :title="isEditMode ? 'ویرایش دوره' : 'افزودن دوره جدید'"
       :desc="
-        isEditMode
-          ? 'اطلاعات دوره الگو را به‌روز کنید'
-          : 'در این قسمت می‌توانید دوره الگوی جدید اضافه کنید'
+        isEditMode ? 'اطلاعات دوره را به‌روز کنید' : 'در این قسمت می‌توانید دوره جدید اضافه کنید'
       "
     >
       <template #icon>
@@ -44,26 +42,26 @@
             </div>
             <div class="course-form__cell course-form__cell--third">
               <SelectField
-                v-model="form.defaultTeacherId"
-                name="defaultTeacherId"
+                v-model="form.teacherId"
+                name="teacherId"
                 label="استاد"
                 :options="teacherOptions"
                 option-label="name"
                 option-value="id"
                 :searchable="true"
                 :on-search="searchTeachers"
-                :error="errors.defaultTeacherId"
+                :error="errors.teacherId"
               />
             </div>
             <div class="course-form__cell course-form__cell--third">
               <TextField
-                v-model="form.defaultCapacity"
-                name="defaultCapacity"
+                v-model="form.capacity"
+                name="capacity"
                 label="ظرفیت (نفر)"
                 inputmode="numeric"
                 :convert-digits="true"
-                :error="errors.defaultCapacity"
-                @blur="validateAt('defaultCapacity', form.defaultCapacity)"
+                :error="errors.capacity"
+                @blur="validateAt('capacity', form.capacity)"
               />
             </div>
             <div class="course-form__cell course-form__cell--third">
@@ -171,18 +169,18 @@ import FileUploader from '@/components/form/FileUploader.vue'
 import ImageCropper from '@/components/form/ImageCropper.vue'
 import { objectToFormData } from '@/utils/object-to-formdata'
 import { useUploadMediaMutation } from '@/services/query/auth'
+import { courseSchema } from '@/features/admin/courses/schema'
 import TextareaField from '@/components/form/TextareaField.vue'
 import { useAdminUsersListQuery } from '@/services/query/admin-users'
-import { courseTemplateSchema } from '@/features/admin/courses/schema'
 import { COURSE_CONTENT_TYPE, COURSE_CONTENT_TYPE_ACCEPT } from '@/enums'
 import BoxedIconTitleBlock from '@/components/blocks/BoxedIconTitleBlock.vue'
 import {
-  adminCourseTemplatesKeys,
-  useAddAdminCourseTemplateMutation,
-  useAdminCourseTemplateQuery,
-  useAdminCourseTemplatesListQuery,
-  useUpdateAdminCourseTemplateMutation,
-} from '@/services/query/admin-course-templates'
+  adminCoursesKeys,
+  useAddAdminCourseMutation,
+  useAdminCourseQuery,
+  useAdminCoursesListQuery,
+  useUpdateAdminCourseMutation,
+} from '@/services/query/admin-courses'
 
 const route = useRoute()
 const router = useRouter()
@@ -194,8 +192,8 @@ const isEditMode = computed(() => !!courseId.value)
 
 const form = ref({
   title: '',
-  defaultTeacherId: '',
-  defaultCapacity: '',
+  teacherId: '',
+  capacity: '',
   sessionsCount: '',
   prerequisites: [],
   contentType: '',
@@ -215,7 +213,7 @@ const contentTypeOptions = Object.entries(COURSE_CONTENT_TYPE).map(([value, labe
 
 const contentAccept = computed(() => COURSE_CONTENT_TYPE_ACCEPT[form.value.contentType] || '*')
 
-const { validate, validateAt, errors } = useYup(courseTemplateSchema)
+const { validate, validateAt, errors } = useYup(courseSchema)
 
 const teacherSearch = ref('')
 const teacherFilters = computed(() => ({ name: teacherSearch.value }))
@@ -237,7 +235,7 @@ const teacherOptions = computed(() => {
 const prereqSearch = ref('')
 const prereqFilters = computed(() => ({ title: prereqSearch.value }))
 const prereqPagination = ref({ page: 1, perPage: 30 })
-const { data: prereqsResponse } = useAdminCourseTemplatesListQuery(prereqFilters, prereqPagination)
+const { data: prereqsResponse } = useAdminCoursesListQuery(prereqFilters, prereqPagination)
 const selectedPrereqs = ref([])
 const prerequisiteOptions = computed(() => {
   const base = prereqsResponse.value?.data ?? []
@@ -252,28 +250,28 @@ const searchPrerequisites = useDebounce((q) => {
   prereqSearch.value = q || ''
 }, 400)
 
-const { data: existingCourse } = useAdminCourseTemplateQuery(courseId, {
+const { data: existingCourse } = useAdminCourseQuery(courseId, {
   enabled: () => !!courseId.value,
 })
 
 watch(existingCourse, (course) => {
   if (!course) return
-  const teacher = course.defaultTeacher || course.teacher
+  const teacher = course.teacher
   if (teacher) selectedTeacher.value = teacher
   const prereqs = Array.isArray(course.prerequisites) ? course.prerequisites : []
   selectedPrereqs.value = prereqs.map((p) => p.course || p).filter((c) => c?.id)
 
   form.value = {
     title: course.title || '',
-    defaultTeacherId: teacher?.id || course.defaultTeacherId || '',
-    defaultCapacity: course.defaultCapacity ?? course.capacity ?? '',
+    teacherId: teacher?.id || course.teacherId || '',
+    capacity: course.capacity ?? '',
     sessionsCount: course.sessionsCount ?? '',
     prerequisites: prereqs.map((p) => p.courseId ?? p.id).filter(Boolean),
     contentType: course.contentType || '',
     contentMediaId: course.contentMediaId || null,
     description: course.description || '',
     coverMediaId: course.coverMediaId || null,
-    termId: termId.value,
+    termId: course.termId ?? termId.value,
   }
   if (course.coverUrl) image.value = { url: course.coverUrl }
   if (course.contentMedia) {
@@ -315,7 +313,7 @@ const onContentSelect = async (files) => {
   try {
     const formData = objectToFormData({
       file,
-      purpose: 'content',
+      purpose: 'voice',
       context: 'course',
       type: form.value.contentType,
     })
@@ -336,8 +334,8 @@ const onContentRemove = () => {
 
 const onContentError = (msg) => toast.error(msg)
 
-const addMutation = useAddAdminCourseTemplateMutation()
-const updateMutation = useUpdateAdminCourseTemplateMutation()
+const addMutation = useAddAdminCourseMutation()
+const updateMutation = useUpdateAdminCourseMutation()
 
 const submitting = computed(() => addMutation.isPending.value || updateMutation.isPending.value)
 
@@ -349,7 +347,7 @@ const onSubmit = async () => {
   } else {
     await addMutation.mutateAsync(payload)
   }
-  await queryClient.invalidateQueries({ queryKey: adminCourseTemplatesKeys.all })
+  await queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
   router.push({ name: 'admin-courses' })
 }
 
@@ -452,6 +450,7 @@ const onCancel = () => router.push({ name: 'admin-courses' })
   &__actions {
     display: flex;
     justify-content: flex-end;
+    justify-content: space-between;
     gap: 0.625rem;
   }
 
diff --git a/src/features/admin/courses/pages/CoursesListPage.vue b/src/features/admin/courses/pages/CoursesListPage.vue
index 7ca81a5..49a3261 100644
--- a/src/features/admin/courses/pages/CoursesListPage.vue
+++ b/src/features/admin/courses/pages/CoursesListPage.vue
@@ -25,9 +25,9 @@
             v-for="course in templates"
             :key="course.id"
             :course="course"
-            @edit="onEditTemplate"
-            @delete="onAskDeleteTemplate"
-            @change-status="onChangeTemplateStatus"
+            @edit="onEditCourse"
+            @delete="onAskDelete"
+            @change-status="onChangeStatus"
             @show-details="onShowDetails"
           />
         </div>
@@ -36,20 +36,27 @@
       </template>
 
       <template #offered>
-        <SkeletonLoaderBlock v-if="offeredPending" :rows="6" :cols-per-row="1" />
-        <div v-else-if="offered.length > 0">
-          <CourseItem
-            v-for="course in offered"
-            :key="course.id"
-            :course="course"
-            @edit="onEditOffered"
-            @delete="onAskDeleteOffered"
-            @change-status="onChangeOfferedStatus"
-            @show-details="onShowDetails"
-          />
-        </div>
-        <NoItems v-else title="متاسفیم" desc="دوره‌ای برای نمایش وجود ندارد." />
-        <PaginationBlock :pagination="offeredPaginationMeta" @update:page="setOfferedPage" />
+        <NoItems
+          v-if="!hasOfferedTerm"
+          title="ترم را انتخاب کنید"
+          desc="برای نمایش دوره‌های ارائه شده، ابتدا ترم را از فیلترها انتخاب کنید."
+        />
+        <template v-else>
+          <SkeletonLoaderBlock v-if="offeredPending" :rows="6" :cols-per-row="1" />
+          <div v-else-if="offered.length > 0">
+            <CourseItem
+              v-for="course in offered"
+              :key="course.id"
+              :course="course"
+              @edit="onEditCourse"
+              @delete="onAskDelete"
+              @change-status="onChangeStatus"
+              @show-details="onShowDetails"
+            />
+          </div>
+          <NoItems v-else title="متاسفیم" desc="دوره‌ای برای نمایش وجود ندارد." />
+          <PaginationBlock :pagination="offeredPaginationMeta" @update:page="setOfferedPage" />
+        </template>
       </template>
     </TabsBlock>
 
@@ -61,11 +68,11 @@
 </template>
 
 <script setup>
-import { computed, ref } from 'vue'
-import { useRouter } from 'vue-router'
 import useModal from '@/composables/useModal'
+import { useRoute, useRouter } from 'vue-router'
 import { useQueryClient } from '@tanstack/vue-query'
 import SvgIcon from '@/components/icons/SvgIcon.vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import NoItems from '@/components/blocks/NoItems.vue'
 import TabsBlock from '@/components/blocks/TabsBlock.vue'
 import { usePagination } from '@/composables/usePagination'
@@ -81,25 +88,25 @@ import AddSessionToCourseModal from '@/features/admin/courses/components/modals/
 import {
   adminCoursesKeys,
   useAdminCoursesListQuery,
-  useChangeAdminCourseStatusMutation,
   useDeleteAdminCourseMutation,
+  useUpdateAdminCourseMutation,
 } from '@/services/query/admin-courses'
-import {
-  adminCourseTemplatesKeys,
-  useAdminCourseTemplatesListQuery,
-  useChangeAdminCourseTemplateStatusMutation,
-  useDeleteAdminCourseTemplateMutation,
-} from '@/services/query/admin-course-templates'
 
+const route = useRoute()
 const router = useRouter()
 const queryClient = useQueryClient()
 const { openModal, isModal } = useModal()
 
+const routeTermId = computed(() => (route.params.termId ? Number(route.params.termId) : null))
+
 const onAdd = () => {
   if (activeTab.value === 'templates') {
-    router.push({ name: 'admin-add-course-template' }).catch(() => {})
+    router.push({ name: 'admin-add-course' }).catch(() => {})
   } else {
-    openModal('AddOfferedCourseModal', { mode: 'add' })
+    openModal('AddOfferedCourseModal', {
+      mode: 'add',
+      termId: routeTermId.value ?? undefined,
+    })
   }
 }
 
@@ -121,10 +128,16 @@ const tabs = [
     buttonAction: onAdd,
   },
 ]
-const activeTab = ref('templates')
+const activeTab = ref(routeTermId.value ? 'offered' : 'templates')
 
 const templateFilters = ref({ title: '', status: '', fromDate: '', toDate: '' })
-const offeredFilters = ref({ title: '', termId: '', status: '', fromDate: '', toDate: '' })
+const offeredFilters = ref({
+  title: '',
+  termId: routeTermId.value ?? '',
+  status: '',
+  fromDate: '',
+  toDate: '',
+})
 
 const currentFilters = computed({
   get: () => (activeTab.value === 'templates' ? templateFilters.value : offeredFilters.value),
@@ -146,7 +159,7 @@ const {
   reset: resetOfferedPagination,
 } = usePagination({ page: 1, perPage: 10 })
 
-const { data: templatesData, isLoading: templatesPending } = useAdminCourseTemplatesListQuery(
+const { data: templatesData, isLoading: templatesPending } = useAdminCoursesListQuery(
   templateFilters,
   templatesPagination,
   {
@@ -155,16 +168,18 @@ const { data: templatesData, isLoading: templatesPending } = useAdminCourseTempl
   }
 )
 
+const hasOfferedTerm = computed(() => !!offeredFilters.value.termId)
+
 const { data: offeredData, isLoading: offeredPending } = useAdminCoursesListQuery(
   offeredFilters,
   offeredPagination,
   {
-    enabled: () => activeTab.value === 'offered',
+    enabled: () => activeTab.value === 'offered' && hasOfferedTerm.value,
     keepPreviousData: true,
   }
 )
 
-const templates = computed(() => templatesData.value?.data?.items ?? [])
+const templates = computed(() => templatesData.value?.data ?? [])
 const templatesPaginationMeta = computed(() => ({
   page: templatesPagination.value.page,
   perPage: templatesPagination.value.perPage,
@@ -188,12 +203,8 @@ const onFilterApply = () => {
 }
 const onFilterReset = onFilterApply
 
-const onEditTemplate = (course) => {
-  router.push({ name: 'admin-edit-course-template', params: { id: course.id } }).catch(() => {})
-}
-
-const onEditOffered = (course) => {
-  openModal('AddOfferedCourseModal', { mode: 'edit', courseId: course.id })
+const onEditCourse = (course) => {
+  router.push({ name: 'admin-edit-course', params: { id: course.id } }).catch(() => {})
 }
 
 const onShowDetails = (course) => {
@@ -203,45 +214,33 @@ const onShowDetails = (course) => {
   })
 }
 
-const invalidateTemplates = () =>
-  queryClient.invalidateQueries({ queryKey: adminCourseTemplatesKeys.all })
-const invalidateOffered = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
+const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
 
-const deleteTemplateMutation = useDeleteAdminCourseTemplateMutation()
-const changeTemplateStatusMutation = useChangeAdminCourseTemplateStatusMutation()
+const deleteMutation = useDeleteAdminCourseMutation()
+// Backend has no dedicated status endpoint — PATCH /courses/:id with { isActive }.
+const updateMutation = useUpdateAdminCourseMutation()
 
-const deleteOfferedMutation = useDeleteAdminCourseMutation()
-const changeOfferedStatusMutation = useChangeAdminCourseStatusMutation()
-
-const onAskDeleteTemplate = (course) => {
+const onAskDelete = (course) => {
   openModal('ConfirmModal', {
     title: `حذف ${course.title}`,
     message: `بعد از حذف امکان بازگشت وجود ندارد، آیا مطمئن هستید که می‌خواهید <strong>${course.title}</strong> را حذف کنید؟`,
-    onConfirm: () => deleteTemplateMutation.mutate(course.id, { onSuccess: invalidateTemplates }),
+    onConfirm: () => deleteMutation.mutate(course.id, { onSuccess: invalidate }),
   })
 }
 
-const onAskDeleteOffered = (course) => {
-  openModal('ConfirmModal', {
-    title: `حذف ${course.title}`,
-    message: `بعد از حذف امکان بازگشت وجود ندارد، آیا مطمئن هستید که می‌خواهید <strong>${course.title}</strong> را حذف کنید؟`,
-    onConfirm: () => deleteOfferedMutation.mutate(course.id, { onSuccess: invalidateOffered }),
-  })
+const onChangeStatus = ({ id, isActive }) => {
+  updateMutation.mutate({ id, payload: { isActive } }, { onSuccess: invalidate })
 }
 
-const onChangeTemplateStatus = ({ id, isActive }) => {
-  changeTemplateStatusMutation.mutate(
-    { id, payload: { isActiveByDefault: isActive } },
-    { onSuccess: invalidateTemplates }
-  )
+const syncRouteTermId = (termId) => {
+  if (!termId) return
+  activeTab.value = 'offered'
+  offeredFilters.value = { ...offeredFilters.value, termId }
+  resetOfferedPagination()
 }
 
-const onChangeOfferedStatus = ({ id, isActive }) => {
-  changeOfferedStatusMutation.mutate(
-    { id, payload: { isActive } },
-    { onSuccess: invalidateOffered }
-  )
-}
+onMounted(() => syncRouteTermId(routeTermId.value))
+watch(routeTermId, (val) => syncRouteTermId(val))
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/features/admin/courses/schema/index.js b/src/features/admin/courses/schema/index.js
index c4e6d90..c11200c 100644
--- a/src/features/admin/courses/schema/index.js
+++ b/src/features/admin/courses/schema/index.js
@@ -1,20 +1,20 @@
 import { array, boolean, mixed, number, object, string } from 'yup'
 
-export const courseTemplateSchema = object().shape({
+export const courseSchema = object().shape({
   title: string().required().min(3).max(255),
-  defaultTeacherId: mixed().required(),
-  defaultCapacity: number().required().min(1),
+  teacherId: mixed().required(),
+  capacity: number().required().min(1),
   sessionsCount: number().required().min(1),
   prerequisites: array().nullable().default([]),
   contentType: string().oneOf(['video', 'voice', 'text']).required(),
   contentMediaId: number().nullable().notRequired(),
   description: string().nullable().notRequired(),
-  termId: string().nullable(),
+  termId: mixed().nullable(),
+  isActive: boolean().nullable().notRequired(),
 })
 
 export const offeredCourseSchema = object().shape({
   termId: string().required(),
-  templateId: string().required(),
   title: string().required(),
   capacity: string().required(),
   imageId: string().nullable().notRequired(),
diff --git a/src/features/admin/exams/components/ExamItem.vue b/src/features/admin/exams/components/ExamItem.vue
index 17528ed..f0af6fb 100644
--- a/src/features/admin/exams/components/ExamItem.vue
+++ b/src/features/admin/exams/components/ExamItem.vue
@@ -5,7 +5,7 @@
       <div class="exam-item__sub">
         <span class="exam-item__sub-label">دوره:</span>
         <span class="exam-item__sub-value">
-          {{ exam.courseTemplate?.title || exam.courseTemplateTitle || '—' }}
+          {{ exam.course?.title || exam.courseTitle || '—' }}
         </span>
         <span class="exam-item__dot">|</span>
         <span class="exam-item__sub-label">جلسه:</span>
diff --git a/src/features/admin/exams/components/ExamQuestionBuilder.vue b/src/features/admin/exams/components/ExamQuestionBuilder.vue
index 0ec4ece..a30e2e7 100644
--- a/src/features/admin/exams/components/ExamQuestionBuilder.vue
+++ b/src/features/admin/exams/components/ExamQuestionBuilder.vue
@@ -4,12 +4,16 @@
       v-for="(question, questionIndex) in questions"
       :key="question.id"
       class="exam-question-builder__card"
+      :class="{ 'exam-question-builder__card--readonly': isLocked(question) }"
     >
       <div class="exam-question-builder__head">
-        <p class="exam-question-builder__title">سوال شماره {{ questionIndex + 1 }}</p>
+        <p class="exam-question-builder__title">
+          سوال شماره {{ questionIndex + 1 }}
+          <span v-if="isLocked(question)" class="exam-question-builder__lock">(ذخیره شده)</span>
+        </p>
         <button
           type="button"
-          :disabled="disabled"
+          :disabled="disabled || isLocked(question)"
           class="exam-question-builder__remove"
           aria-label="حذف سوال"
           @click="removeQuestion(question.id)"
@@ -22,24 +26,24 @@
         <div class="exam-question-builder__col exam-question-builder__col--main">
           <label class="exam-question-builder__label">متن سوال</label>
           <textarea
-            :value="question.title"
-            :disabled="disabled"
+            :value="question.questionText"
+            :disabled="disabled || isLocked(question)"
             rows="1"
             placeholder="لطفا سوال خود را وارد کنید"
             class="exam-question-builder__textarea"
-            @input="updateQuestion(question.id, { title: $event.target.value })"
+            @input="updateQuestion(question.id, { questionText: $event.target.value })"
           />
         </div>
         <div class="exam-question-builder__col exam-question-builder__col--score">
-          <label class="exam-question-builder__label">بارم نمره</label>
+          <label class="exam-question-builder__label">ترتیب</label>
           <input
-            :value="question.score"
-            :disabled="disabled"
+            :value="question.position"
+            :disabled="disabled || isLocked(question)"
             type="text"
             inputmode="numeric"
-            placeholder="15"
+            placeholder="1"
             class="exam-question-builder__input"
-            @input="updateQuestion(question.id, { score: $event.target.value })"
+            @input="updateQuestion(question.id, { position: $event.target.value })"
           />
         </div>
       </div>
@@ -49,31 +53,31 @@
           <p class="exam-question-builder__label">گزینه‌ها</p>
           <div class="exam-question-builder__answers-list">
             <div
-              v-for="answer in question.answers"
-              :key="answer.id"
+              v-for="option in question.options"
+              :key="option.id"
               class="exam-question-builder__answer"
             >
               <input
-                :value="answer.title"
-                :disabled="disabled"
+                :value="option.optionText"
+                :disabled="disabled || isLocked(question)"
                 type="text"
                 placeholder="متن گزینه"
                 class="exam-question-builder__answer-input"
-                @input="updateOption(question.id, answer.id, $event.target.value)"
+                @input="updateOption(question.id, option.id, $event.target.value)"
               />
               <button
                 type="button"
-                :disabled="disabled"
+                :disabled="disabled || isLocked(question)"
                 class="exam-question-builder__answer-remove"
                 aria-label="حذف گزینه"
-                @click="removeOption(question.id, answer.id)"
+                @click="removeOption(question.id, option.id)"
               >
                 <SvgIcon name="close" :size="14" color="#b1b1b1" />
               </button>
             </div>
             <button
               type="button"
-              :disabled="disabled"
+              :disabled="disabled || isLocked(question)"
               class="exam-question-builder__answer-add"
               aria-label="افزودن گزینه"
               @click="addOption(question.id)"
@@ -85,16 +89,14 @@
 
         <div class="exam-question-builder__correct">
           <SelectField
-            :model-value="question.correctAnswerId"
+            :model-value="correctOptionId(question)"
             :name="`correctAnswer-${question.id}`"
-            :options="correctAnswerOptions(question)"
+            :options="correctOptions(question)"
             option-label="label"
             option-value="value"
             label="گزینه صحیح"
-            :disabled="disabled || question.answers.length === 0"
-            @update:model-value="
-              (value) => updateQuestion(question.id, { correctAnswerId: value || null })
-            "
+            :disabled="disabled || isLocked(question) || question.options.length === 0"
+            @update:model-value="(value) => setCorrectOption(question.id, value)"
           />
         </div>
       </div>
@@ -128,22 +130,26 @@ const defaultLabels = ['گزینه اول', 'گزینه دوم', 'گزینه س
 
 const questions = computed(() => (Array.isArray(props.modelValue) ? props.modelValue : []))
 
+// Backend has no PATCH/DELETE for questions/options — once a question came
+// from the server (numeric id, no `__local`), the form locks editing it.
+const isLocked = (question) => question?.__local !== true
+
 const cloneQuestions = () =>
   questions.value.map((q) => ({
     ...q,
-    answers: Array.isArray(q.answers) ? q.answers.map((a) => ({ ...a })) : [],
+    options: Array.isArray(q.options) ? q.options.map((o) => ({ ...o })) : [],
   }))
 
 const createId = (prefix) => `${prefix}-${Date.now()}-${Math.random().toString(16).slice(2)}`
 
-const createOption = () => ({ id: createId('answer'), title: '' })
+const createOption = () => ({ id: createId('option'), optionText: '', isCorrect: false })
 
 const createQuestion = () => ({
   id: createId('question'),
-  title: '',
-  score: '',
-  correctAnswerId: null,
-  answers: [createOption(), createOption()],
+  questionText: '',
+  position: questions.value.length + 1,
+  options: [createOption(), createOption()],
+  __local: true,
 })
 
 const emitQuestions = (next) => emit('update:modelValue', next)
@@ -163,39 +169,48 @@ const updateQuestion = (questionId, patch) => {
 const addOption = (questionId) => {
   const next = cloneQuestions().map((q) => {
     if (q.id !== questionId) return q
-    return { ...q, answers: [...q.answers, createOption()] }
+    return { ...q, options: [...q.options, createOption()] }
   })
   emitQuestions(next)
 }
 
-const removeOption = (questionId, answerId) => {
+const removeOption = (questionId, optionId) => {
+  const next = cloneQuestions().map((q) => {
+    if (q.id !== questionId) return q
+    const options = q.options.filter((o) => o.id !== optionId)
+    return { ...q, options }
+  })
+  emitQuestions(next)
+}
+
+const updateOption = (questionId, optionId, optionText) => {
   const next = cloneQuestions().map((q) => {
     if (q.id !== questionId) return q
-    const answers = q.answers.filter((a) => a.id !== answerId)
     return {
       ...q,
-      answers,
-      correctAnswerId: String(q.correctAnswerId) === String(answerId) ? null : q.correctAnswerId,
+      options: q.options.map((o) => (o.id === optionId ? { ...o, optionText } : o)),
     }
   })
   emitQuestions(next)
 }
 
-const updateOption = (questionId, answerId, title) => {
+const setCorrectOption = (questionId, optionId) => {
   const next = cloneQuestions().map((q) => {
     if (q.id !== questionId) return q
     return {
       ...q,
-      answers: q.answers.map((a) => (a.id === answerId ? { ...a, title } : a)),
+      options: q.options.map((o) => ({ ...o, isCorrect: String(o.id) === String(optionId) })),
     }
   })
   emitQuestions(next)
 }
 
+const correctOptionId = (question) => question.options.find((o) => o.isCorrect)?.id ?? null
+
 const optionLabel = (index) => defaultLabels[index] || `گزینه ${index + 1}`
 
-const correctAnswerOptions = (question) =>
-  question.answers.map((a, idx) => ({ value: a.id, label: optionLabel(idx) }))
+const correctOptions = (question) =>
+  question.options.map((o, idx) => ({ value: o.id, label: optionLabel(idx) }))
 </script>
 
 <style lang="scss" scoped>
@@ -209,6 +224,10 @@ const correctAnswerOptions = (question) =>
     border-radius: 1.5rem;
     padding: 0.875rem;
     box-shadow: 0 8px 24px rgba(0, 0, 0, 2.5%);
+
+    &--readonly {
+      background: rgba(0, 0, 0, 2%);
+    }
   }
 
   &__head {
@@ -227,6 +246,12 @@ const correctAnswerOptions = (question) =>
     margin: 0;
   }
 
+  &__lock {
+    font-size: 0.7rem;
+    color: #9c9c9c;
+    margin-inline-start: 0.25rem;
+  }
+
   &__remove {
     width: 2rem;
     height: 2rem;
diff --git a/src/features/admin/exams/components/ExamsFilters.vue b/src/features/admin/exams/components/ExamsFilters.vue
index fc897ad..160337f 100644
--- a/src/features/admin/exams/components/ExamsFilters.vue
+++ b/src/features/admin/exams/components/ExamsFilters.vue
@@ -7,9 +7,9 @@
         </template>
       </TextField>
       <SelectField
-        v-model="form.courseTemplateId"
-        name="courseTemplateId"
-        label="دوره الگو"
+        v-model="form.courseId"
+        name="courseId"
+        label="دوره"
         :options="templateOptions"
         option-label="title"
         option-value="id"
@@ -30,7 +30,7 @@
         @click="onReset"
       >
         <template #icon>
-          <SvgIcon name="close" :size="20" />
+          <SvgIcon name="close" color="black" :size="20" />
         </template>
       </CircleButton>
       <CircleButton
@@ -55,18 +55,18 @@ import TextField from '@/components/form/TextField.vue'
 import CircleButton from '@/components/CircleButton.vue'
 import SelectField from '@/components/form/SelectField.vue'
 import DatePickerField from '@/components/form/DatePickerField.vue'
-import { useAdminCourseTemplatesListQuery } from '@/services/query/admin-course-templates'
+import { useAdminCoursesListQuery } from '@/services/query/admin-courses'
 
 const props = defineProps({
   modelValue: {
     type: Object,
-    default: () => ({ title: '', courseTemplateId: '', fromDate: '', toDate: '' }),
+    default: () => ({ title: '', courseId: '', fromDate: '', toDate: '' }),
   },
 })
 
 const emit = defineEmits(['update:modelValue', 'apply', 'reset'])
 
-const emptyForm = () => ({ title: '', courseTemplateId: '', fromDate: '', toDate: '' })
+const emptyForm = () => ({ title: '', courseId: '', fromDate: '', toDate: '' })
 const form = ref({ ...emptyForm(), ...props.modelValue })
 
 watch(
@@ -82,10 +82,7 @@ const todayIso = new Date().toISOString()
 const templateSearch = ref('')
 const templateFilters = computed(() => ({ title: templateSearch.value }))
 const templatePagination = ref({ page: 1, perPage: 30 })
-const { data: templatesResponse } = useAdminCourseTemplatesListQuery(
-  templateFilters,
-  templatePagination
-)
+const { data: templatesResponse } = useAdminCoursesListQuery(templateFilters, templatePagination)
 const templateOptions = computed(() => templatesResponse.value?.data ?? [])
 
 const searchTemplates = useDebounce((q) => {
diff --git a/src/features/admin/exams/components/modals/ExamDetailsModal.vue b/src/features/admin/exams/components/modals/ExamDetailsModal.vue
index 909d88e..d47442c 100644
--- a/src/features/admin/exams/components/modals/ExamDetailsModal.vue
+++ b/src/features/admin/exams/components/modals/ExamDetailsModal.vue
@@ -102,13 +102,13 @@ const summaryItems = computed(() => {
     },
     {
       title: 'دوره مرتبط',
-      value: e.courseTemplate?.title || e.courseTemplateTitle || '—',
+      value: e.course?.title || e.courseTitle || '—',
       numeric: false,
     },
     { title: 'وضعیت', value: e.statusLabel || e.faStatus || e.status || '—', numeric: false },
     {
-      title: 'مدت زمان',
-      value: e.durationMinutes == null ? '—' : `${e.durationMinutes} دقیقه`,
+      title: 'حد نصاب قبولی',
+      value: e.passScore == null ? '—' : `${e.passScore} نمره`,
       numeric: true,
     },
     {
@@ -127,25 +127,17 @@ const summaryItems = computed(() => {
 const displayQuestions = computed(() => {
   const raw = exam.value?.questions || []
   return raw.map((question, index) => {
-    const answersSource =
-      (Array.isArray(question.answers) && question.answers) ||
-      (Array.isArray(question.options) && question.options) ||
-      []
-    const answers = answersSource.map((answer, ai) => {
-      const id = answer?.id ?? `${question?.id || index + 1}-${ai + 1}`
-      const title =
-        (typeof answer === 'string' && answer) ||
-        answer?.title ||
-        answer?.text ||
-        answer?.label ||
-        '—'
-      return { id, title, isCorrect: String(id) === String(question?.correctAnswerId) }
-    })
+    const optionsSource = Array.isArray(question.options) ? question.options : []
+    const answers = optionsSource.map((option, ai) => ({
+      id: option?.id ?? `${question?.id || index + 1}-${ai + 1}`,
+      title: option?.optionText || '—',
+      isCorrect: !!option?.isCorrect,
+    }))
     return {
       id: question?.id ?? `question-${index + 1}`,
-      order: index + 1,
-      title: question?.title || question?.question || '—',
-      score: question?.score ?? '',
+      order: question?.position ?? index + 1,
+      title: question?.questionText || '—',
+      score: '',
       answers,
     }
   })
diff --git a/src/features/admin/exams/pages/ExamFormPage.vue b/src/features/admin/exams/pages/ExamFormPage.vue
index 8ff218a..7ed9d3a 100644
--- a/src/features/admin/exams/pages/ExamFormPage.vue
+++ b/src/features/admin/exams/pages/ExamFormPage.vue
@@ -31,32 +31,17 @@
             :error="errors.title"
             @blur="validateAt('title', form.title)"
           />
-          <TextField
-            v-model="form.durationMinutes"
-            name="durationMinutes"
-            label="مدت آزمون"
-            inputmode="numeric"
-            :convert-digits="true"
-            :error="errors.durationMinutes"
-            @blur="validateAt('durationMinutes', form.durationMinutes)"
-          />
           <TextField
             v-model="form.passingScore"
             name="passingScore"
-            label="حداقل نمره قبولی"
+            label="حد نصاب قبولی"
             inputmode="numeric"
             :convert-digits="true"
             :error="errors.passingScore"
             @blur="validateAt('passingScore', form.passingScore)"
           />
-          <DatePickerField
-            v-model="form.endDate"
-            name="endDate"
-            label="تاریخ اعتبار"
-            :error="errors.endDate"
-          />
           <div class="exam-form__toggle-cell">
-            <ToggleSwitch v-model="form.randomize" label="به صورت رندوم باشد" />
+            <ToggleSwitch v-model="form.isActive" label="آزمون فعال باشد" />
           </div>
         </div>
       </div>
@@ -116,13 +101,13 @@ import { examSchema } from '@/features/admin/exams/schema'
 import SelectField from '@/components/form/SelectField.vue'
 import ToggleSwitch from '@/components/form/ToggleSwitch.vue'
 import TextareaField from '@/components/form/TextareaField.vue'
-import DatePickerField from '@/components/form/DatePickerField.vue'
 import { useAdminSessionsListQuery } from '@/services/query/admin-sessions'
 import BoxedIconTitleBlock from '@/components/blocks/BoxedIconTitleBlock.vue'
 import ExamQuestionBuilder from '@/features/admin/exams/components/ExamQuestionBuilder.vue'
 import {
   adminExamsKeys,
   useAddAdminExamMutation,
+  useAddAdminExamQuestionMutation,
   useAdminExamQuery,
   useUpdateAdminExamMutation,
 } from '@/services/query/admin-exams'
@@ -137,32 +122,27 @@ const isEditMode = computed(() => !!examId.value)
 const form = ref({
   title: '',
   sessionId: '',
-  endDate: '',
-  durationMinutes: '',
   passingScore: '',
-  randomize: true,
+  isActive: true,
   description: '',
 })
 
 const createId = (prefix) => `${prefix}-${Date.now()}-${Math.random().toString(16).slice(2)}`
 
+const blankOption = () => ({ id: createId('option'), optionText: '', isCorrect: false })
+
 const blankQuestion = () => ({
   id: createId('question'),
-  title: '',
-  score: '',
-  correctAnswerId: null,
-  answers: [
-    { id: createId('answer'), title: '' },
-    { id: createId('answer'), title: '' },
-  ],
+  questionText: '',
+  position: 1,
+  options: [blankOption(), { ...blankOption(), id: createId('option') }],
+  __local: true,
 })
 
 const questions = ref([blankQuestion()])
 const questionError = ref('')
 
-const schema = examSchema
-
-const { validate, validateAt, errors } = useYup(schema)
+const { validate, validateAt, errors } = useYup(examSchema)
 
 const sessionSearch = ref('')
 const sessionFilters = computed(() => ({ title: sessionSearch.value }))
@@ -185,20 +165,20 @@ const { data: existingExam } = useAdminExamQuery(examId, {
   enabled: () => !!examId.value,
 })
 
-const normalizeQuestions = (raw = []) => {
+const normalizeExistingQuestions = (raw = []) => {
   if (!Array.isArray(raw) || raw.length === 0) return [blankQuestion()]
   return raw.map((q, qIdx) => {
-    const answersSrc = q.answers || q.options || q.choices || []
-    const answers = (Array.isArray(answersSrc) ? answersSrc : []).map((a, aIdx) => ({
-      id: a?.id || createId(`answer-${qIdx}-${aIdx}`),
-      title: typeof a === 'string' ? a : a?.title || a?.text || a?.label || '',
-    }))
+    const options = Array.isArray(q.options) ? q.options : []
     return {
-      id: q.id || createId(`question-${qIdx}`),
-      title: q.title || q.question || q.text || '',
-      score: q.score ?? q.barom ?? '',
-      correctAnswerId: q.correctAnswerId || q.correctOptionId || q.correctAnswer?.id || null,
-      answers: answers.length > 0 ? answers : blankQuestion().answers,
+      id: q.id ?? createId(`question-${qIdx}`),
+      questionText: q.questionText || '',
+      position: q.position ?? qIdx + 1,
+      options: options.map((o, oIdx) => ({
+        id: o.id ?? createId(`option-${qIdx}-${oIdx}`),
+        optionText: o.optionText || '',
+        isCorrect: !!o.isCorrect,
+      })),
+      // No `__local` flag — these came from the server, so the builder will lock them.
     }
   })
 }
@@ -209,62 +189,89 @@ watch(existingExam, (exam) => {
   form.value = {
     title: exam.title || '',
     sessionId: exam.session?.id || exam.sessionId || '',
-    endDate: exam.endDate || '',
-    durationMinutes: exam.durationMinutes ?? '',
-    passingScore: exam.passingScore ?? '',
-    randomize: exam.randomize ?? true,
+    passingScore: exam.passScore ?? '',
+    isActive: exam.isActive ?? true,
     description: exam.description || '',
   }
-  questions.value = normalizeQuestions(exam.questions)
+  questions.value = normalizeExistingQuestions(exam.questions)
 })
 
-const validateQuestionList = () => {
-  const list = questions.value
-  if (list.some((q) => !String(q.title || '').trim() || !String(q.score || '').trim())) {
-    questionError.value = 'لطفا متن سوال و بارم هر سوال را وارد کنید.'
+const validateLocalQuestions = () => {
+  const localOnes = questions.value.filter((q) => q.__local === true)
+  if (!isEditMode.value && localOnes.length === 0) {
+    questionError.value = 'حداقل یک سوال اضافه کنید.'
     return null
   }
-  if (list.some((q) => q.answers.filter((a) => a.title?.trim()).length < 2)) {
-    questionError.value = 'برای هر سوال حداقل دو گزینه وارد کنید.'
-    return null
-  }
-  if (
-    list.some((q) => {
-      if (!q.correctAnswerId) return true
-      return !q.answers.some((a) => String(a.id) === String(q.correctAnswerId) && a.title?.trim())
-    })
-  ) {
-    questionError.value = 'گزینه صحیح هر سوال را از گزینه‌های موجود انتخاب کنید.'
-    return null
+  for (const q of localOnes) {
+    if (!String(q.questionText || '').trim()) {
+      questionError.value = 'متن همه سوالات را وارد کنید.'
+      return null
+    }
+    const validOptions = q.options.filter((o) => String(o.optionText || '').trim())
+    if (validOptions.length < 2) {
+      questionError.value = 'برای هر سوال حداقل دو گزینه وارد کنید.'
+      return null
+    }
+    if (!validOptions.some((o) => o.isCorrect)) {
+      questionError.value = 'گزینه صحیح هر سوال را انتخاب کنید.'
+      return null
+    }
   }
   questionError.value = ''
-  return list.map((q) => ({
-    id: q.id,
-    title: q.title.trim(),
-    score: q.score,
-    correctAnswerId: q.correctAnswerId,
-    answers: q.answers.filter((a) => a.title?.trim()).map((a) => ({ id: a.id, title: a.title })),
+  return localOnes.map((q, idx) => ({
+    questionText: q.questionText.trim(),
+    position: Number(q.position) || idx + 1,
+    options: q.options
+      .filter((o) => String(o.optionText || '').trim())
+      .map((o) => ({
+        optionText: o.optionText.trim(),
+        isCorrect: !!o.isCorrect,
+      })),
   }))
 }
 
-const addMutation = useAddAdminExamMutation()
-const updateMutation = useUpdateAdminExamMutation()
+const buildExamPayload = (values) => ({
+  sessionId: values.sessionId,
+  title: values.title,
+  description: values.description,
+  passingScore: Number(values.passingScore) || 0,
+  isActive: values.isActive,
+})
 
-const submitting = computed(() => addMutation.isPending.value || updateMutation.isPending.value)
+const addExamMutation = useAddAdminExamMutation()
+const updateExamMutation = useUpdateAdminExamMutation()
+const addQuestionMutation = useAddAdminExamQuestionMutation()
+
+const submitting = computed(
+  () =>
+    addExamMutation.isPending.value ||
+    updateExamMutation.isPending.value ||
+    addQuestionMutation.isPending.value
+)
+
+const postQuestionsSequentially = async (id, list) => {
+  for (const payload of list) {
+    // Sequential so question position ordering is preserved on the backend.
+    // eslint-disable-next-line no-await-in-loop
+    await addQuestionMutation.mutateAsync({ examId: id, payload })
+  }
+}
 
 const onSubmit = async () => {
-  const { isValid, payload } = await validate(form.value)
-  const cleanQuestions = validateQuestionList()
-  if (!isValid || !cleanQuestions) return
-  const finalPayload = {
-    ...payload,
-    questions: cleanQuestions,
-    questionsCount: cleanQuestions.length,
-  }
+  const { isValid } = await validate(form.value)
+  const newQuestions = validateLocalQuestions()
+  if (!isValid || !newQuestions) return
+
+  const examPayload = buildExamPayload(form.value)
+  let targetExamId = examId.value
   if (isEditMode.value) {
-    await updateMutation.mutateAsync({ id: examId.value, payload: finalPayload })
+    await updateExamMutation.mutateAsync({ id: targetExamId, payload: examPayload })
   } else {
-    await addMutation.mutateAsync(finalPayload)
+    const created = await addExamMutation.mutateAsync(examPayload)
+    targetExamId = created?.data?.id ?? created?.id ?? targetExamId
+  }
+  if (targetExamId && newQuestions.length > 0) {
+    await postQuestionsSequentially(targetExamId, newQuestions)
   }
   await queryClient.invalidateQueries({ queryKey: adminExamsKeys.all })
   router.push({ name: 'admin-exams' })
@@ -306,7 +313,7 @@ const onCancel = () => router.push({ name: 'admin-exams' })
     }
 
     @media (min-width: 1280px) {
-      grid-template-columns: repeat(6, 1fr);
+      grid-template-columns: repeat(4, 1fr);
     }
   }
 
diff --git a/src/features/admin/exams/pages/ExamsListPage.vue b/src/features/admin/exams/pages/ExamsListPage.vue
index 7ff6a3a..4d443e0 100644
--- a/src/features/admin/exams/pages/ExamsListPage.vue
+++ b/src/features/admin/exams/pages/ExamsListPage.vue
@@ -75,7 +75,7 @@ const router = useRouter()
 const queryClient = useQueryClient()
 const { openModal, isModal } = useModal()
 
-const filters = ref({ title: '', courseTemplateId: '', fromDate: '', toDate: '' })
+const filters = ref({ title: '', courseId: '', fromDate: '', toDate: '' })
 const { pagination, setPage, reset: resetPagination } = usePagination({ page: 1, perPage: 10 })
 
 const { data, isLoading } = useAdminExamsListQuery(filters, pagination, {
diff --git a/src/features/admin/exams/schema/index.js b/src/features/admin/exams/schema/index.js
index f3ea66a..9f92eb0 100644
--- a/src/features/admin/exams/schema/index.js
+++ b/src/features/admin/exams/schema/index.js
@@ -1,10 +1,9 @@
-import { number, object, string } from 'yup'
+import { boolean, number, object, string } from 'yup'
 
 export const examSchema = object().shape({
   title: string().required().min(3),
   sessionId: string().required(),
-  endDate: string().required(),
-  durationMinutes: number().typeError('مدت زمان باید عدد باشد').required(),
   passingScore: number().typeError('حد نصاب قبولی باید عدد باشد').required(),
   description: string().nullable().notRequired(),
+  isActive: boolean().nullable().notRequired(),
 })
diff --git a/src/features/admin/messages/components/TicketItem.vue b/src/features/admin/messages/components/TicketItem.vue
index 73af18f..0fccc7e 100644
--- a/src/features/admin/messages/components/TicketItem.vue
+++ b/src/features/admin/messages/components/TicketItem.vue
@@ -1,23 +1,20 @@
 <template>
   <div class="ticket-item">
     <div class="ticket-item__user">
-      <div v-if="ticket.user?.avatarUrl" class="ticket-item__avatar">
-        <img :src="ticket.user.avatarUrl" :alt="userName" />
+      <div v-if="ticket.student?.avatarUrl" class="ticket-item__avatar">
+        <img :src="ticket.student.avatarUrl" :alt="userName" />
       </div>
       <div v-else class="ticket-item__avatar ticket-item__avatar--placeholder">
         <SvgIcon name="user" :size="24" color="#bcbcbc" />
       </div>
       <div class="ticket-item__info">
         <p class="ticket-item__name">{{ userName }}</p>
-        <p class="ticket-item__title">{{ ticket.title || '—' }}</p>
+        <p class="ticket-item__title">{{ ticket.subject || '—' }}</p>
       </div>
     </div>
 
     <div class="ticket-item__meta">
-      <span
-        class="ticket-item__status"
-        :class="`ticket-item__status--${ticket.status || 'pending'}`"
-      >
+      <span class="ticket-item__status" :class="`ticket-item__status--${ticket.status || 'open'}`">
         {{ statusLabel }}
       </span>
       <div class="ticket-item__pill">
@@ -58,20 +55,22 @@ const props = defineProps({
 const emit = defineEmits(['show-details'])
 
 const userName = computed(() => {
-  const u = props.ticket.user
-  if (!u) return '—'
-  return `${u.firstName || ''} ${u.lastName || ''}`.trim() || u.fullName || '—'
+  const s = props.ticket.student
+  if (!s) return '—'
+  return s.name || `${s.firstName || ''} ${s.lastName || ''}`.trim() || s.fullName || '—'
 })
 
-const statusLabel = computed(
-  () => props.ticket.statusLabel || TICKET_STATUS[props.ticket.status] || '—'
-)
+const statusLabel = computed(() => TICKET_STATUS[props.ticket.status] || '—')
 
-const createdAt = computed(
-  () => props.ticket.faCreatedAt || formatJalaaliDate(props.ticket.createdAt) || '—'
-)
+const createdAt = computed(() => formatJalaaliDate(props.ticket.createdAt) || '—')
 
-const createdTime = computed(() => props.ticket.faCreatedTime || '')
+const createdTime = computed(() => {
+  const iso = props.ticket.createdAt
+  if (!iso) return ''
+  const d = new Date(iso)
+  if (Number.isNaN(d.getTime())) return ''
+  return d.toLocaleTimeString('fa-IR', { hour: '2-digit', minute: '2-digit' })
+})
 </script>
 
 <style lang="scss" scoped>
@@ -160,7 +159,7 @@ const createdTime = computed(() => props.ticket.faCreatedTime || '')
     font-weight: 500;
     white-space: nowrap;
 
-    &--pending {
+    &--open {
       background: rgba(204, 154, 40, 8%);
       color: #cc6f00;
     }
diff --git a/src/features/admin/messages/components/modals/TicketDetailsModal.vue b/src/features/admin/messages/components/modals/TicketDetailsModal.vue
index 6434735..1a92a50 100644
--- a/src/features/admin/messages/components/modals/TicketDetailsModal.vue
+++ b/src/features/admin/messages/components/modals/TicketDetailsModal.vue
@@ -17,7 +17,7 @@
             :class="`ticket-details__row--${senderClass(message)}`"
           >
             <div class="ticket-details__bubble">
-              <p class="ticket-details__text">{{ message.text }}</p>
+              <p class="ticket-details__text">{{ message.message }}</p>
               <span class="ticket-details__time">{{ messageTime(message) }}</span>
             </div>
           </div>
@@ -26,19 +26,6 @@
 
         <div class="ticket-details__divider" />
 
-        <div v-if="attachment" class="ticket-details__attachment">
-          <SvgIcon name="file" :size="16" color="var(--color-prim-gray)" />
-          <span class="ticket-details__attachment-name">{{ attachment.name }}</span>
-          <button
-            type="button"
-            class="ticket-details__attachment-remove"
-            aria-label="حذف فایل"
-            @click="removeAttachment"
-          >
-            <SvgIcon name="close" :size="14" color="var(--color-error)" />
-          </button>
-        </div>
-
         <form class="ticket-details__compose" @submit.prevent="onSend">
           <button
             type="submit"
@@ -65,20 +52,6 @@
             >
               <SvgIcon name="mood" :size="30" color="currentColor" />
             </button>
-            <button
-              type="button"
-              class="ticket-details__compose-btn"
-              aria-label="پیوست فایل"
-              @click="triggerFilePicker"
-            >
-              <SvgIcon name="attach-file" :size="30" color="currentColor" />
-            </button>
-            <input
-              ref="fileInput"
-              type="file"
-              class="ticket-details__file-input"
-              @change="onFileSelected"
-            />
           </div>
         </form>
       </div>
@@ -110,7 +83,6 @@ import SvgIcon from '@/components/icons/SvgIcon.vue'
 import NoItems from '@/components/blocks/NoItems.vue'
 import { formatJalaaliDate } from '@/utils/date-utils'
 import LineTitleBlock from '@/components/LineTitleBlock.vue'
-import { objectToFormData } from '@/utils/object-to-formdata'
 import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import {
@@ -167,28 +139,21 @@ const { data: ticket, isLoading } = useAdminTicketQuery(ticketId, {
 
 const messages = computed(() => ticket.value?.messages ?? [])
 
-const ticketDate = computed(
-  () => ticket.value?.faCreatedAt || formatJalaaliDate(ticket.value?.createdAt) || '—'
-)
+const ticketDate = computed(() => formatJalaaliDate(ticket.value?.createdAt) || '—')
 
-const senderClass = (message) => (message.sender === 'admin' ? 'admin' : 'user')
+// Anyone whose id matches the ticket's student is "the student"; everyone else
+// (admin, counselor) renders on the opposite side of the thread.
+const senderClass = (message) => (message.senderId === ticket.value?.studentId ? 'user' : 'admin')
 
-const messageTime = (message) => message.time || message.faSentAt || message.sentAt || '—'
+const messageTime = (message) => {
+  if (!message.createdAt) return '—'
+  const d = new Date(message.createdAt)
+  if (Number.isNaN(d.getTime())) return '—'
+  return d.toLocaleTimeString('fa-IR', { hour: '2-digit', minute: '2-digit' })
+}
 
 const text = ref('')
-const attachment = ref(null)
-const canSend = computed(() => text.value.trim().length > 0 || !!attachment.value)
-
-const fileInput = ref(null)
-const triggerFilePicker = () => fileInput.value?.click()
-const onFileSelected = (event) => {
-  const file = event.target?.files?.[0]
-  if (file) attachment.value = file
-  if (event.target) event.target.value = ''
-}
-const removeAttachment = () => {
-  attachment.value = null
-}
+const canSend = computed(() => text.value.trim().length > 0)
 
 const emojiOpen = ref(false)
 const emojiButton = ref(null)
@@ -244,12 +209,10 @@ const sendMutation = useSendAdminTicketMessageMutation()
 const onSend = async () => {
   if (!canSend.value || !ticketId.value) return
   const value = text.value.trim()
-  const file = attachment.value
   text.value = ''
-  attachment.value = null
   emojiOpen.value = false
-  const payload = file ? objectToFormData({ text: value, attachment: file }) : { text: value }
-  await sendMutation.mutateAsync({ id: ticketId.value, payload })
+  // Backend POST /admin/tickets/:id/messages — body is { message: string }.
+  await sendMutation.mutateAsync({ id: ticketId.value, payload: { message: value } })
   await queryClient.invalidateQueries({ queryKey: adminTicketsKeys.all })
 }
 
diff --git a/src/features/admin/router.js b/src/features/admin/router.js
index 2ac1305..a3e107d 100644
--- a/src/features/admin/router.js
+++ b/src/features/admin/router.js
@@ -54,16 +54,28 @@ export default [
     meta: { layout: 'admin', role: 'admin', title: 'مدیریت دوره' },
   },
   {
-    path: '/add-course-template',
-    name: 'admin-add-course-template',
-    component: () => import('@/features/admin/courses/pages/CourseTemplateFormPage.vue'),
-    meta: { layout: 'admin', role: 'admin', title: 'افزودن دوره الگو' },
+    path: '/add-course',
+    name: 'admin-add-course',
+    component: () => import('@/features/admin/courses/pages/CourseFormPage.vue'),
+    meta: { layout: 'admin', role: 'admin', title: 'افزودن دوره' },
   },
   {
-    path: '/edit-course-template/:id',
-    name: 'admin-edit-course-template',
-    component: () => import('@/features/admin/courses/pages/CourseTemplateFormPage.vue'),
-    meta: { layout: 'admin', role: 'admin', title: 'ویرایش دوره الگو' },
+    path: '/edit-course/:id',
+    name: 'admin-edit-course',
+    component: () => import('@/features/admin/courses/pages/CourseFormPage.vue'),
+    meta: { layout: 'admin', role: 'admin', title: 'ویرایش دوره' },
+  },
+  {
+    path: '/terms/:termId/courses',
+    name: 'admin-term-courses',
+    component: () => import('@/features/admin/courses/pages/CoursesListPage.vue'),
+    meta: { layout: 'admin', role: 'admin', title: 'دوره‌های ترم' },
+  },
+  {
+    path: '/courses/:courseId/sessions',
+    name: 'admin-course-sessions',
+    component: () => import('@/features/admin/sessions/pages/SessionsListPage.vue'),
+    meta: { layout: 'admin', role: 'admin', title: 'جلسات دوره' },
   },
   {
     path: '/sessions',
diff --git a/src/features/admin/sessions/components/SessionItem.vue b/src/features/admin/sessions/components/SessionItem.vue
index 536e8a0..a219166 100644
--- a/src/features/admin/sessions/components/SessionItem.vue
+++ b/src/features/admin/sessions/components/SessionItem.vue
@@ -13,7 +13,7 @@
     <div class="session-item__meta">
       <div class="session-item__pill">
         <span class="session-item__pill-label">متعلق به دوره:</span>
-        <span class="session-item__pill-value">{{ session.courseTemplate?.title || '—' }}</span>
+        <span class="session-item__pill-value">{{ session.course?.title || '—' }}</span>
       </div>
       <div class="session-item__pill">
         <span class="session-item__pill-label">مدت جلسه:</span>
diff --git a/src/features/admin/sessions/components/SessionsFilters.vue b/src/features/admin/sessions/components/SessionsFilters.vue
index 50503f1..06b0bab 100644
--- a/src/features/admin/sessions/components/SessionsFilters.vue
+++ b/src/features/admin/sessions/components/SessionsFilters.vue
@@ -7,9 +7,9 @@
         </template>
       </TextField>
       <SelectField
-        v-model="form.courseTemplateId"
-        name="courseTemplateId"
-        label="دوره الگو"
+        v-model="form.courseId"
+        name="courseId"
+        label="دوره"
         :options="templateOptions"
         option-label="title"
         option-value="id"
@@ -64,14 +64,14 @@ import TextField from '@/components/form/TextField.vue'
 import CircleButton from '@/components/CircleButton.vue'
 import SelectField from '@/components/form/SelectField.vue'
 import DatePickerField from '@/components/form/DatePickerField.vue'
-import { useAdminCourseTemplatesListQuery } from '@/services/query/admin-course-templates'
+import { useAdminCoursesListQuery } from '@/services/query/admin-courses'
 
 const props = defineProps({
   modelValue: {
     type: Object,
     default: () => ({
       title: '',
-      courseTemplateId: '',
+      courseId: '',
       sessionType: '',
       fromDate: '',
       toDate: '',
@@ -83,7 +83,7 @@ const emit = defineEmits(['update:modelValue', 'apply', 'reset'])
 
 const emptyForm = () => ({
   title: '',
-  courseTemplateId: '',
+  courseId: '',
   sessionType: '',
   fromDate: '',
   toDate: '',
@@ -109,10 +109,7 @@ const sessionTypeOptions = Object.entries(SESSION_TYPE).map(([value, label]) =>
 const templateSearch = ref('')
 const templateFilters = computed(() => ({ title: templateSearch.value }))
 const templatePagination = ref({ page: 1, perPage: 30 })
-const { data: templatesResponse } = useAdminCourseTemplatesListQuery(
-  templateFilters,
-  templatePagination
-)
+const { data: templatesResponse } = useAdminCoursesListQuery(templateFilters, templatePagination)
 const templateOptions = computed(() => templatesResponse.value?.data ?? [])
 
 const searchTemplates = useDebounce((q) => {
diff --git a/src/features/admin/sessions/components/modals/SessionDetailsModal.vue b/src/features/admin/sessions/components/modals/SessionDetailsModal.vue
index 7b63ece..7ba2c1a 100644
--- a/src/features/admin/sessions/components/modals/SessionDetailsModal.vue
+++ b/src/features/admin/sessions/components/modals/SessionDetailsModal.vue
@@ -13,8 +13,8 @@
             </div>
             <div class="session-details__hero-info">
               <p class="session-details__title">{{ session.title || '—' }}</p>
-              <p v-if="session.courseTemplate?.title" class="session-details__sub">
-                دوره: {{ session.courseTemplate.title }}
+              <p v-if="session.course?.title" class="session-details__sub">
+                دوره: {{ session.course.title }}
               </p>
             </div>
           </div>
diff --git a/src/features/admin/sessions/pages/SessionFormPage.vue b/src/features/admin/sessions/pages/SessionFormPage.vue
index a581c82..8e0a5a7 100644
--- a/src/features/admin/sessions/pages/SessionFormPage.vue
+++ b/src/features/admin/sessions/pages/SessionFormPage.vue
@@ -11,182 +11,143 @@
     </BoxedIconTitleBlock>
 
     <form class="session-form__form" @submit.prevent="onSubmit">
-      <div class="session-form__grid">
-        <div class="session-form__image-col">
-          <ImageCropper
-            v-model="image"
-            name="image"
-            bg-color="#eeeeee"
-            @crop="onImageCropped"
-            @error="onImageError"
-          />
-        </div>
+      <LineTitleBlock title="اطلاعات جلسه" title-en="Session Details" />
 
-        <div class="session-form__main-col">
-          <LineTitleBlock title="اطلاعات جلسه" title-en="Session Details" />
-          <div class="session-form__row">
-            <div class="session-form__cell session-form__cell--third">
-              <TextField
-                v-model="form.title"
-                name="title"
-                label="عنوان جلسه"
-                :error="errors.title"
-                @blur="validateAt('title', form.title)"
-              >
-                <template #appendIcon>
-                  <SvgIcon name="book" :size="20" color="var(--color-thd-gray)" />
-                </template>
-              </TextField>
-            </div>
-            <div class="session-form__cell session-form__cell--third">
-              <SelectField
-                v-model="form.courseTemplateId"
-                name="courseTemplateId"
-                label="دوره الگو"
-                :options="templateOptions"
-                option-label="title"
-                option-value="id"
-                :searchable="true"
-                :on-search="searchTemplates"
-                :error="errors.courseTemplateId"
-              />
-            </div>
-            <div class="session-form__cell session-form__cell--third">
-              <SelectField
-                v-model="form.sessionType"
-                name="sessionType"
-                label="نوع جلسه"
-                :options="sessionTypeOptions"
-                option-label="label"
-                option-value="value"
-                :error="errors.sessionType"
-              />
-            </div>
-            <div class="session-form__cell session-form__cell--third">
-              <TextField
-                v-model="form.durationMinutes"
-                name="durationMinutes"
-                label="مدت زمان (دقیقه)"
-                inputmode="numeric"
-                :convert-digits="true"
-                :error="errors.durationMinutes"
-                @blur="validateAt('durationMinutes', form.durationMinutes)"
-              />
-            </div>
-            <div class="session-form__cell session-form__cell--third">
-              <TextField
-                v-model="form.order"
-                name="order"
-                label="ترتیب"
-                inputmode="numeric"
-                :convert-digits="true"
-                :error="errors.order"
-              />
-            </div>
+      <!-- row 1 — title / startTime / endTime -->
+      <div class="session-form__row session-form__row--three">
+        <TextField
+          v-model="form.title"
+          name="title"
+          label="عنوان جلسه"
+          :error="errors.title"
+          @blur="validateAt('title', form.title)"
+        >
+          <template #appendIcon>
+            <SvgIcon name="book" :size="20" color="var(--color-thd-gray)" />
+          </template>
+        </TextField>
+        <DatePickerField
+          v-model="form.startTime"
+          name="startTime"
+          label="زمان شروع"
+          type="datetime"
+          :error="errors.startTime"
+          @blur="validateAt('startTime', form.startTime)"
+        />
+        <DatePickerField
+          v-model="form.endTime"
+          name="endTime"
+          label="زمان پایان"
+          type="datetime"
+          :error="errors.endTime"
+        />
+      </div>
 
-            <template v-if="form.sessionType === 'online'">
-              <div class="session-form__cell session-form__cell--third">
-                <TextField
-                  v-model="form.sessionConfig.meetingLink"
-                  name="meetingLink"
-                  label="لینک جلسه"
-                />
-              </div>
-              <div class="session-form__cell session-form__cell--third">
-                <SelectField
-                  v-model="form.sessionConfig.platform"
-                  name="platform"
-                  label="پلتفرم"
-                  :options="platformOptions"
-                  option-label="label"
-                  option-value="value"
-                />
-              </div>
-              <div class="session-form__cell session-form__cell--third">
-                <DatePickerField
-                  v-model="form.sessionConfig.startTime"
-                  name="startTime"
-                  label="تاریخ و ساعت شروع"
-                  type="datetime"
-                />
-              </div>
-            </template>
+      <!-- row 2 — durationMinutes / courseId / contentType -->
+      <div class="session-form__row session-form__row--three">
+        <TextField
+          v-model="form.durationMinutes"
+          name="durationMinutes"
+          label="مدت زمان جلسه (دقیقه)"
+          inputmode="numeric"
+          :convert-digits="true"
+          :error="errors.durationMinutes"
+          @blur="validateAt('durationMinutes', form.durationMinutes)"
+        />
+        <SelectField
+          v-model="form.courseId"
+          name="courseId"
+          label="دوره"
+          :options="courseOptions"
+          option-label="title"
+          option-value="id"
+          :searchable="true"
+          :on-search="searchCourses"
+          :error="errors.courseId"
+        />
+        <SelectField
+          v-model="form.contentType"
+          name="contentType"
+          label="محتوای جلسه"
+          :options="contentTypeOptions"
+          option-label="label"
+          option-value="value"
+          :error="errors.contentType"
+          @change="onContentTypeChange"
+        />
+      </div>
 
-            <template v-else-if="form.sessionType === 'in_person'">
-              <div class="session-form__cell session-form__cell--third">
-                <DatePickerField
-                  v-model="form.sessionConfig.startTime"
-                  name="startTime"
-                  label="تاریخ و ساعت شروع"
-                  type="datetime"
-                />
-              </div>
-              <div class="session-form__cell session-form__cell--full">
-                <TextField
-                  v-model="form.sessionConfig.location"
-                  name="location"
-                  label="مکان جلسه"
-                />
-              </div>
-            </template>
+      <!-- row 3 — sessionType / meetingLink -->
+      <div class="session-form__row session-form__row--two">
+        <SelectField
+          v-model="form.sessionType"
+          name="sessionType"
+          label="نوع جلسه"
+          :options="sessionTypeOptions"
+          option-label="label"
+          option-value="value"
+          :error="errors.sessionType"
+          @change="onSessionTypeChange"
+        />
+        <TextField
+          v-model="form.meetingLink"
+          name="meetingLink"
+          label="لینک جلسه"
+          :disabled="form.sessionType !== 'online'"
+          :error="errors.meetingLink"
+          @blur="validateAt('meetingLink', form.meetingLink)"
+        />
+      </div>
 
-            <template v-else-if="['video', 'audio'].includes(form.sessionType)">
-              <div class="session-form__cell session-form__cell--third">
-                <TextField
-                  v-model="form.sessionConfig.minWatchedPercent"
-                  name="minWatchedPercent"
-                  label="حداقل درصد مشاهده (%)"
-                  inputmode="numeric"
-                  :convert-digits="true"
-                />
-              </div>
-              <div class="session-form__cell session-form__cell--third session-form__toggle-cell">
-                <ToggleSwitch
-                  v-model="form.sessionConfig.mustCompleteBeforeNext"
-                  label="الزام تکمیل قبل از جلسه بعدی"
-                />
-              </div>
-            </template>
+      <!-- row 4 — description -->
+      <div class="session-form__row">
+        <TextareaField
+          v-model="form.description"
+          name="description"
+          label="توضیحات جلسه"
+          :row="5"
+        />
+      </div>
 
-            <template v-else-if="['text', 'slide', 'pdf'].includes(form.sessionType)">
-              <div class="session-form__cell session-form__cell--third">
-                <TextField
-                  v-model="form.sessionConfig.minReadPercent"
-                  name="minReadPercent"
-                  label="حداقل درصد مطالعه (%)"
-                  inputmode="numeric"
-                  :convert-digits="true"
-                />
-              </div>
-              <div class="session-form__cell session-form__cell--third session-form__toggle-cell">
-                <ToggleSwitch
-                  v-model="form.sessionConfig.mustCompleteBeforeNext"
-                  label="الزام تکمیل قبل از جلسه بعدی"
-                />
-              </div>
-            </template>
+      <!-- row 5 — content uploader -->
+      <div class="session-form__row">
+        <label class="session-form__uploader-label">محتوای جلسه</label>
+        <FileUploader
+          v-model="contentFiles"
+          :accept="contentAccept"
+          :multiple="false"
+          :max-files="1"
+          :disabled="!form.contentType"
+          @select="onContentSelect"
+          @remove="onContentRemove"
+          @error="onContentError"
+        />
+      </div>
 
-            <div class="session-form__cell session-form__cell--full">
-              <TextareaField
-                v-model="form.description"
-                name="description"
-                label="توضیحات"
-                :row="5"
-              />
-            </div>
-          </div>
-
-          <div class="session-form__materials">
-            <LineTitleBlock title="فایل‌های جلسه" title-en="Session Materials" />
-            <FileUploader
-              v-model="materials"
-              accept=".mp4,.mov,.avi,.mp3,.wav,.jpg,.jpeg,.png,.pdf,.txt,.doc,.docx"
-              :multiple="true"
-              :max-files="10"
-              context="session"
-            />
-          </div>
-        </div>
+      <!-- row 6 — preview of uploaded content -->
+      <div v-if="contentPreviewUrl" class="session-form__row session-form__preview">
+        <video
+          v-if="form.contentType === 'video'"
+          :src="contentPreviewUrl"
+          controls
+          class="session-form__media"
+        />
+        <audio
+          v-else-if="form.contentType === 'voice'"
+          :src="contentPreviewUrl"
+          controls
+          class="session-form__media"
+        />
+        <a
+          v-else
+          :href="contentPreviewUrl"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="session-form__file-link"
+        >
+          <SvgIcon name="file" :size="18" color="var(--color-primary)" />
+          <span>{{ contentFiles[0]?.name || 'فایل پیوست' }}</span>
+        </a>
       </div>
 
       <div class="session-form__divider" />
@@ -227,19 +188,17 @@ import { useQueryClient } from '@tanstack/vue-query'
 import BaseButton from '@/components/BaseButton.vue'
 import SvgIcon from '@/components/icons/SvgIcon.vue'
 import TextField from '@/components/form/TextField.vue'
-import { SESSION_PLATFORM, SESSION_TYPE } from '@/enums'
 import SelectField from '@/components/form/SelectField.vue'
 import LineTitleBlock from '@/components/LineTitleBlock.vue'
-import ToggleSwitch from '@/components/form/ToggleSwitch.vue'
-import ImageCropper from '@/components/form/ImageCropper.vue'
 import FileUploader from '@/components/form/FileUploader.vue'
 import { objectToFormData } from '@/utils/object-to-formdata'
+import { useUploadMediaMutation } from '@/services/query/auth'
 import TextareaField from '@/components/form/TextareaField.vue'
 import { sessionSchema } from '@/features/admin/sessions/schema'
-import { useUploadMediaMutation } from '@/services/query/auth'
 import DatePickerField from '@/components/form/DatePickerField.vue'
+import { useAdminCoursesListQuery } from '@/services/query/admin-courses'
 import BoxedIconTitleBlock from '@/components/blocks/BoxedIconTitleBlock.vue'
-import { useAdminCourseTemplatesListQuery } from '@/services/query/admin-course-templates'
+import { COURSE_CONTENT_TYPE, COURSE_CONTENT_TYPE_ACCEPT, SESSION_TYPE } from '@/enums'
 import {
   adminSessionsKeys,
   useAddAdminSessionMutation,
@@ -254,149 +213,146 @@ const queryClient = useQueryClient()
 const sessionId = computed(() => (route.params.id ? Number(route.params.id) : null))
 const isEditMode = computed(() => !!sessionId.value)
 
-const sessionTypeOptions = Object.entries(SESSION_TYPE).map(([value, label]) => ({
-  value,
-  label,
-}))
-const platformOptions = Object.entries(SESSION_PLATFORM).map(([value, label]) => ({
-  value,
-  label,
-}))
+// نوع جلسه: only the two delivery modes — backend `type` collapses to online/offline.
+const sessionTypeOptions = [
+  { value: 'in_person', label: SESSION_TYPE.in_person },
+  { value: 'online', label: SESSION_TYPE.online },
+]
 
-const emptySessionConfig = () => ({
-  meetingLink: '',
-  platform: '',
-  startTime: '',
-  location: '',
-  minWatchedPercent: '',
-  minReadPercent: '',
-  mustCompleteBeforeNext: false,
-})
+// محتوای جلسه: voice / video / text — reuses the course content-type enum.
+const contentTypeOptions = Object.entries(COURSE_CONTENT_TYPE).map(([value, label]) => ({
+  value,
+  label,
+}))
 
 const form = ref({
   title: '',
-  courseTemplateId: '',
-  sessionType: '',
+  startTime: '',
+  endTime: '',
   durationMinutes: '',
-  order: '',
+  courseId: '',
+  contentType: '',
+  sessionType: '',
+  meetingLink: '',
   description: '',
-  imageId: null,
-  sessionConfig: emptySessionConfig(),
+  contentMediaId: null,
 })
 
-const image = ref(null)
-const materials = ref([])
+const contentFiles = ref([])
 
-const schema = sessionSchema
+const contentAccept = computed(() => COURSE_CONTENT_TYPE_ACCEPT[form.value.contentType] || '*')
+const contentPreviewUrl = computed(() => contentFiles.value[0]?.url || '')
 
-const { validate, validateAt, errors } = useYup(schema)
+const { validate, validateAt, errors } = useYup(sessionSchema)
 
-const templateSearch = ref('')
-const templateFilters = computed(() => ({ title: templateSearch.value }))
-const templatePagination = ref({ page: 1, perPage: 30 })
-const { data: templatesResponse } = useAdminCourseTemplatesListQuery(
-  templateFilters,
-  templatePagination
-)
-const selectedTemplate = ref(null)
-const templateOptions = computed(() => {
-  const base = templatesResponse.value?.data ?? []
-  if (selectedTemplate.value && !base.some((t) => t.id === selectedTemplate.value.id)) {
-    return [...base, selectedTemplate.value]
+const courseSearch = ref('')
+const courseFilters = computed(() => ({ title: courseSearch.value }))
+const coursePagination = ref({ page: 1, perPage: 30 })
+const { data: coursesResponse } = useAdminCoursesListQuery(courseFilters, coursePagination)
+const selectedCourse = ref(null)
+const courseOptions = computed(() => {
+  const base = coursesResponse.value?.data ?? []
+  if (selectedCourse.value && !base.some((c) => c.id === selectedCourse.value.id)) {
+    return [...base, selectedCourse.value]
   }
   return base
 })
 
-const searchTemplates = useDebounce((q) => {
-  templateSearch.value = q || ''
+const searchCourses = useDebounce((q) => {
+  courseSearch.value = q || ''
 }, 400)
 
+const onContentTypeChange = () => {
+  contentFiles.value = []
+  form.value.contentMediaId = null
+}
+
+const onSessionTypeChange = () => {
+  if (form.value.sessionType !== 'online') form.value.meetingLink = ''
+}
+
 const { data: existingSession } = useAdminSessionQuery(sessionId, {
   enabled: () => !!sessionId.value,
 })
 
 watch(existingSession, (session) => {
   if (!session) return
-  if (session.courseTemplate) {
-    selectedTemplate.value = session.courseTemplate
-  }
+  if (session.course) selectedCourse.value = session.course
   form.value = {
     title: session.title || '',
-    courseTemplateId: session.courseTemplate?.id || session.courseTemplateId || '',
-    sessionType: session.sessionType || '',
+    startTime: session.startsAt || session.sessionConfig?.startTime || '',
+    endTime: session.endsAt || session.sessionConfig?.endTime || '',
     durationMinutes: session.durationMinutes ?? '',
-    order: session.order ?? '',
+    courseId: session.course?.id || session.courseId || '',
+    contentType: session.contentType || '',
+    sessionType: session.sessionType || '',
+    meetingLink: session.link || session.sessionConfig?.meetingLink || '',
     description: session.description || '',
-    imageId: session.imageId || null,
-    sessionConfig: { ...emptySessionConfig(), ...session.sessionConfig },
+    contentMediaId: session.contentMediaId || null,
   }
-  if (session.image) image.value = { url: session.image }
-  if (Array.isArray(session.materials)) {
-    materials.value = session.materials.map((m) => ({
-      id: m.id,
-      name: m.title || `فایل ${m.id}`,
-      url: m.filePath || '',
-      type: m.type,
-    }))
+  if (session.contentMedia) {
+    contentFiles.value = [
+      {
+        id: session.contentMedia.id,
+        name: session.contentMedia.fileName || session.contentMedia.name || 'file',
+        size: session.contentMedia.fileSize ?? 0,
+        url: session.contentMedia.url,
+      },
+    ]
   }
 })
 
 const uploadMutation = useUploadMediaMutation()
 
-const onImageCropped = async (file) => {
+const purposeForContentType = (contentType) => {
+  if (contentType === 'video') return 'video'
+  if (contentType === 'voice') return 'voice'
+  return 'attachment'
+}
+
+const onContentSelect = async (files) => {
+  const file = files?.[0]
+  if (!file) return
   try {
-    const formData = objectToFormData({ file, subType: 'avatar', context: 'session' })
+    const formData = objectToFormData({
+      file,
+      purpose: purposeForContentType(form.value.contentType),
+      context: 'session',
+    })
     const response = await uploadMutation.mutateAsync(formData)
     const payload = response?.data ?? response
-    image.value = { url: payload?.url, uploadId: payload?.uploadId, ...payload }
-    form.value.imageId = payload?.uploadId || payload?.id
+    const id = payload?.id ?? payload?.uploadId
+    contentFiles.value = [{ id, name: file.name, size: file.size, url: payload?.url }]
+    form.value.contentMediaId = id
   } catch {
-    /* handled globally */
+    contentFiles.value = []
   }
 }
 
-const onImageError = (msg) => toast.error(msg)
-
-const cleanSessionConfig = (config, type) => {
-  const result = {}
-  const allow = (key) => {
-    if (type === 'online') return ['meetingLink', 'platform', 'startTime'].includes(key)
-    if (type === 'in_person') return ['startTime', 'location'].includes(key)
-    if (['video', 'audio'].includes(type))
-      return ['minWatchedPercent', 'mustCompleteBeforeNext'].includes(key)
-    if (['text', 'slide', 'pdf'].includes(type))
-      return ['minReadPercent', 'mustCompleteBeforeNext'].includes(key)
-    return false
-  }
-  Object.entries(config || {}).forEach(([k, v]) => {
-    if (!allow(k)) return
-    if (v === '' || v === null || v === undefined) return
-    result[k] = v
-  })
-  return result
+const onContentRemove = () => {
+  contentFiles.value = []
+  form.value.contentMediaId = null
 }
 
+const onContentError = (msg) => toast.error(msg)
+
 const buildPayload = (values) => {
-  const sessionConfig = cleanSessionConfig(values.sessionConfig, values.sessionType)
   const payload = {
     title: values.title,
-    courseTemplateId: values.courseTemplateId,
-    sessionType: values.sessionType,
+    startTime: values.startTime,
+    endTime: values.endTime,
     durationMinutes: values.durationMinutes,
-    order: values.order,
+    courseId: values.courseId,
+    contentType: values.contentType,
+    sessionType: values.sessionType,
+    meetingLink: values.sessionType === 'online' ? values.meetingLink : undefined,
     description: values.description,
-    imageId: values.imageId,
+    contentMediaId: values.contentMediaId,
   }
-  if (Object.keys(sessionConfig).length > 0) payload.sessionConfig = sessionConfig
-  payload.materials = materials.value.map((m, index) => ({
-    fileId: m.id,
-    isRequired: false,
-    type: m.type,
-    title: m.name,
-    order: index + 1,
-  }))
   Object.keys(payload).forEach((key) => {
-    if (payload[key] === undefined || payload[key] === '') delete payload[key]
+    if (payload[key] === undefined || payload[key] === '' || payload[key] === null) {
+      delete payload[key]
+    }
   })
   return payload
 }
@@ -436,82 +392,72 @@ const onCancel = () => router.push({ name: 'admin-sessions' })
     background: rgba(255, 255, 255, 60%);
     padding: 1rem;
     border-radius: 1rem;
-  }
-
-  &__grid {
-    display: grid;
-    grid-template-columns: 1fr;
-    gap: 1rem;
-
-    @media (min-width: 1024px) {
-      grid-template-columns: 4fr 8fr;
-    }
-
-    @media (min-width: 1280px) {
-      grid-template-columns: 3fr 9fr;
-    }
-  }
-
-  &__image-col {
-    order: 2;
-
-    @media (min-width: 1024px) {
-      order: 1;
-      padding: 0.5rem;
-    }
-  }
-
-  &__main-col {
-    order: 1;
-
-    @media (min-width: 1024px) {
-      order: 2;
-      padding-inline-start: 1.25rem;
-    }
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
   }
 
   &__row {
-    display: flex;
-    flex-flow: column wrap;
+    display: grid;
+    grid-template-columns: 1fr;
     gap: 0.5rem;
-    align-items: stretch;
-    margin-bottom: 0.5rem;
 
-    @media (min-width: 768px) {
-      flex-direction: row;
-    }
-  }
-
-  &__cell {
-    width: 100%;
-
-    &--third {
+    &--two {
       @media (min-width: 768px) {
-        width: 49%;
-      }
-
-      @media (min-width: 1280px) {
-        width: 32.3%;
+        grid-template-columns: repeat(2, 1fr);
       }
     }
 
-    &--full {
-      width: 100%;
+    &--three {
+      @media (min-width: 768px) {
+        grid-template-columns: repeat(2, 1fr);
+      }
+
+      @media (min-width: 1024px) {
+        grid-template-columns: repeat(3, 1fr);
+      }
     }
   }
 
-  &__toggle-cell {
-    display: flex;
+  &__uploader-label {
+    display: block;
+    margin-bottom: 0.5rem;
+    font-family: var(--font-family-fa);
+    font-weight: 300;
+    line-height: 1.5rem;
+    font-size: 0.875rem;
+    color: var(--color-prim-gray);
+  }
+
+  &__preview {
     align-items: center;
+    justify-items: center;
   }
 
-  &__materials {
-    margin-top: 1.5rem;
+  &__media {
+    max-width: 100%;
+    border-radius: 0.75rem;
+    background: #000;
+  }
+
+  &__file-link {
+    display: inline-flex;
+    align-items: center;
+    gap: 0.5rem;
+    color: var(--color-primary);
+    text-decoration: none;
+    font-family: var(--font-family-fa);
+    font-size: 0.875rem;
+    padding: 0.5rem 0;
+
+    &:hover {
+      text-decoration: underline;
+    }
   }
 
   &__divider {
     border-block-end: 1px solid var(--color-thd-gray);
-    margin-block: 1.5rem;
+    margin-block: 1rem;
   }
 
   &__actions {
diff --git a/src/features/admin/sessions/pages/SessionsListPage.vue b/src/features/admin/sessions/pages/SessionsListPage.vue
index 9b00749..52d560a 100644
--- a/src/features/admin/sessions/pages/SessionsListPage.vue
+++ b/src/features/admin/sessions/pages/SessionsListPage.vue
@@ -47,12 +47,12 @@
 </template>
 
 <script setup>
-import { computed, ref } from 'vue'
-import { useRouter } from 'vue-router'
 import useModal from '@/composables/useModal'
+import { useRoute, useRouter } from 'vue-router'
 import { useQueryClient } from '@tanstack/vue-query'
 import BaseButton from '@/components/BaseButton.vue'
 import SvgIcon from '@/components/icons/SvgIcon.vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import NoItems from '@/components/blocks/NoItems.vue'
 import { usePagination } from '@/composables/usePagination'
 import PaginationBlock from '@/components/blocks/PaginationBlock.vue'
@@ -69,19 +69,31 @@ import {
   useDeleteAdminSessionMutation,
 } from '@/services/query/admin-sessions'
 
+const route = useRoute()
 const router = useRouter()
 const queryClient = useQueryClient()
 const { openModal, isModal } = useModal()
 
+const routeCourseId = computed(() => (route.params.courseId ? Number(route.params.courseId) : null))
+
 const filters = ref({
   title: '',
-  courseTemplateId: '',
+  courseId: routeCourseId.value ?? '',
   sessionType: '',
   fromDate: '',
   toDate: '',
 })
 const { pagination, setPage, reset: resetPagination } = usePagination({ page: 1, perPage: 10 })
 
+const syncRouteCourseId = (courseId) => {
+  if (!courseId) return
+  filters.value = { ...filters.value, courseId }
+  resetPagination()
+}
+
+onMounted(() => syncRouteCourseId(routeCourseId.value))
+watch(routeCourseId, (val) => syncRouteCourseId(val))
+
 const { data, isLoading } = useAdminSessionsListQuery(filters, pagination, {
   keepPreviousData: true,
 })
diff --git a/src/features/admin/sessions/schema/index.js b/src/features/admin/sessions/schema/index.js
index d7623b1..1fb3804 100644
--- a/src/features/admin/sessions/schema/index.js
+++ b/src/features/admin/sessions/schema/index.js
@@ -1,10 +1,18 @@
 import { number, object, string } from 'yup'
 
 export const sessionSchema = object().shape({
-  courseTemplateId: string().required(),
   title: string().required().min(3),
-  sessionType: string().required(),
-  durationMinutes: number().typeError('مدت زمان باید عدد باشد').required(),
-  order: number().typeError('ترتیب باید عدد باشد').nullable().notRequired(),
+  startTime: string().required(),
+  endTime: string().nullable().notRequired(),
+  durationMinutes: number().typeError('مدت زمان باید عدد باشد').required().min(1),
+  courseId: string().required(),
+  contentType: string().oneOf(['voice', 'video', 'text']).required(),
+  sessionType: string().oneOf(['in_person', 'online']).required(),
+  meetingLink: string().when('sessionType', {
+    is: 'online',
+    then: (schema) => schema.required(),
+    otherwise: (schema) => schema.nullable().notRequired(),
+  }),
   description: string().nullable().notRequired(),
+  contentMediaId: number().nullable().notRequired(),
 })
diff --git a/src/features/admin/terms/components/CourseItem.vue b/src/features/admin/terms/components/CourseItem.vue
new file mode 100644
index 0000000..ebbca13
--- /dev/null
+++ b/src/features/admin/terms/components/CourseItem.vue
@@ -0,0 +1,229 @@
+<template>
+  <div class="course-item">
+    <div class="course-item__main">
+      <div v-if="course.image" class="course-item__image">
+        <img :src="course.image" :alt="course.title" />
+      </div>
+      <div v-else class="course-item__image course-item__image--placeholder">
+        <SvgIcon name="book" :size="22" color="#bcbcbc" />
+      </div>
+      <div class="course-item__title-block">
+        <p class="course-item__title">
+          <span>دوره</span>
+          <strong>{{ course.title }}</strong>
+        </p>
+        <div class="course-item__teacher">
+          <SvgIcon name="user" :size="11" color="#bcbcbc" />
+          <span class="course-item__teacher-label">استاد:</span>
+          <span class="course-item__teacher-name">{{ teacherName }}</span>
+        </div>
+      </div>
+    </div>
+
+    <div class="course-item__meta">
+      <Badge
+        variant="cyan"
+        size="sm"
+        icon="calendar"
+        :label="`وضعیت دوره :`"
+        :value="`در حال گذراندن`"
+      />
+    </div>
+
+    <div v-if="!isActive" class="course-item__status">
+      <span class="course-item__status-badge">
+        <span class="course-item__status-dot" />
+        غیرفعال
+      </span>
+    </div>
+
+    <div class="course-item__actions">
+      <CircleButton
+        tooltip="حذف"
+        bg-color="rgba(104, 104, 104, 0.05)"
+        size="2.5rem"
+        @click="emit('delete', course)"
+      >
+        <template #icon>
+          <SvgIcon name="trash" :size="18" color="var(--color-error)" />
+        </template>
+      </CircleButton>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import Badge from '@/components/Badge.vue'
+import SvgIcon from '@/components/icons/SvgIcon.vue'
+import CircleButton from '@/components/CircleButton.vue'
+
+const props = defineProps({
+  course: { type: Object, required: true },
+})
+
+const emit = defineEmits(['delete'])
+
+const teacherName = computed(() => {
+  const t = props.course.teacher
+  if (!t) return '—'
+  return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
+})
+
+const isActive = computed(() => props.course.isActive ?? false)
+</script>
+
+<style lang="scss" scoped>
+.course-item {
+  display: flex;
+  flex-direction: column;
+  gap: 0.625rem;
+  padding: 0.75rem;
+  background: rgba(255, 255, 255, 50%);
+  box-shadow: 0 4px 10px -6px rgba(241, 241, 241, 90%);
+  border-radius: 0.875rem;
+  margin-bottom: 0.625rem;
+
+  @media (min-width: 1280px) {
+    flex-flow: row wrap;
+    align-items: center;
+  }
+
+  &__main {
+    display: flex;
+    align-items: center;
+    gap: 0.625rem;
+    flex: 1 1 33%;
+    min-width: 0;
+  }
+
+  &__image {
+    width: 3rem;
+    height: 3rem;
+    min-width: 3rem;
+    border-radius: 0.375rem;
+    border: 1px solid #eee;
+    overflow: hidden;
+    flex-shrink: 0;
+
+    img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+
+    &--placeholder {
+      background: #f5f5f5;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: none;
+    }
+  }
+
+  &__title-block {
+    min-width: 0;
+  }
+
+  &__title {
+    font-family: var(--font-family-fa);
+    font-size: 0.95rem;
+    color: #4b4b4b;
+    margin: 0;
+    display: flex;
+    gap: 0.25rem;
+
+    strong {
+      font-weight: 700;
+    }
+  }
+
+  &__teacher {
+    display: flex;
+    align-items: center;
+    gap: 0.25rem;
+    margin-top: 0.25rem;
+  }
+
+  &__teacher-label {
+    font-family: var(--font-family-fa);
+    font-size: 0.65rem;
+    color: #838383;
+  }
+
+  &__teacher-name {
+    font-family: var(--font-family-fa);
+    font-size: 0.75rem;
+    color: #4b4b4b;
+  }
+
+  &__meta {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.375rem;
+    flex: 1 1 33%;
+    justify-content: flex-start;
+  }
+
+  &__pill {
+    background: rgba(107, 107, 107, 5%);
+    padding: 0.25rem 1rem;
+    border-radius: 0.875rem;
+    line-height: 1.5;
+    white-space: nowrap;
+  }
+
+  &__pill-label {
+    font-family: var(--font-family-fa);
+    font-weight: 300;
+    font-size: 0.75rem;
+    color: #848484;
+    margin-inline-end: 0.25rem;
+  }
+
+  &__pill-value {
+    font-family: var(--font-family-en);
+    font-size: 0.75rem;
+  }
+
+  &__status {
+    flex: 0 0 auto;
+  }
+
+  &__status-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 0.375rem;
+    padding: 0.25rem 1rem;
+    border-radius: 0.875rem;
+    background: rgba(204, 40, 49, 6%);
+    color: var(--color-error);
+    font-family: var(--font-family-fa);
+    font-size: 0.7rem;
+  }
+
+  &__status-dot {
+    width: 0.375rem;
+    height: 0.375rem;
+    border-radius: 9999px;
+    background: currentcolor;
+  }
+
+  &__actions {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    gap: 0.375rem;
+    flex: 1 1 100%;
+
+    @media (min-width: 1280px) {
+      flex: 1 1 auto;
+    }
+  }
+
+  &__details-btn {
+    min-width: 8rem;
+    padding: 0 0.875rem;
+  }
+}
+</style>
diff --git a/src/features/admin/terms/components/TermItem.vue b/src/features/admin/terms/components/TermItem.vue
index ad0afbc..f12410a 100644
--- a/src/features/admin/terms/components/TermItem.vue
+++ b/src/features/admin/terms/components/TermItem.vue
@@ -43,16 +43,6 @@
           <SvgIcon name="trash" :size="18" color="var(--color-error)" />
         </template>
       </CircleButton>
-      <CircleButton
-        tooltip="کپی"
-        bg-color="rgba(104, 104, 104, 0.05)"
-        size="2.5rem"
-        @click="emit('clone', term)"
-      >
-        <template #icon>
-          <SvgIcon name="copy" :size="18" color="var(--color-sec-gray)" />
-        </template>
-      </CircleButton>
       <CircleButton
         tooltip="ویرایش"
         bg-color="rgba(104, 104, 104, 0.05)"
@@ -90,10 +80,8 @@ const props = defineProps({
 
 const emit = defineEmits(['edit', 'delete', 'clone', 'change-status', 'show-details'])
 
-const startDate = computed(
-  () => props.term.faStartDate || formatJalaaliDate(props.term.startDate) || ''
-)
-const endDate = computed(() => props.term.faEndDate || formatJalaaliDate(props.term.endDate) || '')
+const startDate = computed(() => formatJalaaliDate(props.term.startsAt) || '')
+const endDate = computed(() => formatJalaaliDate(props.term.endsAt) || '')
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/features/admin/terms/components/TermsFilters.vue b/src/features/admin/terms/components/TermsFilters.vue
index 9839c23..76eb5d0 100644
--- a/src/features/admin/terms/components/TermsFilters.vue
+++ b/src/features/admin/terms/components/TermsFilters.vue
@@ -28,7 +28,7 @@
         @click="onReset"
       >
         <template #icon>
-          <SvgIcon name="close" :size="20" />
+          <SvgIcon name="close" color="black" :size="20" />
         </template>
       </CircleButton>
       <CircleButton
diff --git a/src/features/admin/terms/components/modals/AttachCourseToTermModal.vue b/src/features/admin/terms/components/modals/AttachCourseToTermModal.vue
index 5855d17..933261f 100644
--- a/src/features/admin/terms/components/modals/AttachCourseToTermModal.vue
+++ b/src/features/admin/terms/components/modals/AttachCourseToTermModal.vue
@@ -96,14 +96,16 @@ import NoItems from '@/components/blocks/NoItems.vue'
 import CircleButton from '@/components/CircleButton.vue'
 import { adminTermsKeys } from '@/services/query/admin-terms'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
-import { useAdminCourseTemplatesListQuery } from '@/services/query/admin-course-templates'
 import {
   adminCoursesKeys,
-  useAddAdminCourseMutation,
   useAdminCoursesListQuery,
-  useDeleteAdminCourseMutation,
+  useUpdateAdminCourseMutation,
 } from '@/services/query/admin-courses'
 
+// TODO: repurpose this modal as "copy course from another term" — the original
+// flow (link a stand-alone template to a term) no longer matches the unified
+// course model. Until then, this stays a stand-alone-course → new-offered-course copy.
+
 defineOptions({ name: 'AttachCourseToTermModal' })
 
 const queryClient = useQueryClient()
@@ -116,7 +118,7 @@ const searchQuery = ref('')
 const templateFilters = computed(() => ({ title: searchQuery.value }))
 const templatePagination = ref({ page: 1, perPage: 20 })
 
-const { data: templatesResponse, isLoading } = useAdminCourseTemplatesListQuery(
+const { data: templatesResponse, isLoading } = useAdminCoursesListQuery(
   templateFilters,
   templatePagination
 )
@@ -124,18 +126,24 @@ const { data: templatesResponse, isLoading } = useAdminCourseTemplatesListQuery(
 const templates = computed(() => templatesResponse.value?.data ?? [])
 
 const courseFilters = computed(() => ({ termId: termId.value }))
-const coursePagination = ref({ page: 1, perPage: 100 })
+const coursePagination = ref({ page: 1, perPage: 10 })
 const { data: coursesResponse } = useAdminCoursesListQuery(courseFilters, coursePagination, {
   enabled: () => !!termId.value,
 })
 
 const attachedCourses = computed(() => coursesResponse.value?.data ?? [])
 
-const attachedCourseByTemplate = (templateId) =>
-  attachedCourses.value.find((c) => c.template?.id === templateId || c.templateId === templateId)
+// Tracks which stand-alone course (termId=null) has already been copied
+// into this term. We match by title since the unified model no longer
+// keeps a back-reference to the source course.
+const attachedCourseByTemplate = (sourceId) => {
+  const source = templates.value.find((t) => t.id === sourceId)
+  if (!source) return null
+  return attachedCourses.value.find((c) => c.title === source.title)
+}
 
-const teacherName = (template) => {
-  const t = template.defaultTeacher || template.teacher
+const teacherName = (course) => {
+  const t = course.teacher
   if (!t) return '—'
   return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
 }
@@ -147,8 +155,7 @@ const onSearch = useDebounce((event) => {
 
 const pendingId = ref(null)
 
-const addMutation = useAddAdminCourseMutation()
-const deleteMutation = useDeleteAdminCourseMutation()
+const updateMutation = useUpdateAdminCourseMutation()
 
 const invalidate = () => {
   queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
@@ -156,16 +163,12 @@ const invalidate = () => {
 }
 
 const onAttach = async (template) => {
+  console.log(template)
+
   if (!termId.value) return
   pendingId.value = template.id
   try {
-    await addMutation.mutateAsync({
-      termId: termId.value,
-      templateId: template.id,
-      title: template.title,
-      capacity: template.defaultCapacity ?? null,
-      isActive: template.isActiveByDefault ?? true,
-    })
+    await updateMutation.mutateAsync({ id: template.id, payload: { termId: termId.value } })
     invalidate()
   } finally {
     pendingId.value = null
@@ -177,7 +180,7 @@ const onDetach = async (template) => {
   if (!offered) return
   pendingId.value = template.id
   try {
-    await deleteMutation.mutateAsync(offered.id)
+    await updateMutation.mutateAsync({ id: template.id, payload: { termId: null } })
     invalidate()
   } finally {
     pendingId.value = null
@@ -303,7 +306,7 @@ watch(termId, () => {
 
   &__footer {
     display: flex;
-    justify-content: flex-start;
+    justify-content: flex-end;
   }
 
   &__close-btn {
diff --git a/src/features/admin/terms/components/modals/TermDetailsModal.vue b/src/features/admin/terms/components/modals/TermDetailsModal.vue
index 54603d6..7a6ec91 100644
--- a/src/features/admin/terms/components/modals/TermDetailsModal.vue
+++ b/src/features/admin/terms/components/modals/TermDetailsModal.vue
@@ -16,11 +16,11 @@
               <LineInfoBlock title="عنوان ترم" :desc="term.title || '-'" />
               <LineInfoBlock
                 title="تاریخ شروع"
-                :numeric-desc="term.faStartDate || formatJalaaliDate(term.startDate) || '-'"
+                :numeric-desc="formatJalaaliDate(term.startsAt) || '-'"
               />
               <LineInfoBlock
                 title="تاریخ پایان"
-                :numeric-desc="term.faEndDate || formatJalaaliDate(term.endDate) || '-'"
+                :numeric-desc="formatJalaaliDate(term.endsAt) || '-'"
               />
               <LineInfoBlock title="تعداد دانشجویان" :numeric-desc="term.studentsCount ?? 0" />
               <LineInfoBlock title="تعداد دوره‌ها" :numeric-desc="term.coursesCount ?? 0" />
@@ -109,10 +109,7 @@
                 v-for="course in termCourses"
                 :key="course.id"
                 :course="course"
-                @edit="onEditCourse"
-                @delete="onAskDeleteCourse"
-                @change-status="onChangeCourseStatus"
-                @show-details="onShowCourseDetails"
+                @delete="(course) => onAskDeleteCourse(course)"
               />
             </div>
             <NoItems v-else title="متاسفیم" desc="دوره‌ای برای نمایش وجود ندارد." />
@@ -138,6 +135,7 @@
 
 <script setup>
 import { computed, ref } from 'vue'
+import CourseItem from '../CourseItem.vue'
 import useModal from '@/composables/useModal'
 import { useQueryClient } from '@tanstack/vue-query'
 import BasicModal from '@/components/BasicModal.vue'
@@ -152,13 +150,11 @@ import LineTitleBlock from '@/components/LineTitleBlock.vue'
 import ToggleSwitch from '@/components/form/ToggleSwitch.vue'
 import LineInfoBlock from '@/components/blocks/LineInfoBlock.vue'
 import PaginationBlock from '@/components/blocks/PaginationBlock.vue'
-import CourseItem from '@/features/admin/courses/components/CourseItem.vue'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import {
   adminCoursesKeys,
   useAdminCoursesListQuery,
-  useChangeAdminCourseStatusMutation,
-  useDeleteAdminCourseMutation,
+  useUpdateAdminCourseMutation,
 } from '@/services/query/admin-courses'
 import {
   adminTermsKeys,
@@ -181,10 +177,10 @@ const { data: term } = useAdminTermQuery(termId, {
 })
 
 const tabs = [
-  { name: 'students', label: 'دانشجویان', icon: 'users' },
   { name: 'courses', label: 'دوره‌ها', icon: 'list-bullets' },
+  { name: 'students', label: 'دانشجویان', icon: 'users' },
 ]
-const activeTab = ref('students')
+const activeTab = ref('courses')
 
 const studentFilters = ref({})
 const {
@@ -230,15 +226,10 @@ const onToggleLeave = (student, isOnLeave) => {
 }
 
 const onAskRemoveStudent = (student) => {
-  openModal('ConfirmModal', {
-    title: `حذف ${studentName(student)}`,
-    message: `آیا از حذف <strong>${studentName(student)}</strong> از این ترم اطمینان دارید؟`,
-    onConfirm: () =>
-      removeStudentMutation.mutate(
-        { termId: termId.value, userId: student.id },
-        { onSuccess: invalidate }
-      ),
-  })
+  removeStudentMutation.mutate(
+    { termId: termId.value, userId: student.id },
+    { onSuccess: invalidate }
+  )
 }
 
 const courseFilters = computed(() => ({ termId: termId.value }))
@@ -265,31 +256,18 @@ const coursePaginationMeta = computed(() => ({
 
 const invalidateCourses = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
 
-const deleteCourseMutation = useDeleteAdminCourseMutation()
-const changeCourseStatusMutation = useChangeAdminCourseStatusMutation()
+// Backend has no dedicated status endpoint — PATCH /courses/:id with { isActive }.
+const updateCourseMutation = useUpdateAdminCourseMutation()
 
 const onOpenAddCourse = () => {
   openModal('AttachCourseToTermModal', { termId: termId.value })
 }
 
-const onEditCourse = (course) => {
-  openModal('AddOfferedCourseModal', { mode: 'edit', courseId: course.id })
-}
-
-const onShowCourseDetails = (course) => {
-  openModal('CourseDetailsModal', { id: course.id })
-}
-
 const onAskDeleteCourse = (course) => {
-  openModal('ConfirmModal', {
-    title: `حذف ${course.title}`,
-    message: `بعد از حذف امکان بازگشت وجود ندارد، آیا از حذف <strong>${course.title}</strong> اطمینان دارید؟`,
-    onConfirm: () => deleteCourseMutation.mutate(course.id, { onSuccess: invalidateCourses }),
-  })
-}
-
-const onChangeCourseStatus = ({ id, isActive }) => {
-  changeCourseStatusMutation.mutate({ id, payload: { isActive } }, { onSuccess: invalidateCourses })
+  updateCourseMutation.mutate(
+    { id: course.id, payload: { termId: null } },
+    { onSuccess: invalidateCourses }
+  )
 }
 
 const onOpenAddStudent = () => {
@@ -352,7 +330,7 @@ const onOpenAddStudent = () => {
     }
 
     @media (min-width: 1280px) {
-      grid-template-columns: repeat(5, 1fr);
+      grid-template-columns: repeat(6, 1fr);
     }
   }
 
diff --git a/src/features/admin/terms/pages/TermFormPage.vue b/src/features/admin/terms/pages/TermFormPage.vue
index d5d9ff3..fdb7148 100644
--- a/src/features/admin/terms/pages/TermFormPage.vue
+++ b/src/features/admin/terms/pages/TermFormPage.vue
@@ -149,18 +149,22 @@ const { data: existingTerm } = useAdminTermQuery(termId, {
   enabled: () => !!termId.value,
 })
 
-watch(existingTerm, (term) => {
-  if (!term) return
-  form.value = {
-    title: term.title || '',
-    description: term.description || '',
-    isActive: term.isActive ?? true,
-    startsAt: term.startsAt || '',
-    endsAt: term.endsAt || '',
-    coverMediaId: term.coverMediaId || null,
-  }
-  if (term.coverUrl) image.value = { url: term.coverUrl }
-})
+watch(
+  existingTerm,
+  (term) => {
+    console.log(term)
+    if (!term) return
+    form.value = {
+      title: term.title || '',
+      description: term.description || '',
+      isActive: term.isActive ?? true,
+      startsAt: term.startsAt || '',
+      endsAt: term.endsAt || '',
+    }
+    if (term.coverUrl) image.value = { url: term.coverUrl }
+  },
+  { immediate: true }
+)
 
 const uploadMutation = useUploadMediaMutation()
 
diff --git a/src/features/admin/terms/pages/TermsListPage.vue b/src/features/admin/terms/pages/TermsListPage.vue
index 621d0cc..bdb3895 100644
--- a/src/features/admin/terms/pages/TermsListPage.vue
+++ b/src/features/admin/terms/pages/TermsListPage.vue
@@ -73,9 +73,8 @@ import AttachCourseToTermModal from '@/features/admin/terms/components/modals/At
 import {
   adminTermsKeys,
   useAdminTermsListQuery,
-  useChangeAdminTermStatusMutation,
-  useCloneAdminTermMutation,
   useDeleteAdminTermMutation,
+  useUpdateAdminTermMutation,
 } from '@/services/query/admin-terms'
 
 const router = useRouter()
@@ -110,8 +109,8 @@ const onEdit = (term) => {
 const invalidate = () => queryClient.invalidateQueries({ queryKey: adminTermsKeys.all })
 
 const deleteMutation = useDeleteAdminTermMutation()
-const cloneMutation = useCloneAdminTermMutation()
-const changeStatusMutation = useChangeAdminTermStatusMutation()
+// Backend has no dedicated status endpoint — PATCH /terms/:id with { isActive }.
+const updateMutation = useUpdateAdminTermMutation()
 
 const onAskDelete = (term) => {
   openModal('ConfirmModal', {
@@ -121,12 +120,8 @@ const onAskDelete = (term) => {
   })
 }
 
-const onClone = (term) => {
-  cloneMutation.mutate(term.id, { onSuccess: invalidate })
-}
-
 const onChangeStatus = ({ id, isActive }) => {
-  changeStatusMutation.mutate({ id, payload: { isActive } }, { onSuccess: invalidate })
+  updateMutation.mutate({ id, payload: { isActive } }, { onSuccess: invalidate })
 }
 
 const onShowDetails = (term) => {
diff --git a/src/features/student/consultants/components/ConsultantItem.vue b/src/features/student/consultants/components/ConsultantItem.vue
index 7312e28..03e38b6 100644
--- a/src/features/student/consultants/components/ConsultantItem.vue
+++ b/src/features/student/consultants/components/ConsultantItem.vue
@@ -20,7 +20,7 @@
 
 <script setup>
 import { computed } from 'vue'
-import Badge from '@/global-components/Badge.vue'
+import Badge from '@/components/Badge.vue'
 
 const TONE_MAP = {
   approved: 'success',
diff --git a/src/features/student/services/components/ServiceItem.vue b/src/features/student/services/components/ServiceItem.vue
index c59a968..48b4630 100644
--- a/src/features/student/services/components/ServiceItem.vue
+++ b/src/features/student/services/components/ServiceItem.vue
@@ -20,7 +20,7 @@
 
 <script setup>
 import { computed } from 'vue'
-import Badge from '@/global-components/Badge.vue'
+import Badge from '@/components/Badge.vue'
 
 const TONE_MAP = {
   approved: 'success',
diff --git a/src/layouts/AdminLayout.vue b/src/layouts/AdminLayout.vue
index 18e59f5..6d338c8 100644
--- a/src/layouts/AdminLayout.vue
+++ b/src/layouts/AdminLayout.vue
@@ -59,11 +59,13 @@ const educationRoutes = new Set([
   'admin-add-term',
   'admin-edit-term',
   'admin-courses',
-  'admin-add-course-template',
-  'admin-edit-course-template',
+  'admin-add-course',
+  'admin-edit-course',
+  'admin-term-courses',
   'admin-sessions',
   'admin-add-session',
   'admin-edit-session',
+  'admin-course-sessions',
   'admin-assignments',
   'admin-exams',
   'admin-add-exam',
@@ -104,14 +106,20 @@ const menuItems = computed(() => [
         to: { name: 'admin-courses' },
         active: [
           'admin-courses',
-          'admin-add-course-template',
-          'admin-edit-course-template',
+          'admin-add-course',
+          'admin-edit-course',
+          'admin-term-courses',
         ].includes(route.name),
       },
       {
         title: 'مدیریت جلسه',
         to: { name: 'admin-sessions' },
-        active: ['admin-sessions', 'admin-add-session', 'admin-edit-session'].includes(route.name),
+        active: [
+          'admin-sessions',
+          'admin-add-session',
+          'admin-edit-session',
+          'admin-course-sessions',
+        ].includes(route.name),
       },
       {
         title: 'مدیریت تکالیف',
diff --git a/src/services/api/admin-assignments.js b/src/services/api/admin-assignments.js
index 916c2a0..39a2ed0 100644
--- a/src/services/api/admin-assignments.js
+++ b/src/services/api/admin-assignments.js
@@ -7,17 +7,20 @@ export const apiShowAdminAssignment = (id) => http.get(buildUrl(endpoints.showAs
 
 export const apiAddAdminAssignment = (payload) => http.post(endpoints.addNewAssignment, payload)
 
+// Backend uses PATCH /homeworks/:id (not PUT).
 export const apiUpdateAdminAssignment = (id, payload) =>
-  http.put(buildUrl(endpoints.updateAssignment, { id }), payload)
+  http.patch(buildUrl(endpoints.updateAssignment, { id }), payload)
 
 export const apiDeleteAdminAssignment = (id) =>
   http.delete(buildUrl(endpoints.deleteAssignment, { id }))
 
-export const apiGetAdminAssignmentSubmissions = (assignmentId, params) =>
-  http.get(buildUrl(endpoints.getAssignmentSubmissions, { assignmentId }), { params })
+export const apiGetAdminAssignmentSubmissions = (homeworkId, params) =>
+  http.get(buildUrl(endpoints.getAssignmentSubmissions, { homeworkId }), { params })
 
-export const apiShowAdminAssignmentSubmission = (assignmentId, submissionId) =>
-  http.get(buildUrl(endpoints.showAssignmentSubmission, { assignmentId, submissionId }))
+// Backend exposes submissions flat under /homework-submissions/:submissionId —
+// the parent `homeworkId` is not part of the URL, so we ignore it here.
+export const apiShowAdminAssignmentSubmission = (_homeworkId, submissionId) =>
+  http.get(buildUrl(endpoints.showAssignmentSubmission, { submissionId }))
 
-export const apiReviewAdminAssignmentSubmission = (assignmentId, submissionId, payload) =>
-  http.post(buildUrl(endpoints.reviewAssignmentSubmission, { assignmentId, submissionId }), payload)
+export const apiReviewAdminAssignmentSubmission = (_homeworkId, submissionId, payload) =>
+  http.patch(buildUrl(endpoints.reviewAssignmentSubmission, { submissionId }), payload)
diff --git a/src/services/api/admin-course-templates.js b/src/services/api/admin-course-templates.js
deleted file mode 100644
index 3fcdc50..0000000
--- a/src/services/api/admin-course-templates.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { http } from '@/services/api/http'
-import { buildUrl, endpoints } from '@/services/api/endpoints'
-
-export const apiGetAdminCourseTemplates = (params) => http.get(endpoints.getCoursesList, { params })
-
-export const apiShowAdminCourseTemplate = (id) => http.get(buildUrl(endpoints.showCourse, { id }))
-
-export const apiAddAdminCourseTemplate = (payload) => http.post(endpoints.addNewCourse, payload)
-
-export const apiUpdateAdminCourseTemplate = (id, payload) =>
-  http.put(buildUrl(endpoints.updateCourseTemplate, { id }), payload)
-
-export const apiDeleteAdminCourseTemplate = (id) =>
-  http.delete(buildUrl(endpoints.deleteCourseTemplate, { id }))
-
-export const apiChangeAdminCourseTemplateStatus = (id, payload) =>
-  http.post(buildUrl(endpoints.changeStatusCourseTemplate, { id }), payload)
-
-export const apiGetAdminTemplateStudents = (templateId, params) =>
-  http.get(buildUrl(endpoints.listTemplateStudents, { templateId }), { params })
-
-export const apiAddAdminTemplateStudent = (templateId, payload) =>
-  http.post(buildUrl(endpoints.addTemplateStudent, { templateId }), payload)
-
-export const apiRemoveAdminTemplateStudent = (templateId, userId) =>
-  http.delete(buildUrl(endpoints.removeTemplateStudent, { templateId, userId }))
-
-export const apiGetAdminTemplateSessions = (templateId, params) =>
-  http.get(buildUrl(endpoints.listTemplateSessions, { templateId }), { params })
-
-export const apiAttachAdminTemplateSession = (templateId, payload) =>
-  http.post(buildUrl(endpoints.attachTemplateSession, { templateId }), payload)
-
-export const apiDetachAdminTemplateSession = (templateId, sessionId) =>
-  http.delete(buildUrl(endpoints.detachTemplateSession, { templateId, sessionId }))
diff --git a/src/services/api/admin-courses.js b/src/services/api/admin-courses.js
index 0dc4b26..9ff152e 100644
--- a/src/services/api/admin-courses.js
+++ b/src/services/api/admin-courses.js
@@ -12,5 +12,20 @@ export const apiUpdateAdminCourse = (id, payload) =>
 
 export const apiDeleteAdminCourse = (id) => http.delete(buildUrl(endpoints.deleteCourse, { id }))
 
-export const apiChangeAdminCourseStatus = (id, payload) =>
-  http.post(buildUrl(endpoints.changeStatusCourse, { id }), payload)
+export const apiGetAdminCourseStudents = (courseId, params) =>
+  http.get(buildUrl(endpoints.listCourseStudents, { courseId }), { params })
+
+export const apiAddAdminCourseStudent = (courseId, payload) =>
+  http.post(buildUrl(endpoints.addCourseStudent, { courseId }), payload)
+
+export const apiRemoveAdminCourseStudent = (courseId, userId) =>
+  http.delete(buildUrl(endpoints.removeCourseStudent, { courseId, userId }))
+
+export const apiGetAdminCourseSessions = (courseId, params) =>
+  http.get(buildUrl(endpoints.listCourseSessions, { courseId }), { params })
+
+export const apiAttachAdminCourseSession = (courseId, payload) =>
+  http.post(buildUrl(endpoints.attachCourseSession, { courseId }), payload)
+
+export const apiDetachAdminCourseSession = (courseId, sessionId) =>
+  http.delete(buildUrl(endpoints.detachCourseSession, { courseId, sessionId }))
diff --git a/src/services/api/admin-exams.js b/src/services/api/admin-exams.js
index a8617cc..8e4378f 100644
--- a/src/services/api/admin-exams.js
+++ b/src/services/api/admin-exams.js
@@ -7,11 +7,22 @@ export const apiShowAdminExam = (id) => http.get(buildUrl(endpoints.showExam, {
 
 export const apiAddAdminExam = (payload) => http.post(endpoints.addNewExam, payload)
 
+// Backend uses PATCH /exams/:id (not PUT).
 export const apiUpdateAdminExam = (id, payload) =>
-  http.put(buildUrl(endpoints.updateExam, { id }), payload)
+  http.patch(buildUrl(endpoints.updateExam, { id }), payload)
 
 export const apiDeleteAdminExam = (id) => http.delete(buildUrl(endpoints.deleteExam, { id }))
 
+// POST /exams/:examId/questions — payload: { questionText, position, options: [{ optionText, isCorrect }] }
+// Must include ≥2 options; question + options created atomically.
+export const apiAddAdminExamQuestion = (examId, payload) =>
+  http.post(buildUrl(endpoints.addExamQuestion, { examId }), payload)
+
+// POST /questions/:questionId/options — payload: { optionText, isCorrect }
+export const apiAddAdminQuestionOption = (questionId, payload) =>
+  http.post(buildUrl(endpoints.addQuestionOption, { questionId }), payload)
+
+// Mock-only — backend has no /exams/:id/participants endpoint yet.
 export const apiGetAdminExamParticipants = (examId, params) =>
   http.get(buildUrl(endpoints.getExamParticipants, { examId }), { params })
 
diff --git a/src/services/api/admin-sessions.js b/src/services/api/admin-sessions.js
index 5f76dfb..c129096 100644
--- a/src/services/api/admin-sessions.js
+++ b/src/services/api/admin-sessions.js
@@ -12,8 +12,5 @@ export const apiUpdateAdminSession = (id, payload) =>
 
 export const apiDeleteAdminSession = (id) => http.delete(buildUrl(endpoints.deleteSession, { id }))
 
-export const apiChangeAdminSessionStatus = (id, payload) =>
-  http.post(buildUrl(endpoints.changeStatusSession, { id }), payload)
-
 export const apiGetSessionAttendance = (sessionId, params) =>
   http.get(buildUrl(endpoints.getSessionsAttendance, { sessionId }), { params })
diff --git a/src/services/api/admin-terms.js b/src/services/api/admin-terms.js
index 35ebab9..194f7af 100644
--- a/src/services/api/admin-terms.js
+++ b/src/services/api/admin-terms.js
@@ -14,9 +14,6 @@ export const apiDeleteAdminTerm = (id) => http.delete(buildUrl(endpoints.deleteT
 
 export const apiCloneAdminTerm = (id) => http.post(buildUrl(endpoints.cloneTerm, { id }))
 
-export const apiChangeAdminTermStatus = (id, payload) =>
-  http.post(buildUrl(endpoints.changeStatusTerm, { id }), payload)
-
 export const apiGetAdminTermStudents = (termId, params) =>
   http.get(buildUrl(endpoints.listUserTerm, { termId }), { params })
 
diff --git a/src/services/api/admin-tickets.js b/src/services/api/admin-tickets.js
index 28ed424..d99f5ee 100644
--- a/src/services/api/admin-tickets.js
+++ b/src/services/api/admin-tickets.js
@@ -8,5 +8,6 @@ export const apiShowAdminTicket = (id) => http.get(buildUrl(endpoints.showTicket
 export const apiSendAdminTicketMessage = (id, payload) =>
   http.post(buildUrl(endpoints.sendTicketMessage, { id }), payload)
 
+// Backend uses PATCH (not POST).
 export const apiChangeAdminTicketStatus = (id, payload) =>
-  http.post(buildUrl(endpoints.changeTicketStatus, { id }), payload)
+  http.patch(buildUrl(endpoints.changeTicketStatus, { id }), payload)
diff --git a/src/services/api/endpoints.js b/src/services/api/endpoints.js
index 893118f..4b6d899 100644
--- a/src/services/api/endpoints.js
+++ b/src/services/api/endpoints.js
@@ -1,4 +1,5 @@
 export const endpoints = {
+  // ─── Auth & profile ────────────────────────────────────────────────────────
   register: '/register',
   resendVerificationCodeForRegister: '/resend-verification-code',
   verifyCode: '/verify-code',
@@ -10,13 +11,14 @@ export const endpoints = {
   verifyForgotPasswordCode: '/verify-forgot-password-code',
   resetPassword: '/reset-password',
   logout: '/logout',
-  uploadMedia: '/media',
+  me: '/auth/me',
+  updateProfile: '/profile',
 
+  // ─── Geo ───────────────────────────────────────────────────────────────────
   provinceList: '/provinces',
   citiesList: '/provinces/:provinceId/cities',
 
-  me: '/auth/me',
-  updateProfile: '/profile',
+  // ─── Student-facing ────────────────────────────────────────────────────────
   getStudentCourses: '/student/courses',
   showStudentCourse: '/student/courses/:id',
   getStudentTerms: '/student/terms',
@@ -45,12 +47,12 @@ export const endpoints = {
   getStudentCertificates: '/student/certificates',
   downloadStudentCertificate: '/student/certificates/:id/download',
 
+  // ─── Admin: users (out of scope of the Terms/Courses backend doc) ──────────
   getPendingStudents: '/admin/pending-students',
   showPendingStudent: '/admin/pending-students/:id',
   changeStatusPendingStudent: '/admin/pending-students/:id/status',
   downloadPdfPendingStudentInfo: '/admin/pending-students/:id/pdf',
   getApprovedUsers: '/admin/users',
-
   showUserDetails: '/admin/users/:id',
   addNewUser: '/admin/users',
   updateUser: '/admin/users/:id',
@@ -59,63 +61,92 @@ export const endpoints = {
   changeUserStatus: '/admin/users/:id/status',
   deleteUser: '/admin/users/:id',
 
+  // ─── Backend-aligned: Terms ────────────────────────────────────────────────
   getTermsList: '/terms',
   addNewTerm: '/terms',
   showTerm: '/terms/:id',
   updateTerm: '/terms/:id',
   deleteTerm: '/terms/:id',
-  cloneTerm: '/admin/terms/:id/clone',
-  changeStatusTerm: '/admin/terms/:id/status',
-
-  listUserTerm: '/admin/terms/:termId/students',
-  addUserTerm: '/admin/terms/:termId/students',
-  removeUserTerm: '/admin/terms/:termId/students/:userId',
-  changeLeaveStatus: '/admin/terms/:termId/students/:userId/toggle-leave',
-
-  listCourseTerm: '/admin/terms/:termId/courses',
-  addCourseTerm: '/admin/terms/:termId/courses',
-  removeCourseTerm: '/admin/terms/:termId/courses/:courseId',
 
+  // ─── Backend-aligned: Courses ──────────────────────────────────────────────
   getCoursesList: '/courses',
   addNewCourse: '/courses',
   showCourse: '/courses/:id',
   updateCourse: '/courses/:id',
   deleteCourse: '/courses/:id',
-  changeStatusCourse: '/admin/courses/:id/toggle-status',
-
-  getCourseTemplatesList: '/admin/courses',
-  addNewCourseTemplate: '/admin/courses',
-  showCourseTemplate: '/admin/courses/:id',
-  updateCourseTemplate: '/admin/courses/:id',
-  deleteCourseTemplate: '/admin/courses/:id',
-  changeStatusCourseTemplate: '/admin/course-templates/:id/status',
-
-  listTemplateStudents: '/admin/course-templates/:templateId/students',
-  addTemplateStudent: '/admin/course-templates/:templateId/students',
-  removeTemplateStudent: '/admin/course-templates/:templateId/students/:userId',
-
-  listTemplateSessions: '/admin/course-templates/:templateId/sessions',
-  attachTemplateSession: '/admin/course-templates/:templateId/sessions',
-  detachTemplateSession: '/admin/course-templates/:templateId/sessions/:sessionId',
 
+  // ─── Backend-aligned: Sessions ─────────────────────────────────────────────
   getSessionsList: '/sessions',
   addNewSession: '/sessions',
   showSession: '/sessions/:id',
   updateSession: '/sessions/:id',
   deleteSession: '/sessions/:id',
-  changeStatusSession: '/admin/sessions/:id/toggle-status',
 
+  // ─── Backend-aligned: Exams ────────────────────────────────────────────────
+  // `getExamsList` is not yet in the backend Postman doc, but per the user
+  // the backend will add it at /exams — wired up now so the FE doesn't need
+  // to change when the endpoint lands.
+  getExamsList: '/exams',
+  showExam: '/exams/:id',
+  addNewExam: '/exams',
+  updateExam: '/exams/:id',
+  deleteExam: '/exams/:id',
+  addExamQuestion: '/exams/:examId/questions',
+  addQuestionOption: '/questions/:questionId/options',
+  submitExam: '/exams/:examId/submit',
+
+  // ─── Backend-aligned: Homeworks (FE calls them "assignments") ──────────────
+  addNewAssignment: '/homeworks',
+  updateAssignment: '/homeworks/:id',
+  deleteAssignment: '/homeworks/:id',
+  submitHomework: '/homeworks/:homeworkId/submit',
+  reviewAssignmentSubmission: '/homework-submissions/:submissionId/review',
+
+  // ─── Backend-aligned: Media ────────────────────────────────────────────────
+  uploadMedia: '/media',
+  downloadMedia: '/media/:id/download',
+  deleteMedia: '/media/:id',
+
+  // ─── FE mock-only — NOT in backend Postman doc ─────────────────────────────
+  // Kept so existing UI screens continue to work against the mock layer.
+  // See docs/backend-vs-ui-gaps.md for the list of decisions pending.
+
+  // Terms — clone + status + students-in-term + courses-in-term
+  cloneTerm: '/admin/terms/:id/clone',
+  listUserTerm: '/admin/terms/:termId/students',
+  addUserTerm: '/admin/terms/:termId/students',
+  removeUserTerm: '/admin/terms/:termId/students/:userId',
+  changeLeaveStatus: '/admin/terms/:termId/students/:userId/toggle-leave',
+  listCourseTerm: '/admin/terms/:termId/courses',
+  addCourseTerm: '/admin/terms/:termId/courses',
+  removeCourseTerm: '/admin/terms/:termId/courses/:courseId',
+
+  // Courses — students-in-course + attach/detach sessions (backend uses 1:N via session.course_id)
+  listCourseStudents: '/admin/courses/:courseId/students',
+  addCourseStudent: '/admin/courses/:courseId/students',
+  removeCourseStudent: '/admin/courses/:courseId/students/:userId',
+  listCourseSessions: '/admin/courses/:courseId/sessions',
+  attachCourseSession: '/admin/courses/:courseId/sessions',
+  detachCourseSession: '/admin/courses/:courseId/sessions/:sessionId',
+
+  // Sessions — attendance roster
   getSessionsAttendance: '/admin/sessions/:sessionId/attendances',
 
-  getAssignmentsList: '/admin/assignments',
-  addNewAssignment: '/admin/assignments',
-  showAssignment: '/admin/assignments/:id',
-  updateAssignment: '/admin/assignments/:id',
-  deleteAssignment: '/admin/assignments/:id',
-  getAssignmentSubmissions: '/admin/assignments/:assignmentId/submissions',
-  showAssignmentSubmission: '/admin/assignments/:assignmentId/submissions/:submissionId',
-  reviewAssignmentSubmission: '/admin/assignments/:assignmentId/submissions/:submissionId/review',
+  // Exams — participants only (backend has /exams/:id but no participants endpoints)
+  getExamParticipants: '/admin/exams/:examId/participants',
+  showExamParticipant: '/admin/exams/:examId/participants/:participantId',
 
+  // Homeworks — list, show, submissions list, show submission
+  // Paths aligned to backend `/homeworks` and `/homework-submissions`. The
+  // backend Postman doc currently exposes only create/update/delete/submit/review;
+  // list + show + submissions list + show-submission stay mock-only until backend
+  // adds them, but URL shape is locked in.
+  getAssignmentsList: '/homeworks',
+  showAssignment: '/homeworks/:id',
+  getAssignmentSubmissions: '/homeworks/:homeworkId/submissions',
+  showAssignmentSubmission: '/homework-submissions/:submissionId',
+
+  // ─── Tickets / Consultations (out of scope of Terms/Courses backend doc) ───
   getTicketsList: '/admin/tickets',
   showTicket: '/admin/tickets/:id',
   sendTicketMessage: '/admin/tickets/:id/messages',
@@ -125,14 +156,6 @@ export const endpoints = {
   showConsultation: '/admin/consultations/:id',
   sendConsultationMessage: '/admin/consultations/:id/messages',
   changeConsultationStatus: '/admin/consultations/:id/status',
-
-  getExamsList: '/admin/exams',
-  addNewExam: '/admin/exams',
-  showExam: '/admin/exams/:id',
-  updateExam: '/admin/exams/:id',
-  deleteExam: '/admin/exams/:id',
-  getExamParticipants: '/admin/exams/:examId/participants',
-  showExamParticipant: '/admin/exams/:examId/participants/:participantId',
 }
 
 export const buildUrl = (template, params = {}) =>
diff --git a/src/services/mock/fixtures/admin-assignments.js b/src/services/mock/fixtures/admin-assignments.js
index 1a9227c..30426d4 100644
--- a/src/services/mock/fixtures/admin-assignments.js
+++ b/src/services/mock/fixtures/admin-assignments.js
@@ -3,8 +3,8 @@ export const adminAssignments = [
     id: 301,
     title: 'یادداشت‌برداری از جلسه اول',
     description: 'خلاصه‌ای از مباحث جلسه اول را در دو صفحه بنویسید.',
-    courseTemplate: { id: 1, title: 'اصول اخلاق اسلامی' },
-    courseTemplateTitle: 'اصول اخلاق اسلامی',
+    course: { id: 1, title: 'اصول اخلاق اسلامی' },
+    courseTitle: 'اصول اخلاق اسلامی',
     session: { id: 101, title: 'مقدمه‌ای بر اخلاق اسلامی' },
     sessionTitle: 'مقدمه‌ای بر اخلاق اسلامی',
     startDate: '2025-09-26T00:00:00.000Z',
@@ -19,8 +19,8 @@ export const adminAssignments = [
     id: 302,
     title: 'تحلیل تفسیری سوره حمد',
     description: 'تحلیل سه آیه از سوره حمد را ارسال نمایید.',
-    courseTemplate: { id: 2, title: 'مفاهیم قرآنی' },
-    courseTemplateTitle: 'مفاهیم قرآنی',
+    course: { id: 2, title: 'مفاهیم قرآنی' },
+    courseTitle: 'مفاهیم قرآنی',
     session: { id: 102, title: 'تفسیر سوره حمد' },
     sessionTitle: 'تفسیر سوره حمد',
     startDate: '2025-10-05T00:00:00.000Z',
@@ -55,7 +55,7 @@ export const assignmentSubmissions = new Map([
           },
         },
         termTitle: 'ترم پاییز ۱۴۰۴',
-        courseTemplateTitle: 'اصول اخلاق اسلامی',
+        courseTitle: 'اصول اخلاق اسلامی',
         sessionTitle: 'مقدمه‌ای بر اخلاق اسلامی',
         userDescription: 'یادداشت‌های جلسه اول به همراه برداشت شخصی ضمیمه است.',
         attachments: [{ id: 1, title: 'یادداشت-جلسه-اول.pdf', fileUrl: '#', type: 'document' }],
@@ -82,7 +82,7 @@ export const assignmentSubmissions = new Map([
           },
         },
         termTitle: 'ترم پاییز ۱۴۰۴',
-        courseTemplateTitle: 'اصول اخلاق اسلامی',
+        courseTitle: 'اصول اخلاق اسلامی',
         sessionTitle: 'مقدمه‌ای بر اخلاق اسلامی',
         userDescription: 'خلاصه‌ای از جلسه به همراه پرسش پایان.',
         attachments: [],
diff --git a/src/services/mock/fixtures/admin-courses.js b/src/services/mock/fixtures/admin-courses.js
index 7cd6d5d..a539c4b 100644
--- a/src/services/mock/fixtures/admin-courses.js
+++ b/src/services/mock/fixtures/admin-courses.js
@@ -1,50 +1,5 @@
-export const adminCourseTemplates = [
-  {
-    id: 1,
-    title: 'اصول اخلاق اسلامی',
-    description: 'دوره مقدماتی برای آشنایی با اخلاق اسلامی.',
-    image: 'https://picsum.photos/seed/course1/200/200',
-    defaultTeacher: { id: 5, firstName: 'علی', lastName: 'حسنی', fullName: 'علی حسنی' },
-    defaultCapacity: 30,
-    isActiveByDefault: true,
-    prerequisitesCount: 0,
-    prerequisites: [],
-    createdAt: '2025-08-10T08:00:00.000Z',
-  },
-  {
-    id: 2,
-    title: 'مفاهیم قرآنی',
-    description: 'بررسی مفاهیم قرآنی به همراه تفسیر مختصر.',
-    image: 'https://picsum.photos/seed/course2/200/200',
-    defaultTeacher: { id: 6, firstName: 'حسین', lastName: 'مرادی', fullName: 'حسین مرادی' },
-    defaultCapacity: 25,
-    isActiveByDefault: true,
-    prerequisitesCount: 1,
-    prerequisites: [{ courseId: 1, course: { id: 1, title: 'اصول اخلاق اسلامی' } }],
-    createdAt: '2025-09-12T08:00:00.000Z',
-  },
-  {
-    id: 3,
-    title: 'فقه عبادات',
-    description: 'مرور احکام عملی نماز و روزه.',
-    image: '',
-    defaultTeacher: { id: 7, firstName: 'مهدی', lastName: 'سهرابی', fullName: 'مهدی سهرابی' },
-    defaultCapacity: 20,
-    isActiveByDefault: false,
-    prerequisitesCount: 0,
-    prerequisites: [],
-    createdAt: '2026-01-05T08:00:00.000Z',
-  },
-]
-
-// Offered courses carry both the spec keys (term_id/teacher_id/
-// description/capacity/is_active/cover_url) and the UI-only keys the
-// current frontend reads (image, template/templateId, term/teacher
-// nested objects, prerequisitesCount, startDate, endDate). See
-// docs/backend-api-todo.md.
 const makeTeacherSnapshot = (overrides) => ({
   id: overrides.id,
-  // --- spec ---
   name: overrides.name ?? `${overrides.firstName ?? ''} ${overrides.lastName ?? ''}`.trim(),
   email: overrides.email ?? '',
   phone: overrides.phone ?? null,
@@ -52,16 +7,70 @@ const makeTeacherSnapshot = (overrides) => ({
   avatarUrl: overrides.avatarUrl ?? null,
   avatarDownloadUrl: overrides.avatarDownloadUrl ?? null,
   createdAt: overrides.createdAt ?? '',
-  // --- ui-only ---
   firstName: overrides.firstName ?? '',
   lastName: overrides.lastName ?? '',
-  fullName:
-    overrides.fullName ?? `${overrides.firstName ?? ''} ${overrides.lastName ?? ''}`.trim(),
+  fullName: overrides.fullName ?? `${overrides.firstName ?? ''} ${overrides.lastName ?? ''}`.trim(),
 })
 
-export const adminOfferedCourses = [
+export const adminCourses = [
+  {
+    id: 1,
+    termId: null,
+    teacherId: 5,
+    title: 'اصول اخلاق اسلامی',
+    description: 'دوره مقدماتی برای آشنایی با اخلاق اسلامی.',
+    capacity: 30,
+    isActive: true,
+    coverUrl: 'https://picsum.photos/seed/course1/200/200',
+    image: 'https://picsum.photos/seed/course1/200/200',
+    teacher: makeTeacherSnapshot({ id: 5, firstName: 'علی', lastName: 'حسنی' }),
+    term: null,
+    sessionsCount: 0,
+    prerequisitesCount: 0,
+    prerequisites: [],
+    startDate: '',
+    endDate: '',
+    createdAt: '2025-08-10T08:00:00.000Z',
+  },
+  {
+    id: 2,
+    termId: null,
+    teacherId: 6,
+    title: 'مفاهیم قرآنی',
+    description: 'بررسی مفاهیم قرآنی به همراه تفسیر مختصر.',
+    capacity: 25,
+    isActive: true,
+    coverUrl: 'https://picsum.photos/seed/course2/200/200',
+    image: 'https://picsum.photos/seed/course2/200/200',
+    teacher: makeTeacherSnapshot({ id: 6, firstName: 'حسین', lastName: 'مرادی' }),
+    term: null,
+    sessionsCount: 0,
+    prerequisitesCount: 1,
+    prerequisites: [{ courseId: 1, course: { id: 1, title: 'اصول اخلاق اسلامی' } }],
+    startDate: '',
+    endDate: '',
+    createdAt: '2025-09-12T08:00:00.000Z',
+  },
+  {
+    id: 3,
+    termId: null,
+    teacherId: 7,
+    title: 'فقه عبادات',
+    description: 'مرور احکام عملی نماز و روزه.',
+    capacity: 20,
+    isActive: false,
+    coverUrl: '',
+    image: '',
+    teacher: makeTeacherSnapshot({ id: 7, firstName: 'مهدی', lastName: 'سهرابی' }),
+    term: null,
+    sessionsCount: 0,
+    prerequisitesCount: 0,
+    prerequisites: [],
+    startDate: '',
+    endDate: '',
+    createdAt: '2026-01-05T08:00:00.000Z',
+  },
   {
-    // --- spec ---
     id: 11,
     termId: 1,
     teacherId: 5,
@@ -70,20 +79,17 @@ export const adminOfferedCourses = [
     capacity: 30,
     isActive: true,
     coverUrl: 'https://picsum.photos/seed/offered1/200/200',
-
-    // --- ui-only ---
     image: 'https://picsum.photos/seed/offered1/200/200',
-    template: { id: 1, title: 'اصول اخلاق اسلامی' },
-    templateId: 1,
-    term: { id: 1, title: 'ترم پاییز ۱۴۰۴' },
     teacher: makeTeacherSnapshot({ id: 5, firstName: 'علی', lastName: 'حسنی' }),
+    term: { id: 1, title: 'ترم پاییز ۱۴۰۴' },
+    sessionsCount: 0,
     prerequisitesCount: 0,
+    prerequisites: [],
     startDate: '2025-09-23T00:00:00.000Z',
     endDate: '2025-11-20T00:00:00.000Z',
     createdAt: '2025-09-01T08:00:00.000Z',
   },
   {
-    // --- spec ---
     id: 12,
     termId: 1,
     teacherId: 6,
@@ -92,20 +98,17 @@ export const adminOfferedCourses = [
     capacity: 25,
     isActive: true,
     coverUrl: 'https://picsum.photos/seed/offered2/200/200',
-
-    // --- ui-only ---
     image: 'https://picsum.photos/seed/offered2/200/200',
-    template: { id: 2, title: 'مفاهیم قرآنی' },
-    templateId: 2,
-    term: { id: 1, title: 'ترم پاییز ۱۴۰۴' },
     teacher: makeTeacherSnapshot({ id: 6, firstName: 'حسین', lastName: 'مرادی' }),
+    term: { id: 1, title: 'ترم پاییز ۱۴۰۴' },
+    sessionsCount: 0,
     prerequisitesCount: 1,
+    prerequisites: [{ courseId: 11, course: { id: 11, title: 'اصول اخلاق اسلامی - پاییز' } }],
     startDate: '2025-10-01T00:00:00.000Z',
     endDate: '2025-12-15T00:00:00.000Z',
     createdAt: '2025-09-10T08:00:00.000Z',
   },
   {
-    // --- spec ---
     id: 13,
     termId: 2,
     teacherId: 7,
@@ -114,14 +117,12 @@ export const adminOfferedCourses = [
     capacity: 20,
     isActive: false,
     coverUrl: '',
-
-    // --- ui-only ---
     image: '',
-    template: { id: 3, title: 'فقه عبادات' },
-    templateId: 3,
-    term: { id: 2, title: 'ترم زمستان ۱۴۰۴' },
     teacher: makeTeacherSnapshot({ id: 7, firstName: 'مهدی', lastName: 'سهرابی' }),
+    term: { id: 2, title: 'ترم زمستان ۱۴۰۴' },
+    sessionsCount: 0,
     prerequisitesCount: 0,
+    prerequisites: [],
     startDate: '2026-01-22T00:00:00.000Z',
     endDate: '2026-03-15T00:00:00.000Z',
     createdAt: '2025-12-10T08:00:00.000Z',
diff --git a/src/services/mock/fixtures/admin-exams.js b/src/services/mock/fixtures/admin-exams.js
index a3ee66b..c584e03 100644
--- a/src/services/mock/fixtures/admin-exams.js
+++ b/src/services/mock/fixtures/admin-exams.js
@@ -1,67 +1,83 @@
-const sampleQuestions = (seed) => [
-  {
-    id: `${seed}-q1`,
-    title: 'کدام گزینه به مفهوم تقوا نزدیک‌تر است؟',
-    score: 5,
-    correctAnswerId: `${seed}-q1-a2`,
-    answers: [
-      { id: `${seed}-q1-a1`, title: 'پرهیز از خطا و دوری از گناه' },
-      { id: `${seed}-q1-a2`, title: 'خودنگه‌داری در محضر خداوند' },
-      { id: `${seed}-q1-a3`, title: 'پرهیز از خوراکی‌های مضر' },
-    ],
-  },
-  {
-    id: `${seed}-q2`,
-    title: 'منبع اصلی احکام شیعه چیست؟',
-    score: 5,
-    correctAnswerId: `${seed}-q2-a1`,
-    answers: [
-      { id: `${seed}-q2-a1`, title: 'قرآن و سنت اهل بیت(ع)' },
-      { id: `${seed}-q2-a2`, title: 'فقط قرآن کریم' },
-      { id: `${seed}-q2-a3`, title: 'اجماع علما' },
-    ],
-  },
+// Shape mirrors backend Postman doc for /exams:
+//   exam: { id, sessionId, title, description, passScore, isActive,
+//           questions: [{ id, questionText, position,
+//                         options: [{ id, optionText, isCorrect }] }] }
+// (Backend hides `is_correct` from non-admin reads; the admin mock shows it.)
+
+const buildQuestion = (id, questionText, position, options, correctIndex) => ({
+  id,
+  questionText,
+  position,
+  options: options.map((optionText, idx) => ({
+    id: id * 100 + idx + 1,
+    optionText,
+    isCorrect: idx === correctIndex,
+  })),
+})
+
+const ethicsQuestions = [
+  buildQuestion(
+    1,
+    'کدام گزینه به مفهوم تقوا نزدیک‌تر است؟',
+    1,
+    ['پرهیز از خطا و دوری از گناه', 'خودنگه‌داری در محضر خداوند', 'پرهیز از خوراکی‌های مضر'],
+    1
+  ),
+  buildQuestion(
+    2,
+    'منبع اصلی احکام شیعه چیست؟',
+    2,
+    ['قرآن و سنت اهل بیت(ع)', 'فقط قرآن کریم', 'اجماع علما'],
+    0
+  ),
+]
+
+const quranQuestions = [
+  buildQuestion(3, 'سوره حمد چند آیه دارد؟', 1, ['۵ آیه', '۶ آیه', '۷ آیه', '۸ آیه'], 2),
+  buildQuestion(
+    4,
+    'کدام آیه به نام آیة‌الکرسی شناخته می‌شود؟',
+    2,
+    ['آیه ۲۵۵ سوره بقره', 'آیه اول سوره فاتحه', 'آیه ۱۸ سوره آل عمران'],
+    0
+  ),
 ]
 
 export const adminExams = [
   {
     id: 201,
+    sessionId: 101,
     title: 'آزمون پایان فصل اول اخلاق',
     description: 'آزمون چهار گزینه‌ای از مفاهیم درس‌های ۱ تا ۳.',
-    courseTemplate: { id: 1, title: 'اصول اخلاق اسلامی' },
-    courseTemplateTitle: 'اصول اخلاق اسلامی',
+    passScore: 12,
+    isActive: true,
+    questions: ethicsQuestions,
+    // ── UI-only fields for ExamItem / ExamDetailsModal (not in backend). ──
+    course: { id: 1, title: 'اصول اخلاق اسلامی' },
+    courseTitle: 'اصول اخلاق اسلامی',
     session: { id: 101, title: 'مقدمه‌ای بر اخلاق اسلامی' },
     sessionTitle: 'مقدمه‌ای بر اخلاق اسلامی',
-    durationMinutes: 25,
-    passingScore: 12,
-    questionsCount: 2,
-    randomize: true,
-    endDate: '2026-05-15T00:00:00.000Z',
-    startDate: '2026-05-01T00:00:00.000Z',
+    questionsCount: ethicsQuestions.length,
     createdAt: '2026-04-20T08:00:00.000Z',
-    questions: sampleQuestions(201),
-    usedInTerms: [{ termId: 1 }],
   },
   {
     id: 202,
+    sessionId: 102,
     title: 'آزمون مفاهیم قرآنی - میان‌ترم',
     description: 'آزمون میان‌ترم برای مرور آیات کلیدی.',
-    courseTemplate: { id: 2, title: 'مفاهیم قرآنی' },
-    courseTemplateTitle: 'مفاهیم قرآنی',
+    passScore: 14,
+    isActive: true,
+    questions: quranQuestions,
+    course: { id: 2, title: 'مفاهیم قرآنی' },
+    courseTitle: 'مفاهیم قرآنی',
     session: { id: 102, title: 'تفسیر سوره حمد' },
     sessionTitle: 'تفسیر سوره حمد',
-    durationMinutes: 30,
-    passingScore: 14,
-    questionsCount: 2,
-    randomize: false,
-    endDate: '2026-06-10T00:00:00.000Z',
-    startDate: '2026-05-25T00:00:00.000Z',
+    questionsCount: quranQuestions.length,
     createdAt: '2026-05-10T08:00:00.000Z',
-    questions: sampleQuestions(202),
-    usedInTerms: [{ termId: 1 }],
   },
 ]
 
+// FE-mock-only — no backend endpoint for exam participants.
 export const examParticipants = new Map([
   [
     201,
@@ -85,10 +101,6 @@ export const examParticipants = new Map([
             date: '2026-05-05T10:30:00.000Z',
             score: 17,
             scoreTone: 'good',
-            questions: sampleQuestions(201).map((q) => ({
-              ...q,
-              userAnswerId: q.correctAnswerId,
-            })),
           },
         ],
       },
@@ -111,10 +123,6 @@ export const examParticipants = new Map([
             date: '2026-05-06T11:00:00.000Z',
             score: 9,
             scoreTone: 'bad',
-            questions: sampleQuestions(201).map((q, i) => ({
-              ...q,
-              userAnswerId: i === 0 ? q.answers[0].id : q.correctAnswerId,
-            })),
           },
         ],
       },
diff --git a/src/services/mock/fixtures/admin-sessions.js b/src/services/mock/fixtures/admin-sessions.js
index 90adec1..a75ab59 100644
--- a/src/services/mock/fixtures/admin-sessions.js
+++ b/src/services/mock/fixtures/admin-sessions.js
@@ -1,4 +1,3 @@
-// Maps the FE's 7-value `sessionType` to the spec's 3-value `type`.
 const SESSION_TYPE_TO_SPEC = {
   in_person: 'offline',
   online: 'online',
@@ -13,29 +12,26 @@ const makeSession = (overrides) => {
   const sessionType = overrides.sessionType ?? ''
   const sessionConfig = overrides.sessionConfig ?? {}
   const startsAt = overrides.startsAt ?? sessionConfig.startTime ?? null
-  const location = overrides.location ?? sessionConfig.location ?? null
+  const endsAt = overrides.endsAt ?? sessionConfig.endTime ?? null
   const link = overrides.link ?? sessionConfig.meetingLink ?? null
   return {
-    // --- spec ---
     id: overrides.id,
     courseId: overrides.courseId ?? null,
     title: overrides.title ?? '',
     description: overrides.description ?? '',
     type: overrides.type ?? SESSION_TYPE_TO_SPEC[sessionType] ?? null,
     startsAt,
-    location,
+    endsAt,
     link,
     media: overrides.media ?? [],
-
-    // --- ui-only ---
     image: overrides.image ?? '',
-    courseTemplate: overrides.courseTemplate ?? null,
+    course: overrides.course ?? null,
     sessionType,
     sessionTypeFa: overrides.sessionTypeFa ?? '',
+    contentType: overrides.contentType ?? '',
+    contentMediaId: overrides.contentMediaId ?? null,
     durationMinutes: overrides.durationMinutes ?? 0,
-    order: overrides.order ?? 1,
     sessionConfig,
-    materials: overrides.materials ?? [],
     usedInTerms: overrides.usedInTerms ?? [],
     createdAt: overrides.createdAt ?? '',
   }
@@ -48,7 +44,7 @@ export const adminSessions = [
     title: 'مقدمه‌ای بر اخلاق اسلامی',
     description: 'جلسه نخست؛ تعاریف و چارچوب دوره.',
     image: 'https://picsum.photos/seed/session1/200/200',
-    courseTemplate: { id: 1, title: 'اصول اخلاق اسلامی' },
+    course: { id: 11, title: 'اصول اخلاق اسلامی - پاییز' },
     sessionType: 'in_person',
     sessionTypeFa: 'حضوری',
     durationMinutes: 90,
@@ -65,7 +61,7 @@ export const adminSessions = [
     courseId: 12,
     title: 'تفسیر سوره حمد',
     description: 'تحلیل آیات سوره حمد.',
-    courseTemplate: { id: 2, title: 'مفاهیم قرآنی' },
+    course: { id: 12, title: 'مفاهیم قرآنی - پاییز' },
     sessionType: 'online',
     sessionTypeFa: 'آنلاین',
     durationMinutes: 75,
@@ -83,7 +79,7 @@ export const adminSessions = [
     courseId: 13,
     title: 'احکام نماز جماعت',
     description: 'مرور احکام و شرایط نماز جماعت.',
-    courseTemplate: { id: 3, title: 'فقه عبادات' },
+    course: { id: 13, title: 'فقه عبادات - زمستان' },
     sessionType: 'video',
     sessionTypeFa: 'ویدئو',
     durationMinutes: 50,
diff --git a/src/services/mock/fixtures/admin-tickets.js b/src/services/mock/fixtures/admin-tickets.js
index 30fbe3e..8bdb617 100644
--- a/src/services/mock/fixtures/admin-tickets.js
+++ b/src/services/mock/fixtures/admin-tickets.js
@@ -1,92 +1,148 @@
+// Shape mirrors backend Postman doc for /admin/tickets:
+//   ticket: { id, student_id, assigned_to_user_id, target_role, status, subject,
+//             created_at, student, assignee, messages: [{ id, ticket_id,
+//             sender_id, message, created_at, sender }] }
+// Field names use camelCase here (snake_case bridge happens at the HTTP layer
+// when we swap the mock for the real backend).
+
+const makeUser = (overrides) => ({
+  id: overrides.id,
+  name: overrides.name ?? '',
+  email: overrides.email ?? '',
+  phone: overrides.phone ?? null,
+  roles: overrides.roles ?? ['student'],
+  avatarUrl: overrides.avatarUrl ?? null,
+  avatarDownloadUrl: overrides.avatarDownloadUrl ?? null,
+  createdAt: overrides.createdAt ?? '',
+})
+
+const studentJane = makeUser({
+  id: 100,
+  name: 'فاطمه رضایی',
+  email: 'fateme@example.com',
+  phone: '+989121111111',
+  roles: ['student'],
+  avatarUrl: '',
+  createdAt: '2026-02-01T10:00:00.000Z',
+})
+
+const studentMaryam = makeUser({
+  id: 102,
+  name: 'مریم احمدی',
+  email: 'maryam@example.com',
+  phone: '+989122222222',
+  roles: ['student'],
+  avatarUrl: '',
+  createdAt: '2026-02-05T10:00:00.000Z',
+})
+
+const studentAli = makeUser({
+  id: 103,
+  name: 'علی علوی',
+  email: 'ali@example.com',
+  phone: '+989123333333',
+  roles: ['student'],
+  avatarUrl: '',
+  createdAt: '2026-02-10T10:00:00.000Z',
+})
+
+const adminUser = makeUser({
+  id: 1,
+  name: 'مدیر سامانه',
+  email: 'admin@example.com',
+  roles: ['admin'],
+  createdAt: '2026-01-01T00:00:00.000Z',
+})
+
 export const adminTickets = [
   {
     id: 401,
-    title: 'پیگیری وضعیت ثبت‌نام',
-    user: {
-      id: 100,
-      firstName: 'فاطمه',
-      lastName: 'رضایی',
-      fullName: 'فاطمه رضایی',
-      avatarUrl: '',
-    },
+    studentId: studentJane.id,
+    assignedToUserId: adminUser.id,
+    targetRole: 'admin',
     status: 'answered',
-    statusLabel: 'پاسخ داده شده',
-    createdAt: '2026-05-09T20:28:00.000Z',
-    faCreatedAt: '۱۴۰۵/۰۲/۱۹',
-    faCreatedTime: '۱۰:۳۰',
+    subject: 'پیگیری وضعیت ثبت‌نام',
+    createdAt: '2026-05-09T10:30:00.000Z',
+    student: studentJane,
+    assignee: adminUser,
     messages: [
       {
         id: 1,
-        sender: 'user',
-        text: 'سلام وقت بخیر، در فرایند ثبت‌نام به مشکل برخوردم.',
-        time: '۱۲:۳۵',
+        ticketId: 401,
+        senderId: studentJane.id,
+        message: 'سلام وقت بخیر، در فرایند ثبت‌نام به مشکل برخوردم.',
+        createdAt: '2026-05-09T10:35:00.000Z',
+        sender: studentJane,
       },
       {
         id: 2,
-        sender: 'admin',
-        text: 'سلام و عرض ادب. لطفا کد پیگیری ثبت‌نام را ارسال کنید.',
-        time: '۱۲:۴۰',
+        ticketId: 401,
+        senderId: adminUser.id,
+        message: 'سلام و عرض ادب. لطفا کد پیگیری ثبت‌نام را ارسال کنید.',
+        createdAt: '2026-05-09T10:40:00.000Z',
+        sender: adminUser,
       },
       {
         id: 3,
-        sender: 'user',
-        text: 'کد ثبت‌نام: ۱۲۳۴۵۶۷۸',
-        time: '۱۲:۴۲',
+        ticketId: 401,
+        senderId: studentJane.id,
+        message: 'کد ثبت‌نام: ۱۲۳۴۵۶۷۸',
+        createdAt: '2026-05-09T10:42:00.000Z',
+        sender: studentJane,
       },
     ],
   },
   {
     id: 402,
-    title: 'سوال درباره جلسه آموزشی',
-    user: {
-      id: 102,
-      firstName: 'مریم',
-      lastName: 'احمدی',
-      fullName: 'مریم احمدی',
-      avatarUrl: '',
-    },
-    status: 'pending',
-    statusLabel: 'در انتظار پاسخ',
+    studentId: studentMaryam.id,
+    assignedToUserId: null,
+    targetRole: 'admin',
+    status: 'open',
+    subject: 'سوال درباره جلسه آموزشی',
     createdAt: '2026-05-08T09:15:00.000Z',
-    faCreatedAt: '۱۴۰۵/۰۲/۱۸',
-    faCreatedTime: '۱۲:۴۵',
+    student: studentMaryam,
+    assignee: null,
     messages: [
       {
         id: 1,
-        sender: 'user',
-        text: 'سلام، درباره ساعت برگزاری جلسه چهارم سوال داشتم.',
-        time: '۱۲:۴۵',
+        ticketId: 402,
+        senderId: studentMaryam.id,
+        message: 'سلام، درباره ساعت برگزاری جلسه چهارم سوال داشتم.',
+        createdAt: '2026-05-08T09:15:00.000Z',
+        sender: studentMaryam,
       },
     ],
   },
   {
     id: 403,
-    title: 'درخواست بستن تیکت',
-    user: {
-      id: 103,
-      firstName: 'علی',
-      lastName: 'علوی',
-      fullName: 'علی علوی',
-      avatarUrl: '',
-    },
+    studentId: studentAli.id,
+    assignedToUserId: adminUser.id,
+    targetRole: 'admin',
     status: 'closed',
-    statusLabel: 'بسته شده',
+    subject: 'درخواست بستن تیکت',
     createdAt: '2026-05-07T14:10:00.000Z',
-    faCreatedAt: '۱۴۰۵/۰۲/۱۷',
-    faCreatedTime: '۱۷:۴۰',
+    student: studentAli,
+    assignee: adminUser,
     messages: [
       {
         id: 1,
-        sender: 'user',
-        text: 'مشکل برطرف شد. لطفا تیکت بسته شود.',
-        time: '۱۷:۴۰',
+        ticketId: 403,
+        senderId: studentAli.id,
+        message: 'مشکل برطرف شد. لطفا تیکت بسته شود.',
+        createdAt: '2026-05-07T17:40:00.000Z',
+        sender: studentAli,
       },
       {
         id: 2,
-        sender: 'admin',
-        text: 'با تشکر از شما. تیکت بسته شد.',
-        time: '۱۷:۴۲',
+        ticketId: 403,
+        senderId: adminUser.id,
+        message: 'با تشکر از شما. تیکت بسته شد.',
+        createdAt: '2026-05-07T17:42:00.000Z',
+        sender: adminUser,
       },
     ],
   },
 ]
+
+// The signed-in admin used as `sender` when a message is posted from the FE.
+export const currentAdminUser = adminUser
diff --git a/src/services/mock/routes/admin-assignments.js b/src/services/mock/routes/admin-assignments.js
index 683d431..5001167 100644
--- a/src/services/mock/routes/admin-assignments.js
+++ b/src/services/mock/routes/admin-assignments.js
@@ -1,7 +1,7 @@
 import { register } from '@/services/mock/registry'
 import { endpoints } from '@/services/api/endpoints'
+import { adminCourses } from '@/services/mock/fixtures/admin-courses'
 import { adminSessions } from '@/services/mock/fixtures/admin-sessions'
-import { adminCourseTemplates } from '@/services/mock/fixtures/admin-courses'
 import { adminAssignments, assignmentSubmissions } from '@/services/mock/fixtures/admin-assignments'
 import {
   filterDateRange,
@@ -23,7 +23,7 @@ const computeDurationDays = (start, end) => {
 register('GET', endpoints.getAssignmentsList, ({ query }) => {
   let list = filterItems(adminAssignments, query, {
     title: 'includes',
-    courseTemplateId: (item, v) => String(item.courseTemplate?.id) === String(v),
+    courseId: (item, v) => String(item.course?.id) === String(v),
     sessionId: (item, v) => String(item.session?.id) === String(v),
   })
   list = filterDateRange(list, query)
@@ -35,14 +35,14 @@ register('GET', endpoints.showAssignment, ({ params }) => ({
 }))
 
 register('POST', endpoints.addNewAssignment, ({ data }) => {
-  const tpl = adminCourseTemplates.find((c) => c.id === Number(data.courseTemplateId))
+  const course = adminCourses.find((c) => c.id === Number(data.courseId))
   const sess = adminSessions.find((s) => s.id === Number(data.sessionId))
   const item = {
     id: makeId(),
     title: data.title || '',
     description: data.description || '',
-    courseTemplate: tpl ? { id: tpl.id, title: tpl.title } : null,
-    courseTemplateTitle: tpl?.title || '',
+    course: course ? { id: course.id, title: course.title } : null,
+    courseTitle: course?.title || '',
     session: sess ? { id: sess.id, title: sess.title } : null,
     sessionTitle: sess?.title || '',
     startDate: data.startDate || '',
@@ -57,15 +57,15 @@ register('POST', endpoints.addNewAssignment, ({ data }) => {
   return { data: item }
 })
 
-register('PUT', endpoints.updateAssignment, ({ params, data }) => {
-  const tpl = adminCourseTemplates.find((c) => c.id === Number(data.courseTemplateId))
+register('PATCH', endpoints.updateAssignment, ({ params, data }) => {
+  const course = adminCourses.find((c) => c.id === Number(data.courseId))
   const sess = adminSessions.find((s) => s.id === Number(data.sessionId))
   return {
     data: updateById(adminAssignments, params.id, {
       title: data.title,
       description: data.description,
-      courseTemplate: tpl ? { id: tpl.id, title: tpl.title } : undefined,
-      courseTemplateTitle: tpl?.title,
+      course: course ? { id: course.id, title: course.title } : undefined,
+      courseTitle: course?.title,
       session: sess ? { id: sess.id, title: sess.title } : undefined,
       sessionTitle: sess?.title,
       startDate: data.startDate,
@@ -83,19 +83,26 @@ register('DELETE', endpoints.deleteAssignment, ({ params }) => {
 })
 
 register('GET', endpoints.getAssignmentSubmissions, ({ params, query }) => {
-  const list = assignmentSubmissions.get(Number(params.assignmentId)) || []
+  const list = assignmentSubmissions.get(Number(params.homeworkId)) || []
   return paginate(list, query)
 })
 
-register('GET', endpoints.showAssignmentSubmission, ({ params }) => {
-  const list = assignmentSubmissions.get(Number(params.assignmentId)) || []
-  const found = list.find((s) => String(s.id) === String(params.submissionId))
-  return { data: found || null }
-})
+// Backend `/homework-submissions/:submissionId` — submissions live flat, so we
+// scan every homework's submission list to find the matching id.
+const findSubmission = (submissionId) => {
+  for (const list of assignmentSubmissions.values()) {
+    const found = list.find((s) => String(s.id) === String(submissionId))
+    if (found) return found
+  }
+  return null
+}
 
-register('POST', endpoints.reviewAssignmentSubmission, ({ params, data }) => {
-  const list = assignmentSubmissions.get(Number(params.assignmentId)) || []
-  const sub = list.find((s) => String(s.id) === String(params.submissionId))
+register('GET', endpoints.showAssignmentSubmission, ({ params }) => ({
+  data: findSubmission(params.submissionId),
+}))
+
+register('PATCH', endpoints.reviewAssignmentSubmission, ({ params, data }) => {
+  const sub = findSubmission(params.submissionId)
   if (sub) {
     Object.assign(sub, {
       score: data.score ?? sub.score,
diff --git a/src/services/mock/routes/admin-courses.js b/src/services/mock/routes/admin-courses.js
index 0a4810b..2697437 100644
--- a/src/services/mock/routes/admin-courses.js
+++ b/src/services/mock/routes/admin-courses.js
@@ -2,11 +2,7 @@ import { register } from '@/services/mock/registry'
 import { endpoints } from '@/services/api/endpoints'
 import { adminTerms } from '@/services/mock/fixtures/admin-terms'
 import { adminUsers } from '@/services/mock/fixtures/admin-users'
-import {
-  adminCourseTemplates,
-  adminOfferedCourses,
-  makeTeacherSnapshot,
-} from '@/services/mock/fixtures/admin-courses'
+import { adminCourses, makeTeacherSnapshot } from '@/services/mock/fixtures/admin-courses'
 import {
   filterDateRange,
   filterItems,
@@ -18,92 +14,48 @@ import {
   updateById,
 } from '@/services/mock/helpers'
 
-register('GET', endpoints.getCourseTemplatesList, ({ query }) => {
-  let list = filterItems(adminCourseTemplates, query, {
-    title: 'includes',
-    status: (item, v) => String(item.isActiveByDefault ? 1 : 0) === String(v),
+const resolveTermId = (raw) => {
+  if (raw === undefined || raw === null || raw === '') return null
+  if (raw === 'null') return null
+  const n = Number(raw)
+  return Number.isFinite(n) ? n : null
+}
+
+const resolveTeacher = (rawId) => {
+  const id = Number(rawId)
+  const source = adminUsers.find((u) => u.id === id)
+  if (!source) return null
+  return makeTeacherSnapshot({
+    id: source.id,
+    firstName: source.firstName,
+    lastName: source.lastName,
+    name: source.name,
+    email: source.email,
+    phone: source.phone,
+    roles: source.roles,
+    avatarUrl: source.avatarUrl,
+    avatarDownloadUrl: source.avatarDownloadUrl,
+    createdAt: source.createdAt,
   })
-  list = filterDateRange(list, query)
-  return paginate(list, query)
-})
-
-register('GET', endpoints.showCourseTemplate, ({ params }) => ({
-  data: findOrThrow(adminCourseTemplates, params.id),
-}))
-
-register('POST', endpoints.addNewCourseTemplate, ({ data }) => {
-  const teacher = adminUsers.find((u) => u.id === Number(data.defaultTeacherId))
-  const item = {
-    id: makeId(),
-    title: data.title || '',
-    description: data.description || '',
-    image: data.imageId ? `https://picsum.photos/seed/course-${data.imageId}/200/200` : '',
-    defaultTeacher: teacher
-      ? {
-          id: teacher.id,
-          firstName: teacher.firstName,
-          lastName: teacher.lastName,
-          fullName: `${teacher.firstName} ${teacher.lastName}`,
-        }
-      : null,
-    defaultCapacity: Number(data.defaultCapacity) || 0,
-    isActiveByDefault: !!data.isActiveByDefault,
-    prerequisitesCount: (data.prerequisites || []).length,
-    prerequisites: (data.prerequisites || []).map((id) => ({
-      courseId: id,
-      course: adminCourseTemplates.find((c) => c.id === Number(id)) || { id },
-    })),
-    createdAt: isoNow(),
-  }
-  adminCourseTemplates.unshift(item)
-  return { data: item }
-})
-
-register('PUT', endpoints.updateCourseTemplate, ({ params, data }) => {
-  const teacher = adminUsers.find((u) => u.id === Number(data.defaultTeacherId))
-  return {
-    data: updateById(adminCourseTemplates, params.id, {
-      title: data.title,
-      description: data.description,
-      image: data.imageId ? `https://picsum.photos/seed/course-${data.imageId}/200/200` : undefined,
-      defaultTeacher: teacher
-        ? {
-            id: teacher.id,
-            firstName: teacher.firstName,
-            lastName: teacher.lastName,
-            fullName: `${teacher.firstName} ${teacher.lastName}`,
-          }
-        : undefined,
-      defaultCapacity: Number(data.defaultCapacity) || 0,
-      isActiveByDefault: !!data.isActiveByDefault,
-      prerequisites: (data.prerequisites || []).map((id) => ({
-        courseId: id,
-        course: adminCourseTemplates.find((c) => c.id === Number(id)) || { id },
-      })),
-      prerequisitesCount: (data.prerequisites || []).length,
-    }),
-  }
-})
-
-register('DELETE', endpoints.deleteCourseTemplate, ({ params }) => {
-  removeById(adminCourseTemplates, params.id)
-  return { data: { message: 'حذف موفق' } }
-})
-
-register('POST', endpoints.changeStatusCourseTemplate, ({ params, data }) => ({
-  data: updateById(adminCourseTemplates, params.id, {
-    isActiveByDefault: !!data.isActiveByDefault,
-  }),
-}))
+}
 
 register('GET', endpoints.getCoursesList, ({ query }) => {
-  let list = filterItems(adminOfferedCourses, query, {
+  let list = adminCourses
+  if (query?.termId !== undefined && query?.termId !== '') {
+    if (String(query.termId) === 'null') {
+      list = list.filter((c) => c.termId == null)
+    } else {
+      const tid = Number(query.termId)
+      list = list.filter((c) => c.termId === tid)
+    }
+  }
+  const { termId: _omitted, ...rest } = query || {}
+  list = filterItems(list, rest, {
     title: 'includes',
-    termId: 'eq',
     status: (item, v) => String(item.isActive ? 1 : 0) === String(v),
   })
-  list = filterDateRange(list, query, 'startDate')
-  const { data: items, meta } = paginate(list, query)
+  list = filterDateRange(list, rest, 'startDate')
+  const { data: items, meta } = paginate(list, rest)
   return {
     success: true,
     message: 'OK',
@@ -114,54 +66,40 @@ register('GET', endpoints.getCoursesList, ({ query }) => {
 register('GET', endpoints.showCourse, ({ params }) => ({
   success: true,
   message: 'OK',
-  data: findOrThrow(adminOfferedCourses, params.id),
+  data: findOrThrow(adminCourses, params.id),
 }))
 
 register('POST', endpoints.addNewCourse, ({ data }) => {
-  const template = adminCourseTemplates.find((t) => t.id === Number(data.templateId))
-  const term = adminTerms.find((t) => t.id === Number(data.termId))
-  const teacherSource = adminUsers.find((u) => u.id === Number(data.teacherId))
-  const teacher = teacherSource
-    ? makeTeacherSnapshot({
-        id: teacherSource.id,
-        firstName: teacherSource.firstName,
-        lastName: teacherSource.lastName,
-        name: teacherSource.name,
-        email: teacherSource.email,
-        phone: teacherSource.phone,
-        roles: teacherSource.roles,
-        avatarUrl: teacherSource.avatarUrl,
-        avatarDownloadUrl: teacherSource.avatarDownloadUrl,
-        createdAt: teacherSource.createdAt,
-      })
-    : null
+  const termId = resolveTermId(data.termId)
+  const term = termId == null ? null : adminTerms.find((t) => t.id === termId)
+  const teacher = resolveTeacher(data.teacherId)
   const coverFromUpload = data.imageId
-    ? `https://picsum.photos/seed/offered-${data.imageId}/200/200`
+    ? `https://picsum.photos/seed/course-${data.imageId}/200/200`
     : ''
   const coverUrl = data.coverUrl ?? coverFromUpload
   const item = {
-    // --- spec ---
     id: makeId(),
-    termId: term?.id ?? Number(data.termId) ?? null,
+    termId: term?.id ?? termId ?? null,
     teacherId: teacher?.id ?? (Number(data.teacherId) || null),
-    title: data.title || template?.title || '',
+    title: data.title || '',
     description: data.description || '',
     capacity: Number(data.capacity) || 0,
-    isActive: data.isActive !== undefined ? !!data.isActive : true,
+    isActive: data.isActive === undefined ? true : !!data.isActive,
     coverUrl,
-
-    // --- ui-only ---
     image: coverUrl,
-    template: template ? { id: template.id, title: template.title } : null,
-    templateId: template?.id,
-    term: term ? { id: term.id, title: term.title } : null,
     teacher,
-    prerequisitesCount: 0,
+    term: term ? { id: term.id, title: term.title } : null,
+    sessionsCount: Number(data.sessionsCount) || 0,
+    prerequisitesCount: (data.prerequisites || []).length,
+    prerequisites: (data.prerequisites || []).map((id) => ({
+      courseId: id,
+      course: adminCourses.find((c) => c.id === Number(id)) || { id },
+    })),
     startDate: term?.startDate || '',
     endDate: term?.endDate || '',
     createdAt: isoNow(),
   }
-  adminOfferedCourses.unshift(item)
+  adminCourses.unshift(item)
   return {
     success: true,
     message: 'Course created.',
@@ -174,43 +112,34 @@ register('PATCH', endpoints.updateCourse, ({ params, data }) => {
   if (data.title !== undefined) patch.title = data.title
   if (data.description !== undefined) patch.description = data.description
   if (data.capacity !== undefined) patch.capacity = Number(data.capacity) || 0
+  if (data.sessionsCount !== undefined) patch.sessionsCount = Number(data.sessionsCount) || 0
   if (data.isActive !== undefined) patch.isActive = !!data.isActive
   if (data.termId !== undefined) {
-    patch.termId = Number(data.termId) || null
-    const term = adminTerms.find((t) => t.id === Number(data.termId))
-    if (term) patch.term = { id: term.id, title: term.title }
+    const termId = resolveTermId(data.termId)
+    patch.termId = termId
+    const term = termId == null ? null : adminTerms.find((t) => t.id === termId)
+    patch.term = term ? { id: term.id, title: term.title } : null
   }
   if (data.teacherId !== undefined) {
-    patch.teacherId = Number(data.teacherId) || null
-    const t = adminUsers.find((u) => u.id === Number(data.teacherId))
-    if (t) {
-      patch.teacher = makeTeacherSnapshot({
-        id: t.id,
-        firstName: t.firstName,
-        lastName: t.lastName,
-        name: t.name,
-        email: t.email,
-        phone: t.phone,
-        roles: t.roles,
-        avatarUrl: t.avatarUrl,
-        avatarDownloadUrl: t.avatarDownloadUrl,
-        createdAt: t.createdAt,
-      })
-    }
+    const teacher = resolveTeacher(data.teacherId)
+    patch.teacherId = teacher?.id ?? null
+    patch.teacher = teacher
   }
-  if (data.templateId !== undefined) {
-    const template = adminCourseTemplates.find((t) => t.id === Number(data.templateId))
-    patch.templateId = template?.id
-    if (template) patch.template = { id: template.id, title: template.title }
+  if (data.prerequisites !== undefined) {
+    patch.prerequisites = (data.prerequisites || []).map((id) => ({
+      courseId: id,
+      course: adminCourses.find((c) => c.id === Number(id)) || { id },
+    }))
+    patch.prerequisitesCount = (data.prerequisites || []).length
   }
   if (data.coverUrl !== undefined || data.imageId !== undefined) {
     const url =
       data.coverUrl ??
-      (data.imageId ? `https://picsum.photos/seed/offered-${data.imageId}/200/200` : '')
+      (data.imageId ? `https://picsum.photos/seed/course-${data.imageId}/200/200` : '')
     patch.coverUrl = url
     patch.image = url
   }
-  const updated = updateById(adminOfferedCourses, params.id, patch)
+  const updated = updateById(adminCourses, params.id, patch)
   return {
     success: true,
     message: 'Course updated.',
@@ -219,14 +148,10 @@ register('PATCH', endpoints.updateCourse, ({ params, data }) => {
 })
 
 register('DELETE', endpoints.deleteCourse, ({ params }) => {
-  removeById(adminOfferedCourses, params.id)
+  removeById(adminCourses, params.id)
   return {
     success: true,
     message: 'Course deleted.',
     data: null,
   }
 })
-
-register('POST', endpoints.changeStatusCourse, ({ params, data }) => ({
-  data: updateById(adminOfferedCourses, params.id, { isActive: !!data.isActive }),
-}))
diff --git a/src/services/mock/routes/admin-exams.js b/src/services/mock/routes/admin-exams.js
index c927642..45a2510 100644
--- a/src/services/mock/routes/admin-exams.js
+++ b/src/services/mock/routes/admin-exams.js
@@ -1,7 +1,7 @@
 import { register } from '@/services/mock/registry'
 import { endpoints } from '@/services/api/endpoints'
+import { adminCourses } from '@/services/mock/fixtures/admin-courses'
 import { adminSessions } from '@/services/mock/fixtures/admin-sessions'
-import { adminCourseTemplates } from '@/services/mock/fixtures/admin-courses'
 import { adminExams, examParticipants } from '@/services/mock/fixtures/admin-exams'
 import {
   filterDateRange,
@@ -14,74 +14,139 @@ import {
   updateById,
 } from '@/services/mock/helpers'
 
+const resolveCourseFromSession = (session) => {
+  const courseId = session?.course?.id ?? session?.courseId
+  if (courseId == null) return null
+  return adminCourses.find((c) => c.id === Number(courseId)) || null
+}
+
+const sessionSnapshot = (session) => (session ? { id: session.id, title: session.title } : null)
+
+const courseSnapshot = (course) => (course ? { id: course.id, title: course.title } : null)
+
 register('GET', endpoints.getExamsList, ({ query }) => {
   let list = filterItems(adminExams, query, {
     title: 'includes',
-    courseTemplateId: (item, v) => String(item.courseTemplate?.id) === String(v),
+    courseId: (item, v) => String(item.course?.id) === String(v),
+    sessionId: (item, v) => String(item.sessionId) === String(v),
   })
   list = filterDateRange(list, query)
-  return paginate(list, query)
+  const { data: items, meta } = paginate(list, query)
+  return {
+    success: true,
+    message: 'OK',
+    data: items,
+    meta,
+  }
 })
 
 register('GET', endpoints.showExam, ({ params }) => ({
+  success: true,
+  message: 'OK',
   data: findOrThrow(adminExams, params.id),
 }))
 
 register('POST', endpoints.addNewExam, ({ data }) => {
   const session = adminSessions.find((s) => s.id === Number(data.sessionId))
-  const template = session?.courseTemplate
-    ? adminCourseTemplates.find((c) => c.id === Number(session.courseTemplate.id))
-    : null
+  const course = resolveCourseFromSession(session)
   const item = {
     id: makeId(),
+    sessionId: session?.id ?? Number(data.sessionId) ?? null,
     title: data.title || '',
     description: data.description || '',
-    session: session ? { id: session.id, title: session.title } : null,
+    passScore: Number(data.passingScore ?? data.passScore) || 0,
+    isActive: data.isActive ?? true,
+    questions: [],
+    // UI-only fallbacks for ExamItem / ExamDetailsModal.
+    session: sessionSnapshot(session),
     sessionTitle: session?.title || '',
-    courseTemplate: template ? { id: template.id, title: template.title } : null,
-    courseTemplateTitle: template?.title || '',
-    durationMinutes: Number(data.durationMinutes) || 0,
-    passingScore: Number(data.passingScore) || 0,
-    questionsCount: data.questions?.length || 0,
-    randomize: !!data.randomize,
-    endDate: data.endDate || '',
-    startDate: isoNow(),
+    course: courseSnapshot(course),
+    courseTitle: course?.title || '',
+    questionsCount: 0,
     createdAt: isoNow(),
-    questions: data.questions || [],
-    usedInTerms: [],
   }
   adminExams.unshift(item)
-  return { data: item }
+  return {
+    success: true,
+    message: 'Exam created.',
+    data: item,
+  }
 })
 
-register('PUT', endpoints.updateExam, ({ params, data }) => {
-  const session = adminSessions.find((s) => s.id === Number(data.sessionId))
-  const template = session?.courseTemplate
-    ? adminCourseTemplates.find((c) => c.id === Number(session.courseTemplate.id))
-    : null
+register('PATCH', endpoints.updateExam, ({ params, data }) => {
+  const patch = {}
+  if (data.title !== undefined) patch.title = data.title
+  if (data.description !== undefined) patch.description = data.description
+  if (data.passingScore !== undefined) patch.passScore = Number(data.passingScore) || 0
+  if (data.passScore !== undefined) patch.passScore = Number(data.passScore) || 0
+  if (data.isActive !== undefined) patch.isActive = !!data.isActive
+  if (data.sessionId !== undefined) {
+    const session = adminSessions.find((s) => s.id === Number(data.sessionId))
+    const course = resolveCourseFromSession(session)
+    patch.sessionId = session?.id ?? Number(data.sessionId) ?? null
+    patch.session = sessionSnapshot(session)
+    patch.sessionTitle = session?.title ?? ''
+    patch.course = courseSnapshot(course)
+    patch.courseTitle = course?.title ?? ''
+  }
   return {
-    data: updateById(adminExams, params.id, {
-      title: data.title,
-      description: data.description,
-      session: session ? { id: session.id, title: session.title } : undefined,
-      sessionTitle: session?.title,
-      courseTemplate: template ? { id: template.id, title: template.title } : undefined,
-      courseTemplateTitle: template?.title,
-      durationMinutes: Number(data.durationMinutes) || 0,
-      passingScore: Number(data.passingScore) || 0,
-      questionsCount: data.questions?.length || 0,
-      randomize: !!data.randomize,
-      endDate: data.endDate,
-      questions: data.questions || [],
-    }),
+    success: true,
+    message: 'Exam updated.',
+    data: updateById(adminExams, params.id, patch),
   }
 })
 
 register('DELETE', endpoints.deleteExam, ({ params }) => {
   removeById(adminExams, params.id)
-  return { data: { message: 'حذف موفق' } }
+  return { success: true, message: 'Exam deleted.', data: null }
 })
 
+// POST /exams/:examId/questions — atomic question + options create.
+register('POST', endpoints.addExamQuestion, ({ params, data }) => {
+  const exam = findOrThrow(adminExams, params.examId)
+  const questionId = makeId()
+  const options = Array.isArray(data.options) ? data.options : []
+  const question = {
+    id: questionId,
+    questionText: data.questionText || '',
+    position: data.position ?? (exam.questions?.length ?? 0) + 1,
+    options: options.map((opt, idx) => ({
+      id: questionId * 100 + idx + 1,
+      optionText: opt.optionText || '',
+      isCorrect: !!opt.isCorrect,
+    })),
+  }
+  exam.questions = [...(exam.questions || []), question]
+  exam.questionsCount = exam.questions.length
+  return {
+    success: true,
+    message: 'Question added.',
+    data: question,
+  }
+})
+
+// POST /questions/:questionId/options — single option append.
+register('POST', endpoints.addQuestionOption, ({ params, data }) => {
+  for (const exam of adminExams) {
+    const question = (exam.questions || []).find((q) => String(q.id) === String(params.questionId))
+    if (question) {
+      const option = {
+        id: makeId(),
+        optionText: data.optionText || '',
+        isCorrect: !!data.isCorrect,
+      }
+      question.options = [...(question.options || []), option]
+      return {
+        success: true,
+        message: 'Option added.',
+        data: option,
+      }
+    }
+  }
+  return { success: false, message: 'Question not found.', data: null }
+})
+
+// FE-mock-only.
 register('GET', endpoints.getExamParticipants, ({ params, query }) => {
   const list = examParticipants.get(Number(params.examId)) || []
   return paginate(list, query)
diff --git a/src/services/mock/routes/admin-sessions.js b/src/services/mock/routes/admin-sessions.js
index c4e3f9c..d3f5976 100644
--- a/src/services/mock/routes/admin-sessions.js
+++ b/src/services/mock/routes/admin-sessions.js
@@ -1,7 +1,7 @@
 import { SESSION_TYPE } from '@/enums'
 import { register } from '@/services/mock/registry'
 import { endpoints } from '@/services/api/endpoints'
-import { adminCourseTemplates, adminOfferedCourses } from '@/services/mock/fixtures/admin-courses'
+import { adminCourses } from '@/services/mock/fixtures/admin-courses'
 import {
   adminSessions,
   makeSession,
@@ -23,25 +23,10 @@ const enrich = (session) => ({
   sessionTypeFa: SESSION_TYPE[session.sessionType] || session.sessionTypeFa || '',
 })
 
-const courseSnapshot = (offered) =>
-  offered
-    ? {
-        id: offered.id,
-        termId: offered.termId,
-        teacherId: offered.teacherId,
-        title: offered.title,
-        description: offered.description,
-        capacity: offered.capacity,
-        isActive: offered.isActive,
-        coverUrl: offered.coverUrl,
-      }
-    : null
-
 register('GET', endpoints.getSessionsList, ({ query }) => {
   let list = filterItems(adminSessions, query, {
     title: 'includes',
-    courseTemplateId: (item, v) => String(item.courseTemplate?.id) === String(v),
-    courseId: 'eq',
+    courseId: (item, v) => String(item.course?.id ?? item.courseId) === String(v),
     sessionType: 'eq',
     type: 'eq',
   })
@@ -57,35 +42,41 @@ register('GET', endpoints.getSessionsList, ({ query }) => {
 
 register('GET', endpoints.showSession, ({ params }) => {
   const session = enrich(findOrThrow(adminSessions, params.id))
-  const offered = adminOfferedCourses.find((c) => c.id === session.courseId)
+  const course = adminCourses.find((c) => c.id === session.courseId)
   return {
     success: true,
     message: 'OK',
-    data: { ...session, course: courseSnapshot(offered) },
+    data: { ...session, course: course ? { id: course.id, title: course.title } : session.course },
   }
 })
 
+// Form sends a flat payload (startTime, endTime, meetingLink, contentType, etc.).
+// We mirror those into the legacy `sessionConfig` shape too so SessionDetailsModal
+// (which reads `sessionConfig.startTime` / `sessionConfig.meetingLink`) keeps working.
+const buildSessionConfig = (data) => ({
+  startTime: data.startTime ?? data.sessionConfig?.startTime ?? null,
+  endTime: data.endTime ?? data.sessionConfig?.endTime ?? null,
+  meetingLink: data.meetingLink ?? data.sessionConfig?.meetingLink ?? null,
+})
+
 register('POST', endpoints.addNewSession, ({ data }) => {
-  const tpl = adminCourseTemplates.find((c) => c.id === Number(data.courseTemplateId))
-  const offered =
-    adminOfferedCourses.find((c) => c.id === Number(data.courseId)) ||
-    (tpl ? adminOfferedCourses.find((c) => c.templateId === tpl.id) : null)
+  const course = adminCourses.find((c) => c.id === Number(data.courseId))
+  const sessionConfig = buildSessionConfig(data)
   const item = makeSession({
     id: makeId(),
-    courseId: data.courseId ?? offered?.id ?? null,
+    courseId: course?.id ?? (data.courseId ? Number(data.courseId) : null),
     title: data.title || '',
     description: data.description || '',
-    type: data.type,
-    startsAt: data.startsAt ?? data.sessionConfig?.startTime ?? null,
-    location: data.location ?? data.sessionConfig?.location ?? null,
-    link: data.link ?? data.sessionConfig?.meetingLink ?? null,
-    image: data.imageId ? `https://picsum.photos/seed/session-${data.imageId}/200/200` : '',
-    courseTemplate: tpl ? { id: tpl.id, title: tpl.title } : null,
+    type: data.sessionType === 'online' ? 'online' : 'offline',
+    startsAt: sessionConfig.startTime,
+    endsAt: sessionConfig.endTime,
+    link: sessionConfig.meetingLink,
+    course: course ? { id: course.id, title: course.title } : null,
     sessionType: data.sessionType || 'in_person',
+    contentType: data.contentType || '',
+    contentMediaId: data.contentMediaId ?? null,
     durationMinutes: Number(data.durationMinutes) || 0,
-    order: Number(data.order) || 1,
-    sessionConfig: data.sessionConfig || {},
-    materials: data.materials || [],
+    sessionConfig,
     createdAt: isoNow(),
   })
   adminSessions.unshift(item)
@@ -100,35 +91,34 @@ register('PATCH', endpoints.updateSession, ({ params, data }) => {
   const patch = {}
   if (data.title !== undefined) patch.title = data.title
   if (data.description !== undefined) patch.description = data.description
-  if (data.type !== undefined) patch.type = data.type
-  if (data.startsAt !== undefined) patch.startsAt = data.startsAt
-  if (data.location !== undefined) patch.location = data.location
-  if (data.link !== undefined) patch.link = data.link
-  if (data.courseId !== undefined) patch.courseId = Number(data.courseId) || null
-  if (data.courseTemplateId !== undefined) {
-    const tpl = adminCourseTemplates.find((c) => c.id === Number(data.courseTemplateId))
-    if (tpl) patch.courseTemplate = { id: tpl.id, title: tpl.title }
+  if (data.startTime !== undefined) patch.startsAt = data.startTime
+  if (data.endTime !== undefined) patch.endsAt = data.endTime
+  if (data.meetingLink !== undefined) patch.link = data.meetingLink
+  if (data.courseId !== undefined) {
+    patch.courseId = Number(data.courseId) || null
+    const course = adminCourses.find((c) => c.id === Number(data.courseId))
+    patch.course = course ? { id: course.id, title: course.title } : null
   }
-  if (data.sessionType !== undefined) patch.sessionType = data.sessionType
+  if (data.sessionType !== undefined) {
+    patch.sessionType = data.sessionType
+    patch.type = data.sessionType === 'online' ? 'online' : 'offline'
+  }
+  if (data.contentType !== undefined) patch.contentType = data.contentType
+  if (data.contentMediaId !== undefined) patch.contentMediaId = data.contentMediaId
   if (data.durationMinutes !== undefined) patch.durationMinutes = Number(data.durationMinutes) || 0
-  if (data.order !== undefined) patch.order = Number(data.order) || 1
-  if (data.sessionConfig !== undefined) {
-    patch.sessionConfig = data.sessionConfig
-    if (data.startsAt === undefined && data.sessionConfig.startTime !== undefined) {
-      patch.startsAt = data.sessionConfig.startTime
+  // Keep sessionConfig in sync for SessionDetailsModal display fallback.
+  if (
+    data.startTime !== undefined ||
+    data.endTime !== undefined ||
+    data.meetingLink !== undefined
+  ) {
+    const existing = findOrThrow(adminSessions, params.id)?.sessionConfig || {}
+    patch.sessionConfig = {
+      ...existing,
+      startTime: data.startTime ?? existing.startTime,
+      endTime: data.endTime ?? existing.endTime,
+      meetingLink: data.meetingLink ?? existing.meetingLink,
     }
-    if (data.location === undefined && data.sessionConfig.location !== undefined) {
-      patch.location = data.sessionConfig.location
-    }
-    if (data.link === undefined && data.sessionConfig.meetingLink !== undefined) {
-      patch.link = data.sessionConfig.meetingLink
-    }
-  }
-  if (data.materials !== undefined) patch.materials = data.materials
-  if (data.imageId !== undefined) {
-    patch.image = data.imageId
-      ? `https://picsum.photos/seed/session-${data.imageId}/200/200`
-      : ''
   }
   const updated = updateById(adminSessions, params.id, patch)
   return {
@@ -147,11 +137,6 @@ register('DELETE', endpoints.deleteSession, ({ params }) => {
   }
 })
 
-register('POST', endpoints.changeStatusSession, ({ params, data }) => {
-  const updated = updateById(adminSessions, params.id, { isActive: !!data.isActive })
-  return { data: enrich(updated) }
-})
-
 register('GET', endpoints.getSessionsAttendance, ({ params, query }) => {
   const list = sessionAttendance.get(Number(params.sessionId)) || []
   return paginate(list, query)
diff --git a/src/services/mock/routes/admin-terms.js b/src/services/mock/routes/admin-terms.js
index 96d41cd..c70941f 100644
--- a/src/services/mock/routes/admin-terms.js
+++ b/src/services/mock/routes/admin-terms.js
@@ -1,7 +1,7 @@
 import { register } from '@/services/mock/registry'
 import { endpoints } from '@/services/api/endpoints'
 import { adminUsers } from '@/services/mock/fixtures/admin-users'
-import { adminOfferedCourses } from '@/services/mock/fixtures/admin-courses'
+import { adminCourses } from '@/services/mock/fixtures/admin-courses'
 import { adminTerms, makeTerm, termStudentLinks } from '@/services/mock/fixtures/admin-terms'
 import {
   filterDateRange,
@@ -106,10 +106,6 @@ register('POST', endpoints.cloneTerm, ({ params }) => {
   return { data: clone }
 })
 
-register('POST', endpoints.changeStatusTerm, ({ params, data }) => ({
-  data: updateById(adminTerms, params.id, { isActive: !!data.isActive }),
-}))
-
 const studentSnapshot = (link) => {
   const user = adminUsers.find((u) => u.id === link.userId)
   return user ? { ...user, isOnLeave: link.isOnLeave } : null
@@ -161,7 +157,7 @@ register('POST', endpoints.changeLeaveStatus, ({ params, data }) => {
 
 register('GET', endpoints.listCourseTerm, ({ params, query }) => {
   const termId = Number(params.termId)
-  const list = adminOfferedCourses.filter((c) => Number(c.termId) === termId)
+  const list = adminCourses.filter((c) => Number(c.termId) === termId)
   return paginate(list, query)
 })
 
@@ -170,7 +166,7 @@ register('POST', endpoints.addCourseTerm, ({ params, data }) => {
   const ids = Array.isArray(data.courseIds) ? data.courseIds : []
   const linked = []
   ids.forEach((id) => {
-    const course = adminOfferedCourses.find((c) => Number(c.id) === Number(id))
+    const course = adminCourses.find((c) => Number(c.id) === Number(id))
     if (course) {
       course.termId = termId
       course.term = adminTerms.some((t) => t.id === termId)
@@ -184,7 +180,7 @@ register('POST', endpoints.addCourseTerm, ({ params, data }) => {
 
 register('DELETE', endpoints.removeCourseTerm, ({ params }) => {
   const courseId = Number(params.courseId)
-  const course = adminOfferedCourses.find((c) => c.id === courseId)
+  const course = adminCourses.find((c) => c.id === courseId)
   if (course) {
     course.termId = null
     course.term = null
diff --git a/src/services/mock/routes/admin-tickets.js b/src/services/mock/routes/admin-tickets.js
index f41099e..b9f5b73 100644
--- a/src/services/mock/routes/admin-tickets.js
+++ b/src/services/mock/routes/admin-tickets.js
@@ -1,6 +1,6 @@
 import { register } from '@/services/mock/registry'
 import { endpoints } from '@/services/api/endpoints'
-import { adminTickets } from '@/services/mock/fixtures/admin-tickets'
+import { adminTickets, currentAdminUser } from '@/services/mock/fixtures/admin-tickets'
 import {
   filterDateRange,
   filterItems,
@@ -14,16 +14,28 @@ import {
 register('GET', endpoints.getTicketsList, ({ query }) => {
   let list = filterItems(adminTickets, query, {
     status: 'eq',
+    subject: (item, v) =>
+      String(item.subject || '')
+        .toLowerCase()
+        .includes(String(v).toLowerCase()),
     userName: (item, v) =>
-      `${item.user?.firstName || ''} ${item.user?.lastName || ''}`
+      String(item.student?.name || '')
         .toLowerCase()
         .includes(String(v).toLowerCase()),
   })
   list = filterDateRange(list, query)
-  return paginate(list, query)
+  const { data: items, meta } = paginate(list, query)
+  return {
+    success: true,
+    message: 'OK',
+    data: items,
+    meta,
+  }
 })
 
 register('GET', endpoints.showTicket, ({ params }) => ({
+  success: true,
+  message: 'OK',
   data: findOrThrow(adminTickets, params.id),
 }))
 
@@ -31,25 +43,25 @@ register('POST', endpoints.sendTicketMessage, ({ params, data }) => {
   const ticket = findOrThrow(adminTickets, params.id)
   const message = {
     id: makeId(),
-    sender: 'admin',
-    text: data.text || '',
-    time: 'همین الان',
-    sentAt: isoNow(),
+    ticketId: ticket.id,
+    senderId: currentAdminUser.id,
+    message: data.message || '',
+    createdAt: isoNow(),
+    sender: currentAdminUser,
   }
   ticket.messages = [...(ticket.messages || []), message]
   ticket.status = 'answered'
-  ticket.statusLabel = 'پاسخ داده شده'
-  return { data: ticket }
+  ticket.assigneeId = currentAdminUser.id
+  ticket.assignee = currentAdminUser
+  return {
+    success: true,
+    message: 'Message posted.',
+    data: message,
+  }
 })
 
-register('POST', endpoints.changeTicketStatus, ({ params, data }) => ({
-  data: updateById(adminTickets, params.id, {
-    status: data.status,
-    statusLabel:
-      data.status === 'closed'
-        ? 'بسته شده'
-        : data.status === 'answered'
-        ? 'پاسخ داده شده'
-        : 'در انتظار پاسخ',
-  }),
+register('PATCH', endpoints.changeTicketStatus, ({ params, data }) => ({
+  success: true,
+  message: 'Ticket status updated.',
+  data: updateById(adminTickets, params.id, { status: data.status }),
 }))
diff --git a/src/services/query/admin-course-templates.js b/src/services/query/admin-course-templates.js
deleted file mode 100644
index 93d58ba..0000000
--- a/src/services/query/admin-course-templates.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import { cleanFilters } from '@/utils/clean-filters'
-import { useMutation, useQuery } from '@tanstack/vue-query'
-import {
-  apiAddAdminCourseTemplate,
-  apiAddAdminTemplateStudent,
-  apiAttachAdminTemplateSession,
-  apiChangeAdminCourseTemplateStatus,
-  apiDeleteAdminCourseTemplate,
-  apiDetachAdminTemplateSession,
-  apiGetAdminCourseTemplates,
-  apiGetAdminTemplateSessions,
-  apiGetAdminTemplateStudents,
-  apiRemoveAdminTemplateStudent,
-  apiShowAdminCourseTemplate,
-  apiUpdateAdminCourseTemplate,
-} from '@/services/api/admin-course-templates'
-
-export const adminCourseTemplatesKeys = {
-  all: ['admin', 'course-templates'],
-  list: (filters, pagination) => ['admin', 'course-templates', 'list', filters, pagination],
-  detail: (id) => ['admin', 'course-templates', 'detail', id],
-  students: (templateId, filters, pagination) => [
-    'admin',
-    'course-templates',
-    'students',
-    templateId,
-    filters,
-    pagination,
-  ],
-  sessions: (templateId, filters, pagination) => [
-    'admin',
-    'course-templates',
-    'sessions',
-    templateId,
-    filters,
-    pagination,
-  ],
-}
-
-export const useAdminCourseTemplatesListQuery = (filtersRef, paginationRef, options = {}) =>
-  useQuery({
-    queryKey: ['admin', 'course-templates', 'list', filtersRef, paginationRef],
-    queryFn: () =>
-      apiGetAdminCourseTemplates({
-        ...cleanFilters(filtersRef.value),
-        ...paginationRef.value,
-      }),
-    ...options,
-  })
-
-export const useAdminCourseTemplateQuery = (idRef, options = {}) =>
-  useQuery({
-    queryKey: ['admin', 'course-templates', 'detail', idRef],
-    queryFn: () => apiShowAdminCourseTemplate(idRef.value),
-    select: (response) => response?.data ?? response,
-    ...options,
-  })
-
-export const useAddAdminCourseTemplateMutation = () =>
-  useMutation({ mutationFn: (payload) => apiAddAdminCourseTemplate(payload) })
-
-export const useUpdateAdminCourseTemplateMutation = () =>
-  useMutation({
-    mutationFn: ({ id, payload }) => apiUpdateAdminCourseTemplate(id, payload),
-  })
-
-export const useDeleteAdminCourseTemplateMutation = () =>
-  useMutation({ mutationFn: (id) => apiDeleteAdminCourseTemplate(id) })
-
-export const useChangeAdminCourseTemplateStatusMutation = () =>
-  useMutation({
-    mutationFn: ({ id, payload }) => apiChangeAdminCourseTemplateStatus(id, payload),
-  })
-
-export const useAdminTemplateStudentsQuery = (
-  templateIdRef,
-  filtersRef,
-  paginationRef,
-  options = {}
-) =>
-  useQuery({
-    queryKey: ['admin', 'course-templates', 'students', templateIdRef, filtersRef, paginationRef],
-    queryFn: () =>
-      apiGetAdminTemplateStudents(templateIdRef.value, {
-        ...cleanFilters(filtersRef?.value || {}),
-        ...paginationRef?.value,
-      }),
-    ...options,
-  })
-
-export const useAddAdminTemplateStudentMutation = () =>
-  useMutation({
-    mutationFn: ({ templateId, payload }) => apiAddAdminTemplateStudent(templateId, payload),
-  })
-
-export const useRemoveAdminTemplateStudentMutation = () =>
-  useMutation({
-    mutationFn: ({ templateId, userId }) => apiRemoveAdminTemplateStudent(templateId, userId),
-  })
-
-export const useAdminTemplateSessionsQuery = (
-  templateIdRef,
-  filtersRef,
-  paginationRef,
-  options = {}
-) =>
-  useQuery({
-    queryKey: ['admin', 'course-templates', 'sessions', templateIdRef, filtersRef, paginationRef],
-    queryFn: () =>
-      apiGetAdminTemplateSessions(templateIdRef.value, {
-        ...cleanFilters(filtersRef?.value || {}),
-        ...paginationRef?.value,
-      }),
-    ...options,
-  })
-
-export const useAttachAdminTemplateSessionMutation = () =>
-  useMutation({
-    mutationFn: ({ templateId, payload }) => apiAttachAdminTemplateSession(templateId, payload),
-  })
-
-export const useDetachAdminTemplateSessionMutation = () =>
-  useMutation({
-    mutationFn: ({ templateId, sessionId }) => apiDetachAdminTemplateSession(templateId, sessionId),
-  })
diff --git a/src/services/query/admin-courses.js b/src/services/query/admin-courses.js
index 4d4ff3b..5b2921a 100644
--- a/src/services/query/admin-courses.js
+++ b/src/services/query/admin-courses.js
@@ -2,9 +2,14 @@ import { cleanFilters } from '@/utils/clean-filters'
 import { useMutation, useQuery } from '@tanstack/vue-query'
 import {
   apiAddAdminCourse,
-  apiChangeAdminCourseStatus,
+  apiAddAdminCourseStudent,
+  apiAttachAdminCourseSession,
   apiDeleteAdminCourse,
+  apiDetachAdminCourseSession,
+  apiGetAdminCourseSessions,
+  apiGetAdminCourseStudents,
   apiGetAdminCourses,
+  apiRemoveAdminCourseStudent,
   apiShowAdminCourse,
   apiUpdateAdminCourse,
 } from '@/services/api/admin-courses'
@@ -13,6 +18,22 @@ export const adminCoursesKeys = {
   all: ['admin', 'courses'],
   list: (filters, pagination) => ['admin', 'courses', 'list', filters, pagination],
   detail: (id) => ['admin', 'courses', 'detail', id],
+  students: (courseId, filters, pagination) => [
+    'admin',
+    'courses',
+    'students',
+    courseId,
+    filters,
+    pagination,
+  ],
+  sessions: (courseId, filters, pagination) => [
+    'admin',
+    'courses',
+    'sessions',
+    courseId,
+    filters,
+    pagination,
+  ],
 }
 
 export const useAdminCoursesListQuery = (filtersRef, paginationRef, options = {}) =>
@@ -46,7 +67,44 @@ export const useUpdateAdminCourseMutation = () =>
 export const useDeleteAdminCourseMutation = () =>
   useMutation({ mutationFn: (id) => apiDeleteAdminCourse(id) })
 
-export const useChangeAdminCourseStatusMutation = () =>
-  useMutation({
-    mutationFn: ({ id, payload }) => apiChangeAdminCourseStatus(id, payload),
+export const useAdminCourseStudentsQuery = (courseIdRef, filtersRef, paginationRef, options = {}) =>
+  useQuery({
+    queryKey: ['admin', 'courses', 'students', courseIdRef, filtersRef, paginationRef],
+    queryFn: () =>
+      apiGetAdminCourseStudents(courseIdRef.value, {
+        ...cleanFilters(filtersRef?.value || {}),
+        ...paginationRef?.value,
+      }),
+    ...options,
+  })
+
+export const useAddAdminCourseStudentMutation = () =>
+  useMutation({
+    mutationFn: ({ courseId, payload }) => apiAddAdminCourseStudent(courseId, payload),
+  })
+
+export const useRemoveAdminCourseStudentMutation = () =>
+  useMutation({
+    mutationFn: ({ courseId, userId }) => apiRemoveAdminCourseStudent(courseId, userId),
+  })
+
+export const useAdminCourseSessionsQuery = (courseIdRef, filtersRef, paginationRef, options = {}) =>
+  useQuery({
+    queryKey: ['admin', 'courses', 'sessions', courseIdRef, filtersRef, paginationRef],
+    queryFn: () =>
+      apiGetAdminCourseSessions(courseIdRef.value, {
+        ...cleanFilters(filtersRef?.value || {}),
+        ...paginationRef?.value,
+      }),
+    ...options,
+  })
+
+export const useAttachAdminCourseSessionMutation = () =>
+  useMutation({
+    mutationFn: ({ courseId, payload }) => apiAttachAdminCourseSession(courseId, payload),
+  })
+
+export const useDetachAdminCourseSessionMutation = () =>
+  useMutation({
+    mutationFn: ({ courseId, sessionId }) => apiDetachAdminCourseSession(courseId, sessionId),
   })
diff --git a/src/services/query/admin-exams.js b/src/services/query/admin-exams.js
index 3b70719..5541da7 100644
--- a/src/services/query/admin-exams.js
+++ b/src/services/query/admin-exams.js
@@ -2,6 +2,8 @@ import { cleanFilters } from '@/utils/clean-filters'
 import { useMutation, useQuery } from '@tanstack/vue-query'
 import {
   apiAddAdminExam,
+  apiAddAdminExamQuestion,
+  apiAddAdminQuestionOption,
   apiDeleteAdminExam,
   apiGetAdminExams,
   apiGetAdminExamParticipants,
@@ -36,6 +38,10 @@ export const useAdminExamsListQuery = (filtersRef, paginationRef, options = {})
   useQuery({
     queryKey: ['admin', 'exams', 'list', filtersRef, paginationRef],
     queryFn: () => apiGetAdminExams({ ...cleanFilters(filtersRef.value), ...paginationRef.value }),
+    select: (response) => ({
+      data: response?.data?.items ?? response?.data ?? [],
+      meta: response?.data?.meta ?? response?.meta,
+    }),
     ...options,
   })
 
@@ -74,3 +80,11 @@ export const useUpdateAdminExamMutation = () =>
 
 export const useDeleteAdminExamMutation = () =>
   useMutation({ mutationFn: (id) => apiDeleteAdminExam(id) })
+
+export const useAddAdminExamQuestionMutation = () =>
+  useMutation({ mutationFn: ({ examId, payload }) => apiAddAdminExamQuestion(examId, payload) })
+
+export const useAddAdminQuestionOptionMutation = () =>
+  useMutation({
+    mutationFn: ({ questionId, payload }) => apiAddAdminQuestionOption(questionId, payload),
+  })
diff --git a/src/services/query/admin-sessions.js b/src/services/query/admin-sessions.js
index aa89187..314f2d0 100644
--- a/src/services/query/admin-sessions.js
+++ b/src/services/query/admin-sessions.js
@@ -2,7 +2,6 @@ import { cleanFilters } from '@/utils/clean-filters'
 import { useMutation, useQuery } from '@tanstack/vue-query'
 import {
   apiAddAdminSession,
-  apiChangeAdminSessionStatus,
   apiDeleteAdminSession,
   apiGetAdminSessions,
   apiGetSessionAttendance,
@@ -70,8 +69,3 @@ export const useUpdateAdminSessionMutation = () =>
 
 export const useDeleteAdminSessionMutation = () =>
   useMutation({ mutationFn: (id) => apiDeleteAdminSession(id) })
-
-export const useChangeAdminSessionStatusMutation = () =>
-  useMutation({
-    mutationFn: ({ id, payload }) => apiChangeAdminSessionStatus(id, payload),
-  })
diff --git a/src/services/query/admin-terms.js b/src/services/query/admin-terms.js
index 2bc3c3c..3db616b 100644
--- a/src/services/query/admin-terms.js
+++ b/src/services/query/admin-terms.js
@@ -4,7 +4,6 @@ import {
   apiAddAdminTerm,
   apiAddAdminTermCourses,
   apiAddAdminTermStudents,
-  apiChangeAdminTermStatus,
   apiCloneAdminTerm,
   apiDeleteAdminTerm,
   apiGetAdminTerms,
@@ -70,9 +69,6 @@ export const useDeleteAdminTermMutation = () =>
 export const useCloneAdminTermMutation = () =>
   useMutation({ mutationFn: (id) => apiCloneAdminTerm(id) })
 
-export const useChangeAdminTermStatusMutation = () =>
-  useMutation({ mutationFn: ({ id, payload }) => apiChangeAdminTermStatus(id, payload) })
-
 export const useAdminTermStudentsQuery = (termIdRef, filtersRef, paginationRef, options = {}) =>
   useQuery({
     queryKey: ['admin', 'terms', 'students', termIdRef, filtersRef, paginationRef],
diff --git a/src/services/query/admin-tickets.js b/src/services/query/admin-tickets.js
index fc2e0e5..48693c3 100644
--- a/src/services/query/admin-tickets.js
+++ b/src/services/query/admin-tickets.js
@@ -18,6 +18,10 @@ export const useAdminTicketsListQuery = (filtersRef, paginationRef, options = {}
     queryKey: ['admin', 'tickets', 'list', filtersRef, paginationRef],
     queryFn: () =>
       apiGetAdminTickets({ ...cleanFilters(filtersRef.value), ...paginationRef.value }),
+    select: (response) => ({
+      data: response?.data ?? [],
+      meta: response?.meta,
+    }),
     ...options,
   })