chore: resolved conflicts

frontend/src/pages/Courses/CourseDashboard.vue

@@ -20,7 +20,7 @@
 			<NumberChartGraph :title="__('Lessons')" :value="course.data?.lessons" />
 		</div>
 		<div class="grid grid-cols-[2fr_1fr] gap-5 items-start">
-			<div v-if="course.data?.enrollments" class="border rounded-lg py-3 px-4">
+			<div class="border rounded-lg py-3 px-4">
 				<div class="flex items-center justify-between mb-3">
 					<div class="text-lg text-ink-gray-9 font-semibold">
 						{{ __('Students') }}
@@ -244,6 +244,7 @@
 		v-if="showEnrollmentModal"
 		v-model="showEnrollmentModal"
 		:course="course"
+		:students="progressList"
 	/>
 	<StudentCourseProgress
 		v-if="showProgressModal"

frontend/src/pages/Courses/CourseEnrollmentModal.vue

@@ -58,6 +58,7 @@ import Link from '@/components/Controls/Link.vue'
 
 const show = defineModel<boolean>({ required: true, default: false })
 const student = ref<string | null>(null)
+const students = defineModel<any[]>('students')
 const payment = ref<string | null>(null)
 const purchasedCertificate = ref<boolean>(false)
 
@@ -79,6 +80,7 @@ const enrollStudent = (close: () => void) => {
 		},
 	})
 		.then(() => {
+			students.value?.reload()
 			toast.success(__('Student enrolled successfully'))
 			close()
 		})

frontend/src/pages/Courses/CourseOverview.vue

@@ -76,7 +76,7 @@
 				<CourseReviews
 					:courseName="course.data.name"
 					:avg_rating="course.data.rating"
-					:membership="course.data.membership"
+					:membership="course.data.membership || null"
 				/>
 			</div>
 			<div class="hidden md:block">