fix: user changes

src/features/admin/courses/components/modals/AddCourseStudentModal.vue

@@ -1,305 +0,0 @@
-<template>
-  <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">
-        <div class="add-course-student__search">
-          <SvgIcon name="user" :size="18" color="var(--color-thd-gray)" />
-          <input
-            v-model="searchInput"
-            type="text"
-            class="add-course-student__search-input"
-            placeholder="اسم دانشجو را وارد نمایید"
-            @input="onSearchInput"
-          />
-        </div>
-
-        <SkeletonLoaderBlock v-if="isLoading" :rows="4" :cols-per-row="1" />
-
-        <div v-else-if="users.length > 0" class="add-course-student__list">
-          <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="user?.name" />
-              </div>
-              <div
-                v-else
-                class="add-course-student__avatar add-course-student__avatar--placeholder"
-              >
-                <SvgIcon name="user" :size="20" color="#bcbcbc" />
-              </div>
-              <div class="add-course-student__text">
-                <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>
-                  <span>{{ user.address?.city?.name || '—' }}</span>
-                </p>
-              </div>
-            </div>
-
-            <CircleButton
-              v-if="isAttached(user.id)"
-              tooltip="حذف از دوره"
-              bg-color="rgba(104, 104, 104, 0.05)"
-              size="2.25rem"
-              type="button"
-              :loading="pendingId === user.id"
-              @click="onDetach(user)"
-            >
-              <template #icon>
-                <SvgIcon name="trash" :size="16" color="var(--color-error)" />
-              </template>
-            </CircleButton>
-            <CircleButton
-              v-else
-              tooltip="افزودن به دوره"
-              bg-color="rgba(104, 104, 104, 0.05)"
-              size="2.25rem"
-              type="button"
-              :loading="pendingId === user.id"
-              @click="onAttach(user)"
-            >
-              <template #icon>
-                <SvgIcon name="plus" :size="16" color="var(--color-sec-gray)" />
-              </template>
-            </CircleButton>
-          </div>
-        </div>
-
-        <NoItems v-else title="بدون نتیجه" desc="دانشجویی یافت نشد." />
-
-        <div class="add-course-student__divider" />
-
-        <div class="add-course-student__footer">
-          <BaseButton text="تایید" custom-class="add-course-student__close-btn" @click="close">
-            <template #appendIcon>
-              <SvgIcon name="arrow-left" :size="18" color="#fff" />
-            </template>
-          </BaseButton>
-        </div>
-      </div>
-    </template>
-  </BasicModal>
-</template>
-
-<script setup>
-import { computed, ref, watch } from 'vue'
-import useModal from '@/composables/useModal'
-import useDebounce from '@/composables/useDebounce'
-import { useQueryClient } from '@tanstack/vue-query'
-import BasicModal from '@/components/BasicModal.vue'
-import BaseButton from '@/components/BaseButton.vue'
-import SvgIcon from '@/components/icons/SvgIcon.vue'
-import NoItems from '@/components/blocks/NoItems.vue'
-import CircleButton from '@/components/CircleButton.vue'
-import LineTitleBlock from '@/components/LineTitleBlock.vue'
-import { useAdminUsersListQuery } from '@/services/query/admin-users'
-import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
-import {
-  adminCoursesKeys,
-  useAddAdminCourseStudentMutation,
-  useAdminCourseStudentsQuery,
-  useRemoveAdminCourseStudentMutation,
-} from '@/services/query/admin-courses'
-
-defineOptions({ name: 'AddCourseStudentModal' })
-
-const queryClient = useQueryClient()
-const { getModal } = useModal()
-
-const modalData = computed(() => getModal('AddCourseStudentModal')?.data ?? {})
-const courseId = computed(() => modalData.value.courseId ?? null)
-
-const searchInput = ref('')
-const searchQuery = ref('')
-const userFilters = computed(() => ({ name: searchQuery.value }))
-const userPagination = ref({ page: 1, perPage: 20 })
-
-const { data: usersResponse, isLoading } = useAdminUsersListQuery(userFilters, userPagination)
-const users = computed(() => usersResponse.value?.data ?? [])
-
-const attachedFilters = computed(() => ({}))
-const attachedPagination = ref({ page: 1, perPage: 200 })
-const { data: attachedResponse } = useAdminCourseStudentsQuery(
-  courseId,
-  attachedFilters,
-  attachedPagination,
-  { enabled: () => !!courseId.value }
-)
-const attachedIds = computed(() => new Set((attachedResponse.value?.data ?? []).map((u) => u.id)))
-
-const isAttached = (id) => attachedIds.value.has(id)
-
-const onSearchInput = useDebounce(() => {
-  searchQuery.value = searchInput.value || ''
-  userPagination.value = { ...userPagination.value, page: 1 }
-}, 400)
-
-const pendingId = ref(null)
-
-const addMutation = useAddAdminCourseStudentMutation()
-const removeMutation = useRemoveAdminCourseStudentMutation()
-
-const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
-
-const onAttach = async (user) => {
-  if (!courseId.value) return
-  pendingId.value = user.id
-  try {
-    await addMutation.mutateAsync({
-      courseId: courseId.value,
-      payload: { userIds: [user.id] },
-    })
-    invalidate()
-  } finally {
-    pendingId.value = null
-  }
-}
-
-const onDetach = async (user) => {
-  if (!courseId.value) return
-  pendingId.value = user.id
-  try {
-    await removeMutation.mutateAsync({ courseId: courseId.value, userId: user.id })
-    invalidate()
-  } finally {
-    pendingId.value = null
-  }
-}
-
-watch(courseId, () => {
-  searchInput.value = ''
-  searchQuery.value = ''
-  pendingId.value = null
-})
-</script>
-
-<style lang="scss" scoped>
-.add-course-student {
-  width: 100%;
-  text-align: start;
-  padding: 0.5rem 0.25rem;
-
-  &__search {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-    margin-block: 1rem;
-    padding: 0 1rem;
-    height: 2.75rem;
-    border: 1px solid var(--color-thd-gray);
-    border-radius: 9999px;
-    background: #fff;
-  }
-
-  &__search-input {
-    flex: 1;
-    border: none;
-    outline: none;
-    background: transparent;
-    font-family: var(--font-family-fa);
-    font-size: 0.875rem;
-    color: #4b4b4b;
-    text-align: start;
-
-    &::placeholder {
-      color: var(--color-prim-gray);
-    }
-  }
-
-  &__list {
-    display: flex;
-    flex-direction: column;
-    gap: 0.5rem;
-    max-height: 22rem;
-    overflow-y: auto;
-    padding-inline-end: 0.25rem;
-  }
-
-  &__row {
-    display: flex;
-    align-items: center;
-    gap: 0.625rem;
-    padding: 0.625rem 0.875rem;
-    background: rgba(255, 255, 255, 85%);
-    border-radius: 0.875rem;
-    box-shadow: 0 4px 10px -6px rgba(241, 241, 241, 70%);
-  }
-
-  &__main {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    gap: 0.625rem;
-    min-width: 0;
-  }
-
-  &__avatar {
-    width: 2.5rem;
-    height: 2.5rem;
-    border-radius: 9999px;
-    overflow: hidden;
-    border: 1px solid #eee;
-    flex-shrink: 0;
-
-    img {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-    }
-
-    &--placeholder {
-      background: #f5f5f5;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border: none;
-    }
-  }
-
-  &__text {
-    min-width: 0;
-  }
-
-  &__name {
-    font-family: var(--font-family-fa);
-    font-size: 0.95rem;
-    color: #4b4b4b;
-    margin: 0 0 0.25rem;
-  }
-
-  &__meta {
-    font-family: var(--font-family-fa);
-    font-size: 0.75rem;
-    font-weight: 300;
-    color: #848484;
-    margin: 0;
-  }
-
-  &__sep {
-    color: #c4c4c4;
-    margin-inline: 0.25rem;
-  }
-
-  &__divider {
-    border-block-end: 1px solid var(--color-thd-gray);
-    margin-block: 1rem;
-  }
-
-  &__footer {
-    display: flex;
-    justify-content: flex-start;
-  }
-
-  &__close-btn {
-    min-width: 12rem;
-  }
-}
-</style>

src/features/admin/courses/components/modals/AddSessionToCourseModal.vue

@@ -1,9 +1,14 @@
 <template>
-  <BasicModal width="95%" max-width="42rem" min-width="auto" :show-close-button="true">
+  <BasicModal
+    title="افزودن جلسه"
+    title-en="Add"
+    width="95%"
+    max-width="42rem"
+    min-width="auto"
+    :show-close-button="true"
+  >
     <template #default="{ close }">
       <div class="add-session">
-        <LineTitleBlock title="افزودن جلسه" title-en="Add" />
-
         <div class="add-session__search">
           <SvgIcon name="book" :size="18" color="var(--color-thd-gray)" />
           <input
@@ -37,20 +42,6 @@
             </div>
 
             <CircleButton
-              v-if="isAttached(session.id)"
-              tooltip="حذف از دوره"
-              bg-color="rgba(104, 104, 104, 0.05)"
-              size="2.25rem"
-              type="button"
-              :loading="pendingId === session.id"
-              @click="onDetach(session)"
-            >
-              <template #icon>
-                <SvgIcon name="trash" :size="16" color="var(--color-error)" />
-              </template>
-            </CircleButton>
-            <CircleButton
-              v-else
               tooltip="افزودن به دوره"
               bg-color="rgba(104, 104, 104, 0.05)"
               size="2.25rem"
@@ -92,14 +83,13 @@ import SvgIcon from '@/components/icons/SvgIcon.vue'
 import NoItems from '@/components/blocks/NoItems.vue'
 import CircleButton from '@/components/CircleButton.vue'
 import LineTitleBlock from '@/components/LineTitleBlock.vue'
-import { useAdminSessionsListQuery } from '@/services/query/admin-sessions'
+import { adminCoursesKeys } from '@/services/query/admin-courses'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import {
-  adminCoursesKeys,
-  useAdminCourseSessionsQuery,
-  useAttachAdminCourseSessionMutation,
-  useDetachAdminCourseSessionMutation,
-} from '@/services/query/admin-courses'
+  adminSessionsKeys,
+  useAdminSessionsListQuery,
+  useUpdateAdminSessionMutation,
+} from '@/services/query/admin-sessions'
 
 defineOptions({ name: 'AddSessionToCourseModal' })
 
@@ -111,8 +101,8 @@ const courseId = computed(() => modalData.value.courseId ?? null)
 
 const searchInput = ref('')
 const searchQuery = ref('')
-const sessionFilters = computed(() => ({ title: searchQuery.value }))
-const sessionPagination = ref({ page: 1, perPage: 20 })
+const sessionFilters = computed(() => ({ search: searchQuery.value }))
+const sessionPagination = ref({ page: 1, perPage: 10 })
 
 const { data: sessionsResponse, isLoading } = useAdminSessionsListQuery(
   sessionFilters,
@@ -120,18 +110,6 @@ const { data: sessionsResponse, isLoading } = useAdminSessionsListQuery(
 )
 const sessions = computed(() => sessionsResponse.value?.data ?? [])
 
-const attachedFilters = computed(() => ({}))
-const attachedPagination = ref({ page: 1, perPage: 200 })
-const { data: attachedResponse } = useAdminCourseSessionsQuery(
-  courseId,
-  attachedFilters,
-  attachedPagination,
-  { 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
   if (!t) return '—'
@@ -145,18 +123,20 @@ const onSearchInput = useDebounce(() => {
 
 const pendingId = ref(null)
 
-const attachMutation = useAttachAdminCourseSessionMutation()
-const detachMutation = useDetachAdminCourseSessionMutation()
+const updateSessionMutation = useUpdateAdminSessionMutation()
 
-const invalidate = () => queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
+const invalidate = () => {
+  queryClient.invalidateQueries({ queryKey: adminCoursesKeys.all })
+  queryClient.invalidateQueries({ queryKey: adminSessionsKeys.all })
+}
 
 const onAttach = async (session) => {
   if (!courseId.value) return
   pendingId.value = session.id
   try {
-    await attachMutation.mutateAsync({
-      courseId: courseId.value,
-      payload: { sessionIds: [session.id] },
+    await updateSessionMutation.mutateAsync({
+      id: session.id,
+      payload: { courseId: courseId.value },
     })
     invalidate()
   } finally {
@@ -164,17 +144,6 @@ const onAttach = async (session) => {
   }
 }
 
-const onDetach = async (session) => {
-  if (!courseId.value) return
-  pendingId.value = session.id
-  try {
-    await detachMutation.mutateAsync({ courseId: courseId.value, sessionId: session.id })
-    invalidate()
-  } finally {
-    pendingId.value = null
-  }
-}
-
 watch(courseId, () => {
   searchInput.value = ''
   searchQuery.value = ''

src/features/admin/courses/components/modals/CourseDetailsModal.vue

@@ -1,9 +1,14 @@
 <template>
-  <BasicModal width="95%" max-width="80rem" min-width="auto" :show-close-button="true">
+  <BasicModal
+    title="جزئیات دوره"
+    title-en="details"
+    width="95%"
+    max-width="80rem"
+    min-width="auto"
+    :show-close-button="true"
+  >
     <template #default="{ close }">
       <div class="course-details">
-        <LineTitleBlock title="جزئیات دوره" title-en="details" />
-
         <SkeletonLoaderBlock v-if="isLoading" :rows="3" :cols-per-row="1" />
 
         <template v-else-if="course">
@@ -14,14 +19,6 @@
             </div>
             <div class="course-details__grid">
               <LineInfoBlock title="عنوان دوره" :desc="course.title || '—'" />
-              <LineInfoBlock
-                title="تاریخ شروع"
-                :numeric-desc="course.faStartDate || formatJalaaliDate(course.startDate) || '—'"
-              />
-              <LineInfoBlock
-                title="تاریخ پایان"
-                :numeric-desc="course.faEndDate || formatJalaaliDate(course.endDate) || '—'"
-              />
               <LineInfoBlock title="تعداد جلسات" :numeric-desc="course.sessionsCount ?? 0" />
               <LineInfoBlock title="پیش‌نیاز دوره" :desc="teacherName" />
             </div>
@@ -30,12 +27,8 @@
           <div v-if="course.description" class="course-details__description">
             <LineInfoBlock title="توضیحات دوره" :desc="course.description" />
           </div>
-        </template>
 
-        <NoItems v-else title="یافت نشد" desc="اطلاعات این دوره در دسترس نیست." />
-
-        <TabsBlock v-if="course" :tabs="tabs" v-model="activeTab">
-          <template #sessions>
+          <section class="course-details__sessions">
             <div class="course-details__panel-header">
               <LineTitleBlock title="لیست جلسات" title-en="Sessions" />
               <BaseButton
@@ -60,70 +53,10 @@
               :pagination="sessionsPaginationMeta"
               @update:page="setSessionsPage"
             />
-          </template>
+          </section>
+        </template>
 
-          <template #students>
-            <div class="course-details__panel-header">
-              <LineTitleBlock title="دانشجویان" title-en="Students" />
-              <BaseButton
-                text="افزودن دانشجو به این دوره"
-                custom-class="course-details__panel-btn"
-                @click="onOpenAddStudent"
-              >
-                <template #appendIcon>
-                  <SvgIcon name="arrow-left" :size="16" color="#fff" />
-                </template>
-              </BaseButton>
-            </div>
-
-            <SkeletonLoaderBlock v-if="studentsPending" :rows="4" :cols-per-row="1" />
-            <div v-else-if="students.length > 0">
-              <div
-                v-for="student in students"
-                :key="student.id"
-                class="course-details__student-row"
-              >
-                <div class="course-details__student-main">
-                  <div v-if="studentAvatar(student)" class="course-details__avatar">
-                    <img :src="studentAvatar(student)" :alt="student.name" />
-                  </div>
-                  <div v-else class="course-details__avatar course-details__avatar--placeholder">
-                    <SvgIcon name="user" :size="20" color="#bcbcbc" />
-                  </div>
-                  <div>
-                    <p class="course-details__student-name">{{ student.name || '—' }}</p>
-                    <p class="course-details__student-meta">
-                      <span dir="ltr">{{ student.phone || '—' }}</span>
-                      <template v-if="student.email">
-                        <span class="course-details__sep">،</span>
-                        <span dir="ltr">{{ student.email }}</span>
-                      </template>
-                    </p>
-                  </div>
-                </div>
-                <div v-if="student.phone" class="course-details__student-actions">
-                  <CircleButton
-                    tooltip="ارسال پیام"
-                    bg-color="rgba(104, 104, 104, 0.05)"
-                    size="2.25rem"
-                    @click="onMessageStudent(student)"
-                  >
-                    <template #icon>
-                      <SvgIcon name="chat" :size="16" color="var(--color-sec-gray)" />
-                    </template>
-                  </CircleButton>
-                </div>
-              </div>
-            </div>
-            <NoItems v-else title="بدون دانشجو" desc="دانشجویی به این دوره اضافه نشده است." />
-
-            <PaginationBlock
-              v-if="studentsPaginationMeta.lastPage > 1"
-              :pagination="studentsPaginationMeta"
-              @update:page="setStudentsPage"
-            />
-          </template>
-        </TabsBlock>
+        <NoItems v-else title="یافت نشد" desc="اطلاعات این دوره در دسترس نیست." />
 
         <div class="course-details__divider" />
 
@@ -140,26 +73,20 @@
 </template>
 
 <script setup>
-import { computed, ref } from 'vue'
+import { computed } from 'vue'
 import useModal from '@/composables/useModal'
 import BasicModal from '@/components/BasicModal.vue'
 import BaseButton from '@/components/BaseButton.vue'
 import SvgIcon from '@/components/icons/SvgIcon.vue'
 import NoItems from '@/components/blocks/NoItems.vue'
-import { formatJalaaliDate } from '@/utils/date-utils'
-import CircleButton from '@/components/CircleButton.vue'
-import TabsBlock from '@/components/blocks/TabsBlock.vue'
 import { usePagination } from '@/composables/usePagination'
 import LineTitleBlock from '@/components/LineTitleBlock.vue'
 import LineInfoBlock from '@/components/blocks/LineInfoBlock.vue'
+import { useAdminCourseQuery } from '@/services/query/admin-courses'
 import PaginationBlock from '@/components/blocks/PaginationBlock.vue'
+import { useAdminSessionsListQuery } from '@/services/query/admin-sessions'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import CourseSessionItem from '@/features/admin/courses/components/CourseSessionItem.vue'
-import {
-  useAdminCourseQuery,
-  useAdminCourseSessionsQuery,
-  useCourseAttendeesQuery,
-} from '@/services/query/admin-courses'
 
 defineOptions({ name: 'CourseDetailsModal' })
 
@@ -178,24 +105,17 @@ const teacherName = computed(() => {
   return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
 })
 
-const tabs = [
-  { name: 'sessions', label: 'لیست جلسات', icon: 'list-bullets' },
-  { name: 'students', label: 'دانشجویان', icon: 'users' },
-]
-const activeTab = ref('sessions')
-
-const sessionsFilters = ref({})
+const sessionsFilters = computed(() => ({ courseId: courseId.value }))
 const { pagination: sessionsPagination, setPage: setSessionsPage } = usePagination({
   page: 1,
   perPage: 10,
 })
 
-const { data: sessionsData, isLoading: sessionsPending } = useAdminCourseSessionsQuery(
-  courseId,
+const { data: sessionsData, isLoading: sessionsPending } = useAdminSessionsListQuery(
   sessionsFilters,
   sessionsPagination,
   {
-    enabled: () => !!courseId.value && activeTab.value === 'sessions',
+    enabled: () => !!courseId.value,
     keepPreviousData: true,
   }
 )
@@ -207,43 +127,9 @@ const sessionsPaginationMeta = computed(() => ({
   ...sessionsData.value?.meta,
 }))
 
-const studentsFilters = ref({})
-const { pagination: studentsPagination, setPage: setStudentsPage } = usePagination({
-  page: 1,
-  perPage: 10,
-})
-
-const { data: studentsData, isLoading: studentsPending } = useCourseAttendeesQuery(
-  courseId,
-  studentsFilters,
-  studentsPagination,
-  {
-    enabled: () => !!courseId.value && activeTab.value === 'students',
-    keepPreviousData: true,
-  }
-)
-
-const students = computed(() => studentsData.value?.data ?? [])
-const studentsPaginationMeta = computed(() => ({
-  page: studentsPagination.value.page,
-  perPage: studentsPagination.value.perPage,
-  ...studentsData.value?.meta,
-}))
-
-const studentAvatar = (student) => student.avatarUrl || student.avatarDownloadUrl || ''
-
 const onOpenAddSession = () => {
   openModal('AddSessionToCourseModal', { courseId: courseId.value })
 }
-
-const onOpenAddStudent = () => {
-  openModal('AddCourseStudentModal', { courseId: courseId.value })
-}
-
-const onMessageStudent = (student) => {
-  if (!student?.phone) return
-  window.location.href = `sms:${student.phone}`
-}
 </script>
 
 <style lang="scss" scoped>
@@ -299,6 +185,10 @@ const onMessageStudent = (student) => {
     margin-block: 0.5rem 1rem;
   }
 
+  &__sessions {
+    margin-top: 0.5rem;
+  }
+
   &__panel-header {
     display: flex;
     align-items: center;
@@ -312,74 +202,6 @@ const onMessageStudent = (student) => {
     margin-inline-start: auto;
   }
 
-  &__student-row {
-    display: flex;
-    align-items: center;
-    gap: 0.75rem;
-    padding: 0.625rem 0.875rem;
-    background: rgba(255, 255, 255, 85%);
-    border-radius: 0.875rem;
-    box-shadow: 0 4px 10px -6px rgba(241, 241, 241, 70%);
-    margin-bottom: 0.5rem;
-  }
-
-  &__student-main {
-    display: flex;
-    align-items: center;
-    gap: 0.625rem;
-    flex: 1;
-    min-width: 0;
-  }
-
-  &__avatar {
-    width: 2.5rem;
-    height: 2.5rem;
-    border-radius: 9999px;
-    overflow: hidden;
-    border: 1px solid #eee;
-    flex-shrink: 0;
-
-    img {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-    }
-
-    &--placeholder {
-      background: #f5f5f5;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border: none;
-    }
-  }
-
-  &__student-name {
-    font-family: var(--font-family-fa);
-    font-size: 0.95rem;
-    color: #4b4b4b;
-    margin: 0 0 0.25rem;
-  }
-
-  &__student-meta {
-    font-family: var(--font-family-fa);
-    font-size: 0.75rem;
-    font-weight: 300;
-    color: #848484;
-    margin: 0;
-  }
-
-  &__sep {
-    color: #c4c4c4;
-    margin-inline: 0.25rem;
-  }
-
-  &__student-actions {
-    display: flex;
-    align-items: center;
-    gap: 0.375rem;
-  }
-
   &__divider {
     border-block-end: 1px solid var(--color-thd-gray);
     margin-block: 1.5rem;

src/features/admin/courses/pages/CourseFormPage.vue

@@ -25,7 +25,6 @@
         </div>
 
         <div class="course-form__main-col">
-          <LineTitleBlock title="اطلاعات دوره" title-en="Course Details" />
           <div class="course-form__row">
             <div class="course-form__cell course-form__cell--third">
               <TextField
@@ -64,17 +63,6 @@
                 @blur="validateAt('capacity', form.capacity)"
               />
             </div>
-            <div class="course-form__cell course-form__cell--third">
-              <TextField
-                v-model="form.sessionsCount"
-                name="sessionsCount"
-                label="تعداد جلسه"
-                inputmode="numeric"
-                :convert-digits="true"
-                :error="errors.sessionsCount"
-                @blur="validateAt('sessionsCount', form.sessionsCount)"
-              />
-            </div>
             <div class="course-form__cell course-form__cell--third">
               <SelectField
                 v-model="form.prerequisites"
@@ -152,7 +140,6 @@ import BaseButton from '@/components/BaseButton.vue'
 import SvgIcon from '@/components/icons/SvgIcon.vue'
 import TextField from '@/components/form/TextField.vue'
 import SelectField from '@/components/form/SelectField.vue'
-import LineTitleBlock from '@/components/LineTitleBlock.vue'
 import ImageCropper from '@/components/form/ImageCropper.vue'
 import { objectToFormData } from '@/utils/object-to-formdata'
 import { useUploadMediaMutation } from '@/services/query/auth'
@@ -180,7 +167,6 @@ const form = ref({
   title: '',
   teacherId: '',
   capacity: '',
-  sessionsCount: '',
   prerequisites: [],
   contentType: '',
   description: '',
@@ -198,7 +184,10 @@ const contentTypeOptions = Object.entries(COURSE_CONTENT_TYPE).map(([value, labe
 const { validate, validateAt, errors } = useYup(courseSchema)
 
 const teacherSearch = ref('')
-const teacherFilters = computed(() => ({ name: teacherSearch.value }))
+const teacherFilters = computed(() => ({
+  search: teacherSearch.value,
+  roles: 'teacher',
+}))
 const teacherPagination = ref({ page: 1, perPage: 10 })
 const { data: teachersResponse } = useAdminUsersListQuery(teacherFilters, teacherPagination)
 const selectedTeacher = ref(null)
@@ -247,7 +236,6 @@ watch(existingCourse, (course) => {
     title: course.title || '',
     teacherId: teacher?.id || course.teacherId || '',
     capacity: course.capacity ?? '',
-    sessionsCount: course.sessionsCount ?? '',
     prerequisites: prereqs.map((p) => p.courseId ?? p.id).filter(Boolean),
     contentType: course.contentType || '',
     description: course.description || '',

src/features/admin/courses/pages/CoursesListPage.vue

@@ -62,7 +62,6 @@
 
     <AddOfferedCourseModal v-if="isModal('AddOfferedCourseModal')" />
     <CourseDetailsModal v-if="isModal('CourseDetailsModal')" />
-    <AddCourseStudentModal v-if="isModal('AddCourseStudentModal')" />
     <AddSessionToCourseModal v-if="isModal('AddSessionToCourseModal')" />
   </div>
 </template>
@@ -83,7 +82,6 @@ import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import CoursesFilters from '@/features/admin/courses/components/CoursesFilters.vue'
 import CourseDetailsModal from '@/features/admin/courses/components/modals/CourseDetailsModal.vue'
 import AddOfferedCourseModal from '@/features/admin/courses/components/modals/AddOfferedCourseModal.vue'
-import AddCourseStudentModal from '@/features/admin/courses/components/modals/AddCourseStudentModal.vue'
 import AddSessionToCourseModal from '@/features/admin/courses/components/modals/AddSessionToCourseModal.vue'
 import {
   adminCoursesKeys,

src/features/admin/courses/schema/index.js

@@ -4,7 +4,6 @@ export const courseSchema = object().shape({
   title: string().required().min(3).max(255),
   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(),

src/features/admin/sessions/components/modals/SessionDetailsModal.vue

@@ -17,15 +17,11 @@
               title="تاریخ شروع"
               :numeric-desc="formatJalaaliDate(session.startsAt) || '—'"
             />
-            <LineInfoBlock
-              title="تاریخ پایان"
-              :numeric-desc="formatJalaaliDate(session.endsAt) || '—'"
-            />
+
             <LineInfoBlock title="مدت زمان جلسه" :numeric-desc="durationLabel" />
 
             <LineInfoBlock title="نوع جلسه" :desc="sessionTypeLabel" />
             <LineInfoBlock title="دوره مرتبط" :desc="courseTitle" />
-            <LineInfoBlock title="متعلق به" :desc="termTitle" />
             <LineInfoBlock title="محتوای جلسه" :desc="contentTypeLabel" />
           </div>
 
@@ -37,14 +33,14 @@
             <LineInfoBlock title="لینک جلسه" :desc="session.link" />
           </div>
 
-          <div v-if="mediaUrl || session.contentType" class="session-details__media">
+          <div v-if="mediaUrl || contentType" class="session-details__media">
             <VideoPlayerBlock
-              v-if="session.contentType === 'video'"
+              v-if="contentType === 'video'"
               :src="mediaUrl"
               :video-id="session.id"
             />
             <VoiceRecorder
-              v-else-if="session.contentType === 'voice'"
+              v-else-if="contentType === 'voice'"
               :model-value="mediaUrl"
               :disabled="true"
             />
@@ -112,21 +108,28 @@ const durationLabel = computed(() =>
 
 const courseTitle = computed(() => session.value?.course?.title || '—')
 
-const termTitle = computed(
-  () => session.value?.course?.term?.title || session.value?.term?.title || '—'
-)
-
-const contentTypeLabel = computed(() => COURSE_CONTENT_TYPE[session.value?.contentType] || '—')
-
 const isOnline = computed(() => session.value?.type === 'online')
 
+const collectionToContentType = (collectionName) => {
+  if (collectionName === 'videos') return 'video'
+  if (collectionName === 'voices') return 'voice'
+  if (collectionName === 'pdfs') return 'text'
+  return ''
+}
+
+const media = computed(() => (Array.isArray(session.value?.media) ? session.value.media : []))
+
+const contentMedia = computed(() => media.value.find((m) => m.collectionName !== 'cover'))
+
+const contentType = computed(() => collectionToContentType(contentMedia.value?.collectionName))
+
+const contentTypeLabel = computed(() => COURSE_CONTENT_TYPE[contentType.value] || '—')
+
 const mediaUrl = computed(
-  () => session.value?.contentMedia?.url || session.value?.contentMedia?.downloadUrl || ''
+  () => contentMedia.value?.url || contentMedia.value?.downloadUrl || ''
 )
 
-const mediaFileName = computed(
-  () => session.value?.contentMedia?.fileName || session.value?.contentMedia?.name || 'فایل پیوست'
-)
+const mediaFileName = computed(() => contentMedia.value?.fileName || 'فایل پیوست')
 </script>
 
 <style lang="scss" scoped>

src/features/admin/terms/components/CourseItem.vue

@@ -67,7 +67,7 @@ const emit = defineEmits(['delete'])
 const teacherName = computed(() => {
   const t = props.course.teacher
   if (!t) return '—'
-  return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
+  return t.name
 })
 
 const isActive = computed(() => props.course.isActive ?? false)

src/features/admin/terms/components/modals/AddTermStudentModal.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-term-student">
-        <LineTitleBlock title="افزودن دانشجو" title-en="Add Student" />
-
         <div class="add-term-student__search">
           <SvgIcon name="user" :size="18" color="var(--color-thd-gray)" />
           <input
@@ -37,20 +42,6 @@
             </div>
 
             <CircleButton
-              v-if="isAttached(user.id)"
-              tooltip="حذف از ترم"
-              bg-color="rgba(104, 104, 104, 0.05)"
-              size="2.25rem"
-              type="button"
-              :loading="pendingId === user.id"
-              @click="onDetach(user)"
-            >
-              <template #icon>
-                <SvgIcon name="trash" :size="16" color="var(--color-error)" />
-              </template>
-            </CircleButton>
-            <CircleButton
-              v-else
               tooltip="افزودن به ترم"
               bg-color="rgba(104, 104, 104, 0.05)"
               size="2.25rem"
@@ -91,15 +82,9 @@ import BaseButton from '@/components/BaseButton.vue'
 import SvgIcon from '@/components/icons/SvgIcon.vue'
 import NoItems from '@/components/blocks/NoItems.vue'
 import CircleButton from '@/components/CircleButton.vue'
-import LineTitleBlock from '@/components/LineTitleBlock.vue'
 import { useAdminUsersListQuery } from '@/services/query/admin-users'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
-import {
-  adminTermsKeys,
-  useAddAdminTermStudentsMutation,
-  useAdminTermStudentsQuery,
-  useRemoveAdminTermStudentMutation,
-} from '@/services/query/admin-terms'
+import { adminTermsKeys, useAddAdminTermStudentsMutation } from '@/services/query/admin-terms'
 
 defineOptions({ name: 'AddTermStudentModal' })
 
@@ -111,29 +96,13 @@ const termId = computed(() => modalData.value.termId ?? null)
 
 const searchInput = ref('')
 const searchQuery = ref('')
-const userFilters = computed(() => ({ name: searchQuery.value }))
-const userPagination = ref({ page: 1, perPage: 20 })
+const userFilters = computed(() => ({ search: searchQuery.value }))
+const userPagination = ref({ page: 1, perPage: 10 })
 
 const { data: usersResponse, isLoading } = useAdminUsersListQuery(userFilters, userPagination)
 const users = computed(() => usersResponse.value?.data ?? [])
 
-const attachedFilters = computed(() => ({}))
-const attachedPagination = ref({ page: 1, perPage: 200 })
-const { data: attachedResponse } = useAdminTermStudentsQuery(
-  termId,
-  attachedFilters,
-  attachedPagination,
-  { enabled: () => !!termId.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 userLabel = (user) => user.name.trim() || '—'
 
 const onSearchInput = useDebounce(() => {
   searchQuery.value = searchInput.value || ''
@@ -143,7 +112,6 @@ const onSearchInput = useDebounce(() => {
 const pendingId = ref(null)
 
 const addMutation = useAddAdminTermStudentsMutation()
-const removeMutation = useRemoveAdminTermStudentMutation()
 
 const invalidate = () => queryClient.invalidateQueries({ queryKey: adminTermsKeys.all })
 
@@ -153,7 +121,7 @@ const onAttach = async (user) => {
   try {
     await addMutation.mutateAsync({
       termId: termId.value,
-      payload: { userIds: [user.id] },
+      payload: { userId: user.id },
     })
     invalidate()
   } finally {
@@ -161,17 +129,6 @@ const onAttach = async (user) => {
   }
 }
 
-const onDetach = async (user) => {
-  if (!termId.value) return
-  pendingId.value = user.id
-  try {
-    await removeMutation.mutateAsync({ termId: termId.value, userId: user.id })
-    invalidate()
-  } finally {
-    pendingId.value = null
-  }
-}
-
 watch(termId, () => {
   searchInput.value = ''
   searchQuery.value = ''
@@ -293,7 +250,7 @@ watch(termId, () => {
 
   &__footer {
     display: flex;
-    justify-content: flex-start;
+    justify-content: flex-end;
   }
 
   &__close-btn {

src/features/admin/terms/components/modals/TermDetailsModal.vue

@@ -1,15 +1,21 @@
 <template>
-  <BasicModal width="95%" max-width="80rem" min-width="auto" :show-close-button="true">
-    <template #default="{ data, close }">
+  <BasicModal
+    title="جزئیات ترم"
+    title-en="Term Details"
+    width="95%"
+    max-width="80rem"
+    min-width="auto"
+    :show-close-button="true"
+  >
+    <template #default="{ close }">
       <div v-if="!term" class="term-details">
         <p class="term-details__loading">در حال بارگذاری…</p>
       </div>
       <div v-else class="term-details">
         <section class="term-details__section">
-          <LineTitleBlock title="جزئیات ترم" title-en="Term Details" />
           <div class="term-details__overview">
             <div class="term-details__image">
-              <img v-if="term.image" :src="term.image" :alt="term.title" />
+              <img v-if="term.coverUrl" :src="term.coverUrl" :alt="term.title" />
               <SvgIcon v-else name="book" :size="32" color="#bcbcbc" />
             </div>
             <div class="term-details__overview-grid">
@@ -51,19 +57,19 @@
             <div v-else-if="students.length > 0">
               <div v-for="student in students" :key="student.id" class="term-details__student-row">
                 <div class="term-details__student-main">
-                  <div v-if="studentAvatar(student)" class="term-details__avatar">
-                    <img :src="studentAvatar(student)" :alt="student.name" />
+                  <div v-if="studentAvatar(student?.user)" class="term-details__avatar">
+                    <img :src="studentAvatar(student?.user)" :alt="student.name" />
                   </div>
                   <div v-else class="term-details__avatar term-details__avatar--placeholder">
                     <SvgIcon name="user" :size="20" color="#bcbcbc" />
                   </div>
                   <div>
-                    <p class="term-details__student-name">{{ student.name || '—' }}</p>
+                    <p class="term-details__student-name">{{ student?.user?.name || '—' }}</p>
                     <p class="term-details__student-meta">
-                      <span dir="ltr">{{ student.phone || '—' }}</span>
-                      <template v-if="student.email">
+                      <span dir="ltr">{{ student?.user.phone || '—' }}</span>
+                      <template v-if="student?.user.email">
                         <span class="term-details__sep">،</span>
-                        <span dir="ltr">{{ student.email }}</span>
+                        <span dir="ltr">{{ student?.user.email }}</span>
                       </template>
                     </p>
                   </div>
@@ -114,7 +120,6 @@
           </BaseButton>
         </div>
       </div>
-      <span class="term-details__data-tap" v-if="false">{{ data }}</span>
     </template>
   </BasicModal>
 </template>
@@ -135,12 +140,12 @@ import LineTitleBlock from '@/components/LineTitleBlock.vue'
 import LineInfoBlock from '@/components/blocks/LineInfoBlock.vue'
 import PaginationBlock from '@/components/blocks/PaginationBlock.vue'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
+import { useAdminTermEnrolleesQuery, useAdminTermQuery } from '@/services/query/admin-terms'
 import {
   adminCoursesKeys,
   useAdminCoursesListQuery,
   useUpdateAdminCourseMutation,
 } from '@/services/query/admin-courses'
-import { useAdminTermQuery, useTermAttendeesQuery } from '@/services/query/admin-terms'
 
 defineOptions({ name: 'TermDetailsModal' })
 
@@ -167,7 +172,7 @@ const {
   reset: resetStudentPagination,
 } = usePagination({ page: 1, perPage: 10 })
 
-const { data: studentsData, isLoading: studentsPending } = useTermAttendeesQuery(
+const { data: studentsData, isLoading: studentsPending } = useAdminTermEnrolleesQuery(
   termId,
   studentFilters,
   studentPagination,

src/features/auth/components/SignupForm.vue

@@ -106,7 +106,7 @@ const form = ref({
   password: '',
   passwordConfirmation: '',
 })
-const { validate, validateAt, errors } = useYup(schema)
+const { validate, validateAt, errors } = useYup(schema, () => form.value)
 
 const registerMutation = useRegisterMutation()
 const { savePhoneNumber } = useAuth()

src/features/auth/pages/ResetPasswordPage.vue

@@ -75,7 +75,7 @@ const form = ref({
   password: '',
   passwordConfirmation: '',
 })
-const { validate, validateAt, errors } = useYup(schema)
+const { validate, validateAt, errors } = useYup(schema, () => form.value)
 
 const resetMutation = useResetPasswordMutation()
 

src/features/student/courses/components/StudentCourseItem.vue

@@ -215,26 +215,16 @@ const statusLabel = computed(
     font-family: var(--font-family-fa);
     font-size: 0.7rem;
 
-    &--watching {
+    &--active {
       background: rgba(0, 112, 116, 8%);
       color: #007074;
     }
 
-    &--waitForExam {
-      background: rgba(204, 154, 40, 8%);
-      color: #cc6f00;
-    }
-
     &--completed {
       background: rgba(0, 154, 18, 8%);
       color: #009a12;
     }
 
-    &--failed {
-      background: rgba(204, 40, 49, 8%);
-      color: var(--color-error);
-    }
-
     &--neutral {
       background: rgba(180, 180, 180, 8%);
       color: #686868;

src/features/student/exams/pages/StudentExamPage.vue

@@ -11,12 +11,7 @@
     </BoxedIconTitleBlock>
 
     <SkeletonLoaderBlock v-if="isLoading && !exam" :rows="2" :cols-per-row="1" />
-    <StudentExamSummary
-      v-else-if="exam"
-      :exam="exam"
-      :starting="startMutation.isPending.value"
-      @start="onStart"
-    />
+    <StudentExamSummary v-else-if="exam" :exam="exam" @start="onStart" />
 
     <SimpleTitleIconBlock title="تعداد تلاش ها برای این آزمون" class="se__list-title">
       <template #header-icon>
@@ -38,7 +33,6 @@
 
 <script setup>
 import { computed } from 'vue'
-import { toast } from 'vue3-toastify'
 import { useRoute, useRouter } from 'vue-router'
 import SvgIcon from '@/components/icons/SvgIcon.vue'
 import BoxedIconTitleBlock from '@/components/blocks/BoxedIconTitleBlock.vue'
@@ -46,10 +40,7 @@ import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import SimpleTitleIconBlock from '@/components/blocks/SimpleTitleIconBlock.vue'
 import StudentExamSummary from '@/features/student/exams/components/StudentExamSummary.vue'
 import StudentExamAttemptItem from '@/features/student/exams/components/StudentExamAttemptItem.vue'
-import {
-  useStartStudentExamAttemptMutation,
-  useStudentExamQuery,
-} from '@/services/query/student-exams'
+import { useStudentExamQuery } from '@/services/query/student-exams'
 
 const route = useRoute()
 const router = useRouter()
@@ -62,15 +53,8 @@ const { data: exam, isLoading } = useStudentExamQuery(examId, {
 
 const attempts = computed(() => exam.value?.attempts ?? [])
 
-const startMutation = useStartStudentExamAttemptMutation()
-
-const onStart = async () => {
-  try {
-    await startMutation.mutateAsync({ id: examId.value })
-    router.push({ name: 'student-take-exam', params: { id: examId.value } })
-  } catch {
-    toast.error('شروع آزمون با خطا مواجه شد.')
-  }
+const onStart = () => {
+  router.push({ name: 'student-take-exam', params: { id: examId.value } }).catch(() => {})
 }
 </script>
 

src/features/student/exams/pages/StudentTakeExamPage.vue

@@ -121,10 +121,13 @@ const submitMutation = useSubmitStudentExamAttemptMutation()
 
 const submit = async () => {
   try {
-    await submitMutation.mutateAsync({
-      id: examId.value,
-      payload: { answers: { ...answers } },
-    })
+    const payload = {
+      answers: Object.entries(answers).map(([questionId, selectedOptionId]) => ({
+        questionId: Number(questionId),
+        selectedOptionId,
+      })),
+    }
+    await submitMutation.mutateAsync({ id: examId.value, payload })
     toast.success('پاسخ‌های شما با موفقیت ثبت شد.')
     router.push({ name: 'student-exam', params: { id: examId.value } })
   } catch {

src/features/student/lessons/pages/StudentLessonDetailsPage.vue

@@ -84,7 +84,7 @@ import SvgIcon from '@/components/icons/SvgIcon.vue'
 import NoItems from '@/components/blocks/NoItems.vue'
 import { formatJalaaliDate } from '@/utils/date-utils'
 import TabsBlock from '@/components/blocks/TabsBlock.vue'
-import { useStudentLessonQuery } from '@/services/query/student-lessons'
+import { useStudentCourseQuery } from '@/services/query/student-courses'
 import BoxedIconTitleBlock from '@/components/blocks/BoxedIconTitleBlock.vue'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import StudentExamItem from '@/features/student/exams/components/StudentExamItem.vue'
@@ -95,7 +95,7 @@ const router = useRouter()
 
 const lessonId = computed(() => route.params.id)
 
-const { data: lesson, isLoading } = useStudentLessonQuery(lessonId, {
+const { data: lesson, isLoading } = useStudentCourseQuery(lessonId, {
   enabled: () => !!lessonId.value,
 })
 

src/features/student/router.js

@@ -27,7 +27,7 @@ export default [
     path: '/my-terms',
     name: 'student-terms',
     component: () => import('@/features/student/terms/pages/StudentTermsPage.vue'),
-    meta: { layout: 'student', role: 'student', title: 'دوره‌های آموزشی' },
+    meta: { layout: 'student', role: 'student', title: 'ترم‌های آموزشی' },
   },
   {
     path: '/my-terms/:id',

src/features/student/sessions/pages/StudentSessionDetailsPage.vue

@@ -111,11 +111,12 @@ import { objectToFormData } from '@/utils/object-to-formdata'
 import VoiceRecorder from '@/components/form/VoiceRecorder.vue'
 import ImageUploader from '@/components/form/ImageUploader.vue'
 import VideoPlayerBlock from '@/components/blocks/VideoPlayerBlock.vue'
+import { useUploadMediaMutation } from '@/services/query/auth'
 import BoxedIconTitleBlock from '@/components/blocks/BoxedIconTitleBlock.vue'
 import SkeletonLoaderBlock from '@/components/blocks/SkeletonLoaderBlock.vue'
 import {
   useStudentSessionQuery,
-  useSubmitStudentSessionHomeworkMutation,
+  useSubmitStudentHomeworkMutation,
 } from '@/services/query/student-sessions'
 
 const route = useRoute()
@@ -149,21 +150,39 @@ const errors = reactive({ audio: '', image: '' })
 
 const canSubmit = computed(() => !!(homeworkAudio.value || homeworkImage.value))
 
-const submitMutation = useSubmitStudentSessionHomeworkMutation()
+const submitMutation = useSubmitStudentHomeworkMutation()
+const uploadMediaMutation = useUploadMediaMutation()
+
+const homeworkId = computed(() => session.value?.homeworkId ?? session.value?.homework?.id ?? null)
+
+const uploadHomeworkFile = async (file) => {
+  const fd = objectToFormData({ file, purpose: 'homework_file', context: 'homework' })
+  const response = await uploadMediaMutation.mutateAsync(fd)
+  const payload = response?.data ?? response
+  return payload?.id ?? null
+}
 
 const onSubmit = async () => {
   if (!canSubmit.value) {
     errors.audio = 'حداقل یک فایل صوتی یا تصویر ارسال کنید.'
     return
   }
+  if (!homeworkId.value) {
+    toast.error('تکلیفی برای این جلسه ثبت نشده است.')
+    return
+  }
   errors.audio = ''
   errors.image = ''
   try {
-    const payload = { subType: 'homework' }
-    if (homeworkAudio.value) payload.audio = homeworkAudio.value
-    if (homeworkImage.value) payload.image = homeworkImage.value
-    const fd = objectToFormData(payload)
-    await submitMutation.mutateAsync({ id: sessionId.value, payload: fd })
+    const files = [homeworkAudio.value, homeworkImage.value].filter(Boolean)
+    for (const file of files) {
+      const mediaId = await uploadHomeworkFile(file)
+      if (!mediaId) throw new Error('upload failed')
+      await submitMutation.mutateAsync({
+        homeworkId: homeworkId.value,
+        payload: { mediaId },
+      })
+    }
     toast.success('تکلیف با موفقیت ارسال شد.')
     homeworkAudio.value = null
     homeworkImage.value = null

src/features/student/terms/components/StudentTermItem.vue

@@ -1,50 +1,42 @@
 <template>
-  <div class="student-term-item">
-    <div class="student-term-item__box">
-      <div class="student-term-item__accent" />
-      <div class="student-term-item__info">
-        <p class="student-term-item__title">{{ term.title || '—' }}</p>
-        <div class="student-term-item__teacher">
-          <SvgIcon name="user" :size="10" color="#bcbcbc" />
-          <span class="student-term-item__teacher-label">استـــــــاد:</span>
-          <span class="student-term-item__teacher-name">{{ teacherName }}</span>
+  <div class="sti">
+    <div class="sti__box">
+      <div class="sti__box__image">
+        <img v-if="term.coverUrl" :src="term.coverUrl" :alt="term.title" />
+        <SvgIcon v-else name="book" :size="32" color="#bcbcbc" />
+      </div>
+      <div class="sti__info">
+        <p class="sti__title">{{ term.title || '—' }}</p>
+        <div class="sti__teacher">
+          <span class="sti__teacher-label">تعداد دوره ها:</span>
+          <span class="sti__teacher-name">{{ term.coursesCount ?? 0 }}</span>
         </div>
       </div>
     </div>
 
-    <div class="student-term-item__meta">
-      <div class="student-term-item__dates">
-        <div class="student-term-item__date">
-          <span class="student-term-item__date-label">تاریخ پایان :</span>
-          <span class="student-term-item__date-value">{{ endDate }}</span>
+    <div class="sti__meta">
+      <div class="sti__dates">
+        <div class="sti__date">
+          <span class="sti__date-label">تاریخ پایان :</span>
+          <span class="sti__date-value">{{ endDate }}</span>
         </div>
-        <span class="student-term-item__date-divider" />
-        <div class="student-term-item__date">
-          <span class="student-term-item__date-label">تاریخ شروع :</span>
-          <span class="student-term-item__date-value">{{ startDate }}</span>
+        <span class="sti__date-divider" />
+        <div class="sti__date">
+          <span class="sti__date-label">تاریخ شروع :</span>
+          <span class="sti__date-value">{{ startDate }}</span>
         </div>
       </div>
-      <div v-if="hasGpa" class="student-term-item__status student-term-item__status--gpa">
-        <span class="student-term-item__status-label">معدل دوره :</span>
-        <span class="student-term-item__status-value student-term-item__status-value--en">
-          {{ gpaText }}
-        </span>
-      </div>
-      <div
-        v-else
-        class="student-term-item__status"
-        :class="`student-term-item__status--${term.status || 'watching'}`"
-      >
-        <span class="student-term-item__status-label">وضعیت دوره :</span>
-        <span class="student-term-item__status-value">{{ statusLabel }}</span>
+      <div class="sti__status" :class="`sti__status--${status}`">
+        <span class="sti__status-label">وضعیت دوره :</span>
+        <span class="sti__status-value">{{ statusLabel }}</span>
       </div>
     </div>
 
-    <div v-if="showDetails" class="student-term-item__actions">
+    <div v-if="showDetails" class="sti__actions">
       <BaseButton
-        text="جزئیات دوره"
-        custom-class="student-term-item__details-btn"
-        @click="emit('show-details', term)"
+        text="جزئیات ترم"
+        custom-class="sti__details-btn"
+        @click="emit('show-details', enrollment)"
       >
         <template #appendIcon>
           <SvgIcon name="arrow-left" :size="14" color="#fff" />
@@ -62,40 +54,25 @@ import SvgIcon from '@/components/icons/SvgIcon.vue'
 import { formatJalaaliDate } from '@/utils/date-utils'
 
 const props = defineProps({
-  term: { type: Object, required: true },
+  enrollment: { type: Object, required: true },
   showDetails: { type: Boolean, default: true },
 })
 
 const emit = defineEmits(['show-details'])
 
-const teacherName = computed(() => {
-  const t = props.term.teacher
-  if (t) return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
-  return props.term.teacherName || '—'
-})
+const term = computed(() => props.enrollment.term ?? {})
 
-const startDate = computed(
-  () => props.term.faStartDate || formatJalaaliDate(props.term.startDate) || '—'
-)
+const status = computed(() => props.enrollment.status || 'active')
 
-const endDate = computed(() => props.term.faEndDate || formatJalaaliDate(props.term.endDate) || '—')
+const statusLabel = computed(() => STUDENT_COURSE_STATUS[status.value] || '—')
 
-const statusLabel = computed(
-  () => props.term.statusLabel || STUDENT_COURSE_STATUS[props.term.status] || '—'
-)
+const startDate = computed(() => formatJalaaliDate(term.value.startsAt) || '—')
 
-const hasGpa = computed(
-  () => props.term.gpa !== undefined && props.term.gpa !== null && props.term.gpa !== ''
-)
-
-const gpaText = computed(() => {
-  const v = Number(props.term.gpa)
-  return Number.isFinite(v) ? v.toFixed(3).replace(/0+$/, '').replace(/\.$/, '') : props.term.gpa
-})
+const endDate = computed(() => formatJalaaliDate(term.value.endsAt) || '—')
 </script>
 
 <style lang="scss" scoped>
-.student-term-item {
+.sti {
   display: flex;
   flex-direction: column-reverse;
   gap: 0.625rem;
@@ -114,6 +91,24 @@ const gpaText = computed(() => {
   &__box {
     display: flex;
     align-items: center;
+
+    &__image {
+      width: 2.5rem;
+      height: 2.5rem;
+      border-radius: 0.5rem;
+      background: #f5f5f5;
+      overflow: hidden;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+
+      img {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+      }
+    }
   }
 
   &__info {
@@ -136,6 +131,7 @@ const gpaText = computed(() => {
     text-overflow: ellipsis;
     white-space: nowrap;
     max-width: 100%;
+    text-align: right;
   }
 
   &__teacher {
@@ -175,34 +171,15 @@ const gpaText = computed(() => {
     font-size: 0.75rem;
     white-space: nowrap;
 
-    &--watching {
+    &--active {
       background: rgba(0, 112, 116, 4%);
       color: #007074;
     }
 
-    &--waitForExam {
-      background: rgba(116, 102, 0, 4%);
-      color: #746a00;
-    }
-
     &--completed {
       background: rgba(0, 154, 18, 6%);
       color: #009a12;
     }
-
-    &--failed {
-      background: rgba(204, 40, 49, 6%);
-      color: #cc2831;
-    }
-
-    &--gpa {
-      background: rgba(0, 112, 116, 6%);
-      color: #007074;
-    }
-  }
-
-  &__status-value--en {
-    font-family: var(--font-family-en);
   }
 
   &__status-label {

src/features/student/terms/components/StudentTermSummary.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="student-term-summary">
     <div class="student-term-summary__cover">
-      <img v-if="term.image" :src="term.image" :alt="term.title" />
+      <img v-if="term.coverUrl" :src="term.coverUrl" :alt="term.title" />
     </div>
 
     <div class="student-term-summary__info">
       <div
         class="student-term-summary__status"
-        :class="`student-term-summary__status--${term.status || 'watching'}`"
+        :class="`student-term-summary__status--${status}`"
       >
         <span class="student-term-summary__status-label">وضعیت دوره :</span>
         <span class="student-term-summary__status-value">{{ statusLabel }}</span>
@@ -43,24 +43,24 @@ import SvgIcon from '@/components/icons/SvgIcon.vue'
 import { formatJalaaliDate } from '@/utils/date-utils'
 
 const props = defineProps({
-  term: { type: Object, required: true },
+  enrollment: { type: Object, required: true },
 })
 
+const term = computed(() => props.enrollment.term ?? {})
+
+const status = computed(() => props.enrollment.status || 'active')
+
+const statusLabel = computed(() => STUDENT_COURSE_STATUS[status.value] || '—')
+
 const teacherName = computed(() => {
-  const t = props.term.teacher
+  const t = term.value.teacher
   if (t) return `${t.firstName || ''} ${t.lastName || ''}`.trim() || t.fullName || '—'
-  return props.term.teacherName || '—'
+  return term.value.teacherName || '—'
 })
 
-const startDate = computed(
-  () => props.term.faStartDate || formatJalaaliDate(props.term.startDate) || '—'
-)
+const startDate = computed(() => formatJalaaliDate(term.value.startsAt) || '—')
 
-const endDate = computed(() => props.term.faEndDate || formatJalaaliDate(props.term.endDate) || '—')
-
-const statusLabel = computed(
-  () => props.term.statusLabel || STUDENT_COURSE_STATUS[props.term.status] || '—'
-)
+const endDate = computed(() => formatJalaaliDate(term.value.endsAt) || '—')
 </script>
 
 <style lang="scss" scoped>
@@ -124,25 +124,15 @@ const statusLabel = computed(
     font-family: var(--font-family-fa);
     white-space: nowrap;
 
-    &--watching {
+    &--active {
       background: rgba(0, 112, 116, 4%);
       color: #007074;
     }
 
-    &--waitForExam {
-      background: rgba(116, 102, 0, 4%);
-      color: #746a00;
-    }
-
     &--completed {
       background: rgba(0, 154, 18, 6%);
       color: #009a12;
     }
-
-    &--failed {
-      background: rgba(204, 40, 49, 6%);
-      color: #cc2831;
-    }
   }
 
   &__status-label {

src/features/student/terms/pages/StudentTermDetailsPage.vue

@@ -10,8 +10,8 @@
       </template>
     </BoxedIconTitleBlock>
 
-    <SkeletonLoaderBlock v-if="isLoading && !term" :rows="2" :cols-per-row="1" />
-    <StudentTermSummary v-else-if="term" :term="term" />
+    <SkeletonLoaderBlock v-if="isLoading && !enrollment" :rows="2" :cols-per-row="1" />
+    <StudentTermSummary v-else-if="enrollment" :enrollment="enrollment" />
 
     <SimpleTitleIconBlock title="همه درس ها" class="student-term-details__list-title">
       <template #header-icon>
@@ -49,11 +49,11 @@ const router = useRouter()
 
 const termId = computed(() => route.params.id)
 
-const { data: term, isLoading } = useStudentTermQuery(termId, {
+const { data: enrollment, isLoading } = useStudentTermQuery(termId, {
   enabled: () => !!termId.value,
 })
 
-const lessons = computed(() => term.value?.courses ?? term.value?.lessons ?? [])
+const lessons = computed(() => enrollment.value?.term?.courses ?? [])
 
 const onShowLesson = (lesson) => {
   router.push({ name: 'student-lesson-details', params: { id: lesson.id } }).catch(() => {})

src/features/student/terms/pages/StudentTermsPage.vue

@@ -2,8 +2,8 @@
   <div class="student-terms">
     <BoxedIconTitleBlock
       class="student-terms__heading"
-      title="دوره‌های آموزشی"
-      desc="دوره‌ها و آموزش‌های گذرانده‌شده خود را مشاهده کنید."
+      title="ترم‌های آموزشی"
+      desc="ترم‌ها و آموزش‌های گذرانده‌شده خود را مشاهده کنید."
     >
       <template #icon>
         <SvgIcon name="book" :size="24" color="var(--color-primary)" />
@@ -15,13 +15,13 @@
         <SkeletonLoaderBlock v-if="currentPending" :rows="4" :cols-per-row="1" />
         <div v-else-if="currentTerms.length > 0">
           <StudentTermItem
-            v-for="term in currentTerms"
-            :key="term.id"
-            :term="term"
+            v-for="enrollment in currentTerms"
+            :key="enrollment.id"
+            :enrollment="enrollment"
             @show-details="onShowDetails"
           />
         </div>
-        <NoItems v-else title="دوره‌ای نیست" desc="در حال حاضر دوره‌ای در حال گذراندن ندارید." />
+        <NoItems v-else title="ترم‌ای نیست" desc="در حال حاضر ترم‌ای در حال گذراندن ندارید." />
         <PaginationBlock :pagination="currentMeta" @update:page="setCurrentPage" />
       </template>
 
@@ -29,14 +29,14 @@
         <SkeletonLoaderBlock v-if="endedPending" :rows="4" :cols-per-row="1" />
         <div v-else-if="endedTerms.length > 0">
           <StudentTermItem
-            v-for="term in endedTerms"
-            :key="term.id"
-            :term="term"
+            v-for="enrollment in endedTerms"
+            :key="enrollment.id"
+            :enrollment="enrollment"
             :showDetails="false"
             @show-details="onShowDetails"
           />
         </div>
-        <NoItems v-else title="موردی نیست" desc="هنوز دوره‌ای را تمام نکرده‌اید." />
+        <NoItems v-else title="موردی نیست" desc="هنوز ترم‌ای را تمام نکرده‌اید." />
         <PaginationBlock :pagination="endedMeta" @update:page="setEndedPage" />
       </template>
     </TabsBlock>
@@ -59,13 +59,13 @@ import StudentTermItem from '@/features/student/terms/components/StudentTermItem
 const router = useRouter()
 
 const tabs = [
-  { name: 'current', label: 'دوره های در حال گذراندن', icon: 'list-bullets' },
-  { name: 'ended', label: 'دوره های تکمیل شده', icon: 'list-bullets' },
+  { name: 'current', label: 'ترم های در حال گذراندن', icon: 'list-bullets' },
+  { name: 'ended', label: 'ترم های تکمیل شده', icon: 'list-bullets' },
 ]
 const activeTab = ref('current')
 
-const currentFilters = ref({ status: 'current' })
-const endedFilters = ref({ status: 'ended' })
+const currentFilters = ref({ status: 'active' })
+const endedFilters = ref({ status: 'completed' })
 
 const { pagination: currentPagination, setPage: setCurrentPage } = usePagination({
   page: 1,
@@ -97,6 +97,7 @@ const { data: endedData, isLoading: endedPending } = useStudentTermsListQuery(
 
 const currentTerms = computed(() => currentData.value?.data ?? [])
 const endedTerms = computed(() => endedData.value?.data ?? [])
+console.log({ endedTerms: endedData.value })
 
 const currentMeta = computed(() => ({
   page: currentPagination.value.page,