chore(release): Bumped to Version 2.27.0

fix: don't update onboarding status if user is not system manager

.github/workflows/linters.yml

@@ -7,8 +7,27 @@ on:
     branches: [ main ]
 
 jobs:
+  commit-lint:
+    name: 'Semantic Commits'
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 200
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          check-latest: true
+
+      - name: Check commit titles
+        run: |
+          npm install @commitlint/cli @commitlint/config-conventional
+          npx commitlint --verbose --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }}
+
   linters:
-    name: Semantic Commits
+    name: Semgrep Rules
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
 
@@ -20,8 +39,17 @@ jobs:
         with:
           python-version: '3.10'
 
+      - name: Cache pip
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+
       - name: Install and Run Pre-commit
-        uses: pre-commit/action@v2.0.3
+        uses: pre-commit/action@v3.0.1
 
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules

.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') }}
@@ -70,7 +70,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -79,7 +79,7 @@ jobs:
             ${{ runner.os }}-yarn-ui-
 
       - name: Cache cypress binary
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/Cypress
           key: ${{ runner.os }}-cypress

commitlint.config.js

@@ -0,0 +1,26 @@
+module.exports = {
+	parserPreset: "conventional-changelog-conventionalcommits",
+	rules: {
+		"subject-empty": [2, "never"],
+		"type-case": [2, "always", "lower-case"],
+		"type-empty": [2, "never"],
+		"type-enum": [
+			2,
+			"always",
+			[
+				"build",
+				"chore",
+				"ci",
+				"docs",
+				"feat",
+				"fix",
+				"perf",
+				"refactor",
+				"revert",
+				"style",
+				"test",
+				"deprecate", // deprecation decision
+			],
+		],
+	},
+};

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/index.html

@@ -2,9 +2,9 @@
 <html lang="en">
 	<head>
 		<meta charset="UTF-8" />
-		<link rel="icon" href="{{ favicon or '/assets/lms/frontend/favicon.png' }}" />
+		<link rel="icon" href="{{ favicon }}" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>Frappe Learning</title>
+		<title>{{ title }}</title>
 		<meta name="title" content="{{ meta.title }}" />
 		<meta name="image" content="{{ meta.image }}" />
 		<meta name="description" content="{{ meta.description }}" />
@@ -23,17 +23,6 @@
 				<p>
 					{{ meta.description }}
 				</p>
-				<p>
-					The content here is just for seo purposes. The actual content will be loaded in a few seconds.
-				</p>
-				<p>
-					Seo checks if a page has more than 300 words. So, here are some more words to make it more than 300 words.
-					Page descriptions are the HTML meta tags that provide a brief summary of a web page.
-					Search engines use meta descriptions to help identify the page's topic - they don't use them to rank the page, but they do use them to determine whether or not to display the page in search results.
-					Meta descriptions are important because they're often the first thing people see when they're deciding which search result to click on.
-					They're also important because they can help improve your click-through rate (CTR) from search results.
-					A good meta description can entice people to click on your page instead of someone else's.
-				</p>
 				<a href="{{ meta.link }}">Know More</a>
 			</div>
 		</div>
@@ -41,9 +30,8 @@
 		<div id="popovers"></div>
 
 		<script>
-			window.csrf_token = '{{ csrf_token }}'
-			window.setup_complete = '{{ setup_complete }}'
 			document.getElementById('seo-content').style.display = 'none';
+			window.csrf_token = '{{ csrf_token }}'
 		</script>
 		<script type="module" src="/src/main.js"></script>
 	</body>

frontend/package.json

@@ -26,12 +26,13 @@
     "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.112",
+    "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/public/learning.svg

@@ -0,0 +1,4 @@
+<svg width="80" height="79" viewBox="0 0 80 79" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M57.1285 0.580383H22.8514C10.2309 0.580383 0 10.5649 0 22.8815V56.3332C0 68.6497 10.2309 78.6343 22.8514 78.6343H57.1285C69.749 78.6343 79.9799 68.6497 79.9799 56.3332V22.8815C79.9799 10.5649 69.749 0.580383 57.1285 0.580383Z" fill="#0E7159"/>
+<path d="M62.8434 23.6906L60.7869 23.1052C53.6744 21.0702 45.9048 22.4641 39.992 26.8128C35.8502 23.7742 30.7943 22.1854 25.7099 22.2133H17.1406V27.8163H25.7099C29.6232 27.8163 33.508 29.015 36.6787 31.3845L39.992 33.8377L43.3056 31.3845C47.2475 28.4575 52.3032 27.2588 57.1306 28.0393V50.647C51.1035 49.9223 44.9051 51.4834 39.992 55.0795C35.8502 52.0688 30.8515 50.4798 25.7671 50.4798C24.7959 50.4798 23.8247 50.5355 22.8535 50.647V35.0642H17.1406V57.0588H62.8434V23.7185V23.6906Z" fill="white"/>
+</svg>

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,25 +62,48 @@
 				</div>
 			</div>
 		</div>
-		<div>
+		<div class="m-2 flex flex-col gap-1">
 			<TrialBanner
 				v-if="
 					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,
 							}"
@@ -89,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"
@@ -102,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()
@@ -123,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(
 		{},
 		{
@@ -143,7 +221,7 @@ onMounted(() => {
 			},
 		}
 	)
-})
+}
 
 const unreadNotifications = createResource({
 	cache: 'Unread Notifications Count',
@@ -187,7 +265,12 @@ const addQuizzes = () => {
 			label: 'Quizzes',
 			icon: 'CircleHelp',
 			to: 'Quizzes',
-			activeFor: ['Quizzes', 'QuizForm'],
+			activeFor: [
+				'Quizzes',
+				'QuizForm',
+				'QuizSubmissionList',
+				'QuizSubmission',
+			],
 		})
 	}
 }
@@ -198,7 +281,12 @@ const addAssignments = () => {
 			label: 'Assignments',
 			icon: 'Pencil',
 			to: 'Assignments',
-			activeFor: ['Assignments', 'AssignmentForm'],
+			activeFor: [
+				'Assignments',
+				'AssignmentForm',
+				'AssignmentSubmissionList',
+				'AssignmentSubmission',
+			],
 		})
 	}
 }
@@ -261,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(
@@ -286,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/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

@@ -1,6 +1,16 @@
 <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-if="
+		v-else-if="
 			certification.data &&
 			certification.data.membership &&
 			certification.data.paid_certificate &&
@@ -25,7 +35,7 @@
 			</Button>
 		</router-link>
 		<router-link
-			v-else-if="!certification.data.membership.certficate"
+			v-else-if="!certification.data.membership.certificate"
 			:to="{
 				name: 'CourseCertification',
 				params: {
@@ -61,7 +71,15 @@ const certification = createResource({
 	params: {
 		course: props.courseName,
 	},
-	auto: true,
+	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/CodeEditor.vue

@@ -146,7 +146,6 @@ function resetEditor(value: string, resetHistory = false) {
 	value = getModelValue()
 	aceEditor?.setValue(value)
 	aceEditor?.clearSelection()
-	console.log(isDark.value)
 	aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
 	props.autofocus && aceEditor?.focus()
 	if (resetHistory) {

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 }}

frontend/src/components/CourseCardOverlay.vue

@@ -30,7 +30,7 @@
 						</span>
 					</Button>
 				</router-link>
-				<CertificationLinks :courseName="course.data.name" />
+				<CertificationLinks :courseName="course.data.name" class="w-full" />
 			</div>
 			<router-link
 				v-else-if="course.data.paid_course"

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
@@ -135,6 +142,7 @@
 		</div>
 	</div>
 	<ChapterModal
+		v-if="user.data"
 		v-model="showChapterModal"
 		v-model:outline="outline"
 		:course="courseName"

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/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/Icons/LMSLogo.vue

@@ -1,36 +1,18 @@
 <template>
 	<svg
-		width="118"
-		height="118"
-		viewBox="0 0 118 118"
+		width="80"
+		height="79"
+		viewBox="0 0 80 79"
 		fill="none"
 		xmlns="http://www.w3.org/2000/svg"
 	>
 		<path
-			d="M93.9278 0H23.1013C10.3428 0 0 10.3428 0 23.1013V93.9278C0 106.686 10.3428 117.029 23.1013 117.029H93.9278C106.686 117.029 117.029 106.686 117.029 93.9278V23.1013C117.029 10.3428 106.686 0 93.9278 0Z"
-			fill="url(#paint0_radial_174_336)"
+			d="M57.1285 0.580383H22.8514C10.2309 0.580383 0 10.5649 0 22.8815V56.3332C0 68.6497 10.2309 78.6343 22.8514 78.6343H57.1285C69.749 78.6343 79.9799 68.6497 79.9799 56.3332V22.8815C79.9799 10.5649 69.749 0.580383 57.1285 0.580383Z"
+			fill="#0E7159"
 		/>
 		<path
-			d="M93.9278 0H23.1013C10.3428 0 0 10.3428 0 23.1013V93.9278C0 106.686 10.3428 117.029 23.1013 117.029H93.9278C106.686 117.029 117.029 106.686 117.029 93.9278V23.1013C117.029 10.3428 106.686 0 93.9278 0Z"
-			fill="#0B3D3D"
-			fill-opacity="0.8"
+			d="M62.8434 23.6906L60.7869 23.1052C53.6744 21.0702 45.9048 22.4641 39.992 26.8128C35.8502 23.7742 30.7943 22.1854 25.7099 22.2133H17.1406V27.8163H25.7099C29.6232 27.8163 33.508 29.015 36.6787 31.3845L39.992 33.8377L43.3056 31.3845C47.2475 28.4575 52.3032 27.2588 57.1306 28.0393V50.647C51.1035 49.9223 44.9051 51.4834 39.992 55.0795C35.8502 52.0688 30.8515 50.4798 25.7671 50.4798C24.7959 50.4798 23.8247 50.5355 22.8535 50.647V35.0642H17.1406V57.0588H62.8434V23.7185V23.6906Z"
+			fill="white"
 		/>
-		<path
-			d="M95.1879 33.1294L91.4077 32.0268C80.1721 28.7716 67.9389 30.9242 58.5409 37.7496C52.083 33.0769 43.9975 30.5042 36.1746 30.5042H21.8938V41.0048H36.2796C42.2649 41.0048 48.1978 42.9999 52.923 46.6226L58.5934 50.9279L64.2637 46.6226C70.144 42.1599 77.5469 40.2698 84.7923 41.2673V76.1818C75.5518 75.2367 66.2063 77.7044 58.6459 83.2172C51.0854 77.7044 41.6349 75.2367 32.4994 76.1818V52.8705H21.9988V86.4724H95.3454V33.1294H95.1879Z"
-			fill="#58FF9B"
-		/>
-		<defs>
-			<radialGradient
-				id="paint0_radial_174_336"
-				cx="0"
-				cy="0"
-				r="1"
-				gradientUnits="userSpaceOnUse"
-				gradientTransform="translate(117.24 -101.5) rotate(105.042) scale(226.282)"
-			>
-				<stop offset="0.445162" stop-color="#1F7676" />
-				<stop offset="1" stop-color="#0A4B4B" />
-			</radialGradient>
-		</defs>
 	</svg>
 </template>

frontend/src/components/JobCard.vue

@@ -1,41 +1,37 @@
 <template>
-	<div class="flex space-x-4 border rounded-md p-2">
-		<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">
-					{{ job.job_title }}
-				</span>
-			</div>
-			<div class="flex items-center space-x-2 text-ink-gray-5">
-				<Building2 class="w-4 h-4 stroke-1.5" />
-				<span>
+	<div class="border rounded-md p-4">
+		<div class="flex space-x-4">
+			<img
+				:src="job.company_logo"
+				class="size-10 rounded-full object-contain"
+			/>
+			<div class="flex flex-col space-y-1 flex-1">
+				<div class="flex items-center justify-between">
+					<span class="text-lg font-semibold text-ink-gray-9">
+						{{ job.job_title }}
+					</span>
+				</div>
+				<div class="text-xs text-ink-gray-5">
 					{{ job.company_name }}
-				</span>
-			</div>
-			<div class="flex items-center space-x-2 text-ink-gray-5">
-				<MapPin class="w-4 h-4 stroke-1.5" />
-				<span>
-					{{ job.location }}
-				</span>
-			</div>
-			<div class="flex items-center space-x-2 text-ink-gray-5">
-				<Shapes class="w-4 h-4 stroke-1.5" />
-				<span>
-					{{ job.type }}
-				</span>
-			</div>
-			<div class="flex items-center space-x-2 text-ink-gray-5">
-				<Calendar class="w-4 h-4 stroke-1.5" />
-				<span> {{ __('posted') }} {{ dayjs(job.creation).fromNow() }} </span>
+				</div>
 			</div>
 		</div>
+		<div class="space-x-4 mt-2">
+			<Badge>
+				{{ job.location }}
+			</Badge>
+			<Badge>
+				{{ job.type }}
+			</Badge>
+			<Badge>
+				{{ dayjs(job.creation).fromNow() }}
+			</Badge>
+		</div>
 	</div>
 </template>
 <script setup>
-import { Building2, Calendar, MapPin, Shapes } from 'lucide-vue-next'
 import { inject } from 'vue'
-import { Avatar } from 'frappe-ui'
+import { Badge } from 'frappe-ui'
 
 const dayjs = inject('$dayjs')
 const props = defineProps({

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

@@ -116,6 +116,24 @@ 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'
+
+interface User {
+	data: {
+		email: string
+		name: string
+		enabled: boolean
+		user_image: string
+		full_name: string
+		user_type: ['System User', 'Website User']
+		username: string
+		is_moderator: boolean
+		is_system_manager: boolean
+		is_evaluator: boolean
+		is_instructor: boolean
+		is_fc_site: boolean
+	}
+}
 
 const router = useRouter()
 const show = defineModel('show')
@@ -125,6 +143,8 @@ const memberList = ref([])
 const hasNextPage = ref(false)
 const showForm = ref(false)
 const dayjs = inject('$dayjs')
+const user = inject<User | null>('$user')
+const { updateOnboardingStep } = useOnboarding('learning')
 
 const member = reactive({
 	email: '',
@@ -185,6 +205,9 @@ const newMember = createResource({
 	auto: false,
 	onSuccess(data) {
 		show.value = false
+
+		if (user?.data?.is_system_manager) 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,19 @@
 </template>
 <script setup>
 import { Dialog, createResource } from 'frappe-ui'
-import { ref } from 'vue'
+import { ref, inject } 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 user = inject('$user')
 const courses = defineModel('courses')
+const { updateOnboardingStep } = useOnboarding('learning')
+const settingsStore = useSettings()
 
 const props = defineProps({
 	batch: {
@@ -68,8 +74,11 @@ const addCourse = (close) => {
 		{},
 		{
 			onSuccess() {
-				courses.value.reload()
+				if (user.data?.is_system_manager)
+					updateOnboardingStep('add_batch_course')
+
 				close()
+				courses.value.reload()
 				course.value = null
 				evaluator.value = null
 			},
@@ -79,4 +88,10 @@ const addCourse = (close) => {
 		}
 	)
 }
+
+const openSettings = (close) => {
+	close()
+	settingsStore.activeTab = 'Evaluators'
+	settingsStore.isSettingsOpen = true
+}
 </script>

frontend/src/components/Modals/ChapterModal.vue

@@ -77,15 +77,16 @@ import {
 	FormControl,
 	Switch,
 } from 'frappe-ui'
-import { reactive, watch } from 'vue'
+import { reactive, watch, inject } 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 user = inject('$user')
+const { updateOnboardingStep } = useOnboarding('learning')
 
 const props = defineProps({
 	course: {
@@ -139,15 +140,15 @@ const addChapter = async (close) => {
 				return validateChapter()
 			},
 			onSuccess: (data) => {
+				if (user.data?.is_system_manager)
+					updateOnboardingStep('create_first_chapter')
+
 				capture('chapter_created')
 				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/LiveClassModal.vue

@@ -95,8 +95,8 @@ import {
 	FormControl,
 	Autocomplete,
 } from 'frappe-ui'
-import { reactive, inject } from 'vue'
-import { getTimezones, createToast } from '@/utils/'
+import { reactive, inject, onMounted } from 'vue'
+import { getTimezones, createToast, getUserTimezone } from '@/utils/'
 
 const liveClasses = defineModel('reloadLiveClasses')
 const show = defineModel()
@@ -122,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

@@ -106,23 +106,26 @@
 </template>
 <script setup>
 import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
-import { computed, watch, reactive, ref } from 'vue'
+import { computed, watch, reactive, ref, inject } 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 user = inject('$user')
+const { updateOnboardingStep } = useOnboarding('learning')
 
 const existingQuestion = reactive({
 	question: '',
-	marks: 0,
+	marks: 1,
 })
 const question = reactive({
 	question: '',
 	type: 'Choices',
-	marks: 0,
+	marks: 1,
 })
 
 const populateFields = () => {
@@ -260,6 +263,9 @@ const addQuestionRow = (question, close) => {
 		},
 		{
 			onSuccess() {
+				if (user.data?.is_system_manager)
+					updateOnboardingStep('create_first_quiz')
+
 				show.value = false
 				showToast(__('Success'), __('Question added successfully'), 'check')
 				quiz.value.reload()

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',
@@ -316,19 +328,26 @@ const tabsStructure = computed(() => {
 					icon: 'LogIn',
 					fields: [
 						{
-							label: 'Custom Content',
+							label: 'Identify User Persona',
+							name: 'user_category',
+							type: 'checkbox',
+							description:
+								'Enable this option to identify the user persona during signup.',
+						},
+						{
+							label: 'Disable signup',
+							name: 'disable_signup',
+							type: 'checkbox',
+							description:
+								'New users will have to be manually registered by Admins.',
+						},
+						{
+							label: 'Signup Consent HTML',
 							name: 'custom_signup_content',
 							type: 'Code',
 							mode: 'htmlmixed',
 							rows: 10,
 						},
-						{
-							label: 'Ask for Occupation',
-							name: 'user_category',
-							type: 'checkbox',
-							description:
-								'Enable this option to ask users to select their occupation during the signup process.',
-						},
 					],
 				},
 			],

frontend/src/components/Modals/StudentModal.vue

@@ -26,12 +26,15 @@
 </template>
 <script setup>
 import { Dialog, createResource } from 'frappe-ui'
-import { ref } from 'vue'
+import { ref, inject } 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 user = inject('$user')
+const { updateOnboardingStep } = useOnboarding('learning')
 const show = defineModel()
 
 const props = defineProps({
@@ -59,6 +62,9 @@ const addStudent = (close) => {
 		{},
 		{
 			onSuccess() {
+				if (user.data?.is_system_manager)
+					updateOnboardingStep('add_batch_student')
+
 				students.value.reload()
 				student.value = null
 				close()

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-3"
 		>
 			<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/SettingFields.vue

@@ -99,7 +99,7 @@
 </template>
 <script setup>
 import { FormControl, FileUploader, Button, Switch } from 'frappe-ui'
-import { computed } from 'vue'
+import { computed, onMounted } from 'vue'
 import { getFileSize, validateFile } from '@/utils'
 import { X } from 'lucide-vue-next'
 import Link from '@/components/Controls/Link.vue'

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

@@ -18,8 +18,51 @@
 			<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" />
@@ -50,16 +93,6 @@
 								</template>
 								{{ __('Join Call') }}
 							</Button>
-							<Button
-								v-if="evl.date > dayjs().format()"
-								@click="cancelEvaluation(evl)"
-								class="w-full"
-							>
-								<template #prefix>
-									<Ban class="w-4 h-4 stroke-1.5" />
-								</template>
-								{{ __('Cancel') }}
-							</Button>
 						</div>
 					</div>
 				</div>
@@ -84,11 +117,13 @@ import {
 	Clock,
 	GraduationCap,
 	HeadsetIcon,
+	EllipsisVertical,
 } from 'lucide-vue-next'
 import { inject, ref, getCurrentInstance } from 'vue'
 import { formatTime } from '../utils'
 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')

frontend/src/components/UserDropdown.vue

@@ -36,7 +36,7 @@
 						<span v-else> Learning </span>
 					</div>
 					<div
-						v-if="userResource"
+						v-if="userResource.data"
 						class="mt-1 text-sm text-ink-gray-7 leading-none"
 					>
 						{{ convertToTitleCase(userResource.data?.full_name) }}
@@ -82,6 +82,7 @@ import {
 	User,
 	Settings,
 	Sun,
+	Zap,
 } from 'lucide-vue-next'
 
 const router = useRouter()
@@ -125,98 +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: 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: 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 loginToFrappeCloud = () => {
-	let redirect_to = '/dashboard/welcome'
-	if (userResource.data?.site_info.is_payment_method_added) {
-		redirect_to = '/dashboard/sites/' + userResource.data.sitename
-	}
+	let redirect_to = '/dashboard/sites/' + userResource.data.sitename
 	window.open(`${frappeCloudBaseEndpoint}${redirect_to}`, '_blank')
 }
 </script>

frontend/src/pages/AssignmentForm.vue

@@ -63,6 +63,7 @@ import {
 	createResource,
 	FormControl,
 	TextEditor,
+	usePageMeta,
 } from 'frappe-ui'
 import {
 	computed,
@@ -72,11 +73,13 @@ import {
 	reactive,
 	watch,
 } from 'vue'
+import { sessionStore } from '../stores/session'
 import { showToast } from '@/utils'
 import { useRouter } from 'vue-router'
 
 const user = inject('$user')
 const router = useRouter()
+const { brand } = sessionStore()
 
 const props = defineProps({
 	assignmentID: {
@@ -188,4 +191,11 @@ const assignmentOptions = computed(() => {
 		{ label: 'URL', value: 'URL' },
 	]
 })
+
+usePageMeta(() => {
+	return {
+		title: assignment.doc ? assignment.doc.title : __('New Assignment'),
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/AssignmentSubmission.vue

@@ -1,19 +1,27 @@
 <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 { Breadcrumbs, createResource, usePageMeta } from 'frappe-ui'
+import { computed, inject, onMounted, ref } from 'vue'
+import { sessionStore } from '../stores/session'
 import Assignment from '@/components/Assignment.vue'
 
 const user = inject('$user')
+const fromLesson = ref(false)
+const { brand } = sessionStore()
 
 const props = defineProps({
 	assignmentID: {
@@ -42,6 +50,10 @@ onMounted(() => {
 	if (!user.data) {
 		window.location.href = '/login'
 	}
+
+	if (new URLSearchParams(window.location.search).get('fromLesson')) {
+		fromLesson.value = true
+	}
 })
 
 const breadcrumbs = computed(() => {
@@ -62,4 +74,11 @@ const breadcrumbs = computed(() => {
 	]
 	return crumbs
 })
+
+usePageMeta(() => {
+	return {
+		title: title.data?.title,
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/AssignmentSubmissionList.vue

@@ -84,14 +84,17 @@ import {
 	ListRows,
 	ListRow,
 	ListRowItem,
+	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { Pencil } from 'lucide-vue-next'
+import { sessionStore } from '../stores/session'
 import Link from '@/components/Controls/Link.vue'
 
 const user = inject('$user')
 const dayjs = inject('$dayjs')
+const { brand } = sessionStore()
 const router = useRouter()
 const assignmentID = ref('')
 const member = ref('')
@@ -214,4 +217,11 @@ const breadcrumbs = computed(() => {
 		},
 	]
 })
+
+usePageMeta(() => {
+	return {
+		title: __('Assignment Submissions'),
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/Assignments.vue

@@ -80,15 +80,18 @@ import {
 	createListResource,
 	FormControl,
 	ListView,
+	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
 import { Plus, Pencil } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
+import { sessionStore } from '../stores/session'
 
 const user = inject('$user')
 const dayjs = inject('$dayjs')
 const titleFilter = ref('')
 const typeFilter = ref('')
+const { brand } = sessionStore()
 const router = useRouter()
 
 onMounted(() => {
@@ -184,4 +187,11 @@ const breadcrumbs = computed(() => [
 		route: { name: 'Assignments' },
 	},
 ])
+
+usePageMeta(() => {
+	return {
+		title: __('Assignments'),
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/Badge.vue

@@ -24,10 +24,12 @@
 	</div>
 </template>
 <script setup>
-import { createDocumentResource, createResource } from 'frappe-ui'
+import { createResource, usePageMeta } from 'frappe-ui'
 import { computed, inject } from 'vue'
+import { sessionStore } from '../stores/session'
 
 const dayjs = inject('$dayjs')
+const { brand } = sessionStore()
 
 const props = defineProps({
 	badgeName: {
@@ -70,4 +72,11 @@ const breadcrumbs = computed(() => {
 		},
 	]
 })
+
+usePageMeta(() => {
+	return {
+		title: badge.data.badge,
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/Batch.vue

@@ -190,14 +190,23 @@
 			</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 } from 'vue'
-import { useRouteQuery } from '@vueuse/router'
-import { Breadcrumbs, Button, createResource, Tabs, Badge } from 'frappe-ui'
-import CourseInstructors from '@/components/CourseInstructors.vue'
-import UserAvatar from '@/components/UserAvatar.vue'
+import { computed, inject, ref, onMounted, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import {
+	Breadcrumbs,
+	Button,
+	createResource,
+	Tabs,
+	Badge,
+	usePageMeta,
+} from 'frappe-ui'
 import {
 	Clock,
 	LayoutDashboard,
@@ -210,7 +219,10 @@ import {
 	Globe,
 	ClipboardPen,
 } from 'lucide-vue-next'
-import { formatTime, updateDocumentTitle } from '@/utils'
+import { formatTime } from '@/utils'
+import { sessionStore } from '@/stores/session'
+import CourseInstructors from '@/components/CourseInstructors.vue'
+import UserAvatar from '@/components/UserAvatar.vue'
 import BatchDashboard from '@/components/BatchDashboard.vue'
 import BatchCourses from '@/components/BatchCourses.vue'
 import LiveClass from '@/components/LiveClass.vue'
@@ -226,52 +238,11 @@ import BatchFeedback from '@/components/BatchFeedback.vue'
 const user = inject('$user')
 const showAnnouncementModal = ref(false)
 const openCertificateDialog = ref(false)
+const route = useRoute()
+const router = useRouter()
+const { brand } = sessionStore()
+const tabIndex = ref(0)
 
-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 tabIndex = useRouteQuery('tab', 0, { transform: Number })
 const tabs = computed(() => {
 	let batchTabs = []
 	batchTabs.push({
@@ -313,6 +284,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}`
 }
@@ -321,12 +347,17 @@ const openAnnouncementModal = () => {
 	showAnnouncementModal.value = true
 }
 
-const pageMeta = computed(() => {
-	return {
-		title: batch.data?.title,
-		description: batch.data?.description,
+watch(tabIndex, () => {
+	const tab = tabs.value[tabIndex.value]
+	if (tab.label != route.hash.replace('#', '')) {
+		router.push({ ...route, hash: `#${tab.label.toLowerCase()}` })
 	}
 })
 
-updateDocumentTitle(pageMeta)
+usePageMeta(() => {
+	return {
+		title: batch?.data?.title,
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/BatchDetail.vue

@@ -102,8 +102,9 @@
 import { computed, inject } from 'vue'
 import { useRouter } from 'vue-router'
 import { BookOpen, Clock } from 'lucide-vue-next'
-import { formatTime, updateDocumentTitle } from '@/utils'
-import { Breadcrumbs, createResource } from 'frappe-ui'
+import { formatTime } from '@/utils'
+import { Breadcrumbs, createResource, usePageMeta } from 'frappe-ui'
+import { sessionStore } from '@/stores/session'
 import CourseCard from '@/components/CourseCard.vue'
 import BatchOverlay from '@/components/BatchOverlay.vue'
 import DateRange from '../components/Common/DateRange.vue'
@@ -112,6 +113,7 @@ import UserAvatar from '@/components/UserAvatar.vue'
 
 const user = inject('$user')
 const router = useRouter()
+const { brand } = sessionStore()
 
 const props = defineProps({
 	batchName: {
@@ -152,14 +154,12 @@ const breadcrumbs = computed(() => {
 	return items
 })
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
-		title: batch.data?.title,
-		description: batch.data?.description,
+		title: batch?.data?.title,
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>
 <style>
 .batch-description p {

frontend/src/pages/BatchForm.vue

@@ -264,16 +264,21 @@ import {
 	Button,
 	TextEditor,
 	createResource,
+	usePageMeta,
 } from 'frappe-ui'
-import Link from '@/components/Controls/Link.vue'
 import { useRouter } from 'vue-router'
 import { showToast } from '@/utils'
 import { Image } from 'lucide-vue-next'
 import { capture } from '@/telemetry'
+import { useOnboarding } from 'frappe-ui/frappe'
+import { sessionStore } from '../stores/session'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
+import Link from '@/components/Controls/Link.vue'
 
 const router = useRouter()
 const user = inject('$user')
+const { brand } = sessionStore()
+const { updateOnboardingStep } = useOnboarding('learning')
 
 const props = defineProps({
 	batchName: {
@@ -425,6 +430,12 @@ const createNewBatch = () => {
 		{},
 		{
 			onSuccess(data) {
+				if (user.data?.is_system_manager) {
+					updateOnboardingStep('create_first_batch', true, false, () => {
+						localStorage.setItem('firstBatch', data.name)
+					})
+				}
+
 				capture('batch_created')
 				router.push({
 					name: 'BatchDetail',
@@ -500,4 +511,11 @@ const breadcrumbs = computed(() => {
 	})
 	return crumbs
 })
+
+usePageMeta(() => {
+	return {
+		title: props.batchName == 'new' ? 'New Batch' : batchDetail.data?.title,
+		icon: brand.favicon,
+	}
+})
 </script>

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">
@@ -104,14 +104,16 @@ import {
 	FormControl,
 	Select,
 	TabButtons,
+	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
 import { BookOpen, Plus } from 'lucide-vue-next'
-import { updateDocumentTitle } from '@/utils'
+import { sessionStore } from '@/stores/session'
 import BatchCard from '@/components/BatchCard.vue'
 
 const user = inject('$user')
 const dayjs = inject('$dayjs')
+const { brand } = sessionStore()
 const start = ref(0)
 const pageLength = ref(20)
 const categories = ref([])
@@ -119,7 +121,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 +207,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 +231,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 +253,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 +278,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
 })
@@ -305,12 +306,10 @@ const breadcrumbs = computed(() => [
 	},
 ])
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
-		title: 'Batches',
-		description: 'All upcoming batches.',
+		title: __('Batches'),
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/Billing.vue

@@ -151,19 +151,20 @@
 </template>
 <script setup>
 import {
-	Input,
 	Button,
 	createResource,
 	FormControl,
 	Breadcrumbs,
-	Tooltip,
+	usePageMeta,
 } from 'frappe-ui'
 import { reactive, inject, onMounted, computed } from 'vue'
+import { showToast } from '@/utils/'
+import { sessionStore } from '../stores/session'
 import Link from '@/components/Controls/Link.vue'
 import NotPermitted from '@/components/NotPermitted.vue'
-import { showToast } from '@/utils/'
 
 const user = inject('$user')
+const { brand } = sessionStore()
 
 onMounted(() => {
 	const script = document.createElement('script')
@@ -245,12 +246,10 @@ const paymentLink = createResource({
 })
 
 const generatePaymentLink = () => {
-	console.log('called')
 	paymentLink.submit(
 		{},
 		{
 			validate() {
-				console.log('validation start')
 				if (!billingDetails.source) {
 					return __('Please let us know where you heard about us from.')
 				}
@@ -358,4 +357,11 @@ const redirectTo = computed(() => {
 		return `/lms/courses/${props.name}/certification`
 	}
 })
+
+usePageMeta(() => {
+	return {
+		title: __('Billing Details'),
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/CertifiedParticipants.vue

@@ -102,14 +102,17 @@ import {
 	createListResource,
 	FormControl,
 	Select,
+	usePageMeta,
 } from 'frappe-ui'
 import { computed, onMounted, ref } from 'vue'
 import { updateDocumentTitle } from '@/utils'
 import { BookOpen, GraduationCap } from 'lucide-vue-next'
+import { sessionStore } from '../stores/session'
 
 const currentCategory = ref('')
 const filters = ref({})
 const nameFilter = ref('')
+const { brand } = sessionStore()
 
 onMounted(() => {
 	updateParticipants()
@@ -163,13 +166,12 @@ const breadcrumbs = computed(() => [
 	},
 ])
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
-		title: 'Certified Participants',
-		description: 'All participants that have been certified.',
+		title: __('Certified Participants'),
+		icon: brand.favicon,
 	}
 })
-updateDocumentTitle(pageMeta)
 </script>
 <style>
 .headline {

frontend/src/pages/CourseCertification.vue

@@ -36,14 +36,18 @@
 </template>
 <script setup>
 import { computed, inject, onMounted, ref } from 'vue'
-import { Breadcrumbs, call, createResource } from 'frappe-ui'
+import { Breadcrumbs, call, createResource, usePageMeta } from 'frappe-ui'
+import { useRouter } from 'vue-router'
+import { sessionStore } from '../stores/session'
 import UpcomingEvaluations from '@/components/UpcomingEvaluations.vue'
 
 const courseTitle = ref(null)
 const evaluator = ref(null)
+const { brand } = sessionStore()
 const courses = ref([])
 const user = inject('$user')
 const dayjs = inject('$dayjs')
+const router = useRouter()
 
 const props = defineProps({
 	courseName: {
@@ -53,6 +57,7 @@ const props = defineProps({
 })
 
 onMounted(() => {
+	fetchEnrollmentDetails()
 	fetchCourseDetails()
 })
 
@@ -66,10 +71,26 @@ const certificate = createResource({
 		},
 		fieldname: ['name', 'template', 'issue_date'],
 	},
-	auto: true,
 	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',
@@ -114,4 +135,11 @@ const breadcrumbs = computed(() => [
 		label: __('Certification'),
 	},
 ])
+
+usePageMeta(() => {
+	return {
+		title: courseTitle.value,
+		icon: brand.favicon,
+	}
+})
 </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
@@ -92,16 +92,24 @@
 	</div>
 </template>
 <script setup>
-import { createResource, Breadcrumbs, Badge, Tooltip } from 'frappe-ui'
+import {
+	createResource,
+	Breadcrumbs,
+	Badge,
+	Tooltip,
+	usePageMeta,
+} from 'frappe-ui'
 import { computed } from 'vue'
 import { Users, Star } from 'lucide-vue-next'
+import { sessionStore } from '@/stores/session'
 import CourseCardOverlay from '@/components/CourseCardOverlay.vue'
 import CourseOutline from '@/components/CourseOutline.vue'
 import CourseReviews from '@/components/CourseReviews.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
-import { updateDocumentTitle } from '@/utils'
 import CourseInstructors from '@/components/CourseInstructors.vue'
 
+const { brand } = sessionStore()
+
 const props = defineProps({
 	courseName: {
 		type: String,
@@ -127,14 +135,12 @@ const breadcrumbs = computed(() => {
 	return items
 })
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
 		title: course?.data?.title,
-		description: course?.data?.short_introduction,
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>
 <style>
 .avatar-group {

frontend/src/pages/CourseForm.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="">
+	<div class="h-full">
 		<div class="grid md:grid-cols-[70%,30%] h-full">
 			<div>
 				<header
@@ -8,12 +8,9 @@
 					<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>
+							<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>
@@ -233,11 +230,11 @@
 					</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>
@@ -252,6 +249,7 @@ import {
 	createResource,
 	FormControl,
 	FileUploader,
+	usePageMeta,
 } from 'frappe-ui'
 import {
 	inject,
@@ -263,21 +261,25 @@ import {
 	watch,
 	getCurrentInstance,
 } from 'vue'
-import { showToast, updateDocumentTitle } from '@/utils'
-import Link from '@/components/Controls/Link.vue'
+import { showToast } from '@/utils'
 import { Image, Trash2, X } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
+import { capture } from '@/telemetry'
+import { useOnboarding } from 'frappe-ui/frappe'
+import { sessionStore } from '../stores/session'
+import { useSettings } from '@/stores/settings'
+import Link from '@/components/Controls/Link.vue'
 import CourseOutline from '@/components/CourseOutline.vue'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
-import { capture } from '@/telemetry'
-import { useSettings } from '@/stores/settings'
 
 const user = inject('$user')
 const newTag = ref('')
+const { brand } = sessionStore()
 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({
@@ -398,7 +400,7 @@ const courseResource = createResource({
 			'paid_course',
 			'featured',
 			'enable_certification',
-			'paid_certifiate',
+			'paid_certificate',
 		]
 		for (let idx in checkboxes) {
 			let key = checkboxes[idx]
@@ -441,11 +443,14 @@ const submitCourse = () => {
 	} else {
 		courseCreationResource.submit(course, {
 			onSuccess(data) {
+				if (user.data?.is_system_manager) {
+					updateOnboardingStep('create_first_course', true, false, () => {
+						localStorage.setItem('firstCourse', data.name)
+					})
+				}
+
 				capture('course_created')
 				showToast('Success', 'Course created successfully', 'check')
-				/* if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-					settingsStore.onboardingDetails.reload()
-				} */
 				router.push({
 					name: 'CourseForm',
 					params: { courseName: data.name },
@@ -571,12 +576,10 @@ const breadcrumbs = computed(() => {
 	return crumbs
 })
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
-		title: 'Create a Course',
-		description: 'Create or edit a course for your learning system.',
+		title: courseResource.data?.title || __('New Course'),
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/Courses.vue

@@ -1,318 +1,315 @@
 <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="canCreateCourse()"
+			: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,
+	usePageMeta,
 } from 'frappe-ui'
+import { computed, inject, onMounted, ref, watch } from 'vue'
+import { BookOpen, Plus } from 'lucide-vue-next'
+import { sessionStore } from '@/stores/session'
+import { canCreateCourse } from '@/utils'
 import CourseCard from '@/components/CourseCard.vue'
-import { BookOpen, Plus, Search } from 'lucide-vue-next'
-import { ref, computed, inject, onMounted, watch } from 'vue'
-import { updateDocumentTitle } from '@/utils'
-import { useRouter } from 'vue-router'
-import { useSettings } from '@/stores/settings'
 
 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')
+const { brand } = sessionStore()
 
 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(() => {
+usePageMeta(() => {
 	return {
-		title: 'Courses',
-		description: 'All Courses divided by categories',
+		title: __('Courses'),
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/Home.vue

@@ -1,39 +0,0 @@
-<template>
-	<div class="max-w-3xl py-12 mx-auto">
-		<Button
-			icon-left="code"
-			@click="$resources.ping.fetch"
-			:loading="$resources.ping.loading"
-		>
-			Click to send 'ping' request
-		</Button>
-		<div>
-			{{ $resources.ping.data }}
-		</div>
-		<pre>{{ $resources.ping }}</pre>
-
-		<Button @click="showDialog = true">Open Dialog</Button>
-		<Dialog title="Title" v-model="showDialog"> Dialog content </Dialog>
-	</div>
-</template>
-
-<script>
-import { Dialog } from 'frappe-ui'
-
-export default {
-	name: 'Home',
-	data() {
-		return {
-			showDialog: false,
-		}
-	},
-	resources: {
-		ping: {
-			url: 'ping',
-		},
-	},
-	components: {
-		Dialog,
-	},
-}
-</script>

frontend/src/pages/JobCreation.vue

@@ -139,14 +139,17 @@ import {
 	Button,
 	TextEditor,
 	FileUploader,
+	usePageMeta,
 } from 'frappe-ui'
 import { computed, onMounted, reactive, inject } from 'vue'
 import { FileText, X } from 'lucide-vue-next'
+import { sessionStore } from '@/stores/session'
 import { useRouter } from 'vue-router'
 import { getFileSize, showToast } from '../utils'
 
 const user = inject('$user')
 const router = useRouter()
+const { brand } = sessionStore()
 
 const props = defineProps({
 	jobName: {
@@ -319,4 +322,11 @@ const breadcrumbs = computed(() => {
 	]
 	return crumbs
 })
+
+usePageMeta(() => {
+	return {
+		title: props.jobName == 'new' ? 'New Job' : jobDetail.data?.title,
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/JobDetail.vue

@@ -16,7 +16,7 @@
 					},
 				]"
 			/>
-			<div v-if="user.data?.name" class="flex">
+			<div v-if="user.data?.name" class="flex space-x-2">
 				<router-link
 					v-if="user.data.name == job.data?.owner"
 					:to="{
@@ -24,13 +24,19 @@
 						params: { jobName: job.data?.name },
 					}"
 				>
-					<Button class="mr-2">
+					<Button>
 						<template #prefix>
 							<Pencil class="h-4 w-4 stroke-1.5" />
 						</template>
 						{{ __('Edit') }}
 					</Button>
 				</router-link>
+				<Button @click="redirectToWebsite(job.data?.company_website)">
+					<template #prefix>
+						<SquareArrowOutUpRight class="h-4 w-4 stroke-1.5" />
+					</template>
+					{{ __('Visit Website') }}
+				</Button>
 				<Button
 					v-if="!jobApplication.data?.length"
 					variant="solid"
@@ -56,10 +62,11 @@
 					<div class="flex items-center">
 						<img
 							:src="job.data.company_logo"
-							class="w-16 h-16 rounded-lg object-contain mr-4"
+							class="w-16 h-16 rounded-lg object-contain cursor-pointer mr-4"
 							:alt="job.data.company_name"
+							@click="redirectToWebsite(job.data.company_website)"
 						/>
-						<div class="text-2xl text-ink-gray-9 font-semibold mb-4">
+						<div class="text-2xl text-ink-gray-9 font-semibold">
 							{{ job.data.job_title }}
 						</div>
 					</div>
@@ -69,7 +76,7 @@
 						>
 							<div class="flex items-center space-x-4">
 								<Building2 class="h-4 w-4 text-ink-green-2" />
-								<div class="flex flex-col space-y-2 text-ink-gray-7">
+								<div class="flex flex-col space-y-1 text-ink-gray-7">
 									<span class="text-xs text-ink-gray-5 font-medium uppercase">
 										{{ __('Organisation') }}
 									</span>
@@ -80,7 +87,7 @@
 							</div>
 							<div class="flex items-center space-x-4">
 								<MapPin class="size-4 text-ink-red-3" />
-								<div class="flex flex-col space-y-2 text-ink-gray-7">
+								<div class="flex flex-col space-y-1 text-ink-gray-7">
 									<span class="text-xs font-medium uppercase">
 										{{ __('Location') }}
 									</span>
@@ -91,7 +98,7 @@
 							</div>
 							<div class="flex items-center space-x-4">
 								<ClipboardType class="h-4 w-4 text-yellow-500" />
-								<div class="flex flex-col space-y-2 text-ink-gray-7">
+								<div class="flex flex-col space-y-1 text-ink-gray-7">
 									<span class="text-xs font-medium uppercase">
 										{{ __('Category') }}
 									</span>
@@ -102,7 +109,7 @@
 							</div>
 							<div class="flex items-center space-x-4">
 								<CalendarDays class="h-4 w-4 text-ink-blue-2" />
-								<div class="flex flex-col space-y-2 text-ink-gray-7">
+								<div class="flex flex-col space-y-1 text-ink-gray-7">
 									<span class="text-xs font-medium uppercase">
 										{{ __('Posted on') }}
 									</span>
@@ -116,7 +123,7 @@
 								class="flex items-center space-x-4"
 							>
 								<SquareUserRound class="h-4 w-4 text-purple-500" />
-								<div class="flex flex-col space-y-2 text-ink-gray-7">
+								<div class="flex flex-col space-y-1 text-ink-gray-7">
 									<span class="text-xs font-medium uppercase">
 										{{ __('Applications Received') }}
 									</span>
@@ -142,9 +149,9 @@
 	</div>
 </template>
 <script setup>
-import { Button, Breadcrumbs, createResource } from 'frappe-ui'
-import { inject, ref, computed } from 'vue'
-import { updateDocumentTitle } from '@/utils'
+import { Button, Breadcrumbs, createResource, usePageMeta } from 'frappe-ui'
+import { inject, ref } from 'vue'
+import { sessionStore } from '../stores/session'
 import JobApplicationModal from '@/components/Modals/JobApplicationModal.vue'
 import {
 	MapPin,
@@ -154,10 +161,12 @@ import {
 	CalendarDays,
 	ClipboardType,
 	SquareUserRound,
+	SquareArrowOutUpRight,
 } from 'lucide-vue-next'
 
 const user = inject('$user')
 const dayjs = inject('$dayjs')
+const { brand } = sessionStore()
 const showApplicationModal = ref(false)
 
 const props = defineProps({
@@ -215,12 +224,14 @@ const redirectToLogin = (job) => {
 	window.location.href = `/login?redirect-to=/job-openings/${job}`
 }
 
-const pageMeta = computed(() => {
+const redirectToWebsite = (url) => {
+	window.open(url, '_blank')
+}
+
+usePageMeta(() => {
 	return {
 		title: job.data?.job_title,
-		description: job.data?.description,
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/Jobs.vue

@@ -25,7 +25,7 @@
 			</router-link>
 		</header>
 		<div>
-			<div class="lg:w-3/4 mx-auto p-5">
+			<div v-if="jobs.data?.length" class="p-5">
 				<div
 					class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between mb-5"
 				>
@@ -58,10 +58,7 @@
 					</div>
 				</div>
 
-				<div
-					v-if="jobs.data?.length"
-					class="grid grid-cols-1 lg:grid-cols-2 gap-5"
-				>
+				<div class="grid grid-cols-1 lg:grid-cols-3 gap-5">
 					<router-link
 						v-for="job in jobs.data"
 						:to="{
@@ -73,22 +70,42 @@
 						<JobCard :job="job" />
 					</router-link>
 				</div>
-				<div v-else class="text-ink-gray-7 italic p-5 w-fit mx-auto">
-					{{ __('No jobs posted') }}
+			</div>
+			<div
+				v-else
+				class="flex flex-col items-center justify-center text-sm text-ink-gray-5 mt-48"
+			>
+				<Laptop class="size-10 mx-auto stroke-1 text-ink-gray-4" />
+				<div class="text-lg font-medium mb-1">
+					{{ __('No jobs found') }}
+				</div>
+				<div class="leading-5 w-2/5 text-center">
+					{{
+						__(
+							'There are no jobs available at the moment. Open a job opportunity or check here again later.'
+						)
+					}}
 				</div>
 			</div>
 		</div>
 	</div>
 </template>
 <script setup>
-import { Button, Breadcrumbs, createResource, FormControl } from 'frappe-ui'
-import { Plus, Search } from 'lucide-vue-next'
+import {
+	Button,
+	Breadcrumbs,
+	createResource,
+	FormControl,
+	usePageMeta,
+} from 'frappe-ui'
+import { Laptop, Plus, Search } from 'lucide-vue-next'
+import { sessionStore } from '../stores/session'
 import { inject, computed, ref, onMounted } from 'vue'
 import JobCard from '@/components/JobCard.vue'
-import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
 const jobType = ref(null)
+const { brand } = sessionStore()
 const searchQuery = ref('')
 const filters = ref({})
 const orFilters = ref({})
@@ -147,12 +164,11 @@ const jobTypes = computed(() => {
 		{ label: __('Freelance'), value: 'Freelance' },
 	]
 })
-const pageMeta = computed(() => {
+
+usePageMeta(() => {
 	return {
-		title: 'Jobs',
-		description: 'An open job board for the community',
+		title: __('Jobs'),
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/Lesson.vue

@@ -193,14 +193,15 @@
 	</div>
 </template>
 <script setup>
-import { createResource, Breadcrumbs, Button } from 'frappe-ui'
+import { createResource, Breadcrumbs, Button, usePageMeta } from 'frappe-ui'
 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, GraduationCap } from 'lucide-vue-next'
 import Discussions from '@/components/Discussions.vue'
-import { getEditorTools, updateDocumentTitle } from '../utils'
+import { getEditorTools } from '../utils'
+import { sessionStore } from '@/stores/session'
 import EditorJS from '@editorjs/editorjs'
 import LessonContent from '@/components/LessonContent.vue'
 import CourseInstructors from '@/components/CourseInstructors.vue'
@@ -215,6 +216,7 @@ const editor = ref(null)
 const instructorEditor = ref(null)
 const lessonProgress = ref(0)
 const timer = ref(0)
+const { brand } = sessionStore()
 let timerInterval
 
 const props = defineProps({
@@ -419,14 +421,12 @@ const redirectToLogin = () => {
 	window.location.href = `/login?redirect-to=/lms/courses/${props.courseName}`
 }
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
-		title: lesson.data?.title,
-		description: lesson.data?.course,
+		title: lesson?.data?.title,
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>
 <style>
 .avatar-group {
@@ -587,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

@@ -78,7 +78,13 @@
 	</div>
 </template>
 <script setup>
-import { Breadcrumbs, Button, createResource, FormControl } from 'frappe-ui'
+import {
+	Breadcrumbs,
+	Button,
+	createResource,
+	FormControl,
+	usePageMeta,
+} from 'frappe-ui'
 import {
 	computed,
 	reactive,
@@ -87,18 +93,20 @@ import {
 	ref,
 	onBeforeUnmount,
 } from 'vue'
+import { sessionStore } from '../stores/session'
 import EditorJS from '@editorjs/editorjs'
 import LessonHelp from '@/components/LessonHelp.vue'
 import { ChevronRight } from 'lucide-vue-next'
-import { updateDocumentTitle, createToast, getEditorTools } from '@/utils'
+import { createToast, getEditorTools } from '@/utils'
 import { capture } from '@/telemetry'
-import { useSettings } from '@/stores/settings'
+import { useOnboarding } from 'frappe-ui/frappe'
 
+const { brand } = sessionStore()
 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
 
@@ -394,11 +402,11 @@ const createNewLesson = () => {
 					{ lesson: data.name },
 					{
 						onSuccess() {
+							if (user.data?.is_system_manager)
+								updateOnboardingStep('create_first_lesson')
+
 							capture('lesson_created')
 							showToast('Success', 'Lesson created successfully', 'check')
-							/* if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-								settingsStore.onboardingDetails.reload()
-							} */
 							lessonDetails.reload()
 						},
 					}
@@ -494,14 +502,14 @@ const breadcrumbs = computed(() => {
 	return crumbs
 })
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
-		title: 'Lesson Editor',
-		description: 'Create and edit lessons for your course',
+		title: lessonDetails?.data?.lesson
+			? lessonDetails.data.lesson.title
+			: 'New Lesson',
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>
 <style>
 .embed-tool__caption,
@@ -623,4 +631,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/Notifications.vue

@@ -65,12 +65,14 @@ import {
 	TabButtons,
 	Button,
 	Tooltip,
+	usePageMeta,
 } from 'frappe-ui'
+import { sessionStore } from '../stores/session'
 import { computed, inject, ref, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { X } from 'lucide-vue-next'
-import { updateDocumentTitle } from '@/utils'
 
+const { brand } = sessionStore()
 const user = inject('$user')
 const socket = inject('$socket')
 const activeTab = ref('Unread')
@@ -145,14 +147,12 @@ const breadcrumbs = computed(() => {
 	return crumbs
 })
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
 		title: 'Notifications',
-		description: 'All your notifications in one place.',
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>
 <style>
 .notification strong {

frontend/src/pages/Profile.vue

@@ -86,18 +86,24 @@
 	/>
 </template>
 <script setup>
-import { Breadcrumbs, createResource, Button, TabButtons } from 'frappe-ui'
+import {
+	Breadcrumbs,
+	createResource,
+	Button,
+	TabButtons,
+	usePageMeta,
+} from 'frappe-ui'
 import { computed, inject, watch, ref, onMounted, watchEffect } from 'vue'
 import { sessionStore } from '@/stores/session'
-import { Edit } from 'lucide-vue-next'
+import { Edit, icons } from 'lucide-vue-next'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { useRoute, useRouter } from 'vue-router'
 import NoPermission from '@/components/NoPermission.vue'
-import { convertToTitleCase, updateDocumentTitle } from '@/utils'
+import { convertToTitleCase } from '@/utils'
 import EditProfile from '@/components/Modals/EditProfile.vue'
 import EditCoverImage from '@/components/Modals/EditCoverImage.vue'
 
-const { user } = sessionStore()
+const { user, brand } = sessionStore()
 const $user = inject('$user')
 const route = useRoute()
 const router = useRouter()
@@ -215,12 +221,10 @@ const breadcrumbs = computed(() => {
 	return crumbs
 })
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
 		title: profile.data?.full_name,
-		description: profile.data?.headline,
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

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/ProgramForm.vue

@@ -186,14 +186,17 @@ import {
 	ListHeader,
 	ListHeaderItem,
 	ListSelectBanner,
+	usePageMeta,
 } from 'frappe-ui'
 import { computed, ref } from 'vue'
 import { Plus, Trash2 } from 'lucide-vue-next'
-import Link from '@/components/Controls/Link.vue'
 import { showToast } from '@/utils/'
-import Draggable from 'vuedraggable'
 import { useRouter } from 'vue-router'
+import { sessionStore } from '../stores/session'
+import Draggable from 'vuedraggable'
+import Link from '@/components/Controls/Link.vue'
 
+const { brand } = sessionStore()
 const showDialog = ref(false)
 const currentForm = ref(null)
 const course = ref(null)
@@ -364,4 +367,11 @@ const breadbrumbs = computed(() => {
 		},
 	]
 })
+
+usePageMeta(() => {
+	return {
+		title: program.doc?.title,
+		icon: brand.favicon,
+	}
+})
 </script>

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">
@@ -126,14 +126,17 @@ import {
 	createResource,
 	Dialog,
 	FormControl,
+	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref } from 'vue'
 import { BookOpen, Edit, Plus, LockKeyhole } from 'lucide-vue-next'
 import CourseCard from '@/components/CourseCard.vue'
 import { useRouter } from 'vue-router'
+import { sessionStore } from '../stores/session'
 import { showToast } from '@/utils'
 import { useSettings } from '@/stores/settings'
 
+const { brand } = sessionStore()
 const user = inject('$user')
 const showDialog = ref(false)
 const router = useRouter()
@@ -210,4 +213,11 @@ const breadbrumbs = computed(() => [
 		label: 'Programs',
 	},
 ])
+
+usePageMeta(() => {
+	return {
+		title: __('Programs'),
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/QuizForm.vue

@@ -197,6 +197,7 @@ import {
 	ListRowItem,
 	ListSelectBanner,
 	Button,
+	usePageMeta,
 } from 'frappe-ui'
 import {
 	computed,
@@ -207,11 +208,13 @@ import {
 	onBeforeUnmount,
 	watch,
 } from 'vue'
+import { sessionStore } from '../stores/session'
 import { Plus, Trash2 } from 'lucide-vue-next'
-import Question from '@/components/Modals/Question.vue'
 import { showToast, updateDocumentTitle } from '@/utils'
 import { useRouter } from 'vue-router'
+import Question from '@/components/Modals/Question.vue'
 
+const { brand } = sessionStore()
 const showQuestionModal = ref(false)
 const currentQuestion = reactive({
 	question: '',
@@ -453,12 +456,10 @@ const breadcrumbs = computed(() => {
 	return crumbs
 })
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
 		title: props.quizID == 'new' ? __('New Quiz') : quizDetails.data?.title,
-		description: __('Form to create and edit quizzes'),
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/QuizPage.vue

@@ -1,27 +1,37 @@
 <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 { createResource, Breadcrumbs, usePageMeta } from 'frappe-ui'
+import { computed, inject, onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
-import { updateDocumentTitle } from '@/utils'
+import { sessionStore } from '../stores/session'
 
+const { brand } = sessionStore()
 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({
@@ -47,12 +57,10 @@ const breadcrumbs = computed(() => {
 	return [{ label: __('Quiz Submission') }, { label: title.data?.title }]
 })
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
-		title: title.data?.title,
-		description: __('Quiz Submission'),
+		title: `${title.data?.title}`,
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/QuizSubmission.vue

@@ -79,11 +79,14 @@ import {
 	FormControl,
 	Button,
 	Badge,
+	usePageMeta,
 } from 'frappe-ui'
 import { computed, onBeforeUnmount, onMounted, inject } from 'vue'
 import { useRouter } from 'vue-router'
 import { showToast } from '@/utils'
+import { sessionStore } from '@/stores/session'
 
+const { brand } = sessionStore()
 const router = useRouter()
 const user = inject('$user')
 
@@ -149,4 +152,11 @@ const saveSubmission = () => {
 		}
 	)
 }
+
+usePageMeta(() => {
+	return {
+		title: `${submisisonDetails.doc.quiz_title}`,
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/QuizSubmissionList.vue

@@ -40,6 +40,18 @@
 			</Button>
 		</div>
 	</div>
+	<div
+		v-else
+		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 submissions') }}
+		</div>
+		<div class="leading-5">
+			{{ __('No quiz submissions found. Please check again later.') }}
+		</div>
+	</div>
 </template>
 <script setup>
 import {
@@ -51,10 +63,14 @@ import {
 	ListRows,
 	ListHeader,
 	ListHeaderItem,
+	usePageMeta,
 } from 'frappe-ui'
+import { BookOpen } from 'lucide-vue-next'
 import { computed, onMounted, inject } from 'vue'
+import { sessionStore } from '../stores/session'
 import { useRouter } from 'vue-router'
 
+const { brand } = sessionStore()
 const router = useRouter()
 const user = inject('$user')
 
@@ -105,4 +121,11 @@ const quizColumns = computed(() => {
 const breadcrumbs = computed(() => {
 	return [{ label: __('Quiz Submissions') }]
 })
+
+usePageMeta(() => {
+	return {
+		title: __('Quiz Submissions'),
+		icon: brand.favicon,
+	}
+})
 </script>

frontend/src/pages/Quizzes.vue

@@ -79,12 +79,14 @@ import {
 	ListRow,
 	ListHeader,
 	ListHeaderItem,
+	usePageMeta,
 } from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import { computed, inject, onMounted } from 'vue'
 import { BookOpen, Plus } from 'lucide-vue-next'
-import { updateDocumentTitle } from '@/utils'
+import { sessionStore } from '@/stores/session'
 
+const { brand } = sessionStore()
 const user = inject('$user')
 const router = useRouter()
 
@@ -143,12 +145,10 @@ const breadcrumbs = computed(() => {
 	]
 })
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
 		title: __('Quizzes'),
-		description: __('List of quizzes'),
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/SCORMChapter.vue

@@ -39,11 +39,13 @@ import {
 	createDocumentResource,
 	createListResource,
 	createResource,
+	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onBeforeMount, ref } from 'vue'
 import { useSidebar } from '@/stores/sidebar'
-import { updateDocumentTitle } from '@/utils'
+import { sessionStore } from '../stores/session'
 
+const { brand } = sessionStore()
 const sidebarStore = useSidebar()
 const user = inject('$user')
 const readyToRender = ref(false)
@@ -195,14 +197,10 @@ const breadcrumbs = computed(() => {
 	]
 })
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
-		title: chapter?.doc?.title,
-		description: __('This is a chapter in the course {0}').format(
-			chapter?.doc?.course_title
-		),
+		title: chapter.doc?.title,
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/Statistics.vue

@@ -117,9 +117,9 @@
 	</div>
 </template>
 <script setup>
-import { createResource, Breadcrumbs } from 'frappe-ui'
-import { computed, inject } from 'vue'
-import { updateDocumentTitle } from '@/utils'
+import { createResource, Breadcrumbs, usePageMeta } from 'frappe-ui'
+import { computed } from 'vue'
+import { sessionStore } from '../stores/session'
 import { formatNumber } from '@/utils'
 import { Line, Pie } from 'vue-chartjs'
 import {
@@ -154,7 +154,7 @@ import {
 	BookOpenCheck,
 } from 'lucide-vue-next'
 
-const dayjs = inject('$dayjs')
+const { brand } = sessionStore()
 
 const breadcrumbs = computed(() => {
 	return [
@@ -317,12 +317,10 @@ const chartOptions = (isPie) => {
 	}
 }
 
-const pageMeta = computed(() => {
+usePageMeta(() => {
 	return {
-		title: 'Statistics',
-		description: 'Statistics of the platform',
+		title: __('Statistics'),
+		icon: brand.favicon,
 	}
 })
-
-updateDocumentTitle(pageMeta)
 </script>

frontend/src/stores/session.js

@@ -2,10 +2,11 @@ import { defineStore } from 'pinia'
 import { createResource } from 'frappe-ui'
 import { usersStore } from './user'
 import router from '@/router'
-import { ref, computed } from 'vue'
+import { computed, reactive, ref } from 'vue'
 
 export const sessionStore = defineStore('lms-session', () => {
 	let { userResource } = usersStore()
+	const brand = reactive({})
 
 	function sessionUser() {
 		let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
@@ -46,7 +47,11 @@ export const sessionStore = defineStore('lms-session', () => {
 		cache: 'brand',
 		auto: true,
 		onSuccess(data) {
-			document.querySelector("link[rel='icon']").href = data.favicon
+			brand.name = data.app_name
+			brand.logo = data.app_logo
+			brand.favicon =
+				data.favicon?.file_url ||
+				'/assets/lms/frontend/public/learning.svg'
 		},
 	})
 
@@ -61,6 +66,7 @@ export const sessionStore = defineStore('lms-session', () => {
 		isLoggedIn,
 		login,
 		logout,
+		brand,
 		branding,
 		sidebarSettings,
 	}

frontend/src/stores/settings.js

@@ -9,15 +9,9 @@ export const useSettings = defineStore('settings', () => {
 	const activeTab = ref(null)
 
 	const learningPaths = createResource({
-		url: 'frappe.client.get_single_value',
-		makeParams(values) {
-			return {
-				doctype: 'LMS Settings',
-				field: 'enable_learning_paths',
-			}
-		},
-		auto: isLoggedIn ? true : false,
-		cache: ['learningPaths'],
+		url: 'lms.lms.api.is_learning_path_enabled',
+		auto: true,
+		cache: ['learningPath'],
 	})
 
 	const allowGuestAccess = createResource({
@@ -26,12 +20,6 @@ export const useSettings = defineStore('settings', () => {
 		cache: ['allowGuestAccess'],
 	})
 
-	/* const onboardingDetails = createResource({
-		url: 'lms.lms.utils.is_onboarding_complete',
-		auto: isLoggedIn ? true : false,
-		cache: ['onboardingDetails'],
-	}) */
-
 	return {
 		isSettingsOpen,
 		activeTab,

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

@@ -14,6 +14,7 @@ import dayjs from '@/utils/dayjs'
 import Embed from '@editorjs/embed'
 import SimpleImage from '@editorjs/simple-image'
 import Table from '@editorjs/table'
+import { usersStore } from '../stores/user'
 
 export function createToast(options) {
 	toast({
@@ -158,7 +159,10 @@ export function getEditorTools() {
 		quiz: Quiz,
 		assignment: Assignment,
 		upload: Upload,
-		markdown: Markdown,
+		markdown: {
+			class: Markdown,
+			inlineToolbar: true,
+		},
 		image: SimpleImage,
 		table: {
 			class: Table,
@@ -174,9 +178,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 +442,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 [
 		{
@@ -551,3 +568,8 @@ export const escapeHTML = (text) => {
 		(char) => escape_html_mapping[char] || char
 	)
 }
+
+export const canCreateCourse = () => {
+	const { userResource } = usersStore()
+	return userResource.data?.is_instructor || userResource.data?.is_moderator
+}

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,15 +57,14 @@ 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) => {
+			this.wrapper.addEventListener('input', (event) => {
 				let value = event.target.textContent
 				if (event.keyCode === 32 && value.startsWith('#')) {
 					this.convertToHeader(event, value)
@@ -165,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', 'onb2'],
 	},
 	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.25.0"
+__version__ = "2.27.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

@@ -12,7 +12,6 @@ from frappe.translate import get_all_translations
 from frappe import _
 from frappe.utils import (
 	get_datetime,
-	getdate,
 	cint,
 	flt,
 	now,
@@ -178,7 +177,9 @@ 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:
@@ -230,6 +231,12 @@ def validate_billing_access(billing_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",
@@ -274,6 +281,7 @@ def get_job_details(job):
 			"type",
 			"company_name",
 			"company_logo",
+			"company_website",
 			"name",
 			"creation",
 			"description",
@@ -1251,6 +1259,11 @@ def is_guest_allowed():
 	return frappe.get_cached_value("LMS Settings", None, "allow_guest_access")
 
 
+@frappe.whitelist(allow_guest=True)
+def is_learning_path_enabled():
+	return frappe.get_cached_value("LMS Settings", None, "enable_learning_paths")
+
+
 @frappe.whitelist()
 def cancel_evaluation(evaluation):
 	evaluation = frappe._dict(evaluation)
@@ -1296,10 +1309,60 @@ def get_certification_details(course):
 		membership = frappe.db.get_value(
 			"LMS Enrollment",
 			filters,
-			["name", "certificate", "purchased_certificate"],
+			["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}
+	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": "2025-02-24 12:17:08.436659",
+ "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/course_lesson/course_lesson.json

@@ -161,7 +161,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-11-14 13:46:56.838659",
+ "modified": "2025-04-10 15:19:22.400932",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Course Lesson",
@@ -189,14 +189,28 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "LMS Student",
+   "role": "Course Creator",
+   "select": 1,
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Moderator",
    "select": 1,
    "share": 1,
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

lms/lms/doctype/course_lesson/course_lesson.py

@@ -11,66 +11,34 @@ import json
 
 
 class CourseLesson(Document):
-	def validate(self):
-		# self.check_and_create_folder()
+	def on_update(self):
 		self.validate_quiz_id()
 
 	def validate_quiz_id(self):
 		if self.quiz_id and not frappe.db.exists("LMS Quiz", self.quiz_id):
 			frappe.throw(_("Invalid Quiz ID"))
 
-	def on_update(self):
-		dynamic_documents = ["Exercise", "Quiz"]
-		for section in dynamic_documents:
-			self.update_lesson_name_in_document(section)
+		if self.content:
+			self.save_lesson_details_in_quiz(self.content)
 
-	def update_lesson_name_in_document(self, section):
-		doctype_map = {"Exercise": "LMS Exercise", "Quiz": "LMS Quiz"}
-		macros = find_macros(self.body)
-		documents = [value for name, value in macros if name == section]
-		index = 1
-		for name in documents:
-			e = frappe.get_doc(doctype_map[section], name)
-			e.lesson = self.name
-			e.index_ = index
-			e.course = self.course
-			e.save(ignore_permissions=True)
-			index += 1
-		self.update_orphan_documents(doctype_map[section], documents)
+		if self.instructor_content:
+			self.save_lesson_details_in_quiz(self.instructor_content)
 
-	def update_orphan_documents(self, doctype, documents):
-		"""Updates the documents that were previously part of this lesson,
-		but not any more.
-		"""
-		linked_documents = {
-			row["name"] for row in frappe.get_all(doctype, {"lesson": self.name})
-		}
-		active_documents = set(documents)
-		orphan_documents = linked_documents - active_documents
-		for name in orphan_documents:
-			ex = frappe.get_doc(doctype, name)
-			ex.lesson = None
-			ex.course = None
-			ex.index_ = 0
-			ex.save(ignore_permissions=True)
-
-	def check_and_create_folder(self):
-		args = {
-			"doctype": "File",
-			"is_folder": True,
-			"file_name": f"{self.name} {self.course}",
-		}
-		if not frappe.db.exists(args):
-			folder = frappe.get_doc(args)
-			folder.save(ignore_permissions=True)
-
-	def get_exercises(self):
-		if not self.body:
-			return []
-
-		macros = find_macros(self.body)
-		exercises = [value for name, value in macros if name == "Exercise"]
-		return [frappe.get_doc("LMS Exercise", name) for name in exercises]
+	def save_lesson_details_in_quiz(self, content):
+		content = json.loads(self.content)
+		for block in content.get("blocks"):
+			if block.get("type") == "quiz":
+				quiz = block.get("data").get("quiz")
+				if not frappe.db.exists("LMS Quiz", quiz):
+					frappe.throw(_("Invalid Quiz ID in content"))
+				frappe.db.set_value(
+					"LMS Quiz",
+					quiz,
+					{
+						"course": self.course,
+						"lesson": self.name,
+					},
+				)
 
 
 @frappe.whitelist()
@@ -102,7 +70,7 @@ def save_progress(lesson, course):
 	progress = get_course_progress(course)
 	capture_progress_for_analytics(progress, course)
 
-	# Had to get doc, as on_change doesn't trigger when you use set_value. The trigger is necesary for badge to get assigned.
+	# Had to get doc, as on_change doesn't trigger when you use set_value. The trigger is necessary for badge to get assigned.
 	enrollment = frappe.get_doc("LMS Enrollment", membership)
 	enrollment.progress = progress
 	enrollment.save()

lms/lms/doctype/lms_batch/lms_batch.py

@@ -408,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_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.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

@@ -242,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
   },
@@ -277,28 +277,20 @@
  "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": "2025-02-24 11:50:58.325804",
+ "modified": "2025-03-13 16:01:19.105212",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

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

@@ -44,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",
@@ -70,7 +72,8 @@
    "fieldname": "address",
    "fieldtype": "Link",
    "label": "Address",
-   "options": "Address"
+   "options": "Address",
+   "reqd": 1
   },
   {
    "default": "0",
@@ -124,13 +127,15 @@
    "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",
@@ -156,7 +161,7 @@
    "link_fieldname": "payment"
   }
  ],
- "modified": "2025-02-21 18:29:55.436611",
+ "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"