fix: misc issues

This commit is contained in:
Jannat Patel
2024-06-07 11:37:46 +05:30
parent 2744002390
commit 103ecef9f4
7 changed files with 49 additions and 50 deletions

View File

@@ -2,7 +2,7 @@
<Button
v-if="user.data.is_moderator"
variant="solid"
class="float-right mb-3"
class="float-right mb-5"
@click="openLiveClassModal"
>
<template #prefix>
@@ -12,14 +12,20 @@
{{ __('Add Live Class') }}
</span>
</Button>
<div class="text-lg font-semibold mb-4">
<div class="text-lg font-semibold mb-5">
{{ __('Live Class') }}
</div>
<div v-if="liveClasses.data?.length" class="grid grid-cols-2 gap-5">
<div v-for="cls in liveClasses.data" class="border rounded-md h-full p-3">
<div
v-for="cls in liveClasses.data"
class="flex flex-col border rounded-md h-full p-3"
>
<div class="font-semibold text-lg mb-4">
{{ cls.title }}
</div>
<div class="mb-4">
{{ cls.description }}
</div>
<div class="flex items-center mb-2">
<Calendar class="w-4 h-4 stroke-1.5" />
<span class="ml-2">
@@ -32,10 +38,7 @@
{{ formatTime(cls.time) }}
</span>
</div>
<div class="mb-5">
{{ cls.description }}
</div>
<div class="flex items-center gap-2">
<div class="flex items-center space-x-2 mt-auto">
<a
:href="cls.start_url"
target="_blank"

View File

@@ -43,7 +43,7 @@
</div>
</template>
<template #default="{ tab }">
<div class="pt-5 px-10 pb-10">
<div class="pt-5 px-5 pb-10">
<div v-if="tab.label == 'Courses'">
<BatchCourses :batch="batch.data.name" />
</div>

View File

@@ -227,11 +227,6 @@ const lesson = createResource({
},
auto: true,
onSuccess(data) {
if (data.membership)
current_lesson.submit({
name: data.membership.name,
lesson_name: data.name,
})
markProgress(data)
if (data.content) editor = renderEditor('editor', data.content)
@@ -260,18 +255,6 @@ const markProgress = (data) => {
if (user.data && !data.progress) progress.submit()
}
const current_lesson = createResource({
url: 'frappe.client.set_value',
makeParams(values) {
return {
doctype: 'LMS Enrollment',
name: values.name,
fieldname: 'current_lesson',
value: values.lesson_name,
}
},
})
const progress = createResource({
url: 'lms.lms.doctype.course_lesson.course_lesson.save_progress',
makeParams() {

View File

@@ -154,7 +154,7 @@ router.beforeEach(async (to, from, next) => {
try {
if (isLoggedIn) {
await userResource.reload()
await userResource.promise
}
if (
isLoggedIn &&
@@ -163,7 +163,7 @@ router.beforeEach(async (to, from, next) => {
to.name == 'Notifications' ||
to.name == 'Badge')
) {
await allUsers.reload()
await allUsers.promise
}
} catch (error) {
isLoggedIn = false

View File

@@ -9,6 +9,7 @@ export const usersStore = defineStore('lms-users', () => {
router.push('/login')
}
},
auto: true,
})
const allUsers = createResource({