Merge pull request #1056 from pateljannat/issues-41

fix: misc issues
2024-10-10 16:43:59 +05:30
parent c76d8c582f 675bcc8956
commit 016dafb3c3
25 changed files with 145 additions and 76 deletions
--- a/frontend/src/components/CourseOutline.vue
+++ b/frontend/src/components/CourseOutline.vue
@@ -76,7 +76,7 @@
 										<Trash2
 											v-if="allowEdit"
 											@click.prevent="trashLesson(lesson.name, chapter.name)"
-											class="h-4 w-4 stroke-1.5 text-gray-700 ml-auto invisible group-hover:visible"
+											class="h-4 w-4 text-red-500 ml-auto invisible group-hover:visible"
 										/>
 										<Check
 											v-if="lesson.is_complete"
@@ -119,7 +119,7 @@
 </template>
 <script setup>
 import { Button, createResource } from 'frappe-ui'
-import { ref } from 'vue'
+import { ref, getCurrentInstance } from 'vue'
 import Draggable from 'vuedraggable'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue'
 import {
@@ -138,6 +138,8 @@ const route = useRoute()
 const expandAll = ref(true)
 const showChapterModal = ref(false)
 const currentChapter = ref(null)
+const app = getCurrentInstance()
+const { $dialog } = app.appContext.config.globalProperties

 const props = defineProps({
 	courseName: {
@@ -202,9 +204,23 @@ const updateLessonIndex = createResource({
 })

 const trashLesson = (lessonName, chapterName) => {
-	deleteLesson.submit({
-		lesson: lessonName,
-		chapter: chapterName,
+	$dialog({
+		title: __('Delete Lesson'),
+		message: __('Are you sure you want to delete this lesson?'),
+		actions: [
+			{
+				label: __('Delete'),
+				theme: 'red',
+				variant: 'solid',
+				onClick(close) {
+					deleteLesson.submit({
+						lesson: lessonName,
+						chapter: chapterName,
+					})
+					close()
+				},
+			},
+		],
 	})
 }

--- a/frontend/src/components/VideoBlock.vue
+++ b/frontend/src/components/VideoBlock.vue
@@ -3,13 +3,14 @@
 		<video
 			@timeupdate="updateTime"
 			@ended="videoEnded"
-			class="rounded-lg border border-gray-100"
+			@click="togglePlay"
+			class="rounded-lg border border-gray-100 group cursor-pointer"
 			ref="videoRef"
 		>
 			<source :src="fileURL" :type="type" />
 		</video>
 		<div
-			class="flex items-center space-x-2 bg-gray-200 rounded-md p-0.5 absolute bottom-3 w-[98%] left-0 right-0 mx-auto"
+			class="flex items-center space-x-2 bg-gray-200 rounded-md p-0.5 absolute bottom-3 w-[98%] left-0 right-0 mx-auto invisible group-hover:visible"
 		>
 			<Button variant="ghost">
 				<template #icon>
@@ -106,6 +107,14 @@ const pauseVideo = () => {
 	playing.value = false
 }

+const togglePlay = () => {
+	if (playing.value) {
+		pauseVideo()
+	} else {
+		playVideo()
+	}
+}
+
 const videoEnded = () => {
 	playing.value = false
 }
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -5,6 +5,7 @@ import router from './router'
 import App from './App.vue'
 import { createPinia } from 'pinia'
 import dayjs from '@/utils/dayjs'
+import { createDialog } from '@/utils/dialogs'
 import translationPlugin from './translation'
 import { usersStore } from './stores/user'
 import { sessionStore } from './stores/session'
@@ -36,3 +37,4 @@ let { isLoggedIn } = sessionStore()
 app.provide('$user', userResource)
 app.provide('$allUsers', allUsers)
 app.config.globalProperties.$user = userResource
+app.config.globalProperties.$dialog = createDialog
--- a/frontend/src/pages/JobDetail.vue
+++ b/frontend/src/pages/JobDetail.vue
@@ -52,46 +52,88 @@
 		</header>
 		<div v-if="job.data" class="max-w-3xl mx-auto">
 			<div class="p-4">
-				<div class="flex mb-10">
-					<img
-						:src="job.data.company_logo"
-						class="w-16 h-16 rounded-lg object-contain mr-4"
-						:alt="job.data.company_name"
-					/>
-					<div>
+				<div class="space-y-5 mb-10">
+					<div class="flex items-center">
+						<img
+							:src="job.data.company_logo"
+							class="w-16 h-16 rounded-lg object-contain mr-4"
+							:alt="job.data.company_name"
+						/>
 						<div class="text-2xl font-semibold mb-4">
 							{{ job.data.job_title }}
 						</div>
+					</div>
+					<div>
 						<div
-							class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-2 md:gap-y-4"
+							class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-5 md:gap-y-5"
 						>
 							<div class="flex items-center space-x-2">
-								<Building2 class="h-4 w-4 stroke-1.5" />
-								<span>{{ job.data.company_name }}</span>
-							</div>
-							<div class="flex items-center space-x-2">
-								<MapPin class="h-4 w-4 stroke-1.5" />
-								<span>{{ job.data.location }}</span>
-							</div>
-							<div class="flex items-center space-x-2">
-								<ClipboardType class="h-4 w-4 stroke-1.5" />
-								<span>{{ job.data.type }}</span>
-							</div>
-							<div class="flex items-center space-x-2">
-								<CalendarDays class="h-4 w-4 stroke-1.5" />
-								<span>
-									{{ dayjs(job.data.creation).format('DD MMM YYYY') }}
+								<span class="p-4 bg-green-50 rounded-full">
+									<Building2 class="h-4 w-4 text-green-500" />
 								</span>
+								<div class="flex flex-col space-y-2">
+									<span class="text-xs text-gray-600 font-medium uppercase">
+										{{ __('Organisation') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ job.data.company_name }}
+									</span>
+								</div>
+							</div>
+							<div class="flex items-center space-x-2">
+								<span class="p-4 bg-red-50 rounded-full">
+									<MapPin class="h-4 w-4 text-red-500" />
+								</span>
+								<div class="flex flex-col space-y-2">
+									<span class="text-xs text-gray-600 font-medium uppercase">
+										{{ __('Location') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ job.data.location }}
+									</span>
+								</div>
+							</div>
+							<div class="flex items-center space-x-2">
+								<span class="p-4 bg-yellow-50 rounded-full">
+									<ClipboardType class="h-4 w-4 text-yellow-500" />
+								</span>
+								<div class="flex flex-col space-y-2">
+									<span class="text-xs font-medium text-gray-600 uppercase">
+										{{ __('Category') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ job.data.type }}
+									</span>
+								</div>
+							</div>
+							<div class="flex items-center space-x-2">
+								<span class="p-4 bg-blue-50 rounded-full">
+									<CalendarDays class="h-4 w-4 text-blue-500" />
+								</span>
+								<div class="flex flex-col space-y-2">
+									<span class="text-xs text-gray-600 font-medium uppercase">
+										{{ __('Posted on') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ dayjs(job.data.creation).format('DD MMM YYYY') }}
+									</span>
+								</div>
 							</div>
 							<div
 								v-if="applicationCount.data"
 								class="flex items-center space-x-2"
 							>
-								<SquareUserRound class="h-4 w-4 stroke-1.5" />
-								<span
-									>{{ applicationCount.data }}
-									{{ __('applications received') }}</span
-								>
+								<span class="p-4 bg-purple-50 rounded-full">
+									<SquareUserRound class="h-4 w-4 text-purple-500" />
+								</span>
+								<div class="flex flex-col space-y-2">
+									<span class="text-xs text-gray-600 font-medium uppercase">
+										{{ __('Applications Received') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ applicationCount.data }}
+									</span>
+								</div>
 							</div>
 						</div>
 					</div>
--- a/lms/job/doctype/lms_job_application/test_lms_job_application.py
+++ b/lms/job/doctype/lms_job_application/test_lms_job_application.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSJobApplication(FrappeTestCase):
+class TestLMSJobApplication(UnitTestCase):
 	pass
--- a/lms/lms/doctype/batch_student/test_batch_student.py
+++ b/lms/lms/doctype/batch_student/test_batch_student.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestBatchStudent(FrappeTestCase):
+class TestBatchStudent(UnitTestCase):
 	pass
--- a/lms/lms/doctype/course_evaluator/test_course_evaluator.py
+++ b/lms/lms/doctype/course_evaluator/test_course_evaluator.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestCourseEvaluator(FrappeTestCase):
+class TestCourseEvaluator(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_assignment/test_lms_assignment.py
+++ b/lms/lms/doctype/lms_assignment/test_lms_assignment.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSAssignment(FrappeTestCase):
+class TestLMSAssignment(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_badge/test_lms_badge.py
+++ b/lms/lms/doctype/lms_badge/test_lms_badge.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSBadge(FrappeTestCase):
+class TestLMSBadge(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_badge_assignment/test_lms_badge_assignment.py
+++ b/lms/lms/doctype/lms_badge_assignment/test_lms_badge_assignment.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSBadgeAssignment(FrappeTestCase):
+class TestLMSBadgeAssignment(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_batch/test_lms_batch.py
+++ b/lms/lms/doctype/lms_batch/test_lms_batch.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSClass(FrappeTestCase):
+class TestLMSBatch(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_batch_timetable/test_lms_batch_timetable.py
+++ b/lms/lms/doctype/lms_batch_timetable/test_lms_batch_timetable.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+import unittest


-class TestLMSBatchTimetable(FrappeTestCase):
+class TestLMSBatchTimetable(unittest.TestCase):
 	pass
--- a/lms/lms/doctype/lms_category/test_lms_category.py
+++ b/lms/lms/doctype/lms_category/test_lms_category.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSCategory(FrappeTestCase):
+class TestLMSCategory(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_certificate_evaluation/test_lms_certificate_evaluation.py
+++ b/lms/lms/doctype/lms_certificate_evaluation/test_lms_certificate_evaluation.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSCertificateEvaluation(FrappeTestCase):
+class TestLMSCertificateEvaluation(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_certificate_request/test_lms_certificate_request.py
+++ b/lms/lms/doctype/lms_certificate_request/test_lms_certificate_request.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSCertificateRequest(FrappeTestCase):
+class TestLMSCertificateRequest(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_live_class/test_lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/test_lms_live_class.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSLiveClass(FrappeTestCase):
+class TestLMSLiveClass(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_payment/test_lms_payment.py
+++ b/lms/lms/doctype/lms_payment/test_lms_payment.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSPayment(FrappeTestCase):
+class TestLMSPayment(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_question/test_lms_question.py
+++ b/lms/lms/doctype/lms_question/test_lms_question.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSQuestion(FrappeTestCase):
+class TestLMSQuestion(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_quiz/lms_quiz.py
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.py
@@ -113,7 +113,7 @@ def quiz_summary(quiz, results):
 		result["question"] = question_details.question_detail
 		result["marks_out_of"] = question_details.marks

-		quiz_details = frappe.get_doc(
+		quiz_details = frappe.db.get_value(
 			"LMS Quiz",
 			quiz,
 			["total_marks", "passing_percentage", "lesson", "course"],
--- a/lms/lms/doctype/lms_sidebar_item/test_lms_sidebar_item.py
+++ b/lms/lms/doctype/lms_sidebar_item/test_lms_sidebar_item.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSSidebarItem(FrappeTestCase):
+class TestLMSSidebarItem(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_source/test_lms_source.py
+++ b/lms/lms/doctype/lms_source/test_lms_source.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSSource(FrappeTestCase):
+class TestLMSSource(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_timetable_legend/test_lms_timetable_legend.py
+++ b/lms/lms/doctype/lms_timetable_legend/test_lms_timetable_legend.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSTimetableLegend(FrappeTestCase):
+class TestLMSTimetableLegend(UnitTestCase):
 	pass
--- a/lms/lms/doctype/lms_timetable_template/test_lms_timetable_template.py
+++ b/lms/lms/doctype/lms_timetable_template/test_lms_timetable_template.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestLMSTimetableTemplate(FrappeTestCase):
+class TestLMSTimetableTemplate(UnitTestCase):
 	pass
--- a/lms/lms/doctype/payment_country/test_payment_country.py
+++ b/lms/lms/doctype/payment_country/test_payment_country.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestPaymentCountry(FrappeTestCase):
+class TestPaymentCountry(UnitTestCase):
 	pass
--- a/lms/lms/doctype/zoom_settings/test_zoom_settings.py
+++ b/lms/lms/doctype/zoom_settings/test_zoom_settings.py
@@ -2,8 +2,8 @@
 # See license.txt

 # import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests import UnitTestCase


-class TestZoomSettings(FrappeTestCase):
+class TestZoomSettings(UnitTestCase):
 	pass