chore: update POT file

chore: sync translations from crowdin

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
         node-version: '18'
         check-latest: true
     - name: setup cache for bench
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/bench-cache
         key: ${{ runner.os }}

.github/workflows/ui-tests.yml

@@ -58,7 +58,7 @@ jobs:
           echo "127.0.0.1 lms.test" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}

cypress.config.js

@@ -13,6 +13,6 @@ module.exports = defineConfig({
 		openMode: 0,
 	},
 	e2e: {
-		baseUrl: "http://lms1:8000",
+		baseUrl: "http://testui:8000",
 	},
 });

cypress/e2e/course_creation.cy.js

@@ -5,7 +5,7 @@ describe("Course Creation", () => {
 		cy.visit("/lms/courses");
 
 		// Create a course
-		cy.get("header").children().last().children().last().click();
+		cy.get("button").contains("New").click();
 		cy.wait(1000);
 		cy.url().should("include", "/courses/new/edit");
 
@@ -84,9 +84,8 @@ describe("Course Creation", () => {
 		cy.wait(1000);
 
 		cy.get("label").contains("Title").type("Test Lesson");
-
 		cy.get("#content .ce-block").type(
-			"This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
+			"{enter}This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
 		);
 		cy.button("Save").click();
 

cypress/support/commands.js

@@ -37,6 +37,9 @@ Cypress.Commands.add("login", (email, password) => {
 		url: "/api/method/login",
 		method: "POST",
 		body: { usr: email, pwd: password },
+		timeout: 60000,
+		retryOnStatusCodeFailure: true,
+		retryOnNetworkFailure: true,
 	});
 });
 

frontend/components.d.ts

@@ -0,0 +1,96 @@
+/* eslint-disable */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+// biome-ignore lint: disable
+export {}
+
+/* prettier-ignore */
+declare module 'vue' {
+  export interface GlobalComponents {
+    Annoucements: typeof import('./src/components/Annoucements.vue')['default']
+    AnnouncementModal: typeof import('./src/components/Modals/AnnouncementModal.vue')['default']
+    Apps: typeof import('./src/components/Apps.vue')['default']
+    AppSidebar: typeof import('./src/components/AppSidebar.vue')['default']
+    AssessmentModal: typeof import('./src/components/Modals/AssessmentModal.vue')['default']
+    AssessmentPlugin: typeof import('./src/components/AssessmentPlugin.vue')['default']
+    Assessments: typeof import('./src/components/Assessments.vue')['default']
+    Assignment: typeof import('./src/components/Assignment.vue')['default']
+    AudioBlock: typeof import('./src/components/AudioBlock.vue')['default']
+    Autocomplete: typeof import('./src/components/Controls/Autocomplete.vue')['default']
+    BatchCard: typeof import('./src/components/BatchCard.vue')['default']
+    BatchCourseModal: typeof import('./src/components/Modals/BatchCourseModal.vue')['default']
+    BatchCourses: typeof import('./src/components/BatchCourses.vue')['default']
+    BatchDashboard: typeof import('./src/components/BatchDashboard.vue')['default']
+    BatchFeedback: typeof import('./src/components/BatchFeedback.vue')['default']
+    BatchOverlay: typeof import('./src/components/BatchOverlay.vue')['default']
+    BatchStudentProgress: typeof import('./src/components/Modals/BatchStudentProgress.vue')['default']
+    BatchStudents: typeof import('./src/components/BatchStudents.vue')['default']
+    BrandSettings: typeof import('./src/components/BrandSettings.vue')['default']
+    BulkCertificates: typeof import('./src/components/Modals/BulkCertificates.vue')['default']
+    Categories: typeof import('./src/components/Categories.vue')['default']
+    CertificationLinks: typeof import('./src/components/CertificationLinks.vue')['default']
+    ChapterModal: typeof import('./src/components/Modals/ChapterModal.vue')['default']
+    CodeEditor: typeof import('./src/components/Controls/CodeEditor.vue')['default']
+    CollapseSidebar: typeof import('./src/components/Icons/CollapseSidebar.vue')['default']
+    CourseCard: typeof import('./src/components/CourseCard.vue')['default']
+    CourseCardOverlay: typeof import('./src/components/CourseCardOverlay.vue')['default']
+    CourseInstructors: typeof import('./src/components/CourseInstructors.vue')['default']
+    CourseOutline: typeof import('./src/components/CourseOutline.vue')['default']
+    CourseReviews: typeof import('./src/components/CourseReviews.vue')['default']
+    CreateOutline: typeof import('./src/components/CreateOutline.vue')['default']
+    DateRange: typeof import('./src/components/Common/DateRange.vue')['default']
+    DesktopLayout: typeof import('./src/components/DesktopLayout.vue')['default']
+    DiscussionModal: typeof import('./src/components/Modals/DiscussionModal.vue')['default']
+    DiscussionReplies: typeof import('./src/components/DiscussionReplies.vue')['default']
+    Discussions: typeof import('./src/components/Discussions.vue')['default']
+    EditCoverImage: typeof import('./src/components/Modals/EditCoverImage.vue')['default']
+    EditProfile: typeof import('./src/components/Modals/EditProfile.vue')['default']
+    EvaluationModal: typeof import('./src/components/Modals/EvaluationModal.vue')['default']
+    Evaluators: typeof import('./src/components/Evaluators.vue')['default']
+    Event: typeof import('./src/components/Modals/Event.vue')['default']
+    ExplanationVideos: typeof import('./src/components/Modals/ExplanationVideos.vue')['default']
+    FrappeCloudIcon: typeof import('./src/components/Icons/FrappeCloudIcon.vue')['default']
+    IconPicker: typeof import('./src/components/Controls/IconPicker.vue')['default']
+    IndicatorIcon: typeof import('./src/components/Icons/IndicatorIcon.vue')['default']
+    InviteIcon: typeof import('./src/components/Icons/InviteIcon.vue')['default']
+    JobApplicationModal: typeof import('./src/components/Modals/JobApplicationModal.vue')['default']
+    JobCard: typeof import('./src/components/JobCard.vue')['default']
+    LessonContent: typeof import('./src/components/LessonContent.vue')['default']
+    LessonHelp: typeof import('./src/components/LessonHelp.vue')['default']
+    Link: typeof import('./src/components/Controls/Link.vue')['default']
+    LiveClass: typeof import('./src/components/LiveClass.vue')['default']
+    LiveClassModal: typeof import('./src/components/Modals/LiveClassModal.vue')['default']
+    LMSLogo: typeof import('./src/components/Icons/LMSLogo.vue')['default']
+    Members: typeof import('./src/components/Members.vue')['default']
+    MobileLayout: typeof import('./src/components/MobileLayout.vue')['default']
+    MultiSelect: typeof import('./src/components/Controls/MultiSelect.vue')['default']
+    NoPermission: typeof import('./src/components/NoPermission.vue')['default']
+    NoSidebarLayout: typeof import('./src/components/NoSidebarLayout.vue')['default']
+    NotPermitted: typeof import('./src/components/NotPermitted.vue')['default']
+    OnboardingBanner: typeof import('./src/components/OnboardingBanner.vue')['default']
+    PageModal: typeof import('./src/components/Modals/PageModal.vue')['default']
+    PaymentSettings: typeof import('./src/components/PaymentSettings.vue')['default']
+    ProgressBar: typeof import('./src/components/ProgressBar.vue')['default']
+    Question: typeof import('./src/components/Modals/Question.vue')['default']
+    Quiz: typeof import('./src/components/Quiz.vue')['default']
+    QuizBlock: typeof import('./src/components/QuizBlock.vue')['default']
+    Rating: typeof import('./src/components/Controls/Rating.vue')['default']
+    ReviewModal: typeof import('./src/components/Modals/ReviewModal.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+    SettingDetails: typeof import('./src/components/SettingDetails.vue')['default']
+    SettingFields: typeof import('./src/components/SettingFields.vue')['default']
+    Settings: typeof import('./src/components/Modals/Settings.vue')['default']
+    SidebarLink: typeof import('./src/components/SidebarLink.vue')['default']
+    StudentHeatmap: typeof import('./src/components/StudentHeatmap.vue')['default']
+    StudentModal: typeof import('./src/components/Modals/StudentModal.vue')['default']
+    Tags: typeof import('./src/components/Tags.vue')['default']
+    UnsplashImageBrowser: typeof import('./src/components/UnsplashImageBrowser.vue')['default']
+    UpcomingEvaluations: typeof import('./src/components/UpcomingEvaluations.vue')['default']
+    UploadPlugin: typeof import('./src/components/UploadPlugin.vue')['default']
+    UserAvatar: typeof import('./src/components/UserAvatar.vue')['default']
+    UserDropdown: typeof import('./src/components/UserDropdown.vue')['default']
+    VideoBlock: typeof import('./src/components/VideoBlock.vue')['default']
+  }
+}

frontend/package.json

@@ -19,18 +19,20 @@
     "@editorjs/paragraph": "^2.11.3",
     "@editorjs/simple-image": "^1.6.0",
     "@editorjs/table": "^2.4.2",
+    "@vueuse/router": "^12.7.0",
     "ace-builds": "^1.36.2",
     "apexcharts": "^4.3.0",
     "chart.js": "^4.4.1",
     "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.109",
+    "frappe-ui": "^0.1.122",
+    "highlight.js": "^11.11.1",
     "lucide-vue-next": "^0.383.0",
     "markdown-it": "^14.0.0",
     "pinia": "^2.0.33",
     "socket.io-client": "^4.7.2",
-    "tailwindcss": "^3.3.3",
+    "tailwindcss": "3.4.15",
     "typescript": "^5.7.2",
     "vue": "^3.4.23",
     "vue-chartjs": "^5.3.0",

frontend/src/App.vue

@@ -8,18 +8,34 @@
 <script setup>
 import { Toasts } from 'frappe-ui'
 import { Dialogs } from '@/utils/dialogs'
-import { computed, onMounted, onUnmounted } from 'vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { useScreenSize } from './utils/composables'
 import DesktopLayout from './components/DesktopLayout.vue'
 import MobileLayout from './components/MobileLayout.vue'
+import NoSidebarLayout from './components/NoSidebarLayout.vue'
 import { stopSession } from '@/telemetry'
 import { init as initTelemetry } from '@/telemetry'
 import { usersStore } from '@/stores/user'
+import { useRouter } from 'vue-router'
 
 const screenSize = useScreenSize()
 let { userResource } = usersStore()
+const router = useRouter()
+const noSidebar = ref(false)
+
+router.beforeEach((to, from, next) => {
+	if (to.query.fromLesson) {
+		noSidebar.value = true
+	} else {
+		noSidebar.value = false
+	}
+	next()
+})
 
 const Layout = computed(() => {
+	if (noSidebar.value) {
+		return NoSidebarLayout
+	}
 	if (screenSize.width < 640) {
 		return MobileLayout
 	} else {
@@ -28,11 +44,11 @@ const Layout = computed(() => {
 })
 
 onMounted(async () => {
-	if (!userResource.data) return
-	await initTelemetry()
+	if (userResource.data) await initTelemetry()
 })
 
 onUnmounted(() => {
+	noSidebar.value = false
 	stopSession()
 })
 </script>

frontend/src/components/AppSidebar.vue

@@ -62,26 +62,48 @@
 				</div>
 			</div>
 		</div>
-		<div>
+		<div class="m-2 flex flex-col gap-1">
 			<TrialBanner
 				v-if="
-					userResource.data?.user_type == 'System User' &&
-					userResource.data?.is_fc_site
+					userResource.data?.is_system_manager && userResource.data?.is_fc_site
 				"
 				:isSidebarCollapsed="sidebarStore.isSidebarCollapsed"
 			/>
+			<GettingStartedBanner
+				v-if="showOnboarding && !isOnboardingStepsCompleted"
+				:isSidebarCollapsed="sidebarStore.isSidebarCollapsed"
+				appName="learning"
+			/>
+			<SidebarLink
+				v-if="isOnboardingStepsCompleted"
+				:link="{
+					label: __('Help'),
+				}"
+				:isCollapsed="sidebarStore.isSidebarCollapsed"
+				@click="
+					() => {
+						showHelpModal = minimize ? true : !showHelpModal
+						minimize = !showHelpModal
+					}
+				"
+			>
+				<template #icon>
+					<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
+						<CircleHelp class="h-4 w-4 stroke-1.5" />
+					</span>
+				</template>
+			</SidebarLink>
 			<SidebarLink
 				:link="{
 					label: sidebarStore.isSidebarCollapsed ? 'Expand' : 'Collapse',
 				}"
 				:isCollapsed="sidebarStore.isSidebarCollapsed"
 				@click="toggleSidebar()"
-				class="m-2"
 			>
 				<template #icon>
 					<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
 						<CollapseSidebar
-							class="h-4.5 w-4.5 text-ink-gray-7 duration-300 ease-in-out"
+							class="h-4 w-4 text-ink-gray-7 duration-300 ease-in-out"
 							:class="{
 								'[transform:rotateY(180deg)]': sidebarStore.isSidebarCollapsed,
 							}"
@@ -90,6 +112,23 @@
 				</template>
 			</SidebarLink>
 		</div>
+		<HelpModal
+			v-if="showOnboarding && showHelpModal"
+			v-model="showHelpModal"
+			v-model:articles="articles"
+			appName="learning"
+			title="Frappe Learning"
+			:logo="LMSLogo"
+			:afterSkip="(step) => capture('onboarding_step_skipped_' + step)"
+			:afterSkipAll="() => capture('onboarding_steps_skipped')"
+			:afterReset="(step) => capture('onboarding_step_reset_' + step)"
+			:afterResetAll="() => capture('onboarding_steps_reset')"
+			docsLink="https://docs.frappe.io/learning"
+		/>
+		<IntermediateStepModal
+			v-model="showIntermediateModal"
+			:currentStep="currentStep"
+		/>
 	</div>
 	<PageModal
 		v-model="showPageModal"
@@ -103,15 +142,38 @@ import UserDropdown from '@/components/UserDropdown.vue'
 import CollapseSidebar from '@/components/Icons/CollapseSidebar.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
 import { useStorage } from '@vueuse/core'
-import { ref, onMounted, inject, watch } from 'vue'
+import { ref, onMounted, inject, watch, reactive, markRaw, h } from 'vue'
 import { getSidebarLinks } from '../utils'
 import { usersStore } from '@/stores/user'
 import { sessionStore } from '@/stores/session'
 import { useSidebar } from '@/stores/sidebar'
 import { useSettings } from '@/stores/settings'
-import { ChevronRight, Plus } from 'lucide-vue-next'
-import { Button, createResource, TrialBanner } from 'frappe-ui'
+import { Button, createResource } from 'frappe-ui'
 import PageModal from '@/components/Modals/PageModal.vue'
+import { capture } from '@/telemetry'
+import LMSLogo from '@/components/Icons/LMSLogo.vue'
+import { useRouter } from 'vue-router'
+import InviteIcon from './Icons/InviteIcon.vue'
+import {
+	BookOpen,
+	ChevronRight,
+	Plus,
+	CircleHelp,
+	FolderTree,
+	FileText,
+	UserPlus,
+	Users,
+	BookText,
+} from 'lucide-vue-next'
+import {
+	TrialBanner,
+	HelpModal,
+	GettingStartedBanner,
+	useOnboarding,
+	showHelpModal,
+	minimize,
+	IntermediateStepModal,
+} from 'frappe-ui/frappe'
 
 const { user, sidebarSettings } = sessionStore()
 const { userResource } = usersStore()
@@ -124,12 +186,27 @@ const isModerator = ref(false)
 const isInstructor = ref(false)
 const pageToEdit = ref(null)
 const settingsStore = useSettings()
+const showOnboarding = ref(false)
+const showIntermediateModal = ref(false)
+const currentStep = ref({})
+const router = useRouter()
+let onboardingDetails
+let isOnboardingStepsCompleted = false
+const iconProps = {
+	strokeWidth: 1.5,
+	width: 16,
+	height: 16,
+}
 
 onMounted(() => {
+	addNotifications()
+	setSidebarLinks()
 	socket.on('publish_lms_notifications', (data) => {
 		unreadNotifications.reload()
 	})
-	addNotifications()
+})
+
+const setSidebarLinks = () => {
 	sidebarSettings.reload(
 		{},
 		{
@@ -144,7 +221,7 @@ onMounted(() => {
 			},
 		}
 	)
-})
+}
 
 const unreadNotifications = createResource({
 	cache: 'Unread Notifications Count',
@@ -188,7 +265,12 @@ const addQuizzes = () => {
 			label: 'Quizzes',
 			icon: 'CircleHelp',
 			to: 'Quizzes',
-			activeFor: ['Quizzes', 'QuizForm'],
+			activeFor: [
+				'Quizzes',
+				'QuizForm',
+				'QuizSubmissionList',
+				'QuizSubmission',
+			],
 		})
 	}
 }
@@ -199,7 +281,12 @@ const addAssignments = () => {
 			label: 'Assignments',
 			icon: 'Pencil',
 			to: 'Assignments',
-			activeFor: ['Assignments', 'AssignmentForm'],
+			activeFor: [
+				'Assignments',
+				'AssignmentForm',
+				'AssignmentSubmissionList',
+				'AssignmentSubmission',
+			],
 		})
 	}
 }
@@ -262,16 +349,6 @@ const getSidebarFromStorage = () => {
 	return useStorage('sidebar_is_collapsed', false)
 }
 
-watch(userResource, () => {
-	if (userResource.data) {
-		isModerator.value = userResource.data.is_moderator
-		isInstructor.value = userResource.data.is_instructor
-		addPrograms()
-		addQuizzes()
-		addAssignments()
-	}
-})
-
 const toggleSidebar = () => {
 	sidebarStore.isSidebarCollapsed = !sidebarStore.isSidebarCollapsed
 	localStorage.setItem(
@@ -287,4 +364,218 @@ const toggleWebPages = () => {
 		JSON.stringify(sidebarStore.isWebpagesCollapsed)
 	)
 }
+
+const getFirstCourse = async () => {
+	let firstCourse = localStorage.getItem('firstCourse')
+	if (firstCourse) return firstCourse
+	return await call('lms.lms.onboarding.get_first_course')
+}
+
+const getFirstBatch = async () => {
+	let firstBatch = localStorage.getItem('firstBatch')
+	if (firstBatch) return firstBatch
+	return await call('lms.lms.onboarding.get_first_batch')
+}
+
+const steps = reactive([
+	{
+		name: 'create_first_course',
+		title: __('Create your first course'),
+		icon: markRaw(h(BookOpen, iconProps)),
+		completed: false,
+		onClick: () => {
+			minimize.value = true
+			router.push({
+				name: 'Courses',
+			})
+		},
+	},
+	{
+		name: 'create_first_chapter',
+		title: __('Add your first chapter'),
+		icon: markRaw(h(FolderTree, iconProps)),
+		completed: false,
+		onClick: async () => {
+			minimize.value = true
+			let course = await getFirstCourse()
+			if (course) {
+				router.push({ name: 'CourseForm', params: { courseName: course } })
+			} else {
+				router.push({ name: 'CourseForm' })
+			}
+		},
+	},
+	{
+		name: 'create_first_lesson',
+		title: __('Add your first lesson'),
+		icon: markRaw(h(FileText, iconProps)),
+		completed: false,
+		onClick: async () => {
+			minimize.value = true
+			let course = await getFirstCourse()
+			if (course) {
+				router.push({
+					name: 'CourseForm',
+					params: { courseName: course },
+				})
+			} else {
+				router.push({ name: 'Courses' })
+			}
+		},
+	},
+	{
+		name: 'create_first_quiz',
+		title: __('Create your first quiz'),
+		icon: markRaw(h(CircleHelp, iconProps)),
+		completed: false,
+		onClick: () => {
+			minimize.value = true
+			router.push({ name: 'Quizzes' })
+		},
+	},
+	{
+		name: 'invite_students',
+		title: __('Invite your team and students'),
+		icon: markRaw(h(InviteIcon, iconProps)),
+		completed: false,
+		onClick: () => {
+			minimize.value = true
+			settingsStore.activeTab = 'Members'
+			settingsStore.isSettingsOpen = true
+		},
+	},
+	{
+		name: 'create_first_batch',
+		title: __('Create your first batch'),
+		icon: markRaw(h(Users, iconProps)),
+		completed: false,
+		onClick: () => {
+			minimize.value = true
+			router.push({ name: 'Batches' })
+		},
+	},
+	{
+		name: 'add_batch_student',
+		title: __('Add students to your batch'),
+		icon: markRaw(h(UserPlus, iconProps)),
+		completed: false,
+		onClick: async () => {
+			minimize.value = true
+			let batch = await getFirstBatch()
+			if (batch) {
+				router.push({
+					name: 'Batch',
+					params: {
+						batchName: batch,
+					},
+				})
+			} else {
+				router.push({ name: 'Batch' })
+			}
+		},
+	},
+	{
+		name: 'add_batch_course',
+		title: __('Add courses to your batch'),
+		icon: markRaw(h(BookText, iconProps)),
+		completed: false,
+		onClick: async () => {
+			minimize.value = true
+			let batch = await getFirstBatch()
+			if (batch) {
+				router.push({
+					name: 'Batch',
+					params: {
+						batchName: batch,
+					},
+					hash: '#courses',
+				})
+			} else {
+				router.push({ name: 'Batch' })
+			}
+		},
+	},
+])
+
+const articles = ref([
+	{
+		title: __('Introduction'),
+		opened: false,
+		subArticles: [
+			{ name: 'introduction', title: __('Introduction') },
+			{ name: 'setting-up', title: __('Setting up') },
+		],
+	},
+	{
+		title: __('Creating a course'),
+		opened: false,
+		subArticles: [
+			{ name: 'create-a-course', title: __('Create a course') },
+			{ name: 'add-a-chapter', title: __('Add a chapter') },
+			{ name: 'add-a-lesson', title: __('Add a lesson') },
+		],
+	},
+	{
+		title: __('Creating a batch'),
+		opened: false,
+		subArticles: [
+			{ name: 'create-a-batch', title: __('Create a batch') },
+			{ name: 'create-a-live-class', title: __('Create a live class') },
+		],
+	},
+	{
+		title: __('Assessments'),
+		opened: false,
+		subArticles: [
+			{ name: 'quizzes', title: __('Quizzes') },
+			{ name: 'assignments', title: __('Assignments') },
+		],
+	},
+	{
+		title: __('Certification'),
+		opened: false,
+		subArticles: [
+			{ name: 'issue-a-certificate', title: __('Issue a Certificate') },
+			{
+				name: 'custom-certificate-templates',
+				title: __('Custom Certificate Templates'),
+			},
+		],
+	},
+	{
+		title: __('Monetization'),
+		opened: false,
+		subArticles: [
+			{
+				name: 'setting-up-payment-gateway',
+				title: __('Setting up payment gateway'),
+			},
+		],
+	},
+	{
+		title: __('Settings'),
+		opened: false,
+		subArticles: [{ name: 'roles', title: __('Roles') }],
+	},
+])
+
+const setUpOnboarding = () => {
+	if (userResource.data?.is_system_manager) {
+		onboardingDetails = useOnboarding('learning')
+		onboardingDetails.setUp(steps)
+		isOnboardingStepsCompleted = onboardingDetails.isOnboardingStepsCompleted
+		showOnboarding.value = true
+	}
+}
+
+watch(userResource, () => {
+	if (userResource.data) {
+		isModerator.value = userResource.data.is_moderator
+		isInstructor.value = userResource.data.is_instructor
+		addPrograms()
+		addQuizzes()
+		addAssignments()
+		setUpOnboarding()
+	}
+})
 </script>

frontend/src/components/Assignment.vue

@@ -1,10 +1,13 @@
 <template>
 	<div
 		v-if="assignment.data"
-		class="grid grid-cols-[65%,35%] h-full"
-		:class="{ 'border rounded-lg': !showTitle }"
+		class="grid grid-cols-2 h-full"
+		:class="{ 'border rounded-lg overflow-auto': !showTitle }"
 	>
-		<div class="border-r p-5 overflow-y-auto h-[calc(100vh-3.2rem)]">
+		<div
+			class="border-r p-5 overflow-y-auto h-[calc(100vh-3.2rem)]"
+			:class="{ 'h-full': !showTitle }"
+		>
 			<div v-if="showTitle" class="text-lg font-semibold mb-5 text-ink-gray-9">
 				<div v-if="submissionName === 'new'">
 					{{ __('Submission by') }} {{ user.data?.full_name }}
@@ -50,7 +53,7 @@
 						!['Pass', 'Fail'].includes(submissionResource.doc?.status) &&
 						submissionResource.doc?.owner == user.data?.name
 					"
-					class="bg-surface-blue-2 p-3 rounded-md leading-5 text-sm mb-4"
+					class="bg-surface-blue-2 text-ink-blue-2 p-3 rounded-md leading-5 text-sm mb-4"
 				>
 					{{ __("You've successfully submitted the assignment.") }}
 					{{
@@ -116,7 +119,7 @@
 					/>
 				</div>
 				<div v-else>
-					<div class="text-sm mb-4">
+					<div class="text-sm mb-2 text-ink-gray-7">
 						{{ __('Write your answer here') }}
 					</div>
 					<TextEditor
@@ -138,9 +141,10 @@
 					<div class="text-sm text-ink-gray-5 font-medium mb-2">
 						{{ __('Comments by Evaluator') }}:
 					</div>
-					<div class="leading-5">
-						{{ submissionResource.doc.comments }}
-					</div>
+					<div
+						class="leading-5 text-ink-gray-9"
+						v-html="submissionResource.doc.comments"
+					></div>
 				</div>
 
 				<!-- Grading -->
@@ -198,7 +202,6 @@ const answer = ref(null)
 const comments = ref(null)
 const router = useRouter()
 const user = inject('$user')
-const showTitle = router.currentRoute.value.name == 'AssignmentSubmission'
 const isDirty = ref(false)
 
 const props = defineProps({
@@ -210,6 +213,10 @@ const props = defineProps({
 		type: String,
 		default: 'new',
 	},
+	showTitle: {
+		type: Boolean,
+		default: true,
+	},
 })
 
 onMounted(() => {
@@ -353,6 +360,7 @@ const addNewSubmission = () => {
 							assignmentID: props.assignmentID,
 							submissionName: data.name,
 						},
+						query: { fromLesson: router.currentRoute.value.query.fromLesson },
 					})
 				} else {
 					markLessonProgress()

frontend/src/components/AssignmentBlock.vue

@@ -1,46 +0,0 @@
-<template>
-	<Assignment
-		v-if="user.data && submission.data"
-		:assignmentID="assignmentID"
-		:submissionName="submission.data?.name || 'new'"
-	/>
-	<div v-else class="border rounded-md text-center py-20">
-		<div>
-			{{ __('Please login to access the assignment.') }}
-		</div>
-		<Button @click="redirectToLogin()" class="mt-2">
-			<span>
-				{{ __('Login') }}
-			</span>
-		</Button>
-	</div>
-</template>
-<script setup>
-import { inject, watch } from 'vue'
-import { Button, createResource } from 'frappe-ui'
-import Assignment from '@/components/Assignment.vue'
-
-const user = inject('$user')
-
-const props = defineProps({
-	assignmentID: {
-		type: String,
-		required: true,
-	},
-})
-
-const submission = createResource({
-	url: 'frappe.client.get_value',
-	makeParams(values) {
-		return {
-			doctype: 'LMS Assignment Submission',
-			fieldname: 'name',
-			filters: {
-				assignment: props.assignmentID,
-				member: user.data?.name,
-			},
-		}
-	},
-	auto: true,
-})
-</script>

frontend/src/components/BatchCourses.vue

@@ -63,6 +63,9 @@
 				</ListSelectBanner>
 			</ListView>
 		</div>
+		<div v-else class="text-sm italic text-ink-gray-5">
+			{{ __('No courses added') }}
+		</div>
 		<BatchCourseModal
 			v-model="showCourseModal"
 			:batch="batch"

frontend/src/components/BatchOverlay.vue

@@ -69,7 +69,11 @@
 					name: batch.data.name,
 				},
 			}"
-			v-else-if="batch.data.paid_batch && batch.data.seats_left"
+			v-else-if="
+				batch.data.paid_batch &&
+				batch.data.seats_left > 0 &&
+				batch.data.accept_enrollments
+			"
 		>
 			<Button v-if="!isStudent" class="w-full mt-4" variant="solid">
 				<span>
@@ -80,7 +84,11 @@
 		<Button
 			variant="solid"
 			class="w-full mt-2"
-			v-else-if="batch.data.allow_self_enrollment && batch.data.seats_left"
+			v-else-if="
+				batch.data.allow_self_enrollment &&
+				batch.data.seats_left &&
+				batch.data.accept_enrollments
+			"
 			@click="enrollInBatch()"
 		>
 			{{ __('Enroll Now') }}
@@ -112,6 +120,7 @@ import { useRouter } from 'vue-router'
 
 const router = useRouter()
 const user = inject('$user')
+const dayjs = inject('$dayjs')
 
 const props = defineProps({
 	batch: {

frontend/src/components/BatchStudents.vue

@@ -264,7 +264,8 @@ const students = createResource({
 	auto: true,
 	onSuccess(data) {
 		chartData.value = getChartData()
-		showProgressChart.value = data.length && true
+		showProgressChart.value =
+			data.length && (props.batch?.courses?.length || assessmentCount.value)
 	},
 })
 

frontend/src/components/CertificationLinks.vue

@@ -0,0 +1,85 @@
+<template>
+	<Button
+		v-if="certification.data && certification.data.certificate"
+		@click="downloadCertificate"
+		class=""
+	>
+		<template #prefix>
+			<GraduationCap class="size-4 stroke-1.5" />
+		</template>
+		{{ __('View Certificate') }}
+	</Button>
+	<div
+		v-else-if="
+			certification.data &&
+			certification.data.membership &&
+			certification.data.paid_certificate &&
+			user.data?.is_student
+		"
+	>
+		<router-link
+			v-if="!certification.data.membership.purchased_certificate"
+			:to="{
+				name: 'Billing',
+				params: {
+					type: 'certificate',
+					name: courseName,
+				},
+			}"
+		>
+			<Button class="w-full">
+				<template #prefix>
+					<GraduationCap class="size-4 stroke-1.5" />
+				</template>
+				{{ __('Get Certified') }}
+			</Button>
+		</router-link>
+		<router-link
+			v-else-if="!certification.data.membership.certificate"
+			:to="{
+				name: 'CourseCertification',
+				params: {
+					courseName: courseName,
+				},
+			}"
+		>
+			<Button class="w-full">
+				<template #prefix>
+					<GraduationCap class="size-4 stroke-1.5" />
+				</template>
+				{{ __('Get Certified') }}
+			</Button>
+		</router-link>
+	</div>
+</template>
+<script setup>
+import { Button, createResource } from 'frappe-ui'
+import { inject } from 'vue'
+import { GraduationCap } from 'lucide-vue-next'
+
+const user = inject('$user')
+
+const props = defineProps({
+	courseName: {
+		type: String,
+		required: true,
+	},
+})
+
+const certification = createResource({
+	url: 'lms.lms.api.get_certification_details',
+	params: {
+		course: props.courseName,
+	},
+	auto: user.data ? true : false,
+	cache: ['certificationData', user.data?.name],
+})
+
+const downloadCertificate = () => {
+	window.open(
+		`/api/method/frappe.utils.print_format.download_pdf?doctype=LMS+Certificate&name=${
+			certification.data.certificate.name
+		}&format=${encodeURIComponent(certification.data.certificate.template)}`
+	)
+}
+</script>

frontend/src/components/Controls/Autocomplete.vue

@@ -130,7 +130,7 @@ import {
 	ComboboxOptions,
 	ComboboxOption,
 } from '@headlessui/vue'
-import { Popover, Button } from 'frappe-ui'
+import { Popover } from 'frappe-ui'
 import { ChevronDown, X } from 'lucide-vue-next'
 import { ref, computed, useAttrs, useSlots, watch, nextTick } from 'vue'
 

frontend/src/components/CourseCard.vue

@@ -16,7 +16,8 @@
 					{{ __('Featured') }}
 				</Badge>
 				<div
-					v-for="tag in course.tags"
+					v-if="course.tags"
+					v-for="tag in course.tags?.split(', ')"
 					class="text-xs bg-white text-gray-800 px-2 py-0.5 rounded-md"
 				>
 					{{ tag }}
@@ -100,9 +101,15 @@
 					<CourseInstructors :instructors="course.instructors" />
 				</div>
 
-				<div class="font-semibold">
+				<div v-if="course.paid_course" class="font-semibold">
 					{{ course.price }}
 				</div>
+				<div
+					v-if="course.paid_certificate || course.enable_certification"
+					class="text-xs text-ink-blue-3 bg-surface-blue-1 py-0.5 px-1 rounded-md"
+				>
+					{{ __('Certification') }}
+				</div>
 			</div>
 		</div>
 	</div>

frontend/src/components/CourseCardOverlay.vue

@@ -6,30 +6,32 @@
 			class="rounded-t-md min-h-56 w-full"
 		/>
 		<div class="p-5">
-			<div v-if="course.data.price" class="text-2xl font-semibold mb-3">
+			<div v-if="course.data.paid_course" class="text-2xl font-semibold mb-3">
 				{{ course.data.price }}
 			</div>
-			<router-link
-				v-if="course.data.membership"
-				:to="{
-					name: 'Lesson',
-					params: {
-						courseName: course.name,
-						chapterNumber: course.data.current_lesson
-							? course.data.current_lesson.split('-')[0]
-							: 1,
-						lessonNumber: course.data.current_lesson
-							? course.data.current_lesson.split('-')[1]
-							: 1,
-					},
-				}"
-			>
-				<Button variant="solid" size="md" class="w-full">
-					<span>
-						{{ __('Continue Learning') }}
-					</span>
-				</Button>
-			</router-link>
+			<div v-if="course.data.membership" class="space-y-2">
+				<router-link
+					:to="{
+						name: 'Lesson',
+						params: {
+							courseName: course.name,
+							chapterNumber: course.data.current_lesson
+								? course.data.current_lesson.split('-')[0]
+								: 1,
+							lessonNumber: course.data.current_lesson
+								? course.data.current_lesson.split('-')[1]
+								: 1,
+						},
+					}"
+				>
+					<Button variant="solid" size="md" class="w-full">
+						<span>
+							{{ __('Continue Learning') }}
+						</span>
+					</Button>
+				</router-link>
+				<CertificationLinks :courseName="course.data.name" class="w-full" />
+			</div>
 			<router-link
 				v-else-if="course.data.paid_course"
 				:to="{
@@ -113,17 +115,36 @@
 						{{ course.data.rating }} {{ __('Rating') }}
 					</span>
 				</div>
+				<div
+					v-if="course.data.enable_certification"
+					class="flex items-center font-semibold text-ink-gray-9"
+				>
+					<GraduationCap class="h-4 w-4 stroke-2" />
+					<span class="ml-2">
+						{{ __('Certificate of Completion') }}
+					</span>
+				</div>
+				<div
+					v-if="course.data.paid_certificate"
+					class="flex items-center font-semibold text-ink-gray-9"
+				>
+					<GraduationCap class="h-4 w-4 stroke-2" />
+					<span class="ml-2">
+						{{ __('Paid Certificate after Evaluation') }}
+					</span>
+				</div>
 			</div>
 		</div>
 	</div>
 </template>
 <script setup>
-import { BookOpen, Users, Star } from 'lucide-vue-next'
+import { BookOpen, Users, Star, GraduationCap } from 'lucide-vue-next'
 import { computed, inject } from 'vue'
-import { Button, createResource } from 'frappe-ui'
+import { Button, createResource, Tooltip } from 'frappe-ui'
 import { showToast, formatAmount } from '@/utils/'
 import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
+import CertificationLinks from '@/components/CertificationLinks.vue'
 
 const router = useRouter()
 const user = inject('$user')

frontend/src/components/CourseOutline.vue

@@ -1,10 +1,17 @@
 <template>
-	<div class="text-base">
+	<div class="h-full">
 		<div
 			v-if="title && (outline.data?.length || allowEdit)"
-			class="grid grid-cols-[70%,30%] mb-4 px-2"
+			class="flex items-center justify-between space-x-2 mb-4 px-2"
+			:class="{
+				'sticky top-0 z-10 bg-surface-white border-b px-3 py-2.5 sm:px-5':
+					allowEdit,
+			}"
 		>
-			<div class="font-semibold text-lg leading-5 text-ink-gray-9">
+			<div
+				class="font-semibold text-lg leading-5 text-ink-gray-9"
+				:class="{ 'font-medium text-p-base': allowEdit }"
+			>
 				{{ __(title) }}
 			</div>
 			<Button size="sm" v-if="allowEdit" @click="openChapterModal()">
@@ -72,7 +79,7 @@
 							<div
 								class="outline-lesson pl-8 py-2 pr-4 text-ink-gray-9"
 								:class="
-									isActiveLesson(lesson.number) ? 'bg-surface-selected' : ''
+									isActiveLesson(lesson.number) ? 'bg-surface-gray-3' : ''
 								"
 							>
 								<router-link

frontend/src/components/CourseReviews.vue

@@ -38,7 +38,7 @@
 						<div class="flex mt-2">
 							<Star
 								v-for="index in 5"
-								class="h-5 w-5 text-ink-gray-2 rounded-sm mr-2"
+								class="h-5 w-5 text-ink-gray-1 rounded-sm mr-2"
 								:class="
 									index <= Math.ceil(review.rating)
 										? 'fill-orange-500'

frontend/src/components/Evaluators.vue

@@ -0,0 +1,129 @@
+<template>
+	<div>
+		<div class="flex items-center justify-between mb-4">
+			<div>
+				<div class="text-xl font-semibold mb-1 text-ink-gray-9">
+					{{ __(label) }}
+				</div>
+				<!-- <div class="text-xs text-ink-gray-5">
+					{{ __(description) }}
+				</div> -->
+			</div>
+			<div class="flex item-center space-x-2">
+				<FormControl
+					v-model="search"
+					:placeholder="__('Search')"
+					type="text"
+					:debounce="300"
+				/>
+				<Button @click="() => (showForm = !showForm)">
+					<template #icon>
+						<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
+						<X v-else class="h-3 w-3 stroke-1.5" />
+					</template>
+				</Button>
+			</div>
+		</div>
+
+		<!-- Form to add new member -->
+		<div v-if="showForm" class="flex items-center space-x-2 my-4">
+			<FormControl
+				v-model="email"
+				:placeholder="__('Email')"
+				type="email"
+				class="w-full"
+			/>
+			<Button @click="addEvaluator()" variant="subtle">
+				{{ __('Add') }}
+			</Button>
+		</div>
+
+		<div class="divide-y">
+			<div
+				v-for="evaluator in evaluators.data"
+				@click="openProfile(evaluator.username)"
+				class="cursor-pointer"
+			>
+				<div class="flex items-center justify-between py-3">
+					<div class="flex items-center space-x-3">
+						<Avatar
+							:image="evaluator.user_image"
+							:label="evaluator.full_name"
+							size="lg"
+						/>
+						<div>
+							<div class="text-base font-semibold text-ink-gray-9">
+								{{ evaluator.full_name }}
+							</div>
+							<div class="text-xs text-ink-gray-5">
+								{{ evaluator.evaluator }}
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+import { createResource, Button, FormControl, call, Avatar } from 'frappe-ui'
+import { ref, watch } from 'vue'
+import { Plus, X } from 'lucide-vue-next'
+import { useRouter } from 'vue-router'
+
+const show = defineModel('show')
+const search = ref('')
+const showForm = ref(false)
+const email = ref('')
+const router = useRouter()
+
+const props = defineProps({
+	label: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+		default: '',
+	},
+	show: {
+		type: Boolean,
+	},
+})
+
+const evaluators = createResource({
+	url: 'frappe.client.get_list',
+	makeParams: () => {
+		return {
+			doctype: 'Course Evaluator',
+			fields: ['evaluator', 'full_name', 'user_image', 'username'],
+			filters: search.value ? [['evaluator', 'like', search.value]] : [],
+		}
+	},
+	auto: true,
+})
+
+const addEvaluator = () => {
+	call('lms.lms.api.add_an_evaluator', {
+		email: email.value,
+	}).then((data) => {
+		showForm.value = false
+		email.value = ''
+		evaluators.reload()
+	})
+}
+
+watch(search, () => {
+	evaluators.reload()
+})
+
+const openProfile = (username) => {
+	show.value = false
+	router.push({
+		name: 'Profile',
+		params: {
+			username: username,
+		},
+	})
+}
+</script>

frontend/src/components/Icons/BatchIcon.vue

@@ -1,23 +0,0 @@
-<template>
-	<svg
-		width="18"
-		height="18"
-		viewBox="0 0 18 18"
-		fill="none"
-		xmlns="http://www.w3.org/2000/svg"
-	>
-		<g clip-path="url(#clip0_1584_1676)">
-			<path
-				fill-rule="evenodd"
-				clip-rule="evenodd"
-				d="M3.17474 0.625C2.34632 0.625 1.67474 1.29657 1.67474 2.125V7.475C1.67474 8.30343 2.34632 8.975 3.17474 8.975H14.8247C15.6532 8.975 16.3247 8.30343 16.3247 7.475V2.125C16.3247 1.29657 15.6532 0.625 14.8247 0.625H3.17474ZM2.67474 2.125C2.67474 1.84886 2.8986 1.625 3.17474 1.625H14.8247C15.1009 1.625 15.3247 1.84886 15.3247 2.125V7.475C15.3247 7.75114 15.1009 7.975 14.8247 7.975H3.17474C2.8986 7.975 2.67474 7.75114 2.67474 7.475V2.125ZM4.27478 10.0749C3.99864 10.0749 3.77478 10.2987 3.77478 10.5749V12.6749C3.77478 12.951 3.99864 13.1749 4.27478 13.1749C4.55092 13.1749 4.77478 12.951 4.77478 12.6749V11.0749H6.92478V12.6749C6.92478 12.951 7.14864 13.1749 7.42478 13.1749C7.70092 13.1749 7.92478 12.951 7.92478 12.6749V10.5749C7.92478 10.2987 7.70092 10.0749 7.42478 10.0749H4.27478ZM10.0749 10.5749C10.0749 10.2987 10.2987 10.0749 10.5749 10.0749H13.7249C14.001 10.0749 14.2249 10.2987 14.2249 10.5749V12.6749C14.2249 12.951 14.001 13.1749 13.7249 13.1749C13.4487 13.1749 13.2249 12.951 13.2249 12.6749V11.0749H11.0749V12.6749C11.0749 12.951 10.851 13.1749 10.5749 13.1749C10.2987 13.1749 10.0749 12.951 10.0749 12.6749V10.5749ZM1.125 14.275C0.848858 14.275 0.625 14.4988 0.625 14.775V16.875C0.625 17.1511 0.848858 17.375 1.125 17.375C1.40114 17.375 1.625 17.1511 1.625 16.875V15.275H3.775V16.875C3.775 17.1511 3.99886 17.375 4.275 17.375C4.55114 17.375 4.775 17.1511 4.775 16.875V14.775C4.775 14.4988 4.55114 14.275 4.275 14.275H1.125ZM13.2252 14.775C13.2252 14.4988 13.4491 14.275 13.7252 14.275H16.8752C17.1514 14.275 17.3752 14.4988 17.3752 14.775V16.875C17.3752 17.1511 17.1514 17.375 16.8752 17.375C16.5991 17.375 16.3752 17.1511 16.3752 16.875V15.275H14.2252V16.875C14.2252 17.1511 14.0014 17.375 13.7252 17.375C13.4491 17.375 13.2252 17.1511 13.2252 16.875V14.775ZM7.42511 14.275C7.14897 14.275 6.92511 14.4988 6.92511 14.775V16.875C6.92511 17.1511 7.14897 17.375 7.42511 17.375C7.70125 17.375 7.92511 17.1511 7.92511 16.875V15.275H10.0751V16.875C10.0751 17.1511 10.299 17.375 10.5751 17.375C10.8513 17.375 11.0751 17.1511 11.0751 16.875V14.775C11.0751 14.4988 10.8513 14.275 10.5751 14.275H7.42511Z"
-				fill="#525252"
-			/>
-		</g>
-		<defs>
-			<clipPath id="clip0_1584_1676">
-				<rect width="18" height="18" fill="white" />
-			</clipPath>
-		</defs>
-	</svg>
-</template>

frontend/src/components/Icons/FrappeCloudIcon.vue

@@ -0,0 +1,23 @@
+<template>
+	<svg
+		width="32"
+		height="32"
+		viewBox="0 0 32 32"
+		fill="none"
+		xmlns="http://www.w3.org/2000/svg"
+	>
+		<rect
+			x="0.75"
+			y="0.75"
+			width="30.5"
+			height="30.5"
+			rx="6.25"
+			stroke="currentColor"
+			stroke-width="1.5"
+		/>
+		<path
+			d="M24.5011 14.1124C23.3954 12.4873 21.532 11.5477 19.594 11.6747C18.7616 10.1384 17.2211 9.12267 15.4198 9.0084C14.1651 8.93222 12.8979 9.3766 11.9165 10.24C11.2456 10.8367 10.7611 11.5223 10.463 12.2968C10.289 12.7539 9.89151 13.0459 9.46912 13.0459H6.5V15.5852H9.46912C10.9226 15.5852 12.2271 14.6584 12.7737 13.2237C12.9227 12.8301 13.1712 12.4873 13.5439 12.1571C14.0284 11.7255 14.662 11.4969 15.2583 11.535C16.1528 11.5985 16.7863 12.0175 17.1839 12.538C17.6063 13.0205 17.8423 13.7696 17.979 14.5187C18.774 14.2902 19.6437 14.0997 20.476 14.2394C21.1593 14.3536 21.7929 14.7218 22.2525 15.2678C22.327 15.3567 22.4016 15.4456 22.4637 15.5471C23.06 16.4232 23.1718 17.5024 22.7743 18.5689C22.414 19.5592 21.0847 20.4607 19.9791 20.4607H11.3326C10.1524 20.4607 9.18339 19.5592 9.03432 18.4038H6.54969C6.71119 20.9686 8.78585 23 11.3326 23H19.9915C22.1283 23 24.3769 21.451 25.1098 19.4704C25.7931 17.6167 25.5695 15.6614 24.5135 14.0997L24.5011 14.1124Z"
+			fill="currentColor"
+		/>
+	</svg>
+</template>

frontend/src/components/Icons/InviteIcon.vue

@@ -0,0 +1,16 @@
+<template>
+	<svg
+		width="16"
+		height="16"
+		viewBox="0 0 16 16"
+		fill="none"
+		xmlns="http://www.w3.org/2000/svg"
+	>
+		<path
+			fill-rule="evenodd"
+			clip-rule="evenodd"
+			d="M13.5 0C13.7761 0 14 0.223858 14 0.5V2H15.5C15.7761 2 16 2.22386 16 2.5C16 2.77614 15.7761 3 15.5 3H14V4.5C14 4.77614 13.7761 5 13.5 5C13.2239 5 13 4.77614 13 4.5V3H11.5C11.2239 3 11 2.77614 11 2.5C11 2.22386 11.2239 2 11.5 2H13V0.5C13 0.223858 13.2239 0 13.5 0ZM7.9998 2C4.6862 2 2 4.6862 2 7.9998C2 9.49431 2.54643 10.8612 3.45041 11.9116C4.18218 10.8499 5.63104 9.51974 7.99595 9.50011L8.0001 9.50008C9.89267 9.50009 11.5613 10.456 12.5506 11.91C13.4537 10.8598 13.9996 9.49355 13.9996 7.9998C13.9996 7.72366 14.2235 7.4998 14.4996 7.4998C14.7757 7.4998 14.9996 7.72366 14.9996 7.9998C14.9996 11.8657 11.8657 14.9996 7.9998 14.9996C4.13392 14.9996 1 11.8657 1 7.9998C1 4.13392 4.13392 1 7.9998 1C8.27594 1 8.4998 1.22386 8.4998 1.5C8.4998 1.77614 8.27594 2 7.9998 2ZM11.8227 12.6242C11.0281 11.3487 9.61378 10.5008 8.00216 10.5001C5.94811 10.518 4.73746 11.7366 4.17676 12.6241C5.21484 13.4833 6.54702 13.9996 7.9998 13.9996C9.45251 13.9996 10.7846 13.4833 11.8227 12.6242ZM8 4.5C7.0335 4.5 6.25 5.2835 6.25 6.25C6.25 7.2165 7.0335 8 8 8C8.9665 8 9.75 7.2165 9.75 6.25C9.75 5.2835 8.9665 4.5 8 4.5ZM5.25 6.25C5.25 4.73122 6.48122 3.5 8 3.5C9.51878 3.5 10.75 4.73122 10.75 6.25C10.75 7.76878 9.51878 9 8 9C6.48122 9 5.25 7.76878 5.25 6.25Z"
+			fill="currentColor"
+		/>
+	</svg>
+</template>

frontend/src/components/JobCard.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="flex space-x-4 border rounded-md p-2">
-		<Avatar :image="job.company_logo" :label="job.job_title" size="2xl" />
+		<img :src="job.company_logo" class="size-10 rounded-full object-contain" />
 		<div class="flex flex-col space-y-2 flex-1">
 			<div class="flex items-center justify-between">
 				<span class="font-semibold text-ink-gray-9">

frontend/src/components/LessonContent.vue

@@ -4,7 +4,7 @@
 			class="youtube-video"
 			:src="getYouTubeVideoSource(youtube.split('/').pop())"
 			width="100%"
-			height="400"
+			:height="screenSize.width < 640 ? 200 : 400"
 			frameborder="0"
 			allowfullscreen
 		></iframe>
@@ -15,7 +15,7 @@
 				class="youtube-video"
 				:src="getYouTubeVideoSource(block)"
 				width="100%"
-				height="400"
+				:height="screenSize.width < 640 ? 200 : 400"
 				frameborder="0"
 				allowfullscreen
 			></iframe>
@@ -66,6 +66,9 @@
 <script setup>
 import Quiz from '@/components/QuizBlock.vue'
 import MarkdownIt from 'markdown-it'
+import { useScreenSize } from '@/utils/composables'
+
+const screenSize = useScreenSize()
 
 const markdown = new MarkdownIt({
 	html: true,

frontend/src/components/Members.vue

@@ -36,7 +36,7 @@
 			<FormControl
 				v-model="member.first_name"
 				:placeholder="__('First Name')"
-				type="test"
+				type="text"
 				class="w-full"
 			/>
 			<Button @click="addMember()" variant="subtle">
@@ -116,6 +116,7 @@ import { createResource, Avatar, Button, FormControl, Badge } from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import { ref, watch, reactive, inject } from 'vue'
 import { RefreshCw, Plus, X } from 'lucide-vue-next'
+import { useOnboarding } from 'frappe-ui/frappe'
 
 const router = useRouter()
 const show = defineModel('show')
@@ -125,6 +126,7 @@ const memberList = ref([])
 const hasNextPage = ref(false)
 const showForm = ref(false)
 const dayjs = inject('$dayjs')
+const { updateOnboardingStep } = useOnboarding('learning')
 
 const member = reactive({
 	email: '',
@@ -185,6 +187,7 @@ const newMember = createResource({
 	auto: false,
 	onSuccess(data) {
 		show.value = false
+		updateOnboardingStep('invite_students')
 		router.push({
 			name: 'Profile',
 			params: {

frontend/src/components/Modals/BatchCourseModal.vue

@@ -24,6 +24,7 @@
 				doctype="Course Evaluator"
 				v-model="evaluator"
 				:label="__('Evaluator')"
+				:onCreate="(value, close) => openSettings(close)"
 				class="mt-4"
 			/>
 		</template>
@@ -31,14 +32,18 @@
 </template>
 <script setup>
 import { Dialog, createResource } from 'frappe-ui'
-import { ref, defineModel } from 'vue'
+import { ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
 import { showToast } from '@/utils'
+import { useOnboarding } from 'frappe-ui/frappe'
+import { useSettings } from '@/stores/settings'
 
 const show = defineModel()
 const course = ref(null)
 const evaluator = ref(null)
 const courses = defineModel('courses')
+const { updateOnboardingStep } = useOnboarding('learning')
+const settingsStore = useSettings()
 
 const props = defineProps({
 	batch: {
@@ -69,6 +74,7 @@ const addCourse = (close) => {
 		{
 			onSuccess() {
 				courses.value.reload()
+				updateOnboardingStep('add_batch_course')
 				close()
 				course.value = null
 				evaluator.value = null
@@ -79,4 +85,10 @@ const addCourse = (close) => {
 		}
 	)
 }
+
+const openSettings = (close) => {
+	close()
+	settingsStore.activeTab = 'Evaluators'
+	settingsStore.isSettingsOpen = true
+}
 </script>

frontend/src/components/Modals/ChapterModal.vue

@@ -77,15 +77,15 @@ import {
 	FormControl,
 	Switch,
 } from 'frappe-ui'
-import { defineModel, reactive, watch } from 'vue'
+import { reactive, watch } from 'vue'
 import { showToast, getFileSize } from '@/utils/'
 import { capture } from '@/telemetry'
 import { FileText, X } from 'lucide-vue-next'
-import { useSettings } from '@/stores/settings'
+import { useOnboarding } from 'frappe-ui/frappe'
 
 const show = defineModel()
 const outline = defineModel('outline')
-const settingsStore = useSettings()
+const { updateOnboardingStep } = useOnboarding('learning')
 
 const props = defineProps({
 	course: {
@@ -140,14 +140,12 @@ const addChapter = async (close) => {
 			},
 			onSuccess: (data) => {
 				capture('chapter_created')
+				updateOnboardingStep('create_first_chapter')
 				chapterReference.submit(
 					{ name: data.name },
 					{
 						onSuccess(data) {
 							cleanChapter()
-							/* if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-								settingsStore.onboardingDetails.reload()
-							} */
 							outline.value.reload()
 							showToast(
 								__('Success'),

frontend/src/components/Modals/DiscussionModal.vue

@@ -35,7 +35,7 @@
 </template>
 <script setup>
 import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
-import { reactive, defineModel } from 'vue'
+import { reactive } from 'vue'
 import { showToast, singularize } from '@/utils'
 
 const topics = defineModel('reloadTopics')

frontend/src/components/Modals/EditProfile.vue

@@ -94,7 +94,7 @@ import {
 	createResource,
 	TextEditor,
 } from 'frappe-ui'
-import { reactive, watch, defineModel } from 'vue'
+import { reactive, watch } from 'vue'
 import { FileText, X } from 'lucide-vue-next'
 import { getFileSize, showToast, escapeHTML } from '@/utils'
 

frontend/src/components/Modals/EvaluationModal.vue

@@ -25,7 +25,15 @@
 					<div class="mb-1.5 text-sm text-ink-gray-5">
 						{{ __('Date') }}
 					</div>
-					<FormControl type="date" v-model="evaluation.date" />
+					<FormControl
+						type="date"
+						v-model="evaluation.date"
+						:min="
+							dayjs()
+								.add(dayjs.duration({ days: 1 }))
+								.format('YYYY-MM-DD')
+						"
+					/>
 				</div>
 				<div v-if="slots.data?.length">
 					<div class="mb-1.5 text-sm text-ink-gray-5">
@@ -58,7 +66,7 @@
 </template>
 <script setup>
 import { Dialog, createResource, Select, FormControl } from 'frappe-ui'
-import { defineModel, reactive, watch, inject } from 'vue'
+import { reactive, watch, inject } from 'vue'
 import { createToast, formatTime } from '@/utils/'
 
 const user = inject('$user')
@@ -161,6 +169,11 @@ const getCourses = () => {
 			})
 		}
 	}
+
+	if (courses.length == 1) {
+		evaluation.course = courses[0].value
+	}
+
 	return courses
 }
 

frontend/src/components/Modals/FCVerfiyCodeModal.vue

@@ -1,94 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			size: 'xl',
-			title: __('Login to Frappe Cloud'),
-			actions: [
-				{
-					label: __('Verify'),
-					variant: 'solid',
-					onClick: (close) => {
-						verifyCode(close)
-					},
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<div>
-				<p>
-					{{ __('We have sent the verificaton code to your email id ') }}
-					<b>{{ props.email }}</b>
-				</p>
-				<FormControl
-					v-model="code"
-					:label="__('Verification Code')"
-					class="mb-4"
-				/>
-				<p>
-					{{ __("Didn't receive the code?") }}
-					<a href="#" @click="resendCode">{{ __('Resend') }}</a>
-				</p>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import { call, Dialog } from 'frappe-ui'
-import { showToast } from '@/utils'
-
-const show = defineModel()
-const code = ref('')
-
-const props = defineProps({
-	email: {
-		type: String,
-		required: true,
-	},
-})
-
-const verifyCode = (close) => {
-	if (!code.value) {
-		return
-	}
-	call(
-		'frappe.integrations.frappe_providers.frappecloud_billing.verify_verification_code',
-		{
-			verification_code: code.value,
-			route: window.route,
-		}
-	)
-		.then((data) => {
-			if (data.message.login_token) {
-				close()
-				window.open(
-					`${frappeCloudBaseEndpoint}/api/method/press.api.developer.saas.login_to_fc?token=${data.message.login_token}`,
-					'_blank'
-				)
-				showToast(
-					__('Frappe Cloud Login Successful'),
-					`<p>${__('You will be redirected to Frappe Cloud soon.')}</p><p>${__(
-						"If you haven't been redirected,"
-					)} <a href="${frappeCloudBaseEndpoint}/api/method/press.api.developer.saas.login_to_fc?token=${
-						data.message.login_token
-					}" target="_blank">${__('Click here to login')}</a></p>`,
-					'check'
-				)
-			} else {
-				showToast(__('Login failed'), __('Please try again'), 'x')
-			}
-		})
-		.catch((err) => {
-			showToast(__('Login failed'), __('Please try again'), 'x')
-		})
-}
-
-const resendCode = () => {
-	call(
-		'frappe.integrations.frappe_providers.frappecloud_billing.send_verification_code'
-	).catch((err) => {
-		showToast(__('Failed to resend code'), __('Please try again'), 'x')
-	})
-}
-</script>

frontend/src/components/Modals/JobApplicationModal.vue

@@ -66,7 +66,7 @@
 <script setup>
 import { Dialog, FileUploader, Button, createResource } from 'frappe-ui'
 import { FileText } from 'lucide-vue-next'
-import { ref, inject, defineModel } from 'vue'
+import { ref, inject } from 'vue'
 import { createToast, getFileSize } from '@/utils/'
 
 const resume = ref(null)

frontend/src/components/Modals/LiveClassModal.vue

@@ -39,13 +39,19 @@
 								:required="true"
 							/>
 						</Tooltip>
-						<FormControl
-							v-model="liveClass.timezone"
-							type="select"
-							:options="getTimezoneOptions()"
-							:label="__('Timezone')"
-							:required="true"
-						/>
+
+						<div class="space-y-1.5">
+							<label class="block text-ink-gray-5 text-xs" for="batchTimezone">
+								{{ __('Timezone') }}
+								<span class="text-ink-red-3">*</span>
+							</label>
+							<Autocomplete
+								@update:modelValue="(opt) => (liveClass.timezone = opt.value)"
+								:modelValue="liveClass.timezone"
+								:options="getTimezoneOptions()"
+								:required="true"
+							/>
+						</div>
 					</div>
 					<div>
 						<FormControl
@@ -83,18 +89,14 @@
 </template>
 <script setup>
 import {
-	Input,
-	DatePicker,
-	Select,
-	Textarea,
 	Dialog,
 	createResource,
 	Tooltip,
 	FormControl,
+	Autocomplete,
 } from 'frappe-ui'
-import { reactive, inject } from 'vue'
-import { getTimezones, createToast } from '@/utils/'
-import { Info } from 'lucide-vue-next'
+import { reactive, inject, onMounted } from 'vue'
+import { getTimezones, createToast, getUserTimezone } from '@/utils/'
 
 const liveClasses = defineModel('reloadLiveClasses')
 const show = defineModel()
@@ -120,6 +122,10 @@ let liveClass = reactive({
 	host: user.data.name,
 })
 
+onMounted(() => {
+	liveClass.timezone = getUserTimezone()
+})
+
 const getTimezoneOptions = () => {
 	return getTimezones().map((timezone) => {
 		return {

frontend/src/components/Modals/Question.vue

@@ -109,11 +109,13 @@ import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
 import { computed, watch, reactive, ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
 import { showToast } from '@/utils'
+import { useOnboarding } from 'frappe-ui/frappe'
 
 const show = defineModel()
 const quiz = defineModel('quiz')
 const questionType = ref(null)
 const editMode = ref(false)
+const { updateOnboardingStep } = useOnboarding('learning')
 
 const existingQuestion = reactive({
 	question: '',
@@ -122,7 +124,7 @@ const existingQuestion = reactive({
 const question = reactive({
 	question: '',
 	type: 'Choices',
-	marks: 0,
+	marks: 1,
 })
 
 const populateFields = () => {
@@ -261,6 +263,7 @@ const addQuestionRow = (question, close) => {
 		{
 			onSuccess() {
 				show.value = false
+				updateOnboardingStep('create_first_quiz')
 				showToast(__('Success'), __('Question added successfully'), 'check')
 				quiz.value.reload()
 				close()

frontend/src/components/Modals/ReviewModal.vue

@@ -33,7 +33,7 @@
 </template>
 <script setup>
 import { Dialog, Textarea, createResource } from 'frappe-ui'
-import { defineModel, reactive } from 'vue'
+import { reactive } from 'vue'
 import Rating from '@/components/Controls/Rating.vue'
 import { createToast } from '@/utils/'
 

frontend/src/components/Modals/Settings.vue

@@ -40,6 +40,12 @@
 						:description="activeTab.description"
 						v-model:show="show"
 					/>
+					<Evaluators
+						v-else-if="activeTab.label === 'Evaluators'"
+						:label="activeTab.label"
+						:description="activeTab.description"
+						v-model:show="show"
+					/>
 					<Categories
 						v-else-if="activeTab.label === 'Categories'"
 						:label="activeTab.label"
@@ -78,6 +84,7 @@ import { useSettings } from '@/stores/settings'
 import SettingDetails from '../SettingDetails.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
 import Members from '@/components/Members.vue'
+import Evaluators from '@/components/Evaluators.vue'
 import Categories from '@/components/Categories.vue'
 import BrandSettings from '@/components/BrandSettings.vue'
 import PaymentSettings from '@/components/PaymentSettings.vue'
@@ -193,6 +200,11 @@ const tabsStructure = computed(() => {
 					description: 'Manage the members of your learning system',
 					icon: 'UserRoundPlus',
 				},
+				{
+					label: 'Evaluators',
+					description: 'Manage the evaluators of your learning system',
+					icon: 'UserCheck',
+				},
 				{
 					label: 'Categories',
 					description: 'Manage the members of your learning system',

frontend/src/components/Modals/StudentModal.vue

@@ -29,9 +29,11 @@ import { Dialog, createResource } from 'frappe-ui'
 import { ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
 import { showToast } from '@/utils'
+import { useOnboarding } from 'frappe-ui/frappe'
 
 const students = defineModel('reloadStudents')
 const student = ref()
+const { updateOnboardingStep } = useOnboarding('learning')
 const show = defineModel()
 
 const props = defineProps({
@@ -61,6 +63,7 @@ const addStudent = (close) => {
 			onSuccess() {
 				students.value.reload()
 				student.value = null
+				updateOnboardingStep('add_batch_student')
 				close()
 			},
 			onError(err) {

frontend/src/components/NoSidebarLayout.vue

@@ -0,0 +1,11 @@
+<template>
+	<div class="relative flex h-full flex-col">
+		<div class="h-full flex-1">
+			<div class="flex h-screen text-base bg-surface-white">
+				<div class="w-full overflow-auto" id="scrollContainer">
+					<slot />
+				</div>
+			</div>
+		</div>
+	</div>
+</template>

frontend/src/components/Quiz.vue

@@ -1,7 +1,7 @@
 <template>
 	<div v-if="quiz.data">
 		<div
-			class="bg-surface-blue-2 space-y-1 py-2 px-2 mb-4 rounded-md text-sm text-ink-blue-800"
+			class="bg-surface-blue-2 space-y-1 py-2 px-2 mb-4 rounded-md text-sm text-ink-blue-2"
 		>
 			<div class="leading-5">
 				{{
@@ -29,7 +29,7 @@
 					).format(quiz.data.passing_percentage)
 				}}
 			</div>
-			<div v-if="quiz.data.max_attempts" class="leading-relaxed">
+			<div v-if="quiz.data.max_attempts" class="leading-5">
 				{{
 					__('You can attempt this quiz {0}.').format(
 						quiz.data.max_attempts == 1
@@ -52,7 +52,7 @@
 
 		<div v-if="activeQuestion == 0">
 			<div class="border text-center p-20 rounded-md">
-				<div class="font-semibold text-lg">
+				<div class="font-semibold text-lg text-ink-gray-9">
 					{{ quiz.data.title }}
 				</div>
 				<Button
@@ -67,7 +67,7 @@
 						{{ __('Start') }}
 					</span>
 				</Button>
-				<div v-else>
+				<div v-else class="leading-5 text-ink-gray-7">
 					{{
 						__(
 							'You have already exceeded the maximum number of attempts allowed for this quiz.'
@@ -222,11 +222,14 @@
 				</div>
 			</div>
 		</div>
-		<div v-else class="border rounded-md p-20 text-center space-y-4">
-			<div class="text-lg font-semibold">
+		<div v-else class="border rounded-md p-20 text-center space-y-2">
+			<div class="text-lg font-semibold text-ink-gray-9">
 				{{ __('Quiz Summary') }}
 			</div>
-			<div v-if="quizSubmission.data.is_open_ended">
+			<div
+				v-if="quizSubmission.data.is_open_ended"
+				class="leading-5 text-ink-gray-7"
+			>
 				{{
 					__(
 						"Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
@@ -613,7 +616,6 @@ const getInstructions = (question) => {
 }
 
 const markLessonProgress = () => {
-	console.log(router)
 	if (router.currentRoute.value.name == 'Lesson') {
 		call('lms.lms.api.mark_lesson_progress', {
 			course: router.currentRoute.value.params.courseName,

frontend/src/components/SidebarLink.vue

@@ -2,7 +2,9 @@
 	<button
 		v-if="link && !link.onlyMobile"
 		class="flex h-7 cursor-pointer items-center rounded text-ink-gray-8 duration-300 ease-in-out focus:outline-none focus:transition-none focus-visible:rounded focus-visible:ring-2 focus-visible:ring-outline-gray-3"
-		:class="isActive ? 'bg-surface-white shadow-sm' : 'hover:bg-surface-gray-2'"
+		:class="
+			isActive ? 'bg-surface-selected shadow-sm' : 'hover:bg-surface-gray-2'
+		"
 		@click="handleClick"
 	>
 		<div

frontend/src/components/UpcomingEvaluations.vue

@@ -4,16 +4,65 @@
 			<div class="text-lg font-semibold">
 				{{ __('Upcoming Evaluations') }}
 			</div>
-			<Button @click="openEvalModal">
+			<Button
+				v-if="
+					!upcoming_evals.data?.length ||
+					upcoming_evals.length == courses.length
+				"
+				@click="openEvalModal"
+			>
 				{{ __('Schedule Evaluation') }}
 			</Button>
 		</div>
 		<div v-if="upcoming_evals.data?.length">
-			<div class="grid grid-cols-2 gap-4">
+			<div class="grid grid-cols-3 gap-4">
 				<div v-for="evl in upcoming_evals.data">
 					<div class="border rounded-md p-3">
-						<div class="font-semibold mb-3">
-							{{ evl.course_title }}
+						<div class="flex justify-between mb-3">
+							<span class="font-semibold leading-5">
+								{{ evl.course_title }}
+							</span>
+							<Menu
+								v-if="evl.date > dayjs().format()"
+								as="div"
+								class="relative inline-block text-left"
+							>
+								<div>
+									<MenuButton class="inline-flex w-full justify-center">
+										<EllipsisVertical class="w-4 h-4 stroke-1.5" />
+									</MenuButton>
+								</div>
+
+								<transition
+									enter-active-class="transition duration-100 ease-out"
+									enter-from-class="transform scale-95 opacity-0"
+									enter-to-class="transform scale-100 opacity-100"
+									leave-active-class="transition duration-75 ease-in"
+									leave-from-class="transform scale-100 opacity-100"
+									leave-to-class="transform scale-95 opacity-0"
+								>
+									<MenuItems
+										class="absolute mt-2 w-32 rounded-md bg-white shadow-lg p-1.5"
+									>
+										<MenuItem v-slot="{ active }">
+											<Button
+												variant="ghost"
+												class="w-full"
+												@click="cancelEvaluation(evl)"
+											>
+												<template #prefix>
+													<Ban
+														:active="active"
+														class="size-4 stroke-1.5"
+														aria-hidden="true"
+													/>
+												</template>
+												{{ __('Cancel') }}
+											</Button>
+										</MenuItem>
+									</MenuItems>
+								</transition>
+							</Menu>
 						</div>
 						<div class="flex items-center mb-2">
 							<Calendar class="w-4 h-4 stroke-1.5" />
@@ -28,17 +77,29 @@
 							</span>
 						</div>
 						<div class="flex items-center">
-							<UserCog2 class="w-4 h-4 stroke-1.5" />
-							<span class="ml-2 font-medium">
+							<GraduationCap class="w-4 h-4 stroke-1.5" />
+							<span class="ml-2">
 								{{ evl.evaluator_name }}
 							</span>
 						</div>
+						<div class="flex items-center justify-between space-x-2 mt-4">
+							<Button
+								v-if="evl.google_meet_link"
+								@click="openEvalCall(evl)"
+								class="w-full"
+							>
+								<template #prefix>
+									<HeadsetIcon class="w-4 h-4 stroke-1.5" />
+								</template>
+								{{ __('Join Call') }}
+							</Button>
+						</div>
 					</div>
 				</div>
 			</div>
 		</div>
 		<div v-else class="text-sm italic text-ink-gray-5">
-			{{ __('No upcoming evaluations.') }}
+			{{ __('Please schedule an evaluation to get certified.') }}
 		</div>
 	</div>
 	<EvaluationModal
@@ -50,15 +111,25 @@
 	/>
 </template>
 <script setup>
-import { Calendar, Clock, UserCog2 } from 'lucide-vue-next'
-import { inject, ref } from 'vue'
+import {
+	Ban,
+	Calendar,
+	Clock,
+	GraduationCap,
+	HeadsetIcon,
+	EllipsisVertical,
+} from 'lucide-vue-next'
+import { inject, ref, getCurrentInstance } from 'vue'
 import { formatTime } from '../utils'
-import { Button, createResource } from 'frappe-ui'
+import { Button, createResource, call } from 'frappe-ui'
 import EvaluationModal from '@/components/Modals/EvaluationModal.vue'
+import { Menu, MenuButton, MenuItems, MenuItem } from '@headlessui/vue'
 
 const dayjs = inject('$dayjs')
 const user = inject('$user')
 const showEvalModal = ref(false)
+const app = getCurrentInstance()
+const { $dialog } = app.appContext.config.globalProperties
 
 const props = defineProps({
 	batch: {
@@ -77,10 +148,10 @@ const props = defineProps({
 
 const upcoming_evals = createResource({
 	url: 'lms.lms.utils.get_upcoming_evals',
-	cache: ['upcoming_evals', user.data.name],
 	params: {
 		student: user.data.name,
 		courses: props.courses.map((course) => course.course),
+		batch: props.batch,
 	},
 	auto: true,
 })
@@ -88,4 +159,32 @@ const upcoming_evals = createResource({
 function openEvalModal() {
 	showEvalModal.value = true
 }
+
+const openEvalCall = (evl) => {
+	window.open(evl.google_meet_link, '_blank')
+}
+
+const cancelEvaluation = (evl) => {
+	$dialog({
+		title: __('Cancel this evaluation?'),
+		message: __(
+			'Are you sure you want to cancel this evaluation? This action cannot be undone.'
+		),
+		actions: [
+			{
+				label: __('Cancel'),
+				theme: 'red',
+				variant: 'solid',
+				onClick(close) {
+					call('lms.lms.api.cancel_evaluation', { evaluation: evl }).then(
+						() => {
+							upcoming_evals.reload()
+						}
+					)
+					close()
+				},
+			},
+		],
+	})
+}
 </script>

frontend/src/components/UserDropdown.vue

@@ -59,22 +59,21 @@
 		v-if="userResource.data?.is_moderator"
 		v-model="showSettingsModal"
 	/>
-	<FCVerfiyCodeModal v-if="showFCLoginDialog" :email="verificationEmail" />
 </template>
 
 <script setup>
 import LMSLogo from '@/components/Icons/LMSLogo.vue'
 import { sessionStore } from '@/stores/session'
-import { call, Dropdown } from 'frappe-ui'
+import { Dropdown } from 'frappe-ui'
 import Apps from '@/components/Apps.vue'
 import { useRouter } from 'vue-router'
-import { convertToTitleCase, showToast } from '@/utils'
+import { convertToTitleCase } from '@/utils'
 import { usersStore } from '@/stores/user'
 import { useSettings } from '@/stores/settings'
 import { markRaw, watch, ref, onMounted, computed } from 'vue'
-import SettingsModal from '@/components/Modals/Settings.vue'
 import { createDialog } from '@/utils/dialogs'
-import FCVerfiyCodeModal from './Modals/FCVerfiyCodeModal.vue'
+import SettingsModal from '@/components/Modals/Settings.vue'
+import FrappeCloudIcon from '@/components/Icons/FrappeCloudIcon.vue'
 import {
 	ChevronDown,
 	LogIn,
@@ -83,7 +82,7 @@ import {
 	User,
 	Settings,
 	Sun,
-	LogInIcon,
+	Zap,
 } from 'lucide-vue-next'
 
 const router = useRouter()
@@ -93,11 +92,8 @@ const settingsStore = useSettings()
 let { isLoggedIn } = sessionStore()
 const showSettingsModal = ref(false)
 const theme = ref('light')
-const $dialog = createDialog
 const frappeCloudBaseEndpoint = 'https://frappecloud.com'
-
-const showFCLoginDialog = ref(false)
-const verificationEmail = ref(null)
+const $dialog = createDialog
 
 const props = defineProps({
 	isCollapsed: {
@@ -130,120 +126,115 @@ const toggleTheme = () => {
 const userDropdownOptions = computed(() => {
 	return [
 		{
-			icon: User,
-			label: 'My Profile',
-			onClick: () => {
-				router.push(`/user/${userResource.data?.username}`)
-			},
-			condition: () => {
-				return isLoggedIn
-			},
+			group: '',
+			items: [
+				{
+					icon: User,
+					label: 'My Profile',
+					onClick: () => {
+						router.push(`/user/${userResource.data?.username}`)
+					},
+					condition: () => {
+						return isLoggedIn
+					},
+				},
+				{
+					icon: theme.value === 'light' ? Moon : Sun,
+					label: 'Toggle Theme',
+					onClick: () => {
+						toggleTheme()
+					},
+				},
+				{
+					component: markRaw(Apps),
+					condition: () => {
+						let cookies = new URLSearchParams(
+							document.cookie.split('; ').join('&')
+						)
+						let system_user = cookies.get('system_user')
+						if (system_user === 'yes') return true
+						else return false
+					},
+				},
+				{
+					icon: Settings,
+					label: 'Settings',
+					onClick: () => {
+						settingsStore.isSettingsOpen = true
+					},
+					condition: () => {
+						return userResource.data?.is_moderator
+					},
+				},
+				{
+					icon: FrappeCloudIcon,
+					label: 'Login to Frappe Cloud',
+					onClick: () => {
+						$dialog({
+							title: __('Login to Frappe Cloud?'),
+							message: __(
+								'Are you sure you want to login to your Frappe Cloud dashboard?'
+							),
+							actions: [
+								{
+									label: __('Confirm'),
+									variant: 'solid',
+									onClick(close) {
+										loginToFrappeCloud()
+										close()
+									},
+								},
+							],
+						})
+					},
+					condition: () => {
+						return (
+							userResource.data?.is_system_manager &&
+							userResource.data?.is_fc_site
+						)
+					},
+				},
+			],
 		},
 		{
-			icon: theme.value === 'light' ? Moon : Sun,
-			label: 'Toggle Theme',
-			onClick: () => {
-				toggleTheme()
-			},
-		},
-		{
-			component: markRaw(Apps),
-			condition: () => {
-				let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
-				let system_user = cookies.get('system_user')
-				if (system_user === 'yes') return true
-				else return false
-			},
-		},
-		{
-			icon: Settings,
-			label: 'Settings',
-			onClick: () => {
-				settingsStore.isSettingsOpen = true
-			},
-			condition: () => {
-				return userResource.data?.is_moderator
-			},
-		},
-		{
-			icon: LogInIcon,
-			label: 'Login to Frappe Cloud',
-			onClick: () => {
-				initiateRequestForLoginToFrappeCloud()
-			},
-			condition: () => {
-				return (
-					userResource.data?.user_type == 'System User' &&
-					userResource.data?.is_fc_site
-				)
-			},
-		},
-		{
-			icon: LogOut,
-			label: 'Log out',
-			onClick: () => {
-				logout.submit().then(() => {
-					isLoggedIn = false
-				})
-			},
-			condition: () => {
-				return isLoggedIn
-			},
-		},
-		{
-			icon: LogIn,
-			label: 'Log in',
-			onClick: () => {
-				window.location.href = '/login'
-			},
-			condition: () => {
-				return !isLoggedIn
-			},
+			group: '',
+			items: [
+				{
+					icon: Zap,
+					label: 'Powered by Learning',
+					onClick: () => {
+						window.open('https://frappe.io/learning', '_blank')
+					},
+				},
+				{
+					icon: LogOut,
+					label: 'Log out',
+					onClick: () => {
+						logout.submit().then(() => {
+							isLoggedIn = false
+						})
+					},
+					condition: () => {
+						return isLoggedIn
+					},
+				},
+				{
+					icon: LogIn,
+					label: 'Log in',
+					onClick: () => {
+						window.location.href = '/login'
+					},
+					condition: () => {
+						return !isLoggedIn
+					},
+				},
+			],
 		},
 	]
 })
 
-const initiateRequestForLoginToFrappeCloud = () => {
-	$dialog({
-		title: __('Login to Frappe Cloud?'),
-		message: __(
-			'Are you sure you want to login to your Frappe Cloud dashboard?'
-		),
-		actions: [
-			{
-				label: __('Confirm'),
-				variant: 'solid',
-				onClick(close) {
-					requestLoginToFC()
-					close()
-				},
-			},
-		],
-	})
-}
-
-const requestLoginToFC = () => {
-	call(
-		'frappe.integrations.frappe_providers.frappecloud_billing.send_verification_code'
-	)
-		.then((data) => {
-			if (data.message.is_user_logged_in) {
-				window.open(
-					`${frappeCloudBaseEndpoint}${data.message.redirect_to}`,
-					'_blank'
-				)
-				return
-			} else {
-				showFCLoginDialog.value = true
-				verificationEmail.value = data.message.email
-			}
-		})
-		.catch((err) => {
-			showToast(
-				__('Failed to login to Frappe Cloud'),
-				__('Please try again'),
-				'x'
-			)
-		})
+const loginToFrappeCloud = () => {
+	let redirect_to = '/dashboard/sites/' + userResource.data.sitename
+	window.open(`${frappeCloudBaseEndpoint}${redirect_to}`, '_blank')
 }
 </script>

frontend/src/pages/AssignmentSubmission.vue

@@ -1,19 +1,25 @@
 <template>
 	<header
+		v-if="!fromLesson"
 		class="flex justify-between sticky top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
 	</header>
 	<div class="overflow-hidden h-[calc(100vh-3.2rem)]">
-		<Assignment :assignmentID="assignmentID" :submissionName="submissionName" />
+		<Assignment
+			:assignmentID="assignmentID"
+			:submissionName="submissionName"
+			:showTitle="!fromLesson"
+		/>
 	</div>
 </template>
 <script setup>
 import { Breadcrumbs, createResource } from 'frappe-ui'
-import { computed, inject, onMounted } from 'vue'
+import { computed, inject, onMounted, onBeforeUnmount, ref } from 'vue'
 import Assignment from '@/components/Assignment.vue'
 
 const user = inject('$user')
+const fromLesson = ref(false)
 
 const props = defineProps({
 	assignmentID: {
@@ -42,6 +48,10 @@ onMounted(() => {
 	if (!user.data) {
 		window.location.href = '/login'
 	}
+
+	if (new URLSearchParams(window.location.search).get('fromLesson')) {
+		fromLesson.value = true
+	}
 })
 
 const breadcrumbs = computed(() => {

frontend/src/pages/Batch.vue

@@ -190,11 +190,16 @@
 			</div>
 		</div>
 	</div>
-	<BulkCertificates v-model="openCertificateDialog" :batch="batch.data" />
+	<BulkCertificates
+		v-if="batch.data"
+		v-model="openCertificateDialog"
+		:batch="batch.data"
+	/>
 </template>
 <script setup>
+import { computed, inject, ref, onMounted, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import { Breadcrumbs, Button, createResource, Tabs, Badge } from 'frappe-ui'
-import { computed, inject, ref } from 'vue'
 import CourseInstructors from '@/components/CourseInstructors.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
 import {
@@ -225,52 +230,10 @@ import BatchFeedback from '@/components/BatchFeedback.vue'
 const user = inject('$user')
 const showAnnouncementModal = ref(false)
 const openCertificateDialog = ref(false)
-
-const props = defineProps({
-	batchName: {
-		type: String,
-		required: true,
-	},
-})
-
-const batch = createResource({
-	url: 'lms.lms.utils.get_batch_details',
-	cache: ['batch', props.batchName],
-	params: {
-		batch: props.batchName,
-	},
-	auto: true,
-})
-
-const breadcrumbs = computed(() => {
-	let crumbs = [{ label: 'Batches', route: { name: 'Batches' } }]
-	if (!isStudent.value) {
-		crumbs.push({
-			label: 'Details',
-			route: {
-				name: 'BatchDetail',
-				params: {
-					batchName: batch.data?.name,
-				},
-			},
-		})
-	}
-	crumbs.push({
-		label: batch?.data?.title,
-		route: { name: 'Batch', params: { batchName: props.batchName } },
-	})
-	return crumbs
-})
-
-const isStudent = computed(() => {
-	return (
-		user?.data &&
-		batch.data?.students?.length &&
-		batch.data?.students.includes(user.data.name)
-	)
-})
-
+const route = useRoute()
+const router = useRouter()
 const tabIndex = ref(0)
+
 const tabs = computed(() => {
 	let batchTabs = []
 	batchTabs.push({
@@ -312,6 +275,61 @@ const tabs = computed(() => {
 	return batchTabs
 })
 
+const props = defineProps({
+	batchName: {
+		type: String,
+		required: true,
+	},
+})
+
+onMounted(() => {
+	const hash = route.hash
+	if (hash) {
+		tabs.value.forEach((tab, index) => {
+			if (tab.label?.toLowerCase() === hash.replace('#', '')) {
+				tabIndex.value = index
+			}
+		})
+	}
+})
+
+const batch = createResource({
+	url: 'lms.lms.utils.get_batch_details',
+	cache: ['batch', props.batchName],
+	params: {
+		batch: props.batchName,
+	},
+	auto: true,
+})
+
+const breadcrumbs = computed(() => {
+	let crumbs = [{ label: 'Batches', route: { name: 'Batches' } }]
+	if (!isStudent.value) {
+		crumbs.push({
+			label: 'Details',
+			route: {
+				name: 'BatchDetail',
+				params: {
+					batchName: batch.data?.name,
+				},
+			},
+		})
+	}
+	crumbs.push({
+		label: batch?.data?.title,
+		route: { name: 'Batch', params: { batchName: props.batchName } },
+	})
+	return crumbs
+})
+
+const isStudent = computed(() => {
+	return (
+		user?.data &&
+		batch.data?.students?.length &&
+		batch.data?.students.includes(user.data.name)
+	)
+})
+
 const redirectToLogin = () => {
 	window.location.href = `/login?redirect-to=/lms/batches/${props.batchName}`
 }
@@ -320,6 +338,13 @@ const openAnnouncementModal = () => {
 	showAnnouncementModal.value = true
 }
 
+watch(tabIndex, () => {
+	const tab = tabs.value[tabIndex.value]
+	if (tab.label != route.hash.replace('#', '')) {
+		router.push({ ...route, hash: `#${tab.label.toLowerCase()}` })
+	}
+})
+
 const pageMeta = computed(() => {
 	return {
 		title: batch.data?.title,

frontend/src/pages/BatchForm.vue

@@ -271,9 +271,11 @@ import { showToast } from '@/utils'
 import { Image } from 'lucide-vue-next'
 import { capture } from '@/telemetry'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
+import { useOnboarding } from 'frappe-ui/frappe'
 
 const router = useRouter()
 const user = inject('$user')
+const { updateOnboardingStep } = useOnboarding('learning')
 
 const props = defineProps({
 	batchName: {
@@ -426,6 +428,9 @@ const createNewBatch = () => {
 		{
 			onSuccess(data) {
 				capture('batch_created')
+				updateOnboardingStep('create_first_batch', true, false, () => {
+					localStorage.setItem('firstBatch', data.name)
+				})
 				router.push({
 					name: 'BatchDetail',
 					params: {

frontend/src/pages/Batches.vue

@@ -22,7 +22,7 @@
 		<div
 			class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between mb-5"
 		>
-			<div class="text-lg font-semibold">
+			<div class="text-lg text-ink-gray-9 font-semibold">
 				{{ __('All Batches') }}
 			</div>
 			<div
@@ -72,7 +72,7 @@
 		</div>
 		<div
 			v-else-if="!batches.list.loading"
-			class="flex flex-col items-center justify-center text-sm text-ink-gray-5 italic mt-48"
+			class="flex flex-col items-center justify-center text-sm text-ink-gray-5 mt-48"
 		>
 			<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
 			<div class="text-lg font-medium mb-1">
@@ -119,7 +119,8 @@ const currentCategory = ref(null)
 const title = ref('')
 const certification = ref(false)
 const filters = ref({})
-const currentTab = ref(user.data?.is_student ? 'All' : 'Upcoming')
+const is_student = computed(() => user.data?.is_student)
+const currentTab = ref(is_student.value ? 'All' : 'Upcoming')
 const orderBy = ref('start_date')
 
 onMounted(() => {
@@ -204,12 +205,12 @@ const updateTabFilter = () => {
 	if (!user.data) {
 		return
 	}
-	if (currentTab.value == 'Enrolled' && user.data?.is_student) {
+	if (currentTab.value == 'Enrolled' && is_student.value) {
 		filters.value['enrolled'] = 1
 		delete filters.value['start_date']
 		delete filters.value['published']
 		orderBy.value = 'start_date desc'
-	} else if (user.data?.is_student) {
+	} else if (is_student.value) {
 		delete filters.value['enrolled']
 	} else {
 		delete filters.value['start_date']
@@ -228,7 +229,7 @@ const updateTabFilter = () => {
 }
 
 const updateStudentFilter = () => {
-	if (!user.data || (user.data?.is_student && currentTab.value != 'Enrolled')) {
+	if (!user.data || (is_student.value && currentTab.value != 'Enrolled')) {
 		filters.value['start_date'] = ['>=', dayjs().format('YYYY-MM-DD')]
 		filters.value['published'] = 1
 	}
@@ -250,7 +251,12 @@ const setQueryParams = () => {
 		}
 	})
 
-	history.replaceState({}, '', `${location.pathname}?${queries.toString()}`)
+	let queryString = ''
+	if (queries.toString()) {
+		queryString = `?${queries.toString()}`
+	}
+
+	history.replaceState({}, '', `${location.pathname}${queryString}`)
 }
 
 const updateCategories = (data) => {
@@ -270,30 +276,23 @@ watch(currentTab, () => {
 	updateBatches()
 })
 
-const batchType = computed(() => {
-	let types = [
-		{ label: __(''), value: null },
-		{ label: __('Upcoming'), value: 'Upcoming' },
-		{ label: __('Archived'), value: 'Archived' },
-	]
-	if (user.data?.is_moderator) {
-		types.push({ label: __('Unpublished'), value: 'Unpublished' })
-	}
-	return types
-})
-
 const batchTabs = computed(() => {
 	let tabs = [
 		{
 			label: __('All'),
 		},
 	]
-	if (user.data?.is_student) {
-		tabs.push({ label: __('Enrolled') })
-	} else {
+
+	if (
+		user.data?.is_moderator ||
+		user.data?.is_instructor ||
+		user.data?.is_evaluator
+	) {
 		tabs.push({ label: __('Upcoming') })
 		tabs.push({ label: __('Archived') })
 		tabs.push({ label: __('Unpublished') })
+	} else if (user.data) {
+		tabs.push({ label: __('Enrolled') })
 	}
 	return tabs
 })

frontend/src/pages/Billing.vue

@@ -12,20 +12,15 @@
 			v-if="access.data?.access && orderSummary.data"
 			class="pt-5 pb-10 mx-5"
 		>
-			<!-- <div class="mb-5">
-				<div class="text-lg font-semibold">
-					{{ __('Address') }}
-				</div>
-			</div> -->
 			<div class="flex flex-col lg:flex-row justify-between">
 				<div
-					class="h-fit bg-surface-gray-2 rounded-md p-5 space-y-4 lg:order-last mb-10 lg:mt-10 text-sm font-medium lg:w-1/4"
+					class="h-fit bg-surface-gray-2 rounded-md p-5 space-y-4 lg:order-last mb-10 lg:mt-10 font-medium lg:w-1/3"
 				>
-					<div class="flex items-center justify-between space-x-2">
+					<div class="flex items-baseline justify-between space-y-2">
 						<div class="text-ink-gray-5">
-							{{ __('Ordered Item') }}
+							{{ __('Payment for ') }} {{ type }}:
 						</div>
-						<div class="">
+						<div class="leading-5">
 							{{ orderSummary.data.title }}
 						</div>
 					</div>
@@ -126,7 +121,7 @@
 						<p class="text-ink-gray-5">
 							{{
 								__(
-									'Make sure to enter the right billing name as the same will be used in your invoice.'
+									'Make sure to enter the correct billing name as the same will be used in your invoice.'
 								)
 							}}
 						</p>
@@ -140,10 +135,10 @@
 		<div v-else-if="access.data?.message">
 			<NotPermitted
 				:text="access.data.message"
-				:buttonLabel="
-					type == 'course' ? 'Checkout Courses' : 'Checkout Batches'
+				:buttonLabel="type == 'course' ? 'Checkout Course' : 'Checkout Batch'"
+				:buttonLink="
+					type == 'course' ? `/lms/courses/${name}` : `/lms/batches/${name}`
 				"
-				:buttonLink="type == 'course' ? '/lms/courses' : '/lms/batches'"
 			/>
 		</div>
 		<div v-else-if="!user.data?.name">
@@ -163,7 +158,7 @@ import {
 	Breadcrumbs,
 	Tooltip,
 } from 'frappe-ui'
-import { reactive, inject, onMounted, ref } from 'vue'
+import { reactive, inject, onMounted, computed } from 'vue'
 import Link from '@/components/Controls/Link.vue'
 import NotPermitted from '@/components/NotPermitted.vue'
 import { showToast } from '@/utils/'
@@ -193,7 +188,7 @@ const props = defineProps({
 const access = createResource({
 	url: 'lms.lms.api.validate_billing_access',
 	params: {
-		type: props.type,
+		billing_type: props.type,
 		name: props.name,
 	},
 	onSuccess(data) {
@@ -206,7 +201,7 @@ const orderSummary = createResource({
 	url: 'lms.lms.utils.get_order_summary',
 	makeParams(values) {
 		return {
-			doctype: props.type == 'course' ? 'LMS Course' : 'LMS Batch',
+			doctype: props.type == 'batch' ? 'LMS Batch' : 'LMS Course',
 			docname: props.name,
 			country: billingDetails.country,
 		}
@@ -236,13 +231,15 @@ const paymentLink = createResource({
 	url: 'lms.lms.payments.get_payment_link',
 	makeParams(values) {
 		return {
-			doctype: props.type == 'course' ? 'LMS Course' : 'LMS Batch',
+			doctype: props.type == 'batch' ? 'LMS Batch' : 'LMS Course',
 			docname: props.name,
 			title: orderSummary.data.title,
 			amount: orderSummary.data.original_amount,
 			total_amount: orderSummary.data.amount,
 			currency: orderSummary.data.currency,
 			address: billingDetails,
+			redirect_to: redirectTo.value,
+			payment_for_certificate: props.type == 'certificate',
 		}
 	},
 })
@@ -330,6 +327,8 @@ const validateAddress = () => {
 		!states.includes(billingDetails.state)
 	)
 		return 'Please enter a valid state with correct spelling and the first letter capitalized.'
+
+	console.log('validation address')
 }
 
 const showError = (err) => {
@@ -347,4 +346,14 @@ const changeCurrency = (country) => {
 	billingDetails.country = country
 	orderSummary.reload()
 }
+
+const redirectTo = computed(() => {
+	if (props.type == 'course') {
+		return `/lms/courses/${props.name}`
+	} else if (props.type == 'batch') {
+		return `/lms/batches/${props.name}`
+	} else if (props.type == 'certificate') {
+		return `/lms/courses/${props.name}/certification`
+	}
+})
 </script>

frontend/src/pages/CourseCertification.vue

@@ -0,0 +1,136 @@
+<template>
+	<header
+		class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
+	>
+		<Breadcrumbs class="h-7" :items="breadcrumbs" />
+	</header>
+	<div class="p-5">
+		<div v-if="certificate.data && Object.keys(certificate.data).length">
+			<div class="text-lg text-ink-gray-9 font-semibold mb-1">
+				{{ __('Certification') }}
+			</div>
+			<div class="text-ink-gray-9 text-sm">
+				{{
+					__(
+						'You are already certified for this course. Click on the card below to open your certificate.'
+					)
+				}}
+			</div>
+			<div
+				class="border p-3 w-fit min-w-60 rounded-md space-y-2 hover:bg-surface-gray-1 cursor-pointer mt-5"
+				@click="openCertificate(certificate.data)"
+			>
+				<div class="text-ink-gray-9 font-semibold">
+					{{ courseTitle }}
+				</div>
+				<div class="text-sm text-ink-gray-7 font-medium">
+					{{ __('Issued On') }}:
+					{{ dayjs(certificate.data.issue_date).format('DD MMM YYYY') }}
+				</div>
+			</div>
+		</div>
+		<div v-else>
+			<UpcomingEvaluations v-if="courses.length" :courses="courses" />
+		</div>
+	</div>
+</template>
+<script setup>
+import { computed, inject, onMounted, ref } from 'vue'
+import { Breadcrumbs, call, createResource } from 'frappe-ui'
+import { useRouter } from 'vue-router'
+import UpcomingEvaluations from '@/components/UpcomingEvaluations.vue'
+
+const courseTitle = ref(null)
+const evaluator = ref(null)
+const courses = ref([])
+const user = inject('$user')
+const dayjs = inject('$dayjs')
+const router = useRouter()
+
+const props = defineProps({
+	courseName: {
+		type: String,
+		required: true,
+	},
+})
+
+onMounted(() => {
+	fetchEnrollmentDetails()
+	fetchCourseDetails()
+})
+
+const certificate = createResource({
+	url: 'frappe.client.get_value',
+	params: {
+		doctype: 'LMS Certificate',
+		filters: {
+			member: user.data?.name,
+			course: props.courseName,
+		},
+		fieldname: ['name', 'template', 'issue_date'],
+	},
+	cache: [user.data?.name, props.courseName],
+})
+
+const fetchEnrollmentDetails = () => {
+	call('frappe.client.get_value', {
+		doctype: 'LMS Enrollment',
+		filters: { member: user.data?.name, course: props.courseName },
+		fieldname: ['purchased_certificate'],
+	}).then((data) => {
+		if (data.purchased_certificate) {
+			certificate.reload()
+		} else {
+			router.push({
+				name: 'CourseDetail',
+				params: { courseName: props.courseName },
+			})
+		}
+	})
+}
+
+const fetchCourseDetails = () => {
+	call('frappe.client.get_value', {
+		doctype: 'LMS Course',
+		filters: { name: props.courseName },
+		fieldname: ['title', 'evaluator'],
+	}).then((data) => {
+		courseTitle.value = data.title
+		evaluator.value = data.evaluator
+		populateCourses()
+	})
+}
+
+const populateCourses = () => {
+	courses.value = [
+		{
+			course: props.courseName,
+			title: courseTitle.value,
+			evaluator: evaluator.value,
+		},
+	]
+}
+
+const openCertificate = (certificate) => {
+	window.open(
+		`/api/method/frappe.utils.print_format.download_pdf?doctype=LMS+Certificate&name=${
+			certificate.name
+		}&format=${encodeURIComponent(certificate.template)}`,
+		'_blank'
+	)
+}
+
+const breadcrumbs = computed(() => [
+	{
+		label: __('Courses'),
+		route: { name: 'Courses' },
+	},
+	{
+		label: courseTitle.value,
+		route: { name: 'CourseDetail', params: { courseName: props.courseName } },
+	},
+	{
+		label: __('Certification'),
+	},
+])
+</script>

frontend/src/pages/CourseDetail.vue

@@ -56,12 +56,12 @@
 							<CourseInstructors :instructors="course.data.instructors" />
 						</div>
 					</div>
-					<div class="flex mt-3 mb-4 w-fit">
+					<div v-if="course.data.tags" class="flex mt-4 w-fit">
 						<Badge
 							theme="gray"
 							size="lg"
 							class="mr-2 text-ink-gray-9"
-							v-for="tag in course.data.tags"
+							v-for="tag in course.data.tags.split(', ')"
 						>
 							{{ tag }}
 						</Badge>
@@ -69,7 +69,7 @@
 					<CourseCardOverlay :course="course" class="md:hidden mb-4" />
 					<div
 						v-html="course.data.description"
-						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal"
+						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-4"
 					></div>
 					<div class="mt-10">
 						<CourseOutline

frontend/src/pages/CourseForm.vue

@@ -1,19 +1,20 @@
 <template>
-	<div class="">
+	<div class="h-full">
 		<div class="grid md:grid-cols-[70%,30%] h-full">
 			<div>
 				<header
-					class="sticky top-0 z-10 flex flex-col md:flex-row md:items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
+					class="sticky top-0 z-10 group flex flex-col md:flex-row md:items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
 				>
 					<Breadcrumbs class="h-7" :items="breadcrumbs" />
 					<div class="flex items-center mt-3 md:mt-0">
-						<Button v-if="courseResource.data?.name" @click="trashCourse()">
-							<template #prefix>
+						<Button
+							v-if="courseResource.data?.name"
+							@click="trashCourse()"
+							class="invisible group-hover:visible"
+						>
+							<template #icon>
 								<Trash2 class="w-4 h-4 stroke-1.5" />
 							</template>
-							<span>
-								{{ __('Delete') }}
-							</span>
 						</Button>
 						<Button variant="solid" @click="submitCourse()" class="ml-2">
 							<span>
@@ -160,7 +161,7 @@
 						<div class="text-lg font-semibold mt-5 mb-4">
 							{{ __('Settings') }}
 						</div>
-						<div class="grid grid-cols-3 gap-10 mb-4">
+						<div class="grid grid-cols-2 gap-10 mb-4">
 							<div
 								v-if="user.data?.is_moderator"
 								class="flex flex-col space-y-4"
@@ -188,51 +189,56 @@
 									v-model="course.featured"
 									:label="__('Featured')"
 								/>
-							</div>
-							<div class="flex flex-col space-y-3">
 								<FormControl
 									type="checkbox"
 									v-model="course.disable_self_learning"
 									:label="__('Disable Self Enrollment')"
 								/>
-								<FormControl
-									type="checkbox"
-									v-model="course.enable_certification"
-									:label="__('Completion Certificate')"
-								/>
 							</div>
 						</div>
 					</div>
-					<div class="container border-t">
-						<div class="text-lg font-semibold mt-5 mb-4">
-							{{ __('Pricing') }}
+					<div class="container border-t space-y-4">
+						<div class="text-lg font-semibold mt-5">
+							{{ __('Pricing and Certification') }}
 						</div>
-						<div class="mb-4">
+						<div class="grid grid-cols-3">
 							<FormControl
 								type="checkbox"
 								v-model="course.paid_course"
 								:label="__('Paid Course')"
 							/>
+							<FormControl
+								type="checkbox"
+								v-model="course.enable_certification"
+								:label="__('Completion Certificate')"
+							/>
+							<FormControl
+								type="checkbox"
+								v-model="course.paid_certificate"
+								:label="__('Paid Certificate')"
+							/>
 						</div>
-						<FormControl
-							v-model="course.course_price"
-							:label="__('Course Price')"
-							class="mb-4"
-						/>
+						<FormControl v-model="course.course_price" :label="__('Amount')" />
 						<Link
 							doctype="Currency"
 							v-model="course.currency"
 							:filters="{ enabled: 1 }"
 							:label="__('Currency')"
 						/>
+						<Link
+							v-if="course.paid_certificate"
+							doctype="Course Evaluator"
+							v-model="course.evaluator"
+							:label="__('Evaluator')"
+						/>
 					</div>
 				</div>
 			</div>
-			<div class="border-l pt-5">
+			<div class="border-l">
 				<CourseOutline
 					v-if="courseResource.data"
 					:courseName="courseResource.data.name"
-					:title="course.title"
+					:title="__('Course Outline')"
 					:allowEdit="true"
 				/>
 			</div>
@@ -265,6 +271,7 @@ import { useRouter } from 'vue-router'
 import CourseOutline from '@/components/CourseOutline.vue'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
 import { capture } from '@/telemetry'
+import { useOnboarding } from 'frappe-ui/frappe'
 import { useSettings } from '@/stores/settings'
 
 const user = inject('$user')
@@ -273,6 +280,7 @@ const router = useRouter()
 const instructors = ref([])
 const settingsStore = useSettings()
 const app = getCurrentInstance()
+const { updateOnboardingStep } = useOnboarding('learning')
 const { $dialog } = app.appContext.config.globalProperties
 
 const props = defineProps({
@@ -296,8 +304,10 @@ const course = reactive({
 	disable_self_learning: false,
 	enable_certification: false,
 	paid_course: false,
+	paid_certificate: false,
 	course_price: '',
 	currency: '',
+	evaluator: '',
 })
 
 onMounted(() => {
@@ -391,6 +401,7 @@ const courseResource = createResource({
 			'paid_course',
 			'featured',
 			'enable_certification',
+			'paid_certifiate',
 		]
 		for (let idx in checkboxes) {
 			let key = checkboxes[idx]
@@ -435,9 +446,9 @@ const submitCourse = () => {
 			onSuccess(data) {
 				capture('course_created')
 				showToast('Success', 'Course created successfully', 'check')
-				/* if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-					settingsStore.onboardingDetails.reload()
-				} */
+				updateOnboardingStep('create_first_course', true, false, () => {
+					localStorage.setItem('firstCourse', data.name)
+				})
 				router.push({
 					name: 'CourseForm',
 					params: { courseName: data.name },

frontend/src/pages/Courses.vue

@@ -1,316 +1,312 @@
 <template>
-	<div v-if="courses.data">
-		<header
-			class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
+	<header
+		class="sticky flex items-center justify-between top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5"
+	>
+		<Breadcrumbs :items="breadcrumbs" />
+		<router-link
+			v-if="user.data?.is_moderator"
+			:to="{
+				name: 'CourseForm',
+				params: { courseName: 'new' },
+			}"
 		>
-			<Breadcrumbs
-				class="h-7"
-				:items="[{ label: __('Courses'), route: { name: 'Courses' } }]"
-			/>
-			<div class="flex space-x-2 justify-end">
-				<div class="w-40 md:w-44">
-					<FormControl
-						v-if="categories.data?.length"
-						type="select"
-						v-model="currentCategory"
-						:options="categories.data"
-						:placeholder="__('Category')"
-					/>
-				</div>
-				<div class="w-28 md:w-36">
+			<Button variant="solid">
+				<template #prefix>
+					<Plus class="h-4 w-4 stroke-1.5" />
+				</template>
+				{{ __('New') }}
+			</Button>
+		</router-link>
+	</header>
+	<div class="p-5 pb-10">
+		<div
+			class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between mb-5"
+		>
+			<div class="text-lg text-ink-gray-9 font-semibold">
+				{{ __('All Courses') }}
+			</div>
+			<div
+				class="flex flex-col space-y-2 lg:space-y-0 lg:flex-row lg:items-center lg:space-x-4"
+			>
+				<TabButtons :buttons="courseTabs" v-model="currentTab" />
+				<FormControl
+					v-model="certification"
+					:label="__('Certification')"
+					type="checkbox"
+					@change="updateCourses()"
+				/>
+				<div class="grid grid-cols-2 gap-2">
 					<FormControl
+						v-model="title"
+						:placeholder="__('Search by Title')"
 						type="text"
-						placeholder="Search"
-						v-model="searchQuery"
-						@input="courses.reload()"
-					>
-						<template #prefix>
-							<Search
-								class="w-4 h-4 stroke-1.5 text-ink-gray-5"
-								name="search"
-							/>
-						</template>
-					</FormControl>
-				</div>
-				<router-link
-					v-if="user.data?.is_moderator || user.data?.is_instructor"
-					:to="{
-						name: 'CourseForm',
-						params: {
-							courseName: 'new',
-						},
-					}"
-				>
-					<Button variant="solid">
-						<template #prefix>
-							<Plus class="h-4 w-4" />
-						</template>
-						{{ __('New') }}
-					</Button>
-				</router-link>
-			</div>
-		</header>
-		<div class="">
-			<Tabs
-				v-if="hasCourses"
-				as="div"
-				v-model="tabIndex"
-				tablistClass="overflow-x-visible flex-wrap !gap-3 md:flex-nowrap"
-				:tabs="makeTabs"
-			>
-				<template #tab="{ tab, selected }">
-					<div>
-						<button
-							class="group -mb-px flex items-center gap-2 overflow-hidden border-b border-transparent py-2.5 text-base text-ink-gray-5 duration-300 ease-in-out hover:border-outline-gray-3 hover:text-ink-gray-9"
-							:class="{ 'text-ink-gray-9': selected }"
-						>
-							<component v-if="tab.icon" :is="tab.icon" class="h-5" />
-							{{ __(tab.label) }}
-							<Badge theme="gray">
-								{{ tab.count }}
-							</Badge>
-						</button>
+						class="min-w-40 lg:min-w-0 lg:w-32 xl:w-40"
+						@input="updateCourses()"
+					/>
+					<div class="min-w-40 lg:min-w-0 lg:w-32 xl:w-40">
+						<Select
+							v-if="categories.length"
+							v-model="currentCategory"
+							:options="categories"
+							:placeholder="__('Category')"
+							@change="updateCourses()"
+						/>
 					</div>
-				</template>
-				<template #tab-panel="{ tab }">
-					<div
-						v-if="tab.courses && tab.courses.value.length"
-						class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 gap-7 my-5 mx-5"
-					>
-						<router-link
-							v-for="course in tab.courses.value"
-							:to="
-								course.membership && course.current_lesson
-									? {
-											name: 'Lesson',
-											params: {
-												courseName: course.name,
-												chapterNumber: course.current_lesson.split('-')[0],
-												lessonNumber: course.current_lesson.split('-')[1],
-											},
-									  }
-									: course.membership
-									? {
-											name: 'Lesson',
-											params: {
-												courseName: course.name,
-												chapterNumber: 1,
-												lessonNumber: 1,
-											},
-									  }
-									: {
-											name: 'CourseDetail',
-											params: { courseName: course.name },
-									  }
-							"
-						>
-							<CourseCard :course="course" />
-						</router-link>
-					</div>
-					<div v-else class="p-5 italic text-ink-gray-4">
-						{{ __('No {0} courses').format(tab.label.toLowerCase()) }}
-					</div>
-				</template>
-			</Tabs>
-			<div
-				v-else-if="
-					!courses.loading &&
-					(user.data?.is_moderator || user.data?.is_instructor)
-				"
-				class="grid grid-cols-3 p-5"
-			>
-				<router-link
-					:to="{
-						name: 'CourseForm',
-						params: {
-							courseName: 'new',
-						},
-					}"
-				>
-					<div class="bg-surface-menu-bar py-32 px-5 rounded-md">
-						<div class="flex flex-col items-center text-center space-y-2">
-							<Plus
-								class="size-10 stroke-1 text-ink-gray-8 p-1 rounded-full border bg-surface-white"
-							/>
-							<div class="font-medium">
-								{{ __('Create a Course') }}
-							</div>
-							<span class="text-ink-gray-7 text-sm leading-4">
-								{{ __('You can add chapters and lessons to it.') }}
-							</span>
-						</div>
-					</div>
-				</router-link>
-			</div>
-			<div
-				v-else-if="!courses.loading && !hasCourses"
-				class="text-center p-5 text-ink-gray-5 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-			>
-				<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
-				<div class="text-xl font-medium">
-					{{ __('No courses found') }}
-				</div>
-				<div class="leading-5">
-					{{
-						__(
-							'There are no courses available at the moment. Keep an eye out, fresh learning experiences are on the way soon!'
-						)
-					}}
 				</div>
 			</div>
 		</div>
+		<div
+			v-if="courses.data?.length"
+			class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-5"
+		>
+			<router-link
+				v-for="course in courses.data"
+				:to="{ name: 'CourseDetail', params: { courseName: course.name } }"
+			>
+				<CourseCard :course="course" />
+			</router-link>
+		</div>
+		<div
+			v-else-if="!courses.list.loading"
+			class="flex flex-col items-center justify-center text-sm text-ink-gray-5 italic mt-48"
+		>
+			<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
+			<div class="text-lg font-medium mb-1">
+				{{ __('No courses found') }}
+			</div>
+			<div class="leading-5 w-2/5 text-center">
+				{{
+					__(
+						'There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!'
+					)
+				}}
+			</div>
+		</div>
+		<div
+			v-if="!courses.list.loading && courses.hasNextPage"
+			class="flex justify-center mt-5"
+		>
+			<Button @click="courses.next()">
+				{{ __('Load More') }}
+			</Button>
+		</div>
 	</div>
 </template>
-
 <script setup>
 import {
-	Badge,
 	Breadcrumbs,
 	Button,
-	call,
-	createResource,
+	createListResource,
 	FormControl,
-	Tabs,
+	Select,
+	TabButtons,
 } from 'frappe-ui'
-import CourseCard from '@/components/CourseCard.vue'
-import { BookOpen, Plus, Search } from 'lucide-vue-next'
-import { ref, computed, inject, onMounted, watch } from 'vue'
+import { computed, inject, onMounted, ref, watch } from 'vue'
+import { BookOpen, Plus } from 'lucide-vue-next'
 import { updateDocumentTitle } from '@/utils'
-import { useRouter } from 'vue-router'
-import { useSettings } from '@/stores/settings'
+import CourseCard from '@/components/CourseCard.vue'
 
 const user = inject('$user')
-const searchQuery = ref('')
+const dayjs = inject('$dayjs')
+const start = ref(0)
+const pageLength = ref(30)
+const categories = ref([])
 const currentCategory = ref(null)
-const hasCourses = ref(false)
-const router = useRouter()
-const settings = useSettings()
+const title = ref('')
+const certification = ref(false)
+const filters = ref({})
+const currentTab = ref('Live')
 
 onMounted(() => {
-	checkLearningPath()
-	let queries = new URLSearchParams(location.search)
-	if (queries.has('category')) {
-		currentCategory.value = queries.get('category')
-	}
+	setFiltersFromQuery()
+	updateCourses()
+	categories.value = [
+		{
+			label: '',
+			value: null,
+		},
+	]
 })
 
-const checkLearningPath = () => {
-	if (
-		settings.learningPaths.data &&
-		(!user.data?.is_moderator || !user.data?.is_instructor)
-	) {
-		router.push({ name: 'Programs' })
+const setFiltersFromQuery = () => {
+	let queries = new URLSearchParams(location.search)
+	title.value = queries.get('title') || ''
+	currentCategory.value = queries.get('category') || null
+	certification.value = queries.get('certification') || false
+}
+
+const courses = createListResource({
+	doctype: 'LMS Course',
+	url: 'lms.lms.utils.get_courses',
+	cache: ['courses', user.data?.name],
+	pageLength: pageLength.value,
+	start: start.value,
+	onSuccess(data) {
+		let allCategories = data.map((course) => course.category)
+		allCategories = allCategories.filter(
+			(category, index) => allCategories.indexOf(category) === index && category
+		)
+		if (categories.value.length <= allCategories.length) {
+			updateCategories(data)
+		}
+	},
+})
+
+const updateCourses = () => {
+	updateFilters()
+	courses.update({
+		filters: filters.value,
+	})
+	courses.reload()
+}
+
+const updateFilters = () => {
+	updateCategoryFilter()
+	updateTitleFilter()
+	updateCertificationFilter()
+	updateTabFilter()
+	updateStudentFilter()
+	setQueryParams()
+}
+
+const updateCategoryFilter = () => {
+	if (currentCategory.value) {
+		filters.value['category'] = currentCategory.value
+	} else {
+		delete filters.value['category']
 	}
 }
 
-const courses = createResource({
-	url: 'lms.lms.utils.get_courses',
-	cache: ['courses', user.data?.email],
-	auto: true,
+const updateTitleFilter = () => {
+	if (title.value) {
+		filters.value['title'] = ['like', `%${title.value}%`]
+	} else {
+		delete filters.value['title']
+	}
+}
+
+const updateCertificationFilter = () => {
+	if (certification.value) {
+		filters.value['certification'] = 1
+	} else {
+		delete filters.value['certification']
+	}
+}
+
+const updateTabFilter = () => {
+	delete filters.value['live']
+	delete filters.value['created']
+	delete filters.value['published_on']
+	delete filters.value['upcoming']
+
+	if (currentTab.value == 'Enrolled' && user.data?.is_student) {
+		filters.value['enrolled'] = 1
+		delete filters.value['published']
+	} else {
+		delete filters.value['published']
+		delete filters.value['enrolled']
+
+		if (currentTab.value == 'Live') {
+			filters.value['published'] = 1
+			filters.value['upcoming'] = 0
+			filters.value['live'] = 1
+		} else if (currentTab.value == 'Upcoming') {
+			filters.value['upcoming'] = 1
+			filters.value['published'] = 1
+		} else if (currentTab.value == 'New') {
+			filters.value['published'] = 1
+			filters.value['published_on'] = [
+				'>=',
+				dayjs().add(-3, 'month').format('YYYY-MM-DD'),
+			]
+		} else if (currentTab.value == 'Created') {
+			filters.value['created'] = 1
+		}
+	}
+}
+
+const updateStudentFilter = () => {
+	if (!user.data || (user.data?.is_student && currentTab.value != 'Enrolled')) {
+		filters.value['published'] = 1
+	}
+}
+
+const setQueryParams = () => {
+	let queries = new URLSearchParams(location.search)
+	let filterKeys = {
+		title: title.value,
+		category: currentCategory.value,
+		certification: certification.value,
+	}
+
+	Object.keys(filterKeys).forEach((key) => {
+		if (filterKeys[key]) {
+			queries.set(key, filterKeys[key])
+		} else {
+			queries.delete(key)
+		}
+	})
+
+	let queryString = ''
+	if (queries.toString()) {
+		queryString = `?${queries.toString()}`
+	}
+
+	history.replaceState({}, '', `${location.pathname}${queryString}`)
+}
+
+const updateCategories = (data) => {
+	data.forEach((course) => {
+		if (
+			course.category &&
+			!categories.value.find((category) => category.value === course.category)
+		)
+			categories.value.push({
+				label: course.category,
+				value: course.category,
+			})
+	})
+}
+
+watch(currentTab, () => {
+	updateCourses()
 })
 
-const tabIndex = ref(0)
-let tabs
-
-const makeTabs = computed(() => {
-	tabs = []
-	addToTabs('Live')
-	addToTabs('New')
-	addToTabs('Upcoming')
-
-	if (user.data) {
-		addToTabs('Enrolled')
-
-		if (
-			user.data.is_moderator ||
-			user.data.is_instructor ||
-			courses.data?.created?.length
-		) {
-			addToTabs('Created')
-		}
-
-		if (user.data.is_moderator) {
-			addToTabs('Under Review')
-		}
+const courseTabs = computed(() => {
+	let tabs = [
+		{
+			label: __('Live'),
+		},
+		{
+			label: __('New'),
+		},
+		{
+			label: __('Upcoming'),
+		},
+	]
+	if (
+		user.data?.is_moderator ||
+		user.data?.is_instructor ||
+		user.data?.is_evaluator
+	) {
+		tabs.push({ label: __('Created') })
+	} else if (user.data) {
+		tabs.push({ label: __('Enrolled') })
 	}
 	return tabs
 })
 
-const addToTabs = (label) => {
-	let courses = getCourses(label.toLowerCase().split(' ').join('_'))
-	tabs.push({
-		label,
-		courses: computed(() => courses),
-		count: computed(() => courses.length),
-	})
-}
-
-const getCourses = (type) => {
-	let courseList = courses.data[type]
-	if (searchQuery.value) {
-		let query = searchQuery.value.toLowerCase()
-		courseList = courseList.filter(
-			(course) =>
-				course.title.toLowerCase().includes(query) ||
-				course.short_introduction.toLowerCase().includes(query) ||
-				course.tags.filter((tag) => tag.toLowerCase().includes(query)).length
-		)
-	}
-	if (currentCategory.value && currentCategory.value != '') {
-		courseList = courseList.filter(
-			(course) => course.category == currentCategory.value
-		)
-	}
-	return courseList
-}
-
-const categories = createResource({
-	url: 'lms.lms.api.get_categories',
-	makeParams() {
-		return {
-			doctype: 'LMS Course',
-			filters: {
-				published: 1,
-			},
-		}
+const breadcrumbs = computed(() => [
+	{
+		label: __('Courses'),
+		route: { name: 'Courses' },
 	},
-	cache: ['courseCategories'],
-	auto: true,
-	transform(data) {
-		data.unshift({
-			label: '',
-			value: null,
-		})
-	},
-})
-
-watch(courses, () => {
-	if (courses.data) {
-		Object.keys(courses.data).forEach((section) => {
-			if (courses.data[section].length) {
-				hasCourses.value = true
-			}
-		})
-	}
-})
-
-watch(
-	() => currentCategory.value,
-	() => {
-		let queries = new URLSearchParams(location.search)
-		if (currentCategory.value) {
-			queries.set('category', currentCategory.value)
-		} else {
-			queries.delete('category')
-		}
-		history.pushState(null, '', `${location.pathname}?${queries.toString()}`)
-	}
-)
+])
 
 const pageMeta = computed(() => {
 	return {
 		title: 'Courses',
-		description: 'All Courses divided by categories',
+		description: 'All published courses.',
 	}
 })
 

frontend/src/pages/Lesson.vue

@@ -4,6 +4,7 @@
 			class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
 		>
 			<Breadcrumbs class="h-7" :items="breadcrumbs" />
+			<CertificationLinks :courseName="courseName" />
 		</header>
 		<div class="grid md:grid-cols-[70%,30%] h-screen">
 			<div
@@ -197,13 +198,14 @@ import { computed, watch, inject, ref, onMounted, onBeforeUnmount } from 'vue'
 import CourseOutline from '@/components/CourseOutline.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { useRouter, useRoute } from 'vue-router'
-import { ChevronLeft, ChevronRight } from 'lucide-vue-next'
+import { ChevronLeft, ChevronRight, GraduationCap } from 'lucide-vue-next'
 import Discussions from '@/components/Discussions.vue'
 import { getEditorTools, updateDocumentTitle } from '../utils'
 import EditorJS from '@editorjs/editorjs'
 import LessonContent from '@/components/LessonContent.vue'
 import CourseInstructors from '@/components/CourseInstructors.vue'
 import ProgressBar from '@/components/ProgressBar.vue'
+import CertificationLinks from '@/components/CertificationLinks.vue'
 
 const user = inject('$user')
 const router = useRouter()
@@ -585,11 +587,6 @@ updateDocumentTitle(pageMeta)
 	line-height: 1.7;
 }
 
-iframe {
-	border-top: 3px solid theme('colors.gray.700');
-	border-bottom: 3px solid theme('colors.gray.700');
-}
-
 .tc-table {
 	border-left: 1px solid #e8e8eb;
 }

frontend/src/pages/LessonForm.vue

@@ -92,13 +92,13 @@ import LessonHelp from '@/components/LessonHelp.vue'
 import { ChevronRight } from 'lucide-vue-next'
 import { updateDocumentTitle, createToast, getEditorTools } from '@/utils'
 import { capture } from '@/telemetry'
-import { useSettings } from '@/stores/settings'
+import { useOnboarding } from 'frappe-ui/frappe'
 
 const editor = ref(null)
 const instructorEditor = ref(null)
 const user = inject('$user')
 const openInstructorEditor = ref(false)
-const settingsStore = useSettings()
+const { updateOnboardingStep } = useOnboarding('learning')
 let autoSaveInterval
 let showSuccessMessage = false
 
@@ -139,7 +139,7 @@ const renderEditor = (holder) => {
 const lesson = reactive({
 	title: '',
 	include_in_preview: false,
-	body: 'Test',
+	body: '',
 	instructor_notes: '',
 	content: '',
 })
@@ -294,7 +294,7 @@ const convertToJSON = (lessonData) => {
 				type: 'upload',
 				data: {
 					file_url: video,
-					file_type: 'video',
+					file_type: video.split('.').pop(),
 				},
 			})
 		} else if (block.includes('{{ Audio')) {
@@ -303,7 +303,7 @@ const convertToJSON = (lessonData) => {
 				type: 'upload',
 				data: {
 					file_url: audio,
-					file_type: 'audio',
+					file_type: audio.split('.').pop(),
 				},
 			})
 		} else if (block.includes('{{ PDF')) {
@@ -395,10 +395,8 @@ const createNewLesson = () => {
 					{
 						onSuccess() {
 							capture('lesson_created')
+							updateOnboardingStep('create_first_lesson')
 							showToast('Success', 'Lesson created successfully', 'check')
-							/* if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-								settingsStore.onboardingDetails.reload()
-							} */
 							lessonDetails.reload()
 						},
 					}
@@ -623,4 +621,12 @@ iframe {
 .tc-table {
 	border-left: 1px solid #e8e8eb;
 }
+
+.ce-toolbox__button[data-tool='markdown'] {
+	display: none !important;
+}
+
+.ce-popover-item[data-item-name='markdown'] {
+	display: none !important;
+}
 </style>

frontend/src/pages/ProfileRoles.vue

@@ -72,7 +72,7 @@ const roles = createResource({
 })
 
 const updateRole = createResource({
-	url: 'lms.overrides.user.save_role',
+	url: 'lms.lms.api.save_role',
 	makeParams(values) {
 		return {
 			user: props.profile.data?.name,

frontend/src/pages/Programs.vue

@@ -17,7 +17,7 @@
 	<div v-if="programs.data?.length" class="pt-5 px-5">
 		<div v-for="program in programs.data" class="mb-10">
 			<div class="flex items-center justify-between">
-				<div class="text-xl font-semibold">
+				<div class="text-xl text-ink-gray-9 font-semibold">
 					{{ program.name }}
 				</div>
 				<div class="flex items-center space-x-2">

frontend/src/pages/QuizPage.vue

@@ -1,27 +1,36 @@
 <template>
 	<header
+		v-if="!fromLesson"
 		class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
 	</header>
-	<div class="md:w-7/12 md:mx-auto mx-4 py-10">
+	<div
+		class="md:w-7/12 md:mx-auto mx-4 py-10"
+		:class="{ 'pt-4 md:w-full': fromLesson }"
+	>
 		<Quiz :quizName="quizID" />
 	</div>
 </template>
 <script setup>
 import Quiz from '@/components/Quiz.vue'
 import { createResource, Breadcrumbs } from 'frappe-ui'
-import { computed, inject, onMounted } from 'vue'
+import { computed, inject, onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
 const router = useRouter()
+const fromLesson = ref(false)
 
 onMounted(() => {
 	if (!user.data) {
 		router.push({ name: 'Courses' })
 	}
+
+	if (new URLSearchParams(window.location.search).get('fromLesson')) {
+		fromLesson.value = true
+	}
 })
 
 const props = defineProps({

frontend/src/router.js

@@ -28,6 +28,12 @@ const routes = [
 		component: () => import('@/pages/Lesson.vue'),
 		props: true,
 	},
+	{
+		path: '/courses/:courseName/certification',
+		name: 'CourseCertification',
+		component: () => import('@/pages/CourseCertification.vue'),
+		props: true,
+	},
 	{
 		path: '/courses/:courseName/learn/:chapterName',
 		name: 'SCORMChapter',

frontend/src/utils/assignment.js

@@ -1,10 +1,9 @@
 import { Pencil } from 'lucide-vue-next'
 import { createApp, h } from 'vue'
 import AssessmentPlugin from '@/components/AssessmentPlugin.vue'
-import AssignmentBlock from '@/components/AssignmentBlock.vue'
 import translationPlugin from '../translation'
 import { usersStore } from '@/stores/user'
-import router from '../router'
+import { call } from 'frappe-ui'
 
 export class Assignment {
 	constructor({ data, api, readOnly }) {
@@ -43,14 +42,18 @@ export class Assignment {
 
 	renderAssignment(assignment) {
 		if (this.readOnly) {
-			const app = createApp(AssignmentBlock, {
-				assignmentID: assignment,
-			})
-			app.use(translationPlugin)
-			app.use(router)
 			const { userResource } = usersStore()
-			app.provide('$user', userResource)
-			app.mount(this.wrapper)
+			call('frappe.client.get_value', {
+				doctype: 'LMS Assignment Submission',
+				filters: {
+					assignment: assignment,
+					member: userResource.data?.name,
+				},
+				fieldname: ['name'],
+			}).then((data) => {
+				let submission = data.name || 'new'
+				this.wrapper.innerHTML = `<iframe src="/lms/assignment-submission/${assignment}/${submission}?fromLesson=1" class="w-full h-[500px]"></iframe>`
+			})
 			return
 		}
 		this.wrapper.innerHTML = `<div class='border rounded-md p-10 text-center bg-surface-menu-bar mb-2'>

frontend/src/utils/code.ts

@@ -1,5 +1,7 @@
 import { Code } from "lucide-vue-next"
 import { h, createApp } from "vue"
+import hljs from 'highlight.js/lib/core';
+
 
 const DEFAULT_THEMES = ['light', 'dark'];
 const COMMON_LANGUAGES = {
@@ -42,7 +44,6 @@ export class CodeBox {
 		this.selectInput = document.createElement('input');
 		this.selectDropIcon = document.createElement('i');
 
-		this._injectHighlightJSScriptElement();
 		this._injectHighlightJSCSSElement();
 
 		this.api.listeners.on(window, 'click', this._closeAllLanguageSelects, true);
@@ -150,7 +151,7 @@ export class CodeBox {
 	}
 
 	_highlightCodeArea(event) {
-		window.hljs.highlightBlock(this.codeArea);
+		hljs.highlightBlock(this.codeArea);
 	}
 
 	_handleCodeAreaPaste(event) {
@@ -167,7 +168,8 @@ export class CodeBox {
 		this.codeArea.removeAttribute('class');
 		this.data.language = language[0];
 		this.codeArea.setAttribute('class', `codeBoxTextArea ${this.config.useDefaultTheme} ${this.data.language}`);
-		window.hljs.highlightBlock(this.codeArea);
+	
+		hljs.highlightElement(this.codeArea);
 	}
 
 	_closeAllLanguageSelects() {
@@ -175,20 +177,6 @@ export class CodeBox {
 		for (let i = 0, len = selectPreviews.length; i < len; i++) selectPreviews[i].classList.remove('codeBoxShow');
 	}
 
-	_injectHighlightJSScriptElement() {
-		const highlightJSScriptElement = document.querySelector(`#${this.highlightScriptID}`);
-		const highlightJSScriptURL = 'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/highlight.min.js';
-		if (!highlightJSScriptElement) {
-			const script = document.createElement('script');
-			const head = document.querySelector('head');
-			script.setAttribute('src', highlightJSScriptURL);
-			script.setAttribute('id', this.highlightScriptID);
-
-			if (head) head.appendChild(script);
-		}
-		else highlightJSScriptElement.setAttribute('src', highlightJSScriptURL);
-	}
-
 	_injectHighlightJSCSSElement() {
 		const highlightJSCSSElement = document.querySelector(`#${this.highlightCSSID}`);
 		let highlightJSCSSURL = this._getThemeURLFromConfig();

frontend/src/utils/index.js

@@ -158,7 +158,10 @@ export function getEditorTools() {
 		quiz: Quiz,
 		assignment: Assignment,
 		upload: Upload,
-		markdown: Markdown,
+		markdown: {
+			class: Markdown,
+			inlineToolbar: true,
+		},
 		image: SimpleImage,
 		table: {
 			class: Table,
@@ -174,9 +177,6 @@ export function getEditorTools() {
 		codeBox: {
 			class: CodeBox,
 			config: {
-				themeURL:
-					'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/styles/atom-one-dark.min.css',
-				themeName: 'atom-one-dark',
 				useDefaultTheme: 'dark',
 			},
 		},
@@ -441,6 +441,22 @@ export function getTimezones() {
 	]
 }
 
+export function getUserTimezone() {
+	try {
+		const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
+		const supportedTimezones = getTimezones()
+
+		if (supportedTimezones.includes(timezone)) {
+			return timezone // e.g., 'Asia/Calcutta', 'America/New_York', etc.
+		} else {
+			throw Error('unsupported timezone')
+		}
+	} catch (error) {
+		console.error('Error getting timezone:', error)
+		return null
+	}
+}
+
 export function getSidebarLinks() {
 	return [
 		{

frontend/src/utils/markdownParser.js

@@ -1,3 +1,6 @@
+import { CodeXml } from 'lucide-vue-next'
+import { createApp, h } from 'vue'
+
 export class Markdown {
 	constructor({ data, api, readOnly, config }) {
 		this.api = api
@@ -18,13 +21,26 @@ export class Markdown {
 		}
 	}
 
+	static get toolbox() {
+		const app = createApp({
+			render: () =>
+				h(CodeXml, { size: 18, strokeWidth: 1.5, color: 'black' }),
+		})
+
+		const div = document.createElement('div')
+		app.mount(div)
+		return {
+			title: '',
+			icon: div.innerHTML,
+		}
+	}
+
 	onPaste(event) {
 		const data = {
 			text: event.detail.data.innerHTML,
 		}
 
 		this.data = data
-
 		window.requestAnimationFrame(() => {
 			if (!this.wrapper) {
 				return
@@ -41,19 +57,26 @@ export class Markdown {
 
 	render() {
 		this.wrapper = document.createElement('div')
-		this.wrapper.classList.add('cdx-block')
-		this.wrapper.classList.add('ce-paragraph')
+		this.wrapper.classList.add('cdx-block', 'ce-paragraph')
 		this.wrapper.innerHTML = this.text
 
 		if (!this.readOnly) {
 			this.wrapper.contentEditable = true
 			this.wrapper.innerHTML = this.text
 
-			this.wrapper.addEventListener('keydown', (event) => {
-				const value = event.target.textContent
+			this.wrapper.addEventListener('input', (event) => {
+				let value = event.target.textContent
 				if (event.keyCode === 32 && value.startsWith('#')) {
 					this.convertToHeader(event, value)
-				} else if (event.keyCode === 13) {
+				} else if (event.keyCode == 189) {
+					this.convertBlock('list', {
+						style: 'unordered',
+					})
+				} else if (/^[a-zA-Z]/.test(event.key)) {
+					this.convertBlock('paragraph', {
+						text: value,
+					})
+				} else if (event.keyCode === 13 || event.keyCode === 190) {
 					this.parseContent(event)
 				}
 			})
@@ -75,7 +98,11 @@ export class Markdown {
 
 	parseContent(event) {
 		event.preventDefault()
-		const previousLine = this.wrapper.textContent
+		let previousLine = this.wrapper.textContent
+		if (event.keyCode === 190) {
+			previousLine = previousLine + '.'
+		}
+
 		if (previousLine && this.hasImage(previousLine)) {
 			this.wrapper.textContent = ''
 			this.convertBlock('image')
@@ -94,12 +121,12 @@ export class Markdown {
 					},
 				],
 			})
-		} else if (previousLine && previousLine.startsWith('1. ')) {
+		} else if (previousLine && previousLine.startsWith('1.')) {
 			this.convertBlock('list', {
 				style: 'ordered',
 				items: [
 					{
-						content: previousLine.replace('1. ', ''),
+						content: previousLine.replace('1.', ''),
 					},
 				],
 			})
@@ -108,6 +135,10 @@ export class Markdown {
 			this.convertBlock('embed', {
 				source: previousLine,
 			})
+		} else {
+			this.convertBlock('paragraph', {
+				text: previousLine,
+			})
 		}
 	}
 
@@ -149,7 +180,7 @@ export class Markdown {
 	}
 
 	canBeEmbed(line) {
-		return /^https?:\/\/.+/.test(line)
+		return /^https?:\/\/.+/.test(line.trim())
 	}
 }
 

frontend/src/utils/quiz.js

@@ -43,14 +43,7 @@ export class Quiz {
 
 	renderQuiz(quiz) {
 		if (this.readOnly) {
-			const app = createApp(QuizBlock, {
-				quiz: quiz,
-			})
-			app.use(translationPlugin)
-			app.use(router)
-			const { userResource } = usersStore()
-			app.provide('$user', userResource)
-			app.mount(this.wrapper)
+			this.wrapper.innerHTML = `<iframe src="/lms/quiz/${quiz}?fromLesson=1" class="w-full h-[500px]"></iframe>`
 			return
 		}
 		this.wrapper.innerHTML = `<div class='border rounded-md p-10 text-center bg-surface-menu-bar mb-2'>

frontend/src/utils/upload.js

@@ -56,11 +56,11 @@ export class Upload {
 			app.mount(this.wrapper)
 			return
 		} else if (file.file_type == 'PDF') {
-			this.wrapper.innerHTML = `<iframe src="https://docs.google.com/viewer?url=${
+			this.wrapper.innerHTML = `<iframe src="${
 				window.location.origin
 			}${encodeURI(
 				file.file_url
-			)}&embedded=true" width='100%' height='700px' class="mb-4" type="application/pdf"></iframe>`
+			)}" width='100%' height='700px' class="mb-4" type="application/pdf"></iframe>`
 			return
 		} else {
 			this.wrapper.innerHTML = `<img class="mb-4" src=${encodeURI(

frontend/tailwind.config.js

@@ -3,8 +3,10 @@ module.exports = {
 	content: [
 		'./index.html',
 		'./src/**/*.{vue,js,ts,jsx,tsx}',
-		'./node_modules/frappe-ui/src/components/**/*.{vue,js,ts,jsx,tsx}',
-		'../node_modules/frappe-ui/src/components/**/*.{vue,js,ts,jsx,tsx}',
+		'./node_modules/frappe-ui/src/**/*.{vue,js,ts,jsx,tsx}',
+		'../node_modules/frappe-ui/src/**/*.{vue,js,ts,jsx,tsx}',
+		'./node_modules/frappe-ui/frappe/**/*.{vue,js,ts,jsx,tsx}',
+		'../node_modules/frappe-ui/frappe/**/*.{vue,js,ts,jsx,tsx}',
 	],
 	theme: {
 		extend: {
@@ -12,7 +14,7 @@ module.exports = {
 				1.5: '1.5',
 			},
 			screens: {
-				'2xl': '1536px',
+				'2xl': '1600px',
 				'3xl': '1920px',
 			},
 		},

frontend/vite.config.js

@@ -6,7 +6,17 @@ import frappeui from 'frappe-ui/vite'
 // https://vitejs.dev/config/
 export default defineConfig({
 	plugins: [
-		frappeui(),
+		frappeui({
+			frappeProxy: true,
+			lucideIcons: true,
+			jinjaBootData: true,
+			frappeTypes: {
+				input: {},
+			},
+			buildConfig: {
+				indexHtmlPath: '../lms/www/lms.html',
+			},
+		}),
 		vue({
 			script: {
 				defineModel: true,
@@ -15,7 +25,7 @@ export default defineConfig({
 		}),
 	],
 	server: {
-		allowedHosts: ['fs', 'bs'],
+		allowedHosts: ['fs', 'onb1'],
 	},
 	resolve: {
 		alias: {
@@ -23,28 +33,13 @@ export default defineConfig({
 			'tailwind.config.js': path.resolve(__dirname, 'tailwind.config.js'),
 		},
 	},
-	build: {
-		outDir: `../lms/public/frontend`,
-		emptyOutDir: true,
-		commonjsOptions: {
-			include: [/tailwind.config.js/, /node_modules/],
-		},
-		sourcemap: true,
-		target: 'es2015',
-		rollupOptions: {
-			output: {
-				manualChunks: {
-					'frappe-ui': ['frappe-ui'],
-				},
-			},
-		},
-	},
 	optimizeDeps: {
 		include: [
 			'feather-icons',
 			'showdown',
 			'engine.io-client',
 			'tailwind.config.js',
+			'highlight.js',
 		],
 	},
 })

lms/__init__.py

@@ -1 +1 @@
-__version__ = "2.23.0"
+__version__ = "2.26.0"

lms/hooks.py

@@ -88,7 +88,6 @@ setup_wizard_requires = "assets/lms/js/setup_wizard.js"
 # Override standard doctype classes
 
 override_doctype_class = {
-	"User": "lms.overrides.user.CustomUser",
 	"Web Template": "lms.overrides.web_template.CustomWebTemplate",
 }
 
@@ -104,6 +103,10 @@ doc_events = {
 	},
 	"Discussion Reply": {"after_insert": "lms.lms.utils.handle_notifications"},
 	"Notification Log": {"on_change": "lms.lms.utils.publish_notifications"},
+	"User": {
+		"validate": "lms.lms.user.validate_username_duplicates",
+		"after_insert": "lms.lms.user.after_insert",
+	},
 }
 
 # Scheduled Tasks
@@ -112,6 +115,7 @@ scheduler_events = {
 	"hourly": [
 		"lms.lms.doctype.lms_certificate_request.lms_certificate_request.schedule_evals",
 		"lms.lms.api.update_course_statistics",
+		"lms.lms.doctype.lms_certificate_request.lms_certificate_request.mark_eval_as_completed",
 	],
 	"daily": [
 		"lms.job.doctype.job_opportunity.job_opportunity.update_job_openings",
@@ -190,8 +194,8 @@ jinja = {
 		"lms.lms.utils.get_lesson_index",
 		"lms.lms.utils.get_lesson_url",
 		"lms.page_renderers.get_profile_url",
-		"lms.overrides.user.get_palette",
 		"lms.lms.utils.is_instructor",
+		"lms.lms.utils.get_palette",
 	],
 	"filters": [],
 }
@@ -229,7 +233,6 @@ lms_markdown_macro_renderers = {
 page_renderer = [
 	"lms.page_renderers.ProfileRedirectPage",
 	"lms.page_renderers.ProfilePage",
-	"lms.page_renderers.CoursePage",
 	"lms.page_renderers.SCORMRenderer",
 ]
 
@@ -238,7 +241,7 @@ profile_url_prefix = "/users/"
 
 signup_form_template = "lms.plugins.show_custom_signup"
 
-on_session_creation = "lms.overrides.user.on_session_creation"
+on_login = "lms.lms.user.on_login"
 
 add_to_apps_screen = [
 	{

lms/install.py

@@ -4,7 +4,6 @@ from lms.lms.api import give_dicussions_permission
 
 
 def after_install():
-	add_pages_to_nav()
 	create_batch_source()
 	give_dicussions_permission()
 
@@ -15,37 +14,6 @@ def after_sync():
 	add_all_roles_to("Administrator")
 
 
-def add_pages_to_nav():
-	pages = [
-		{"label": "Explore", "idx": 1},
-		{"label": "Courses", "url": "/lms/courses", "parent": "Explore", "idx": 2},
-		{"label": "Batches", "url": "/lms/batches", "parent": "Explore", "idx": 3},
-		{"label": "Statistics", "url": "/lms/statistics", "parent": "Explore", "idx": 4},
-		{"label": "Jobs", "url": "/lms/job-openings", "parent": "Explore", "idx": 5},
-	]
-
-	for page in pages:
-		filters = frappe._dict()
-		if page.get("url"):
-			filters["url"] = ["like", "%" + page.get("url") + "%"]
-		else:
-			filters["label"] = page.get("label")
-
-		if not frappe.db.exists("Top Bar Item", filters):
-			frappe.get_doc(
-				{
-					"doctype": "Top Bar Item",
-					"label": page.get("label"),
-					"url": page.get("url"),
-					"parent_label": page.get("parent"),
-					"idx": page.get("idx"),
-					"parent": "Website Settings",
-					"parenttype": "Website Settings",
-					"parentfield": "top_bar_items",
-				}
-			).save()
-
-
 def before_uninstall():
 	delete_custom_fields()
 	delete_lms_roles()

lms/lms/api.py

@@ -22,7 +22,10 @@ from frappe.utils import (
 from lms.lms.utils import get_average_rating, get_lesson_count
 from xml.dom.minidom import parseString
 from lms.lms.doctype.course_lesson.course_lesson import save_progress
-from frappe.integrations.frappe_providers.frappecloud_billing import is_fc_site
+from frappe.integrations.frappe_providers.frappecloud_billing import (
+	is_fc_site,
+	current_site_info,
+)
 
 
 @frappe.whitelist()
@@ -174,8 +177,14 @@ def get_user_info():
 	user.is_instructor = "Course Creator" in user.roles
 	user.is_moderator = "Moderator" in user.roles
 	user.is_evaluator = "Batch Evaluator" in user.roles
-	user.is_student = "LMS Student" in user.roles
+	user.is_student = (
+		not user.is_instructor and not user.is_moderator and not user.is_evaluator
+	)
 	user.is_fc_site = is_fc_site()
+	user.is_system_manager = "System Manager" in user.roles
+	if user.is_fc_site and user.is_system_manager:
+		user.site_info = current_site_info()
+		user.sitename = frappe.local.site
 	return user
 
 
@@ -189,24 +198,24 @@ def get_translations():
 
 
 @frappe.whitelist()
-def validate_billing_access(type, name):
+def validate_billing_access(billing_type, name):
 	access = True
 	message = ""
-	doctype = "LMS Course" if type == "course" else "LMS Batch"
+	doctype = "LMS Batch" if billing_type == "batch" else "LMS Course"
 
 	if frappe.session.user == "Guest":
 		access = False
 		message = _("Please login to continue with payment.")
 
-	if type not in ["course", "batch"]:
+	if access and billing_type not in ["course", "batch", "certificate"]:
 		access = False
 		message = _("Module is incorrect.")
 
-	if not frappe.db.exists(doctype, name):
+	if access and not frappe.db.exists(doctype, name):
 		access = False
 		message = _("Module Name is incorrect or does not exist.")
 
-	if type == "course":
+	if access and billing_type == "course":
 		membership = frappe.db.exists(
 			"LMS Enrollment", {"member": frappe.session.user, "course": name}
 		)
@@ -214,7 +223,7 @@ def validate_billing_access(type, name):
 			access = False
 			message = _("You are already enrolled for this course.")
 
-	else:
+	elif access and billing_type == "batch":
 		membership = frappe.db.exists(
 			"LMS Batch Enrollment", {"member": frappe.session.user, "batch": name}
 		)
@@ -222,6 +231,25 @@ def validate_billing_access(type, name):
 			access = False
 			message = _("You are already enrolled for this batch.")
 
+		seat_count = frappe.get_cached_value("LMS Batch", name, "seat_count")
+		number_of_students = frappe.db.count("LMS Batch Enrollment", {"batch": name})
+		if seat_count <= number_of_students:
+			access = False
+			message = _("Batch is sold out.")
+
+	elif access and billing_type == "certificate":
+		purchased_certificate = frappe.db.exists(
+			"LMS Enrollment",
+			{
+				"course": name,
+				"member": frappe.session.user,
+				"purchased_certificate": 1,
+			},
+		)
+		if purchased_certificate:
+			access = False
+			message = _("You have already purchased the certificate for this course.")
+
 	address = frappe.db.get_value(
 		"Address",
 		{"email_id": frappe.session.user},
@@ -369,7 +397,7 @@ def get_evaluator_details(evaluator):
 
 
 @frappe.whitelist(allow_guest=True)
-def get_certified_participants(filters=None, start=0, page_length=30, search=None):
+def get_certified_participants(filters=None, start=0, page_length=30):
 	or_filters = {}
 	if not filters:
 		filters = {}
@@ -1228,3 +1256,107 @@ def get_notifications(filters):
 @frappe.whitelist(allow_guest=True)
 def is_guest_allowed():
 	return frappe.get_cached_value("LMS Settings", None, "allow_guest_access")
+
+
+@frappe.whitelist()
+def cancel_evaluation(evaluation):
+	evaluation = frappe._dict(evaluation)
+
+	if evaluation.member != frappe.session.user:
+		return
+
+	frappe.db.set_value("LMS Certificate Request", evaluation.name, "status", "Cancelled")
+	events = frappe.get_all(
+		"Event Participants",
+		{
+			"email": evaluation.member,
+		},
+		["parent", "name"],
+	)
+
+	for event in events:
+		info = frappe.db.get_value("Event", event.parent, ["starts_on", "subject"], as_dict=1)
+		date = str(info.starts_on).split(" ")[0]
+
+		if (
+			date == str(evaluation.date.format("YYYY-MM-DD"))
+			and evaluation.member_name in info.subject
+		):
+			communication = frappe.db.get_value(
+				"Communication",
+				{"reference_doctype": "Event", "reference_name": event.parent},
+				"name",
+			)
+			if communication:
+				frappe.delete_doc("Communication", communication, ignore_permissions=True)
+
+			frappe.delete_doc("Event Participants", event.name, ignore_permissions=True)
+			frappe.delete_doc("Event", event.parent, ignore_permissions=True)
+
+
+@frappe.whitelist()
+def get_certification_details(course):
+	membership = None
+	filters = {"course": course, "member": frappe.session.user}
+
+	if frappe.db.exists("LMS Enrollment", filters):
+		membership = frappe.db.get_value(
+			"LMS Enrollment",
+			filters,
+			["name", "purchased_certificate"],
+			as_dict=1,
+		)
+
+	paid_certificate = frappe.db.get_value("LMS Course", course, "paid_certificate")
+	certificate = frappe.db.get_value(
+		"LMS Certificate",
+		{"member": frappe.session.user, "course": course},
+		["name", "template"],
+		as_dict=1,
+	)
+
+	return {
+		"membership": membership,
+		"paid_certificate": paid_certificate,
+		"certificate": certificate,
+	}
+
+
+@frappe.whitelist()
+def save_role(user, role, value):
+	frappe.only_for("Moderator")
+	if cint(value):
+		doc = frappe.get_doc(
+			{
+				"doctype": "Has Role",
+				"parent": user,
+				"role": role,
+				"parenttype": "User",
+				"parentfield": "roles",
+			}
+		)
+		doc.save(ignore_permissions=True)
+	else:
+		frappe.db.delete("Has Role", {"parent": user, "role": role})
+	return True
+
+
+@frappe.whitelist()
+def add_an_evaluator(email):
+	if not frappe.db.exists("User", email):
+		user = frappe.new_doc("User")
+		user.update(
+			{
+				"email": email,
+				"first_name": email.split("@")[0].capitalize(),
+				"enabled": 1,
+			}
+		)
+		user.insert()
+		user.add_roles("Batch Evaluator")
+
+	evaluator = frappe.new_doc("Course Evaluator")
+	evaluator.evaluator = email
+	evaluator.insert()
+
+	return evaluator

lms/lms/doctype/course_evaluator/course_evaluator.json

@@ -8,6 +8,11 @@
  "engine": "InnoDB",
  "field_order": [
   "evaluator",
+  "full_name",
+  "column_break_casg",
+  "user_image",
+  "username",
+  "section_break_ljse",
   "schedule",
   "unavailability_section",
   "unavailable_from",
@@ -18,8 +23,10 @@
   {
    "fieldname": "evaluator",
    "fieldtype": "Link",
+   "in_list_view": 1,
    "label": "Evaluator",
    "options": "User",
+   "reqd": 1,
    "unique": 1
   },
   {
@@ -46,11 +53,40 @@
    "fieldname": "unavailable_to",
    "fieldtype": "Date",
    "label": "To"
+  },
+  {
+   "fetch_from": "evaluator.full_name",
+   "fieldname": "full_name",
+   "fieldtype": "Data",
+   "label": "Full Name",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_casg",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_ljse",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fetch_from": "evaluator.user_image",
+   "fieldname": "user_image",
+   "fieldtype": "Attach Image",
+   "label": "User Image",
+   "read_only": 1
+  },
+  {
+   "fetch_from": "evaluator.username",
+   "fieldname": "username",
+   "fieldtype": "Data",
+   "label": "Username",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-04-15 18:45:08.614466",
+ "modified": "2025-03-26 14:02:46.588721",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Course Evaluator",
@@ -94,7 +130,8 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
+}

lms/lms/doctype/course_evaluator/course_evaluator.py

@@ -11,9 +11,15 @@ from frappe.utils import get_time, getdate
 
 class CourseEvaluator(Document):
 	def validate(self):
+		self.validate_evaluator_role()
 		self.validate_time_slots()
 		self.validate_unavailability()
 
+	def validate_evaluator_role(self):
+		roles = frappe.get_roles(self.evaluator)
+		if "Batch Evaluator" not in roles:
+			frappe.get_doc("User", self.evaluator).add_roles("Batch Evaluator")
+
 	def validate_unavailability(self):
 		if (
 			self.unavailable_from

lms/lms/doctype/lms_batch/lms_batch.py

@@ -10,7 +10,6 @@ from datetime import timedelta
 from frappe.model.document import Document
 from frappe.utils import cint, format_datetime, get_time, add_days, nowdate
 from lms.lms.utils import (
-	get_lessons,
 	get_lesson_index,
 	get_lesson_url,
 	get_quiz_details,
@@ -176,6 +175,10 @@ def create_live_class(
 		class_details = frappe.get_doc(payload)
 		class_details.save()
 		return class_details
+	else:
+		frappe.throw(
+			_("Error creating live class. Please try again. {0}").format(response.text)
+		)
 
 
 def authenticate():
@@ -254,17 +257,6 @@ def create_batch(
 	return doc
 
 
-@frappe.whitelist()
-def fetch_lessons(courses):
-	lessons = []
-	courses = json.loads(courses)
-
-	for course in courses:
-		lessons.extend(get_lessons(course.get("course")))
-
-	return lessons
-
-
 @frappe.whitelist()
 def add_course(course, parent, name=None, evaluator=None):
 	frappe.only_for("Moderator")
@@ -416,14 +408,14 @@ def send_batch_start_reminder():
 
 	for batch in batches:
 		students = frappe.get_all(
-			"LMS Batch Enrollment", {"batch": batch}, ["member", "member_name"]
+			"LMS Batch Enrollment", {"batch": batch.name}, ["member", "member_name"]
 		)
 		for student in students:
 			send_mail(batch, student)
 
 
 def send_mail(batch, student):
-	subject = _("Batch Start Reminder")
+	subject = _("Your batch {0} is starting tomorrow").format(batch.title)
 	template = "batch_start_reminder"
 
 	args = {

lms/lms/doctype/lms_category/lms_category.json

@@ -21,7 +21,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-23 19:33:49.593950",
+ "modified": "2025-03-19 12:12:23.723432",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Category",
@@ -51,6 +51,26 @@
    "role": "Moderator",
    "share": 1,
    "write": 1
+  },
+  {
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Course Creator",
+   "select": 1,
+   "share": 1
+  },
+  {
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Batch Evaluator",
+   "select": 1,
+   "share": 1
   }
  ],
  "sort_field": "modified",

lms/lms/doctype/lms_certificate/lms_certificate.json

@@ -122,7 +122,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-01-17 11:57:02.859109",
+ "modified": "2025-02-19 16:26:05.902473",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Certificate",
@@ -156,6 +156,7 @@
    "create": 1,
    "email": 1,
    "export": 1,
+   "if_owner": 1,
    "print": 1,
    "read": 1,
    "report": 1,

lms/lms/doctype/lms_certificate/lms_certificate.py

@@ -122,11 +122,6 @@ def create_certificate(course):
 		)
 
 	else:
-		expires_after_yrs = int(frappe.db.get_value("LMS Course", course, "expiry"))
-		expiry_date = None
-		if expires_after_yrs:
-			expiry_date = add_years(nowdate(), expires_after_yrs)
-
 		default_certificate_template = frappe.db.get_value(
 			"Property Setter",
 			{
@@ -148,7 +143,6 @@ def create_certificate(course):
 				"member": frappe.session.user,
 				"course": course,
 				"issue_date": nowdate(),
-				"expiry_date": expiry_date,
 				"template": default_certificate_template,
 			}
 		)

lms/lms/doctype/lms_certificate/test_lms_certificate.py

@@ -16,7 +16,6 @@ class TestLMSCertificate(unittest.TestCase):
 			"Test Certificate",
 			{
 				"enable_certification": 1,
-				"expiry": 2,
 			},
 		)
 		certificate = create_certificate(course.name)
@@ -24,7 +23,6 @@ class TestLMSCertificate(unittest.TestCase):
 		self.assertEqual(certificate.member, "Administrator")
 		self.assertEqual(certificate.course, course.name)
 		self.assertEqual(certificate.issue_date, nowdate())
-		self.assertEqual(certificate.expiry_date, add_years(nowdate(), cint(course.expiry)))
 
 		frappe.db.delete("LMS Certificate", certificate.name)
 		frappe.db.delete("LMS Course", course.name)

lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js

@@ -4,7 +4,7 @@
 frappe.ui.form.on("LMS Certificate Evaluation", {
 	refresh: function (frm) {
 		if (!frm.is_new() && frm.doc.status == "Pass") {
-			frm.add_custom_button(__("Create LMS Certificate"), () => {
+			frm.add_custom_button(__("Create Certificate"), () => {
 				frappe.model.open_mapped_doc({
 					method: "lms.lms.doctype.lms_certificate_evaluation.lms_certificate_evaluation.create_lms_certificate",
 					frm: frm,

lms/lms/doctype/lms_certificate_request/lms_certificate_request.js

@@ -3,18 +3,15 @@
 
 frappe.ui.form.on("LMS Certificate Request", {
 	refresh: function (frm) {
-		if (!frm.is_new()) {
-			frm.add_custom_button(
-				__("Create LMS Certificate Evaluation"),
-				() => {
-					frappe.model.open_mapped_doc({
-						method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation",
-						frm: frm,
-					});
-				}
-			);
+		if (!frm.is_new() && frm.doc.status == "Upcoming") {
+			frm.add_custom_button(__("Conduct Evaluation"), () => {
+				frappe.model.open_mapped_doc({
+					method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation",
+					frm: frm,
+				});
+			});
 		}
-		if (!frm.doc.google_meet_link) {
+		if (!frm.doc.google_meet_link && frm.doc.status == "Upcoming") {
 			frm.add_custom_button(__("Generate Google Meet Link"), () => {
 				frappe.call({
 					method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.setup_calendar_event",

lms/lms/doctype/lms_certificate_request/lms_certificate_request.json

@@ -24,7 +24,8 @@
   "google_meet_link",
   "column_break_ddyh",
   "start_time",
-  "end_time"
+  "end_time",
+  "status"
  ],
  "fields": [
   {
@@ -144,11 +145,19 @@
    "fieldtype": "Data",
    "hidden": 1,
    "label": "Batch Title"
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_standard_filter": 1,
+   "label": "Status",
+   "options": "Upcoming\nCompleted\nCancelled",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-11 11:19:44.669132",
+ "modified": "2025-02-19 17:20:02.526294",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Certificate Request",
@@ -204,6 +213,19 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
+ "states": [
+  {
+   "color": "Blue",
+   "title": "Upcoming"
+  },
+  {
+   "color": "Green",
+   "title": "Completed"
+  },
+  {
+   "color": "Red",
+   "title": "Cancelled"
+  }
+ ],
  "title_field": "member_name"
 }

lms/lms/doctype/lms_certificate_request/lms_certificate_request.py

@@ -77,6 +77,7 @@ class LMSCertificateRequest(Document):
 				"member": self.member,
 				"course": self.course,
 				"name": ["!=", self.name],
+				"status": "Upcoming",
 			},
 			["date", "start_time", "course"],
 		)
@@ -150,7 +151,11 @@ def schedule_evals():
 		timelapse = add_to_date(get_datetime(), hours=-5)
 		evals = frappe.get_all(
 			"LMS Certificate Request",
-			{"creation": [">=", timelapse], "google_meet_link": ["is", "not set"]},
+			{
+				"creation": [">=", timelapse],
+				"google_meet_link": ["is", "not set"],
+				"status": "Upcoming",
+			},
 			["name", "member", "member_name", "evaluator", "date", "start_time", "end_time"],
 		)
 		for eval in evals:
@@ -254,3 +259,20 @@ def create_lms_certificate_evaluation(source_name, target_doc=None):
 		target_doc,
 	)
 	return doc
+
+
+def mark_eval_as_completed():
+	requests = frappe.get_all(
+		"LMS Certificate Request",
+		{
+			"status": "Upcoming",
+			"date": ["<=", getdate()],
+		},
+		["name", "end_time", "date"],
+	)
+
+	for req in requests:
+		if req.date < getdate():
+			frappe.db.set_value("LMS Certificate Request", req.name, "status", "Completed")
+		elif req.date == getdate() and get_time(req.end_time) < get_time(nowtime()):
+			frappe.db.set_value("LMS Certificate Request", req.name, "status", "Completed")

lms/lms/doctype/lms_course/lms_course.json

@@ -40,15 +40,13 @@
   "pricing_tab",
   "pricing_section",
   "paid_course",
+  "enable_certification",
+  "paid_certificate",
+  "evaluator",
   "column_break_acoj",
   "course_price",
   "currency",
   "amount_usd",
-  "certification_tab",
-  "certification_section",
-  "enable_certification",
-  "column_break_rxww",
-  "expiry",
   "tab_4_tab",
   "statistics_section",
   "enrollments",
@@ -134,22 +132,11 @@
    "fieldtype": "Section Break",
    "label": "Course Settings"
   },
-  {
-   "fieldname": "certification_section",
-   "fieldtype": "Section Break"
-  },
   {
    "default": "0",
    "fieldname": "enable_certification",
    "fieldtype": "Check",
-   "label": "Enable Certification"
-  },
-  {
-   "default": "0",
-   "depends_on": "enable_certification",
-   "fieldname": "expiry",
-   "fieldtype": "Int",
-   "label": "Certification Expires After (Years)"
+   "label": "Completion Certificate"
   },
   {
    "fieldname": "related_courses",
@@ -181,7 +168,6 @@
    "fieldtype": "Section Break"
   },
   {
-   "depends_on": "paid_course",
    "fieldname": "currency",
    "fieldtype": "Link",
    "label": "Currency",
@@ -195,22 +181,16 @@
    "label": "Paid Course"
   },
   {
-   "depends_on": "paid_course",
    "fieldname": "course_price",
    "fieldtype": "Currency",
-   "label": "Course Price",
+   "label": "Amount",
    "mandatory_depends_on": "paid_course"
   },
-  {
-   "fieldname": "column_break_rxww",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "column_break_acoj",
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "paid_course",
    "description": "If you set an amount here, then the USD equivalent setting will not get applied.",
    "fieldname": "amount_usd",
    "fieldtype": "Currency",
@@ -238,12 +218,7 @@
   {
    "fieldname": "pricing_tab",
    "fieldtype": "Tab Break",
-   "label": "Pricing"
-  },
-  {
-   "fieldname": "certification_tab",
-   "fieldtype": "Tab Break",
-   "label": "Certification"
+   "label": "Pricing and Certification"
   },
   {
    "fieldname": "column_break_htgn",
@@ -267,14 +242,14 @@
   {
    "default": "0",
    "fieldname": "enrollments",
-   "fieldtype": "Data",
+   "fieldtype": "Int",
    "label": "Enrollments",
    "read_only": 1
   },
   {
    "default": "0",
    "fieldname": "lessons",
-   "fieldtype": "Data",
+   "fieldtype": "Int",
    "label": "Lessons",
    "read_only": 1
   },
@@ -284,33 +259,38 @@
    "fieldtype": "Data",
    "label": "Rating",
    "read_only": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "paid_certificate",
+   "fieldtype": "Check",
+   "label": "Paid Certificate"
+  },
+  {
+   "depends_on": "paid_certificate",
+   "fieldname": "evaluator",
+   "fieldtype": "Link",
+   "label": "Evaluator",
+   "options": "Course Evaluator"
   }
  ],
  "is_published_field": "published",
  "links": [
   {
-   "group": "Chapters",
+   "link_doctype": "LMS Enrollment",
+   "link_fieldname": "course"
+  },
+  {
    "link_doctype": "Course Chapter",
    "link_fieldname": "course"
   },
   {
-   "group": "Batches",
-   "link_doctype": "LMS Batch Old",
-   "link_fieldname": "course"
-  },
-  {
-   "group": "Mentors",
-   "link_doctype": "LMS Course Mentor Mapping",
-   "link_fieldname": "course"
-  },
-  {
-   "group": "Interests",
-   "link_doctype": "LMS Course Interest",
+   "link_doctype": "Course Lesson",
    "link_fieldname": "course"
   }
  ],
  "make_attachments_public": 1,
- "modified": "2024-10-30 23:08:31.842860",
+ "modified": "2025-03-13 16:01:19.105212",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

lms/lms/doctype/lms_course/lms_course.py

@@ -5,9 +5,8 @@ import json
 import random
 import frappe
 from frappe.model.document import Document
-from frappe.utils import cint, today
-from frappe.utils.telemetry import capture
-from lms.lms.utils import get_chapters, can_create_courses
+from frappe.utils import today, cint
+from lms.lms.utils import get_chapters
 from ...utils import generate_slug, validate_image, update_payment_record
 from frappe import _
 
@@ -19,6 +18,7 @@ class LMSCourse(Document):
 		self.validate_video_link()
 		self.validate_status()
 		self.validate_payments_app()
+		self.validate_certification()
 		self.validate_amount_and_currency()
 		self.image = validate_image(self.image)
 
@@ -52,10 +52,22 @@ class LMSCourse(Document):
 			if "payments" not in installed_apps:
 				frappe.throw(_("Please install the Payments app to create a paid courses."))
 
+	def validate_certification(self):
+		if self.enable_certification and self.paid_certificate:
+			frappe.throw(
+				_("A course cannot have both paid certificate and certificate of completion.")
+			)
+
+		if self.paid_certificate and not self.evaluator:
+			frappe.throw(_("Evaluator is required for paid certificates."))
+
 	def validate_amount_and_currency(self):
-		if self.paid_course and (not self.course_price and not self.currency):
+		if self.paid_course and (cint(self.course_price) < 0 or not self.currency):
 			frappe.throw(_("Amount and currency are required for paid courses."))
 
+		if self.paid_certificate and (cint(self.course_price) <= 0 or not self.currency):
+			frappe.throw(_("Amount and currency are required for paid certificates."))
+
 	def on_update(self):
 		if not self.upcoming and self.has_value_changed("upcoming"):
 			self.send_email_to_interested_users()

lms/lms/doctype/lms_enrollment/lms_enrollment.json

@@ -14,6 +14,9 @@
   "member",
   "member_name",
   "member_username",
+  "certification_section",
+  "purchased_certificate",
+  "certificate",
   "section_break_8",
   "cohort",
   "subgroup",
@@ -123,11 +126,28 @@
    "fieldtype": "Link",
    "label": "Payment",
    "options": "LMS Payment"
+  },
+  {
+   "fieldname": "certification_section",
+   "fieldtype": "Section Break",
+   "label": "Certification"
+  },
+  {
+   "default": "0",
+   "fieldname": "purchased_certificate",
+   "fieldtype": "Check",
+   "label": "Purchased Certificate"
+  },
+  {
+   "fieldname": "certificate",
+   "fieldtype": "Link",
+   "label": "Certificate",
+   "options": "LMS Certificate"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-10-30 12:44:16.103598",
+ "modified": "2025-02-21 17:11:37.986157",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Enrollment",

lms/lms/doctype/lms_live_class/lms_live_class.py

@@ -84,7 +84,7 @@ def send_live_class_reminder():
 
 
 def send_mail(live_class, student):
-	subject = f"Your class on {live_class.title} is tomorrow"
+	subject = _("Your class on {0} is today").format(live_class.title)
 	template = "live_class_reminder"
 
 	args = {

lms/lms/doctype/lms_payment/lms_payment.json

@@ -14,6 +14,7 @@
   "payment_for_document_type",
   "payment_for_document",
   "payment_received",
+  "payment_for_certificate",
   "payment_details_section",
   "currency",
   "amount",
@@ -43,13 +44,15 @@
    "fieldtype": "Currency",
    "in_list_view": 1,
    "label": "Amount",
-   "options": "currency"
+   "options": "currency",
+   "reqd": 1
   },
   {
    "fieldname": "currency",
    "fieldtype": "Link",
    "label": "Currency",
-   "options": "Currency"
+   "options": "Currency",
+   "reqd": 1
   },
   {
    "fieldname": "column_break_rqkd",
@@ -69,7 +72,8 @@
    "fieldname": "address",
    "fieldtype": "Link",
    "label": "Address",
-   "options": "Address"
+   "options": "Address",
+   "reqd": 1
   },
   {
    "default": "0",
@@ -123,19 +127,27 @@
    "fieldname": "payment_for_document_type",
    "fieldtype": "Select",
    "label": "Payment for Document Type",
-   "options": "\nLMS Course\nLMS Batch"
+   "options": "\nLMS Course\nLMS Batch",
+   "reqd": 1
   },
   {
    "fieldname": "payment_for_document",
    "fieldtype": "Dynamic Link",
    "label": "Payment for Document",
-   "options": "payment_for_document_type"
+   "options": "payment_for_document_type",
+   "reqd": 1
   },
   {
    "fieldname": "source",
    "fieldtype": "Link",
    "label": "Source",
    "options": "LMS Source"
+  },
+  {
+   "default": "0",
+   "fieldname": "payment_for_certificate",
+   "fieldtype": "Check",
+   "label": "Payment for Certificate"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -149,7 +161,7 @@
    "link_fieldname": "payment"
   }
  ],
- "modified": "2025-02-18 15:54:25.383353",
+ "modified": "2025-03-13 15:31:38.019002",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Payment",

lms/lms/doctype/lms_payment/lms_payment.py

@@ -33,9 +33,42 @@ def send_payment_reminder():
 	)
 
 	for payment in incomplete_payments:
+		if has_paid_later(payment):
+			continue
+
+		if is_batch_sold_out(payment):
+			continue
+
 		send_mail(payment)
 
 
+def has_paid_later(payment):
+	return frappe.db.exists(
+		"LMS Payment",
+		{
+			"member": payment.member,
+			"payment_received": 1,
+			"payment_for_document": payment.payment_for_document,
+			"payment_for_document_type": payment.payment_for_document_type,
+		},
+	)
+
+
+def is_batch_sold_out(payment):
+	if payment.payment_for_document_type == "LMS Batch":
+		seat_count = frappe.get_cached_value(
+			"LMS Batch", payment.payment_for_document, "seat_count"
+		)
+		number_of_students = frappe.db.count(
+			"LMS Batch Enrollment", {"batch": payment.payment_for_document}
+		)
+
+		if seat_count <= number_of_students:
+			return True
+
+	return False
+
+
 def send_mail(payment):
 	subject = _("Complete Your Enrollment - Don't miss out!")
 	template = "payment_reminder"

lms/lms/onboarding.py

@@ -0,0 +1,21 @@
+import frappe
+
+
+def get_first_course():
+	course = frappe.get_all(
+		"LMS Course",
+		fields=["name"],
+		order_by="creation",
+		limit=1,
+	)
+	return course[0].name if course else None
+
+
+def get_first_batch():
+	batch = frappe.get_all(
+		"LMS Batch",
+		fields=["name"],
+		order_by="creation",
+		limit=1,
+	)
+	return batch[0].name if batch else None

lms/lms/payments.py

@@ -18,19 +18,26 @@ def validate_currency(payment_gateway, currency):
 
 
 @frappe.whitelist()
-def get_payment_link(doctype, docname, title, amount, total_amount, currency, address):
+def get_payment_link(
+	doctype,
+	docname,
+	title,
+	amount,
+	total_amount,
+	currency,
+	address,
+	redirect_to,
+	payment_for_certificate,
+):
 	payment_gateway = get_payment_gateway()
 	address = frappe._dict(address)
 	amount_with_gst = total_amount if total_amount != amount else 0
 
-	payment = record_payment(address, doctype, docname, amount, currency, amount_with_gst)
+	payment = record_payment(
+		address, doctype, docname, amount, currency, amount_with_gst, payment_for_certificate
+	)
 	controller = get_controller(payment_gateway)
 
-	if doctype == "LMS Course":
-		redirect_to = f"/lms/courses/{docname}/learn/1-1"
-	elif doctype == "LMS Batch":
-		redirect_to = f"/lms/batches/{docname}"
-
 	payment_details = {
 		"amount": total_amount,
 		"title": f"Payment for {doctype} {title} {docname}",
@@ -53,7 +60,15 @@ def get_payment_link(doctype, docname, title, amount, total_amount, currency, ad
 	return url
 
 
-def record_payment(address, doctype, docname, amount, currency, amount_with_gst=0):
+def record_payment(
+	address,
+	doctype,
+	docname,
+	amount,
+	currency,
+	amount_with_gst=0,
+	payment_for_certificate=0,
+):
 	address = frappe._dict(address)
 	address_name = save_address(address)
 
@@ -71,6 +86,7 @@ def record_payment(address, doctype, docname, amount, currency, amount_with_gst=
 			"source": address.source,
 			"payment_for_document_type": doctype,
 			"payment_for_document": docname,
+			"payment_for_certificate": payment_for_certificate,
 		}
 	)
 	payment_doc.save(ignore_permissions=True)

lms/lms/user.py

@@ -0,0 +1,91 @@
+import frappe
+from frappe import _
+from frappe.model.naming import append_number_if_name_exists
+from frappe.website.utils import cleanup_page_name
+from frappe.website.utils import is_signup_disabled
+from frappe.utils import random_string, escape_html
+from lms.lms.utils import get_country_code
+
+
+def validate_username_duplicates(doc, method):
+	while not doc.username or doc.username_exists():
+		doc.username = append_number_if_name_exists(
+			doc.doctype, cleanup_page_name(doc.full_name), fieldname="username"
+		)
+	if " " in doc.username:
+		doc.username = doc.username.replace(" ", "")
+
+	if len(doc.username) < 4:
+		doc.username = doc.email.replace("@", "").replace(".", "")
+
+
+def after_insert(doc, method):
+	doc.add_roles("LMS Student")
+
+
+@frappe.whitelist(allow_guest=True)
+def sign_up(email, full_name, verify_terms, user_category):
+	if is_signup_disabled():
+		frappe.throw(_("Sign Up is disabled"), _("Not Allowed"))
+
+	user = frappe.db.get("User", {"email": email})
+	if user:
+		if user.enabled:
+			return 0, _("Already Registered")
+		else:
+			return 0, _("Registered but disabled")
+	else:
+		if frappe.db.get_creation_count("User", 60) > 300:
+			frappe.respond_as_web_page(
+				_("Temporarily Disabled"),
+				_(
+					"Too many users signed up recently, so the registration is disabled. Please try back in an hour"
+				),
+				http_status_code=429,
+			)
+
+	user = frappe.get_doc(
+		{
+			"doctype": "User",
+			"email": email,
+			"first_name": escape_html(full_name),
+			"verify_terms": verify_terms,
+			"user_category": user_category,
+			"country": "",
+			"enabled": 1,
+			"new_password": random_string(10),
+			"user_type": "Website User",
+		}
+	)
+	user.flags.ignore_permissions = True
+	user.flags.ignore_password_policy = True
+	user.insert()
+
+	# set default signup role as per Portal Settings
+	default_role = frappe.db.get_single_value("Portal Settings", "default_role")
+	if default_role:
+		user.add_roles(default_role)
+
+	user.add_roles("LMS Student")
+	set_country_from_ip(None, user.name)
+
+	if user.flags.email_sent:
+		return 1, _("Please check your email for verification")
+	else:
+		return 2, _("Please ask your administrator to verify your sign-up")
+
+
+def set_country_from_ip(login_manager=None, user=None):
+	if not user and login_manager:
+		user = login_manager.user
+	user_country = frappe.db.get_value("User", user, "country")
+	# if user_country:
+	#    return
+	frappe.db.set_value("User", user, "country", get_country_code())
+	return
+
+
+def on_login(login_manager):
+	default_app = frappe.db.get_single_value("System Settings", "default_app")
+	if default_app == "lms":
+		frappe.local.response["home_page"] = "/lms"

lms/lms/utils.py

@@ -1,6 +1,7 @@
 import re
 import string
 import frappe
+import hashlib
 import json
 import razorpay
 import requests
@@ -68,27 +69,26 @@ def generate_slug(title, doctype):
 	return slugify(title, used_slugs=slugs)
 
 
-def get_membership(course, member=None, batch=None):
+def get_membership(course, member=None):
 	if not member:
 		member = frappe.session.user
 
 	filters = {"member": member, "course": course}
-	if batch:
-		filters["batch_old"] = batch
 
-	is_member = frappe.db.exists("LMS Enrollment", filters)
-	if is_member:
+	if frappe.db.exists("LMS Enrollment", filters):
 		membership = frappe.db.get_value(
 			"LMS Enrollment",
 			filters,
-			["name", "batch_old", "current_lesson", "member_type", "progress", "member"],
+			[
+				"name",
+				"current_lesson",
+				"progress",
+				"member",
+				"purchased_certificate",
+				"certificate",
+			],
 			as_dict=True,
 		)
-
-		if membership and membership.batch_old:
-			membership.batch_title = frappe.db.get_value(
-				"LMS Batch Old", membership.batch_old, "title"
-			)
 		return membership
 
 	return False
@@ -533,10 +533,11 @@ def has_course_evaluator_role(member=None):
 
 
 def has_student_role(member=None):
-	return frappe.db.get_value(
-		"Has Role",
-		{"parent": member or frappe.session.user, "role": "LMS Student"},
-		"name",
+	roles = frappe.get_roles(member or frappe.session.user)
+	return (
+		"Moderator" not in roles
+		and "Course Creator" not in roles
+		and "Batch Evaluator" not in roles
 	)
 
 
@@ -856,26 +857,44 @@ def is_onboarding_complete():
 	}
 
 
-def get_evaluator(course, batch):
+def get_evaluator(course, batch=None):
 	evaluator = None
-	evaluator = frappe.db.get_value(
-		"Batch Course",
-		{"parent": batch, "course": course},
-		"evaluator",
-	)
+	if batch:
+		evaluator = frappe.db.get_value(
+			"Batch Course",
+			{"parent": batch, "course": course},
+			"evaluator",
+		)
+	else:
+		evaluator = frappe.db.get_value("LMS Course", course, "evaluator")
 	return evaluator
 
 
 @frappe.whitelist()
-def get_upcoming_evals(student, courses):
+def get_upcoming_evals(student, courses, batch=None):
+	filters = {
+		"member": student,
+		"course": ["in", courses],
+		"date": [">=", frappe.utils.nowdate()],
+		"status": "Upcoming",
+	}
+
+	if batch:
+		filters["batch_name"] = batch
+
 	upcoming_evals = frappe.get_all(
 		"LMS Certificate Request",
-		{
-			"member": student,
-			"course": ["in", courses],
-			"date": [">=", frappe.utils.nowdate()],
-		},
-		["date", "start_time", "course", "evaluator", "google_meet_link"],
+		filters,
+		[
+			"name",
+			"date",
+			"start_time",
+			"course",
+			"evaluator",
+			"google_meet_link",
+			"member",
+			"member_name",
+		],
 		order_by="date",
 	)
 
@@ -967,17 +986,145 @@ def change_currency(amount, currency, country=None):
 
 
 @frappe.whitelist(allow_guest=True)
-def get_courses():
+def get_courses(filters=None, start=0, page_length=20):
 	"""Returns the list of courses."""
-	courses = []
-	course_list = frappe.get_all("LMS Course", pluck="name")
-	for course in course_list:
-		courses.append(get_course_details(course))
 
-	courses = get_categorized_courses(courses)
+	if not filters:
+		filters = {}
+
+	filters, or_filters, show_featured = update_course_filters(filters)
+	fields = get_course_fields()
+
+	courses = frappe.get_all(
+		"LMS Course",
+		filters=filters,
+		fields=fields,
+		or_filters=or_filters,
+		order_by="enrollments desc",
+		start=start,
+		page_length=page_length,
+	)
+	if show_featured:
+		courses = get_featured_courses(filters, or_filters, fields) + courses
+
+	courses = get_enrollment_details(courses)
+	courses = get_course_card_details(courses)
 	return courses
 
 
+def get_course_card_details(courses):
+	for course in courses:
+		course.instructors = get_instructors(course.name)
+
+		if course.paid_course and course.published == 1:
+			course.amount, course.currency = check_multicurrency(
+				course.course_price, course.currency, None, course.amount_usd
+			)
+			course.price = fmt_money(course.amount, 0, course.currency)
+
+	return courses
+
+
+def get_course_or_filters(filters):
+	or_filters = {}
+	or_filters.update({"title": filters.get("title")})
+	or_filters.update({"short_introduction": filters.get("title")})
+	or_filters.update({"description": filters.get("title")})
+	or_filters.update({"tags": filters.get("title")})
+	return or_filters
+
+
+def update_course_filters(filters):
+	or_filters = {}
+	show_featured = False
+
+	if filters.get("title"):
+		or_filters = get_course_or_filters(filters)
+		del filters["title"]
+
+	if filters.get("enrolled"):
+		enrolled_courses = frappe.get_all(
+			"LMS Enrollment", {"member": frappe.session.user}, pluck="course"
+		)
+		filters.update({"name": ["in", enrolled_courses]})
+		del filters["enrolled"]
+
+	if filters.get("created"):
+		created_courses = frappe.get_all(
+			"Course Instructor", {"instructor": frappe.session.user}, pluck="parent"
+		)
+		filters.update({"name": ["in", created_courses]})
+		del filters["created"]
+
+	if filters.get("live"):
+		filters.update({"featured": 0})
+		show_featured = True
+		del filters["live"]
+
+	if filters.get("certification"):
+		or_filters.update({"enable_certification": 1})
+		or_filters.update({"paid_certificate": 1})
+		del filters["certification"]
+
+	return filters, or_filters, show_featured
+
+
+def get_enrollment_details(courses):
+	for course in courses:
+		filters = {
+			"course": course.name,
+			"member": frappe.session.user,
+		}
+
+		if frappe.db.exists("LMS Enrollment", filters):
+			course.membership = frappe.db.get_value(
+				"LMS Enrollment",
+				filters,
+				["name", "course", "current_lesson", "progress", "member"],
+				as_dict=1,
+			)
+
+	return courses
+
+
+def get_featured_courses(filters, or_filters, fields):
+	filters.update({"featured": 1})
+	featured_courses = frappe.get_all(
+		"LMS Course",
+		filters=filters,
+		fields=fields,
+		or_filters=or_filters,
+		order_by="enrollments desc",
+	)
+	return featured_courses
+
+
+def get_course_fields():
+	return [
+		"name",
+		"title",
+		"tags",
+		"image",
+		"short_introduction",
+		"published",
+		"upcoming",
+		"featured",
+		"disable_self_learning",
+		"published_on",
+		"category",
+		"status",
+		"paid_course",
+		"paid_certificate",
+		"course_price",
+		"currency",
+		"amount_usd",
+		"enable_certification",
+		"lessons",
+		"enrollments",
+		"rating",
+	]
+
+
 @frappe.whitelist(allow_guest=True)
 def get_course_details(course):
 	course_details = frappe.db.get_value(
@@ -999,6 +1146,7 @@ def get_course_details(course):
 			"category",
 			"status",
 			"paid_course",
+			"paid_certificate",
 			"course_price",
 			"currency",
 			"amount_usd",
@@ -1009,11 +1157,10 @@ def get_course_details(course):
 		],
 		as_dict=1,
 	)
-	course_details.tags = course_details.tags.split(",") if course_details.tags else []
 
 	course_details.instructors = get_instructors(course_details.name)
 	# course_details.is_instructor = is_instructor(course_details.name)
-	if course_details.paid_course:
+	if course_details.paid_course or course_details.paid_certificate:
 		"""course_details.course_price, course_details.currency = check_multicurrency(
 		        course_details.course_price, course_details.currency, None, course_details.amount_usd
 		)"""
@@ -1126,14 +1273,21 @@ def get_lesson(course, chapter, lesson):
 		return {}
 
 	membership = get_membership(course)
-	course_title = frappe.db.get_value("LMS Course", course, "title")
+	course_info = frappe.db.get_value(
+		"LMS Course", course, ["title", "paid_certificate"], as_dict=1
+	)
+
 	if (
 		not lesson_details.include_in_preview
 		and not membership
 		and not has_course_moderator_role()
 		and not is_instructor(course)
 	):
-		return {"no_preview": 1, "title": lesson_details.title, "course_title": course_title}
+		return {
+			"no_preview": 1,
+			"title": lesson_details.title,
+			"course_title": course_info.title,
+		}
 
 	lesson_details = frappe.db.get_value(
 		"Course Lesson",
@@ -1168,7 +1322,8 @@ def get_lesson(course, chapter, lesson):
 	lesson_details.prev = neighbours["prev"]
 	lesson_details.membership = membership
 	lesson_details.instructors = get_instructors(course)
-	lesson_details.course_title = course_title
+	lesson_details.course_title = course_info.title
+	lesson_details.paid_certificate = course_info.paid_certificate
 	return lesson_details
 
 
@@ -1233,6 +1388,7 @@ def get_batch_details(batch):
 	)
 
 	batch_details.instructors = get_instructors(batch)
+	batch_details.accept_enrollments = batch_details.start_date > getdate()
 
 	batch_details.courses = frappe.get_all(
 		"Batch Course", filters={"parent": batch}, fields=["course", "title", "evaluator"]
@@ -1601,11 +1757,19 @@ def get_order_summary(doctype, docname, country=None):
 		details = frappe.db.get_value(
 			"LMS Course",
 			docname,
-			["title", "name", "paid_course", "course_price as amount", "currency", "amount_usd"],
+			[
+				"title",
+				"name",
+				"paid_course",
+				"paid_certificate",
+				"course_price as amount",
+				"currency",
+				"amount_usd",
+			],
 			as_dict=True,
 		)
 
-		if not details.paid_course:
+		if not details.paid_course and not details.paid_certificate:
 			raise frappe.throw(_("This course is free."))
 
 	else:
@@ -1719,17 +1883,22 @@ def update_payment_record(doctype, docname):
 				"order_id": data.get("order_id"),
 			},
 		)
+		payment_for_certificate = frappe.db.get_value(
+			"LMS Payment", data.payment, "payment_for_certificate"
+		)
 
 		try:
-			if doctype == "LMS Course":
-				enroll_in_course(data.payment, docname)
+			if payment_for_certificate:
+				update_certificate_purchase(docname, data.payment)
+			elif doctype == "LMS Course":
+				enroll_in_course(docname, data.payment)
 			else:
 				enroll_in_batch(docname, data.payment)
 		except Exception as e:
 			frappe.log_error(frappe.get_traceback(), _("Enrollment Failed"))
 
 
-def enroll_in_course(payment_name, course):
+def enroll_in_course(course, payment_name):
 	if not frappe.db.exists(
 		"LMS Enrollment", {"member": frappe.session.user, "course": course}
 	):
@@ -1781,6 +1950,17 @@ def enroll_in_batch(batch, payment_name=None):
 		new_student.save()
 
 
+def update_certificate_purchase(course, payment_name):
+	frappe.db.set_value(
+		"LMS Enrollment",
+		{"member": frappe.session.user, "course": course},
+		{
+			"purchased_certificate": 1,
+			"payment": payment_name,
+		},
+	)
+
+
 @frappe.whitelist()
 def get_programs():
 	if (
@@ -1960,3 +2140,25 @@ def get_batch_card_details(batches):
 			batch.price = fmt_money(batch.amount, 0, batch.currency)
 
 	return batches
+
+
+def get_palette(full_name):
+	"""
+	Returns a color unique to each member for Avatar"""
+
+	palette = [
+		["--orange-avatar-bg", "--orange-avatar-color"],
+		["--pink-avatar-bg", "--pink-avatar-color"],
+		["--blue-avatar-bg", "--blue-avatar-color"],
+		["--green-avatar-bg", "--green-avatar-color"],
+		["--dark-green-avatar-bg", "--dark-green-avatar-color"],
+		["--red-avatar-bg", "--red-avatar-color"],
+		["--yellow-avatar-bg", "--yellow-avatar-color"],
+		["--purple-avatar-bg", "--purple-avatar-color"],
+		["--gray-avatar-bg", "--gray-avatar-color0"],
+	]
+
+	encoded_name = str(full_name).encode("utf-8")
+	hash_name = hashlib.md5(encoded_name).hexdigest()
+	idx = cint((int(hash_name[4:6], 16) + 1) / 5.33)
+	return palette[idx % 8]

lms/lms/web_template/courses_mentored/courses_mentored.html

@@ -1,11 +0,0 @@
-{% set member = frappe.get_doc("User", frappe.session.user) %}
-<div class="mt-10">
-  {% if member.get_mentored_courses() | length %}
-  <div class="course-home-headings"> {{ _("Courses Mentored") }} </div>
-  <div class="cards-parent">
-    {% for course in member.get_mentored_courses() %}
-    {{ widgets.CourseCard(course=course) }}
-    {% endfor %}
-  </div>
-  {% endif %}
-</div>

lms/lms/web_template/courses_mentored/courses_mentored.json

@@ -1,16 +0,0 @@
-{
- "__unsaved": 1,
- "creation": "2021-10-21 11:32:57.411626",
- "docstatus": 0,
- "doctype": "Web Template",
- "fields": [],
- "idx": 0,
- "modified": "2021-10-21 12:01:56.270656",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "Courses Mentored",
- "owner": "Administrator",
- "standard": 1,
- "template": "",
- "type": "Section"
-}

lms/lms/widgets/CourseOutline.html

@@ -1,110 +0,0 @@
-{% set chapters = get_chapters(course.name) %}
-{% set is_instructor = is_instructor(course.name) %}
-
-{% if chapters | length %}
-<div class="course-home-outline">
-
-    {% if not lesson_page %}
-    <div class="page-title mb-8" id="outline-heading" data-course="{{ course.name }}">
-        {{ _("Course Content") }}
-    </div>
-
-    <!-- <div class="mb-2">
-        <span>
-            {{ chapters | length }} chapters
-        </span>
-        <span>
-            . {{ get_lessons(course.name, None, False) }} lessons
-        </span>
-    </div> -->
-    {% endif %}
-
-    {% if chapters | length %}
-    <div>
-    {% for chapter in chapters %}
-    {% set lessons = get_lessons(course.name, chapter) %}
-
-    <div class="chapter-parent" data-chapter="{{ chapter.name }}">
-
-        <div class="chapter-title" data-toggle="collapse" aria-expanded="false"
-        data-target="#{{ get_slugified_chapter_title(chapter.title) }}">
-
-            <img class="chapter-icon" src="/assets/lms/icons/chevron-right.svg">
-            <div class="chapter-title-main">
-                {{ chapter.title }}
-            </div>
-            <!-- <div class="small ml-auto">
-                {{ lessons | length }} lessons
-            </div> -->
-        </div>
-
-
-        <div class="chapter-content collapse navbar-collapse" id="{{ get_slugified_chapter_title(chapter.title) }}">
-
-            {% if chapter.description %}
-            <div class="chapter-description">
-                {{ chapter.description }}
-            </div>
-            {% endif %}
-
-            <div class="lessons">
-
-                {% if lessons | length %}
-
-                {% for lesson in lessons %}
-                {% set active = membership.current_lesson == lesson.name %}
-                <div data-lesson="{{ lesson.name }}" class="lesson-info {% if active %} active-lesson {% endif %}">
-
-                {% if membership or lesson.include_in_preview or is_instructor or has_course_moderator_role() %}
-                <a class="lesson-links"
-                href="{{ get_lesson_url(course.name, lesson.number) }}{% if classname %}?class={{ classname }}{% endif %}{{course.query_parameter}}"
-                {% if is_instructor and not lesson.include_in_preview %}
-                title="{{ _('This lesson is not available for preview. As you are the Instructor of the course only you can see it.') }}"
-                {% endif %}>
-
-                    <svg class="icon icon-sm mr-2">
-                        <use class="" href="#{{ lesson.icon }}">
-                    </svg>
-
-                    <span>{{ lesson.title }}</span>
-
-                    {% if membership %}
-                    <svg class="icon icon-md lesson-progress-tick ml-auto {{ get_progress(course.name, lesson.name) != 'Complete' and 'hide' }}">
-                        <use class="" href="#icon-success">
-                    </svg>
-                    {% endif %}
-
-                </a>
-
-                {% else %}
-                <div class="no-preview" title="This lesson is not available for preview">
-                    <div class="lesson-links">
-                    <svg class="icon icon-sm mr-2">
-                        <use class="" href="#icon-lock-gray">
-                    </svg>
-                    <div>{{ lesson.title }}</div>
-                    </div>
-                </div>
-                {% endif %}
-
-                </div>
-                {% endfor %}
-
-            {% endif %}
-            </div>
-
-        </div>
-    </div>
-    {% endfor %}
-    </div>
-
-    {% endif %}
-
-</div>
-{% endif %}
-
-{% if chapters | length %}
-<!-- No Preview Modal -->
-{{ widgets.NoPreviewModal(course=course, membership=membership) }}
-
-{% endif %}

lms/lms/widgets/MemberCard.html

@@ -1,31 +0,0 @@
-{% set color = get_palette(member.full_name) %}
-<div class="common-card-style member-card">
-	<div class="d-flex">
-		{{ widgets.Avatar(member=member, avatar_class=avatar_class) }}
-
-		<div class="ml-3 my-auto">
-			<div class="member-card-title">
-				{{ member.full_name }}
-			</div>
-
-			{% if member.headline %}
-			<div> {{ member.headline }} </div>
-			{% endif %}
-
-			{% if member.looking_for_job %}
-			<div class="indicator-pill green"> {{ _("Open Network") }} </div>
-			{% endif %}
-
-			{% set course_count = get_authored_courses(member.name, True) | length %}
-			{% set suffix = "Courses" if course_count > 1 else "Course" %}
-
-			{% if show_course_count and course_count > 0 %}
-			<div class="">
-				Created {{ course_count }} {{ suffix }}
-			</div>
-			{% endif %}
-		</div>
-		<a class="stretched-link" href="{{ get_profile_url(member.username) }}"></a>
-	</div>
-
-</div>