chore: resolved conflicts

2025-02-10 16:48:02 +05:30
parent dbf443300b b5a7b4cd2c
commit 5543aa5e02
24 changed files with 2221 additions and 636 deletions
--- a/frontend/src/pages/Batch.vue
+++ b/frontend/src/pages/Batch.vue
@@ -25,6 +25,7 @@
 			<div class="border-r">
 				<Tabs
 					v-model="tabIndex"
+					as="div"
 					:tabs="tabs"
 					tablistClass="overflow-y-hidden bg-surface-white"
 				>
@@ -54,7 +55,7 @@
 							</button>
 						</div>
 					</template>
-					<template #default="{ tab }">
+					<template #tab-panel="{ tab }">
 						<div class="pt-5 px-5 pb-10">
 							<div v-if="tab.label == 'Courses'">
 								<BatchCourses :batch="batch.data.name" />