chore(release): Bumped to Version 2.7.0

feat: payments app integration

.github/helper/update_pot_file.sh

@@ -22,7 +22,7 @@ git config user.name "frappe-pr-bot"
 
 echo "Setting the correct git remote..."
 # Here, the git remote is a local file path by default. Let's change it to the upstream repo.
-git remote add upstream https://github.com/frappe/lms.git
+git remote set-url upstream https://github.com/frappe/lms.git
 
 echo "Creating a new branch..."
 isodate=$(date -u +"%Y-%m-%d")

.github/workflows/generate-pot-file.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  regeneratee-pot-file:
+  regenerate-pot-file:
     name: Release
     runs-on: ubuntu-latest
     strategy:

.github/workflows/make_release_pr.yml

@@ -0,0 +1,27 @@
+name: Create weekly release
+on:
+  schedule:
+    # 13:00 UTC -> 7pm IST on every Wednesday
+    - cron: '30 4 * * 3'
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: octokit/request-action@v2.x
+        with:
+          route: POST /repos/{owner}/{repo}/pulls
+          owner: frappe
+          repo: lms
+          title: |-
+            "chore: merge 'develop' into 'main'"
+          body: "Automated weekly release"
+          base: main
+          head: develop
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/on_release.yml

@@ -0,0 +1,32 @@
+name: Generate Semantic Release
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Entire Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Setup dependencies
+        run: |
+          npm install @semantic-release/git @semantic-release/exec --no-save
+      - name: Create Release
+        env:
+          GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          GIT_AUTHOR_NAME: "Frappe PR Bot"
+          GIT_AUTHOR_EMAIL: "developers@frappe.io"
+          GIT_COMMITTER_NAME: "Frappe PR Bot"
+          GIT_COMMITTER_EMAIL: "developers@frappe.io"
+        run: npx semantic-release

.github/workflows/release_notes.yml

@@ -0,0 +1,39 @@
+# This action:
+#
+# 1. Generates release notes using github API.
+# 2. Strips unnecessary info like chore/style etc from notes.
+# 3. Updates release info.
+
+name: 'Release Notes'
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Tag of release like v2.0.0'
+        required: true
+        type: string
+  release:
+    types: [released]
+
+permissions:
+  contents: read
+
+jobs:
+  regen-notes:
+    name: 'Regenerate release notes'
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Update notes
+      run: |
+        NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json"  /repos/frappe/lms/releases/generate-notes  -f tag_name=$RELEASE_TAG \
+          | jq -r '.body' \
+          | sed -E '/^\* (chore|ci|test|docs|style)/d' \
+          | sed -E 's/by @mergify //'
+        )
+        RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/frappe/lms/releases/tags/$RELEASE_TAG | jq -r '.id')
+        gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/frappe/lms/releases/$RELEASE_ID -f body="$NEW_NOTES"
+      env:
+        GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        RELEASE_TAG: ${{ github.event.inputs.tag_name || github.event.release.tag_name }}

.github/workflows/ui-tests.yml

@@ -99,6 +99,7 @@ jobs:
           cd ~/frappe-bench/
           bench --site lms.test execute frappe.utils.install.complete_setup_wizard
           bench --site lms.test execute frappe.tests.ui_test_helpers.create_test_user
+          bench --site lms.test set-password frappe@example.com admin
 
       - name: cypress pre-requisites
         run: |

.gitignore

@@ -12,3 +12,4 @@ node_modules
 package-lock.json
 lms/public/frontend
 lms/www/lms.html
+frappe-ui

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "frappe-ui"]
+	path = frappe-ui
+	url = https://github.com/frappe/frappe-ui

.releaserc

@@ -0,0 +1,21 @@
+{
+	"branches": ["develop"],
+	"plugins": [
+		"@semantic-release/commit-analyzer", {
+			"preset": "angular"
+		},
+		"@semantic-release/release-notes-generator",
+		[
+			"@semantic-release/exec", {
+				"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" lms/__init__.py'
+			}
+		],
+		[
+			"@semantic-release/git", {
+				"assets": ["lms/__init__.py"],
+				"message": "chore(release): Bumped to Version ${nextRelease.version}"
+			}
+		],
+		"@semantic-release/github"
+	]
+}

cypress/e2e/course_creation.cy.js

@@ -31,12 +31,35 @@ describe("Course Creation", () => {
 			.contains("Preview Video")
 			.type("https://www.youtube.com/embed/-LPmw2Znl2c");
 		cy.get("[id=tags]").type("Learning{enter}Frappe{enter}ERPNext{enter}");
-		cy.get(".search-input").click().type("frappe");
+		cy.get("label")
-		cy.wait(1000);
+			.contains("Category")
+			.parent()
+			.within(() => {
+				cy.get("button").click();
+			});
 		cy.get("[id^=headlessui-combobox-option-")
 			.should("be.visible")
 			.first()
 			.click();
+
+		/* Instructor */
+		cy.get("label")
+			.contains("Instructors")
+			.parent()
+			.within(() => {
+				cy.get("input").click().type("frappe");
+				cy.get("input")
+					.invoke("attr", "aria-controls")
+					.as("instructor_list_id");
+			});
+		cy.get("@instructor_list_id").then((instructor_list_id) => {
+			cy.get(`[id^=${instructor_list_id}`)
+				.should("be.visible")
+				.within(() => {
+					cy.get("[id^=headlessui-combobox-option-").first().click();
+				});
+		});
+
 		cy.get("label").contains("Published").click();
 		cy.get("label").contains("Published On").type("2021-01-01");
 		cy.button("Save").click();
@@ -61,21 +84,7 @@ describe("Course Creation", () => {
 		cy.wait(1000);
 
 		cy.get("label").contains("Title").type("Test Lesson");
-		/* cy.get("#content .ce-block")
-			.click()
-			.invoke("text", "https://www.youtube.com/watch?v=GoDtyItReto"); */
-		/* cy.get("#content .ce-block")
-			.click()
-			.paste("https://www.youtube.com/watch?v=GoDtyItReto"); */
 
-		cy.fixture("Youtube.mov", "base64").then((fileContent) => {
-			cy.get('input[type="file"]').attachFile({
-				fileContent,
-				fileName: "Youtube.mov",
-				mimeType: "image/png",
-				encoding: "base64",
-			});
-		});
 		cy.get("#content .ce-block").type(
 			"This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
 		);
@@ -119,12 +128,6 @@ describe("Course Creation", () => {
 		cy.url().should("include", "/learn/1-1");
 		cy.get("div").contains("Test Lesson");
 
-		cy.get("video")
-			.should("be.visible")
-			.children("source")
-			.invoke("attr", "src")
-			.should("include", "/files/Youtube");
-
 		cy.get("div").contains(
 			"This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
 		);

docker/init.sh

@@ -35,7 +35,6 @@ bench new-site lms.localhost \
 bench --site lms.localhost install-app lms
 bench --site lms.localhost set-config developer_mode 1
 bench --site lms.localhost clear-cache
-bench --site lms.localhost set-config mute_emails 1
 bench use lms.localhost
 
 bench start

frontend/package.json

@@ -14,14 +14,15 @@
     "@editorjs/editorjs": "^2.29.0",
     "@editorjs/embed": "^2.7.0",
     "@editorjs/header": "^2.8.1",
-    "@editorjs/image": "^2.9.0",
     "@editorjs/inline-code": "^1.5.0",
     "@editorjs/nested-list": "^1.4.2",
     "@editorjs/paragraph": "^2.11.3",
+    "@editorjs/simple-image": "^1.6.0",
     "chart.js": "^4.4.1",
+    "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.56",
+    "frappe-ui": "^0.1.69",
     "lucide-vue-next": "^0.383.0",
     "markdown-it": "^14.0.0",
     "pinia": "^2.0.33",

frontend/src/App.vue

@@ -8,12 +8,16 @@
 <script setup>
 import { Toasts } from 'frappe-ui'
 import { Dialogs } from '@/utils/dialogs'
-import { computed, defineAsyncComponent } from 'vue'
+import { computed, onMounted, onUnmounted } from 'vue'
 import { useScreenSize } from './utils/composables'
 import DesktopLayout from './components/DesktopLayout.vue'
 import MobileLayout from './components/MobileLayout.vue'
+import { stopSession } from '@/telemetry'
+import { init as initTelemetry } from '@/telemetry'
+import { usersStore } from '@/stores/user'
 
 const screenSize = useScreenSize()
+let { userResource } = usersStore()
 
 const Layout = computed(() => {
 	if (screenSize.width < 640) {
@@ -22,4 +26,13 @@ const Layout = computed(() => {
 		return DesktopLayout
 	}
 })
+
+onMounted(async () => {
+	if (!userResource.data) return
+	await initTelemetry()
+})
+
+onUnmounted(() => {
+	stopSession()
+})
 </script>

frontend/src/components/AppSidebar.vue

@@ -7,7 +7,7 @@
 			class="flex flex-col overflow-hidden"
 			:class="isSidebarCollapsed ? 'items-center' : ''"
 		>
-			<UserDropdown class="p-2" :isCollapsed="isSidebarCollapsed" />
+			<UserDropdown :isCollapsed="isSidebarCollapsed" />
 			<div class="flex flex-col" v-if="sidebarSettings.data">
 				<SidebarLink
 					v-for="link in sidebarLinks"
@@ -18,7 +18,7 @@
 			</div>
 			<div
 				v-if="sidebarSettings.data?.web_pages?.length || isModerator"
-				class="pt-1"
+				class="mt-4"
 			>
 				<div
 					class="flex items-center justify-between pr-2 cursor-pointer"
@@ -27,7 +27,7 @@
 				>
 					<div
 						v-if="!isSidebarCollapsed"
-						class="flex items-center text-sm font-medium text-gray-600"
+						class="flex items-center text-sm text-gray-600 my-1"
 					>
 						<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
 							<ChevronRight
@@ -36,7 +36,7 @@
 							/>
 						</span>
 						<span class="ml-2">
-							{{ __('Web Pages') }}
+							{{ __('More') }}
 						</span>
 					</div>
 					<Button v-if="isModerator" variant="ghost" @click="openPageModal()">
@@ -100,7 +100,7 @@ import { ChevronRight, Plus } from 'lucide-vue-next'
 import { createResource, Button } from 'frappe-ui'
 import PageModal from '@/components/Modals/PageModal.vue'
 
-const { user } = sessionStore()
+const { user, sidebarSettings } = sessionStore()
 const { userResource } = usersStore()
 const socket = inject('$socket')
 const unreadCount = ref(0)
@@ -115,6 +115,20 @@ onMounted(() => {
 		unreadNotifications.reload()
 	})
 	addNotifications()
+	sidebarSettings.reload(
+		{},
+		{
+			onSuccess(data) {
+				Object.keys(data).forEach((key) => {
+					if (!parseInt(data[key])) {
+						sidebarLinks.value = sidebarLinks.value.filter(
+							(link) => link.label.toLowerCase().split(' ').join('_') !== key
+						)
+					}
+				})
+			},
+		}
+	)
 })
 
 const unreadNotifications = createResource({
@@ -153,21 +167,6 @@ const addNotifications = () => {
 	}
 }
 
-const sidebarSettings = createResource({
-	url: 'lms.lms.api.get_sidebar_settings',
-	cache: 'Sidebar Settings',
-	auto: true,
-	onSuccess(data) {
-		Object.keys(data).forEach((key) => {
-			if (!parseInt(data[key])) {
-				sidebarLinks.value = sidebarLinks.value.filter(
-					(link) => link.label.toLowerCase().split(' ').join('_') !== key
-				)
-			}
-		})
-	},
-})
-
 const openPageModal = (link) => {
 	showPageModal.value = true
 	pageToEdit.value = link

frontend/src/components/Apps.vue

@@ -0,0 +1,67 @@
+<template>
+	<Popover placement="right-start" class="flex w-full">
+		<template #target="{ togglePopover }">
+			<button
+				:class="[
+					'group w-full flex h-7 items-center justify-between rounded px-2 text-base text-gray-800 hover:bg-gray-100',
+				]"
+				@click.prevent="togglePopover()"
+			>
+				<div class="flex gap-2">
+					<LayoutGrid class="size-4 stroke-1.5" />
+					<span class="whitespace-nowrap">
+						{{ __('Apps') }}
+					</span>
+				</div>
+				<ChevronRight class="h-4 w-4 stroke-1.5" />
+			</button>
+		</template>
+		<template #body>
+			<div
+				class="grid grid-cols-3 justify-between mx-3 p-2 rounded-lg border border-gray-100 bg-white shadow-xl"
+			>
+				<div v-for="app in apps.data" key="name">
+					<a
+						:href="app.route"
+						class="flex flex-col gap-1.5 rounded justify-center items-center py-2 px-3 hover:bg-gray-100"
+					>
+						<img class="size-8" :src="app.logo" />
+						<div class="text-sm" @click="app.onClick">
+							{{ app.title }}
+						</div>
+					</a>
+				</div>
+			</div>
+		</template>
+	</Popover>
+</template>
+<script setup>
+import { Popover, createResource } from 'frappe-ui'
+import { LayoutGrid, ChevronRight } from 'lucide-vue-next'
+
+const apps = createResource({
+	url: 'frappe.apps.get_apps',
+	cache: 'apps',
+	auto: true,
+	transform: (data) => {
+		let _apps = [
+			{
+				name: 'frappe',
+				logo: '/assets/lms/images/desk.png',
+				title: __('Desk'),
+				route: '/app',
+			},
+		]
+		data.map((app) => {
+			if (app.name === 'lms') return
+			_apps.push({
+				name: app.name,
+				logo: app.logo,
+				title: __(app.title),
+				route: app.route,
+			})
+		})
+		return _apps
+	},
+})
+</script>

frontend/src/components/Assessments.vue

@@ -1,49 +1,92 @@
 <template>
 	<div>
+		<div class="flex items-center justify-between">
 			<div class="text-lg font-semibold mb-4">
 				{{ __('Assessments') }}
 			</div>
+			<Button v-if="canSeeAddButton()" @click="showModal = true">
+				<template #prefix>
+					<Plus class="h-4 w-4" />
+				</template>
+				{{ __('Add') }}
+			</Button>
+		</div>
 		<div v-if="assessments.data?.length">
 			<ListView
 				:columns="getAssessmentColumns()"
 				:rows="assessments.data"
 				row-key="name"
 				:options="{
-					selectable: false,
 					showTooltip: false,
-					getRowRoute: (row) => {
+					getRowRoute: (row) => getRowRoute(row),
-						if (row.submission) {
-							return {
-								name: 'AssignmentSubmission',
-								params: {
-									assignmentName: row.assessment_name,
-									submissionName: row.submission.name,
-								},
-							}
-						} else {
-							return {
-								name: 'AssignmentSubmission',
-								params: {
-									assignmentName: row.assessment_name,
-									submissionName: 'new',
-								},
-							}
-						}
-					},
 				}"
 			>
+				<ListHeader
+					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+				>
+					<ListHeaderItem :item="item" v-for="item in getAssessmentColumns()">
+						<template #prefix="{ item }">
+							<component
+								v-if="item.icon"
+								:is="item.icon"
+								class="h-4 w-4 stroke-1.5 ml-4"
+							/>
+						</template>
+					</ListHeaderItem>
+				</ListHeader>
+				<ListRows>
+					<ListRow :row="row" v-for="row in assessments.data">
+						<template #default="{ column, item }">
+							<ListRowItem :item="row[column.key]" :align="column.align">
+								<div>
+									{{ row[column.key] }}
+								</div>
+							</ListRowItem>
+						</template>
+					</ListRow>
+				</ListRows>
+				<ListSelectBanner>
+					<template #actions="{ unselectAll, selections }">
+						<div class="flex gap-2">
+							<Button
+								variant="ghost"
+								@click="removeAssessments(selections, unselectAll)"
+							>
+								<Trash2 class="h-4 w-4 stroke-1.5" />
+							</Button>
+						</div>
+					</template>
+				</ListSelectBanner>
 			</ListView>
 		</div>
 		<div v-else class="text-sm italic text-gray-600">
 			{{ __('No Assessments') }}
 		</div>
 	</div>
+	<AssessmentModal
+		v-model="showModal"
+		v-model:assessments="assessments"
+		:batch="props.batch"
+	/>
 </template>
 <script setup>
-import { ListView, createResource } from 'frappe-ui'
+import {
-import { inject } from 'vue'
+	ListView,
+	ListRow,
+	ListRows,
+	ListHeader,
+	ListHeaderItem,
+	ListRowItem,
+	ListSelectBanner,
+	createResource,
+	Button,
+} from 'frappe-ui'
+import { inject, ref } from 'vue'
+import AssessmentModal from '@/components/Modals/AssessmentModal.vue'
+import { Plus, Trash2 } from 'lucide-vue-next'
 
 const user = inject('$user')
+const showModal = ref(false)
 
 const props = defineProps({
 	batch: {
@@ -74,6 +117,61 @@ const assessments = createResource({
 	auto: true,
 })
 
+const deleteAssessments = createResource({
+	url: 'lms.lms.api.delete_documents',
+	makeParams(values) {
+		return {
+			doctype: 'LMS Assessment',
+			documents: values.assessments,
+		}
+	},
+})
+
+const removeAssessments = (selections, unselectAll) => {
+	deleteAssessments.submit(
+		{ assessments: Array.from(selections) },
+		{
+			onSuccess(data) {
+				assessments.reload()
+				unselectAll()
+			},
+		}
+	)
+}
+
+const getRowRoute = (row) => {
+	if (row.assessment_type == 'LMS Assignment') {
+		if (row.submission) {
+			return {
+				name: 'AssignmentSubmission',
+				params: {
+					assignmentName: row.assessment_name,
+					submissionName: row.submission.name,
+				},
+			}
+		} else {
+			return {
+				name: 'AssignmentSubmission',
+				params: {
+					assignmentName: row.assessment_name,
+					submissionName: 'new',
+				},
+			}
+		}
+	} else {
+		return {
+			name: 'Quiz',
+			params: {
+				quizID: row.assessment_name,
+			},
+		}
+	}
+}
+
+const canSeeAddButton = () => {
+	return user.data?.is_moderator || user.data?.is_evaluator
+}
+
 const getAssessmentColumns = () => {
 	let columns = [
 		{

frontend/src/components/BatchCard.vue

@@ -3,6 +3,9 @@
 		class="flex flex-col shadow hover:bg-gray-100 rounded-md p-4 h-full"
 		style="min-height: 150px"
 	>
+		<div class="text-lg leading-5 font-semibold mb-2">
+			{{ batch.title }}
+		</div>
 		<Badge
 			v-if="batch.seat_count && batch.seats_left > 0"
 			theme="green"
@@ -19,38 +22,38 @@
 		>
 			{{ __('Sold Out') }}
 		</Badge>
-		<div class="text-xl font-semibold mb-1">
+		<div class="short-introduction text-sm text-gray-700">
-			{{ batch.title }}
-		</div>
-		<div class="short-introduction">
 			{{ batch.description }}
 		</div>
-		<div class="flex flex-col space-y-2 mt-auto">
+		<div v-if="batch.amount" class="font-semibold mb-4">
-			<div v-if="batch.amount" class="font-semibold text-lg">
 			{{ batch.price }}
 		</div>
-			<div class="flex items-center">
+		<div class="flex flex-col space-y-2 mt-auto">
-				<BookOpen class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
-				<span> {{ batch.courses.length }} {{ __('Courses') }} </span>
-			</div>
 			<DateRange
 				:startDate="batch.start_date"
 				:endDate="batch.end_date"
-				class="mb-3"
+				class="text-sm text-gray-700"
 			/>
-			<div class="flex items-center">
+			<div class="flex items-center text-sm text-gray-700">
 				<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
 				<span>
 					{{ formatTime(batch.start_time) }} - {{ formatTime(batch.end_time) }}
 				</span>
 			</div>
-			<div v-if="batch.timezone" class="flex items-center">
+			<div
-				<Globe class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
+				v-if="batch.timezone"
+				class="flex items-center text-sm text-gray-700"
+			>
+				<Globe class="h-4 w-4 stroke-1.5 mr-2 text-gray-600" />
 				<span>
 					{{ batch.timezone }}
 				</span>
 			</div>
-			<div v-if="batch.instructors?.length" class="flex avatar-group overlap">
+		</div>
+		<div
+			v-if="batch.instructors?.length"
+			class="flex avatar-group overlap mt-4"
+		>
 			<div
 				class="h-6 mr-1"
 				:class="{ 'avatar-group overlap': batch.instructors.length > 1 }"
@@ -63,7 +66,6 @@
 			<CourseInstructors :instructors="batch.instructors" />
 		</div>
 	</div>
-	</div>
 </template>
 <script setup>
 import { Badge } from 'frappe-ui'
@@ -88,7 +90,7 @@ const props = defineProps({
 	text-overflow: ellipsis;
 	width: 100%;
 	overflow: hidden;
-	margin: 0.25rem 0 1.25rem;
+	margin: 0.25rem 0 1rem;
 	line-height: 1.5;
 }
 

frontend/src/components/BatchCourses.vue

@@ -4,15 +4,11 @@
 			<div class="text-xl font-semibold">
 				{{ __('Courses') }}
 			</div>
-			<Button
+			<Button v-if="canSeeAddButton()" @click="openCourseModal()">
-				v-if="user.data?.is_moderator"
-				variant="solid"
-				@click="openCourseModal()"
-			>
 				<template #prefix>
 					<Plus class="h-4 w-4" />
 				</template>
-				{{ __('Add Course') }}
+				{{ __('Add') }}
 			</Button>
 		</div>
 		<div v-if="courses.data?.length">
@@ -88,6 +84,7 @@ import {
 	ListRowItem,
 } from 'frappe-ui'
 import { Plus, Trash2 } from 'lucide-vue-next'
+import { showToast } from '@/utils'
 
 const showCourseModal = ref(false)
 const user = inject('$user')
@@ -132,23 +129,32 @@ const getCoursesColumns = () => {
 	]
 }
 
-const removeCourse = createResource({
+const deleteCourses = createResource({
-	url: 'frappe.client.delete',
+	url: 'lms.lms.api.delete_documents',
 	makeParams(values) {
 		return {
 			doctype: 'Batch Course',
-			name: values.course,
+			documents: values.courses,
 		}
 	},
 })
 
 const removeCourses = (selections, unselectAll) => {
-	selections.forEach(async (course) => {
+	deleteCourses.submit(
-		removeCourse.submit({ course })
+		{
-	})
+			courses: Array.from(selections),
-	setTimeout(() => {
+		},
+		{
+			onSuccess(data) {
 				courses.reload()
+				showToast(__('Success'), __('Courses deleted successfully'), 'check')
 				unselectAll()
-	}, 1000)
+			},
+		}
+	)
+}
+
+const canSeeAddButton = () => {
+	return user.data?.is_moderator || user.data?.is_evaluator
 }
 </script>

frontend/src/components/BatchOverlay.vue

@@ -81,7 +81,7 @@
 		<router-link
 			v-if="isModerator"
 			:to="{
-				name: 'BatchCreation',
+				name: 'BatchForm',
 				params: {
 					batchName: batch.data.name,
 				},

frontend/src/components/BatchStudents.vue

@@ -1,9 +1,9 @@
 <template>
-	<Button class="float-right mb-3" variant="solid" @click="openStudentModal()">
+	<Button class="float-right mb-3" @click="openStudentModal()">
 		<template #prefix>
 			<Plus class="h-4 w-4" />
 		</template>
-		{{ __('Add Student') }}
+		{{ __('Add') }}
 	</Button>
 	<div class="text-lg font-semibold mb-4">
 		{{ __('Students') }}
@@ -88,6 +88,7 @@ import {
 import { Trash2, Plus } from 'lucide-vue-next'
 import { ref } from 'vue'
 import StudentModal from '@/components/Modals/StudentModal.vue'
+import { showToast } from '@/utils'
 
 const showStudentModal = ref(false)
 
@@ -135,23 +136,28 @@ const openStudentModal = () => {
 	showStudentModal.value = true
 }
 
-const removeStudent = createResource({
+const deleteStudents = createResource({
-	url: 'frappe.client.delete',
+	url: 'lms.lms.api.delete_documents',
 	makeParams(values) {
 		return {
 			doctype: 'Batch Student',
-			name: values.student,
+			documents: values.students,
 		}
 	},
 })
 
 const removeStudents = (selections, unselectAll) => {
-	selections.forEach(async (student) => {
+	deleteStudents.submit(
-		removeStudent.submit({ student })
+		{
-	})
+			students: Array.from(selections),
-	setTimeout(() => {
+		},
+		{
+			onSuccess(data) {
 				students.reload()
+				showToast(__('Success'), __('Students deleted successfully'), 'check')
 				unselectAll()
-	}, 500)
+			},
+		}
+	)
 }
 </script>

frontend/src/components/BrandSettings.vue

@@ -0,0 +1,83 @@
+<template>
+	<div class="flex flex-col justify-between h-full">
+		<div>
+			<div class="flex items-center justify-between">
+				<div class="font-semibold mb-1">
+					{{ __(label) }}
+				</div>
+				<Badge
+					v-if="isDirty"
+					:label="__('Not Saved')"
+					variant="subtle"
+					theme="orange"
+				/>
+			</div>
+			<div class="text-xs text-gray-600">
+				{{ __(description) }}
+			</div>
+		</div>
+		<SettingFields :fields="fields" :data="data.data" />
+		<div class="flex flex-row-reverse mt-auto">
+			<Button variant="solid" :loading="saveSettings.loading" @click="update">
+				{{ __('Update') }}
+			</Button>
+		</div>
+	</div>
+</template>
+<script setup>
+import { createResource, Button, Badge } from 'frappe-ui'
+import SettingFields from '@/components/SettingFields.vue'
+import { watch, ref } from 'vue'
+
+const isDirty = ref(false)
+
+const props = defineProps({
+	fields: {
+		type: Array,
+		required: true,
+	},
+	data: {
+		type: Object,
+		required: true,
+	},
+	label: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+	},
+})
+
+const saveSettings = createResource({
+	url: 'frappe.client.set_value',
+	makeParams(values) {
+		return {
+			doctype: 'Website Settings',
+			name: 'Website Settings',
+			fieldname: values.fields,
+		}
+	},
+})
+
+const update = () => {
+	let fieldsToSave = {}
+	let imageFields = ['favicon', 'banner_image', 'footer_logo']
+	props.fields.forEach((f) => {
+		if (imageFields.includes(f.name)) {
+			fieldsToSave[f.name] = f.value ? f.value.file_url : null
+		} else {
+			fieldsToSave[f.name] = f.value
+		}
+	})
+	saveSettings.submit({
+		fields: fieldsToSave,
+	})
+}
+
+watch(props.data, (newData) => {
+	if (newData && !isDirty.value) {
+		isDirty.value = true
+	}
+})
+</script>

frontend/src/components/Categories.vue

@@ -0,0 +1,151 @@
+<template>
+	<div class="flex flex-col min-h-0">
+		<div class="flex items-center justify-between">
+			<div class="text-xl font-semibold mb-1">
+				{{ label }}
+			</div>
+			<Button @click="() => showCategoryForm()">
+				<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
+			v-if="showForm"
+			class="flex items-center justify-between my-4 space-x-2"
+		>
+			<FormControl
+				ref="categoryInput"
+				v-model="category"
+				:placeholder="__('Category Name')"
+				class="flex-1"
+			/>
+			<Button @click="addCategory()" variant="subtle">
+				{{ __('Add') }}
+			</Button>
+		</div>
+
+		<div class="overflow-y-scroll">
+			<div class="text-base divide-y">
+				<FormControl
+					:value="cat.category"
+					type="text"
+					v-for="cat in categories.data"
+					class="form-control"
+					@change.stop="(e) => update(cat.name, e.target.value)"
+				/>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup>
+import {
+	Button,
+	FormControl,
+	createListResource,
+	createResource,
+	debounce,
+} from 'frappe-ui'
+import { Plus, X } from 'lucide-vue-next'
+import { ref } from 'vue'
+
+const showForm = ref(false)
+const category = ref(null)
+const categoryInput = ref(null)
+
+const props = defineProps({
+	label: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+		default: '',
+	},
+})
+
+const categories = createListResource({
+	doctype: 'LMS Category',
+	fields: ['name', 'category'],
+	auto: true,
+})
+
+const newCategory = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'LMS Category',
+				category: category.value,
+			},
+		}
+	},
+})
+
+const addCategory = () => {
+	newCategory.submit(
+		{},
+		{
+			onSuccess(data) {
+				categories.reload()
+				category.value = null
+			},
+		}
+	)
+}
+
+const showCategoryForm = () => {
+	showForm.value = !showForm.value
+	setTimeout(() => {
+		categoryInput.value.$el.querySelector('input').focus()
+	}, 0)
+}
+
+const updateCategory = createResource({
+	url: 'frappe.client.rename_doc',
+	makeParams(values) {
+		return {
+			doctype: 'LMS Category',
+			old_name: values.name,
+			new_name: values.category,
+		}
+	},
+})
+
+const update = (name, value) => {
+	updateCategory.submit(
+		{
+			name: name,
+			category: value,
+		},
+		{
+			onSuccess() {
+				categories.reload()
+			},
+		}
+	)
+}
+</script>
+<style>
+.form-control input {
+	padding: 1.25rem 0;
+	border-color: transparent;
+	background: white;
+}
+
+.form-control input:focus {
+	outline: transparent;
+	background: white;
+	box-shadow: none;
+	border-color: transparent;
+}
+
+.form-control input:hover {
+	outline: transparent;
+	background: white;
+	box-shadow: none;
+	border-color: transparent;
+}
+</style>

frontend/src/components/Controls/Autocomplete.vue

@@ -75,7 +75,7 @@
 								>
 									<li
 										:class="[
-											'flex items-center rounded px-2.5 py-1.5 text-base',
+											'flex items-center rounded px-2.5 py-2 text-base',
 											{ 'bg-gray-100': active },
 										]"
 									>
@@ -87,7 +87,16 @@
 											name="item-label"
 											v-bind="{ active, selected, option }"
 										>
+											<div class="flex flex-col space-y-1">
+												<div>
 													{{ option.label }}
+												</div>
+												<div
+													v-if="option.label != option.description"
+													class="text-xs text-gray-700"
+													v-html="option.description"
+												></div>
+											</div>
 										</slot>
 									</li>
 								</ComboboxOption>

frontend/src/components/Controls/Link.vue

@@ -108,6 +108,7 @@ const options = createResource({
 	url: 'frappe.desk.search.search_link',
 	cache: [props.doctype, text.value],
 	method: 'POST',
+	auto: true,
 	params: {
 		txt: text.value,
 		doctype: props.doctype,
@@ -118,6 +119,7 @@ const options = createResource({
 			return {
 				label: option.value,
 				value: option.value,
+				description: option.description,
 			}
 		})
 	},

frontend/src/components/Controls/Rating.vue

@@ -1,18 +1,28 @@
 <template>
+	<div class="space-y-1">
+		<label class="block text-xs text-gray-600" v-if="props.label">
+			{{ props.label }}
+		</label>
 		<div class="flex text-center">
-		<div v-for="index in 5">
+			<div
+				v-for="index in 5"
+				@mouseover="hoveredRating = index"
+				@mouseleave="hoveredRating = 0"
+			>
 				<Star
-				:class="index <= rating ? 'fill-orange-500' : ''"
+					class="fill-gray-400 text-gray-50 stroke-1 mr-1 cursor-pointer"
-				class="h-6 w-6 fill-gray-400 text-gray-50 mr-1 cursor-pointer"
+					:class="iconClasses(index)"
 					@click="markRating(index)"
 				/>
 			</div>
 		</div>
+	</div>
 </template>
 
 <script setup>
 import { Star } from 'lucide-vue-next'
-import { ref } from 'vue'
+import { computed, ref, watch } from 'vue'
+
 const props = defineProps({
 	id: {
 		type: String,
@@ -22,10 +32,36 @@ const props = defineProps({
 		type: Number,
 		default: 0,
 	},
+	label: {
+		type: String,
+		default: '',
+	},
+	size: {
+		type: String,
+		default: 'md',
+	},
 })
 
+const iconClasses = (index) => {
+	let classes = [
+		{
+			sm: 'size-4',
+			md: 'size-5',
+			lg: 'size-6',
+			xl: 'size-7',
+		}[props.size],
+	]
+	if (index <= hoveredRating.value && index > rating.value) {
+		classes.push('fill-yellow-200')
+	} else if (index <= rating.value) {
+		classes.push('fill-yellow-500')
+	}
+	return classes.join(' ')
+}
+
 const emit = defineEmits(['update:modelValue'])
-let rating = ref(props.modelValue)
+const rating = ref(props.modelValue)
+const hoveredRating = ref(0)
 
 let emitChange = (value) => {
 	emit('update:modelValue', value)
@@ -35,4 +71,11 @@ function markRating(index) {
 	emitChange(index)
 	rating.value = index
 }
+
+watch(
+	() => props.modelValue,
+	(newVal) => {
+		rating.value = newVal
+	}
+)
 </script>

frontend/src/components/CourseCard.vue

@@ -2,28 +2,23 @@
 	<div
 		v-if="course.title"
 		class="flex flex-col h-full rounded-md shadow-md text-base overflow-auto"
-		style="min-height: 320px"
+		style="min-height: 350px"
 	>
 		<div
 			class="course-image"
 			:class="{ 'default-image': !course.image }"
 			:style="{ backgroundImage: 'url(\'' + encodeURI(course.image) + '\')' }"
 		>
-			<div class="flex relative top-4 left-4 w-fit flex-wrap">
+			<div
-				<Badge
+				class="flex items-center flex-wrap space-y-1 space-x-1 relative top-4 px-2 w-fit"
-					v-if="course.featured"
-					variant="subtle"
-					theme="green"
-					size="md"
-					class="mr-2"
 			>
+				<Badge v-if="course.featured" variant="subtle" theme="green" size="md">
 					{{ __('Featured') }}
 				</Badge>
 				<Badge
 					variant="outline"
 					theme="gray"
 					size="md"
-					class="mr-2"
 					v-for="tag in course.tags"
 				>
 					{{ tag }}
@@ -77,7 +72,7 @@
 				{{ course.title }}
 			</div>
 
-			<div class="short-introduction">
+			<div class="short-introduction text-gray-700 text-sm">
 				{{ course.short_introduction }}
 			</div>
 

frontend/src/components/CourseCardOverlay.vue

@@ -63,10 +63,19 @@
 					{{ __('Start Learning') }}
 				</span>
 			</Button>
+			<Button
+				v-if="canGetCertificate"
+				@click="fetchCertificate()"
+				variant="subtle"
+				class="w-full mt-2"
+				size="md"
+			>
+				{{ __('Get Certificate') }}
+			</Button>
 			<router-link
 				v-if="user?.data?.is_moderator || is_instructor()"
 				:to="{
-					name: 'CreateCourse',
+					name: 'CourseForm',
 					params: {
 						courseName: course.data.name,
 					},
@@ -108,6 +117,7 @@ import { BookOpen, Users, Star } from 'lucide-vue-next'
 import { computed, inject } from 'vue'
 import { Button, createResource } from 'frappe-ui'
 import { createToast } from '@/utils/'
+import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
@@ -136,7 +146,7 @@ function enrollStudent() {
 		})
 		setTimeout(() => {
 			window.location.href = `/login?redirect-to=${window.location.pathname}`
-		}, 3000)
+		}, 2000)
 	} else {
 		const enrollStudentResource = createResource({
 			url: 'lms.lms.doctype.lms_enrollment.lms_enrollment.create_membership',
@@ -146,6 +156,9 @@ function enrollStudent() {
 				course: props.course.data.name,
 			})
 			.then(() => {
+				capture('enrolled_in_course', {
+					course: props.course.data.name,
+				})
 				createToast({
 					title: 'Enrolled Successfully',
 					icon: 'check',
@@ -174,4 +187,39 @@ const is_instructor = () => {
 	})
 	return user_is_instructor
 }
+
+const canGetCertificate = computed(() => {
+	if (
+		props.course.data?.enable_certification &&
+		props.course.data?.membership?.progress == 100
+	) {
+		return true
+	}
+	return false
+})
+
+const certificate = createResource({
+	url: 'lms.lms.doctype.lms_certificate.lms_certificate.create_certificate',
+	makeParams(values) {
+		return {
+			course: values.course,
+		}
+	},
+	onSuccess(data) {
+		console.log(data)
+		window.open(
+			`/api/method/frappe.utils.print_format.download_pdf?doctype=LMS+Certificate&name=${
+				data.name
+			}&format=${encodeURIComponent(data.template)}`,
+			'_blank'
+		)
+	},
+})
+
+const fetchCertificate = () => {
+	certificate.submit({
+		course: props.course.data?.name,
+		member: user.data?.name,
+	})
+}
 </script>

frontend/src/components/CourseOutline.vue

@@ -4,7 +4,7 @@
 			v-if="title && (outline.data?.length || allowEdit)"
 			class="grid grid-cols-[70%,30%] mb-4 px-2"
 		>
-			<div class="font-semibold text-lg">
+			<div class="font-semibold text-lg leading-5">
 				{{ __(title) }}
 			</div>
 			<Button size="sm" v-if="allowEdit" @click="openChapterModal()">
@@ -41,6 +41,7 @@
 				<DisclosurePanel>
 					<Draggable
 						:list="chapter.lessons"
+						:disabled="!allowEdit"
 						item-key="name"
 						group="items"
 						@end="updateOutline"
@@ -50,7 +51,7 @@
 							<div class="outline-lesson pl-8 py-2 pr-4">
 								<router-link
 									:to="{
-										name: allowEdit ? 'CreateLesson' : 'Lesson',
+										name: allowEdit ? 'LessonForm' : 'Lesson',
 										params: {
 											courseName: courseName,
 											chapterNumber: lesson.number.split('.')[0],
@@ -89,7 +90,7 @@
 					<div v-if="allowEdit" class="flex mt-2 mb-4 pl-8">
 						<router-link
 							:to="{
-								name: 'CreateLesson',
+								name: 'LessonForm',
 								params: {
 									courseName: courseName,
 									chapterNumber: chapter.idx,

frontend/src/components/Discussions.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<Button v-if="!singleThread" class="float-right" @click="openTopicModal()">
-			{{ __('New {0}').format(title) }}
+			{{ __('New {0}').format(singularize(title)) }}
 		</Button>
 		<div class="text-xl font-semibold">
 			{{ __(title) }}
@@ -65,7 +65,7 @@
 <script setup>
 import { createResource, Button } from 'frappe-ui'
 import UserAvatar from '@/components/UserAvatar.vue'
-import { timeAgo } from '../utils'
+import { singularize, timeAgo } from '../utils'
 import { ref, onMounted, inject } from 'vue'
 import DiscussionReplies from '@/components/DiscussionReplies.vue'
 import DiscussionModal from '@/components/Modals/DiscussionModal.vue'

frontend/src/components/LessonHelp.vue

@@ -0,0 +1,74 @@
+<template>
+	<div class="space-y-5">
+		<div class="space-y-2">
+			<div
+				class="flex items-center text-sm font-medium space-x-2 cursor-pointer"
+				@click="openHelpDialog('quiz')"
+			>
+				<span>
+					{{ __('How to add a Quiz?') }}
+				</span>
+				<Info class="w-3 h-3 text-gray-700" />
+			</div>
+			<div class="text-xs text-gray-600 mb-1 leading-5">
+				{{
+					__(
+						'Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page.'
+					)
+				}}
+			</div>
+		</div>
+
+		<div class="space-y-2">
+			<div
+				class="flex items-center text-sm font-medium space-x-2 cursor-pointer"
+				@click="openHelpDialog('upload')"
+			>
+				<span class="leading-5">
+					{{ __('How to upload content from your system?') }}
+				</span>
+				<Info class="w-3 h-3 text-gray-700" />
+			</div>
+			<div class="text-xs text-gray-600 mb-1 leading-5">
+				{{
+					__(
+						'To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson.'
+					)
+				}}
+			</div>
+		</div>
+
+		<div class="space-y-2">
+			<div
+				class="flex items-center text-sm font-medium space-x-2 cursor-pointer"
+				@click="openHelpDialog('youtube')"
+			>
+				<span>
+					{{ __('How to add a YouTube Video?') }}
+				</span>
+				<Info class="w-3 h-3 text-gray-700" />
+			</div>
+			<div class="text-xs text-gray-600 mb-1 leading-5">
+				{{
+					__(
+						'Copy the URL of the video from YouTube and paste it in the editor.'
+					)
+				}}
+			</div>
+		</div>
+	</div>
+	<ExplanationVideos v-model="showExplanation" :type="type" />
+</template>
+<script setup>
+import { Info } from 'lucide-vue-next'
+import { ref } from 'vue'
+import ExplanationVideos from '@/components/Modals/ExplanationVideos.vue'
+
+const showExplanation = ref(false)
+const type = ref(null)
+
+const openHelpDialog = (contentType) => {
+	type.value = contentType
+	showExplanation.value = true
+}
+</script>

frontend/src/components/LessonPlugins.vue

@@ -1,163 +0,0 @@
-<template>
-	<div class="text-lg font-semibold">
-		{{ __('Components') }}
-	</div>
-	<div class="mt-5">
-		<Tooltip
-			:text="
-				__(
-					'Content such as quiz, video and image will be added in the editor you select.'
-				)
-			"
-			placement="bottom"
-		>
-			<div class="">
-				<div class="text-xs text-gray-600 mb-1">
-					{{ __('Select an Editor') }}
-				</div>
-				<Select v-model="currentEditor" :options="getEditorOptions()" />
-			</div>
-		</Tooltip>
-		<div class="flex mt-4">
-			<Link
-				v-model="quiz"
-				class="flex-1"
-				doctype="LMS Quiz"
-				:label="__('Select a Quiz')"
-			/>
-			<Button @click="addQuiz()" class="self-end ml-2">
-				<template #icon>
-					<Plus class="h-4 w-4 stroke-1.5" />
-				</template>
-			</Button>
-		</div>
-		<div class="mt-4">
-			<div class="text-xs text-gray-600 mb-1">
-				{{ __('Add an image, video, pdf or audio.') }}
-			</div>
-			<div class="flex">
-				<FileUploader
-					v-if="!file"
-					:fileTypes="['image/*', 'video/*', 'audio/*', '.pdf']"
-					:validateFile="validateFile"
-					@success="(data) => addFile(data)"
-				>
-					<template v-slot="{ file, progress, uploading, openFileSelector }">
-						<div class="">
-							<Button @click="openFileSelector" :loading="uploading">
-								{{
-									uploading
-										? __('Uploading {0}%').format(progress)
-										: __('Upload a File')
-								}}
-							</Button>
-						</div>
-					</template>
-				</FileUploader>
-				<div v-else class="">
-					<div class="flex items-center">
-						<div class="border rounded-md p-2 mr-2">
-							<FileText class="h-4 w-4 stroke-1.5 text-gray-700" />
-						</div>
-						<div class="flex flex-col">
-							<span class="text-xs">
-								{{ file.file_name }}
-							</span>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="mt-4">
-			<div class="text-xs text-gray-600 mb-1">
-				{{
-					__(
-						'To add a YouTube video, paste the URL of the video in the editor.'
-					)
-				}}
-			</div>
-			<YouTubeExplanation>
-				<template v-slot="{ togglePopover }">
-					<div
-						@click="togglePopover()"
-						class="flex items-center text-sm underline cursor-pointer"
-					>
-						<Info class="w-3 h-3 stroke-1.5 text-gray-700 mr-1" />
-						{{ __('Learn More') }}
-					</div>
-				</template>
-			</YouTubeExplanation>
-		</div>
-	</div>
-</template>
-<script setup>
-import Link from '@/components/Controls/Link.vue'
-import { FileUploader, Button, Select, Tooltip } from 'frappe-ui'
-import { Plus, FileText, Info } from 'lucide-vue-next'
-import { ref, watch } from 'vue'
-import YouTubeExplanation from '@/components/Modals/YouTubeExplanation.vue'
-
-const quiz = ref(null)
-const file = ref(null)
-const lessonEditor = ref(null)
-const instructorEditor = ref(null)
-const currentEditor = ref('Lesson Content')
-
-const props = defineProps({
-	editor: {
-		required: true,
-	},
-	notesEditor: {
-		required: true,
-	},
-})
-
-const addQuiz = () => {
-	getCurrentEditor().caret.setToLastBlock('end', 0)
-	if (quiz.value) {
-		getCurrentEditor().blocks.insert('quiz', {
-			quiz: quiz.value,
-		})
-		quiz.value = null
-	}
-}
-
-const addFile = (data) => {
-	getCurrentEditor().caret.setToLastBlock('end', 0)
-	getCurrentEditor().blocks.insert('upload', data)
-}
-
-const validateFile = (file) => {
-	let extension = file.name.split('.').pop().toLowerCase()
-	if (!['jpg', 'jpeg', 'png', 'mp4', 'mov', 'mp3', 'pdf'].includes(extension)) {
-		return 'Only image and video files are allowed.'
-	}
-}
-
-const getEditorOptions = () => {
-	return [
-		{
-			label: 'Lesson Content',
-			value: 'Lesson Content',
-		},
-		{
-			label: 'Instructor Content',
-			value: 'Instructor Content',
-		},
-	]
-}
-
-const getCurrentEditor = () => {
-	return currentEditor.value == 'Lesson Content'
-		? lessonEditor.value
-		: instructorEditor.value
-}
-
-watch(
-	() => [props.editor, props.notesEditor],
-	([newEditor, newNotesEditor], [oldEditor, oldNotesEditor]) => {
-		lessonEditor.value = newEditor
-		instructorEditor.value = newNotesEditor
-	}
-)
-</script>

frontend/src/components/LiveClass.vue

@@ -1,33 +1,30 @@
 <template>
-	<Button
+	<div class="flex items-center justify-between mb-5">
-		v-if="user.data.is_moderator"
+		<div class="text-lg font-semibold">
-		variant="solid"
+			{{ __('Live Class') }}
-		class="float-right mb-5"
+		</div>
-		@click="openLiveClassModal"
+		<Button v-if="user.data.is_moderator" @click="openLiveClassModal">
-	>
 			<template #prefix>
 				<Plus class="h-4 w-4" />
 			</template>
 			<span>
-			{{ __('Add Live Class') }}
+				{{ __('Add') }}
 			</span>
 		</Button>
-	<div class="text-lg font-semibold mb-5">
-		{{ __('Live Class') }}
 	</div>
 	<div v-if="liveClasses.data?.length" class="grid grid-cols-2 gap-5">
 		<div
 			v-for="cls in liveClasses.data"
-			class="flex flex-col border rounded-md h-full p-3"
+			class="flex flex-col border rounded-md h-full text-sm text-gray-700 p-3"
 		>
-			<div class="font-semibold text-lg mb-4">
+			<div class="font-semibold text-gray-900 text-lg mb-4">
 				{{ cls.title }}
 			</div>
-			<div class="mb-4">
+			<div class="leading-5 text-gray-700 text-sm mb-4">
 				{{ cls.description }}
 			</div>
 			<div class="flex items-center mb-2">
-				<Calendar class="w-4 h-4 stroke-1.5" />
+				<Calendar class="w-4 h-4 stroke-1.5 text-gray-700" />
 				<span class="ml-2">
 					{{ dayjs(cls.date).format('DD MMMM YYYY') }}
 				</span>
@@ -38,7 +35,7 @@
 					{{ formatTime(cls.time) }}
 				</span>
 			</div>
-			<div class="flex items-center space-x-2 mt-auto">
+			<div class="flex items-center space-x-2 text-gray-900 mt-auto">
 				<a
 					:href="cls.start_url"
 					target="_blank"
@@ -90,7 +87,6 @@ const liveClasses = createListResource({
 	doctype: 'LMS Live Class',
 	filters: {
 		batch_name: props.batch,
-		date: ['>=', new Date()],
 	},
 	fields: [
 		'title',

frontend/src/components/Members.vue

@@ -0,0 +1,203 @@
+<template>
+	<div class="flex min-h-0 flex-col text-base">
+		<div class="flex items-center justify-between">
+			<div>
+				<div class="text-xl font-semibold mb-1">
+					{{ __(label) }}
+				</div>
+				<!-- <div class="text-xs text-gray-600">
+					{{ __(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="member.email"
+				:placeholder="__('Email')"
+				type="email"
+				class="w-full"
+			/>
+			<FormControl
+				v-model="member.first_name"
+				:placeholder="__('First Name')"
+				type="test"
+				class="w-full"
+			/>
+			<Button @click="addMember()" variant="subtle">
+				{{ __('Add') }}
+			</Button>
+		</div>
+
+		<div class="mt-2 pb-10 overflow-auto">
+			<!-- Member list -->
+			<div class="overflow-y-scroll">
+				<ul class="divide-y">
+					<li
+						v-for="member in memberList"
+						class="grid grid-cols-3 gap-10 py-2 cursor-pointer"
+					>
+						<div
+							@click="openProfile(member.username)"
+							class="flex items-center space-x-3 col-span-2"
+						>
+							<Avatar
+								:image="member.user_image"
+								:label="member.full_name"
+								size="lg"
+							/>
+							<div class="space-y-1">
+								<div class="flex">
+									<div class="text-gray-900">
+										{{ member.full_name }}
+									</div>
+									<div v-if="getRole(member)">
+										{{ getRole(member) }}
+									</div>
+								</div>
+								<div class="text-sm text-gray-700">
+									{{ member.name }}
+								</div>
+							</div>
+						</div>
+						<div class="flex items-center justify-center text-gray-700 text-sm">
+							<div v-if="member.last_active">
+								{{ dayjs(member.last_active).format('DD MMM, YYYY HH:mm a') }}
+							</div>
+							<div v-else>-</div>
+						</div>
+					</li>
+				</ul>
+			</div>
+			<div
+				v-if="memberList.length && hasNextPage"
+				class="flex justify-center mt-4"
+			>
+				<Button @click="members.reload()">
+					<template #prefix>
+						<RefreshCw class="h-3 w-3 stroke-1.5" />
+					</template>
+					{{ __('Load More') }}
+				</Button>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+import { createResource, Avatar, Button, FormControl } from 'frappe-ui'
+import { useRouter } from 'vue-router'
+import { ref, watch, reactive, inject } from 'vue'
+import { RefreshCw, Plus, X } from 'lucide-vue-next'
+
+const router = useRouter()
+const show = defineModel('show')
+const search = ref('')
+const start = ref(0)
+const memberList = ref([])
+const hasNextPage = ref(false)
+const showForm = ref(false)
+const dayjs = inject('$dayjs')
+
+const member = reactive({
+	email: '',
+	first_name: '',
+})
+
+const props = defineProps({
+	label: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+		default: '',
+	},
+	show: {
+		type: Boolean,
+	},
+})
+
+const members = createResource({
+	url: 'lms.lms.api.get_members',
+	makeParams: () => {
+		return {
+			search: search.value,
+			start: start.value,
+		}
+	},
+	onSuccess(data) {
+		memberList.value = memberList.value.concat(data)
+		start.value = start.value + 20
+		hasNextPage.value = data.length === 20
+	},
+	auto: true,
+})
+
+const openProfile = (username) => {
+	show.value = false
+	router.push({
+		name: 'Profile',
+		params: {
+			username: username,
+		},
+	})
+}
+
+const newMember = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'User',
+				first_name: member.first_name,
+				email: member.email,
+			},
+		}
+	},
+	auto: false,
+	onSuccess(data) {
+		show.value = false
+		router.push({
+			name: 'Profile',
+			params: {
+				username: data.username,
+			},
+		})
+	},
+})
+
+const addMember = () => {
+	newMember.reload()
+}
+
+watch(search, () => {
+	memberList.value = []
+	start.value = 0
+	members.reload()
+})
+
+const getRole = (role) => {
+	const map = {
+		'LMS Student': 'Student',
+		'Course Creator': 'Instructor',
+		Moderator: 'Moderator',
+		'Batch Evaluator': 'Evaluator',
+	}
+	return map[role]
+}
+</script>

frontend/src/components/MobileLayout.vue

@@ -4,14 +4,14 @@
 			<slot />
 		</div>
 		<div
-			v-if="tabs"
+			v-if="sidebarSettings.data"
 			class="fixed flex justify-around border-t border-gray-300 bottom-0 z-10 w-full bg-white standalone:pb-4"
 			:style="{
-				gridTemplateColumns: `repeat(${tabs.length}, minmax(0, 1fr))`,
+				gridTemplateColumns: `repeat(${sidebarLinks.length}, minmax(0, 1fr))`,
 			}"
 		>
 			<button
-				v-for="tab in tabs"
+				v-for="tab in sidebarLinks"
 				:key="tab.label"
 				:class="isVisible(tab) ? 'block' : 'hidden'"
 				class="flex flex-col items-center justify-center py-3 transition active:scale-95"
@@ -29,21 +29,38 @@
 <script setup>
 import { getSidebarLinks } from '../utils'
 import { useRouter } from 'vue-router'
-import { computed } from 'vue'
+import { computed, ref, onMounted } from 'vue'
 import { sessionStore } from '@/stores/session'
 import { usersStore } from '@/stores/user'
 import * as icons from 'lucide-vue-next'
 
-const { logout, user } = sessionStore()
+const { logout, user, sidebarSettings } = sessionStore()
 let { isLoggedIn } = sessionStore()
 const router = useRouter()
 let { userResource } = usersStore()
+const sidebarLinks = ref(getSidebarLinks())
 
-const tabs = computed(() => {
+onMounted(() => {
-	let links = getSidebarLinks()
+	sidebarSettings.reload(
+		{},
+		{
+			onSuccess(data) {
+				Object.keys(data).forEach((key) => {
+					if (!parseInt(data[key])) {
+						sidebarLinks.value = sidebarLinks.value.filter(
+							(link) => link.label.toLowerCase().split(' ').join('_') !== key
+						)
+					}
+				})
+				addAccessLinks()
+			},
+		}
+	)
+})
 
+const addAccessLinks = () => {
 	if (user) {
-		links.push({
+		sidebarLinks.value.push({
 			label: 'Profile',
 			icon: 'UserRound',
 			activeFor: [
@@ -54,18 +71,17 @@ const tabs = computed(() => {
 				'ProfileRoles',
 			],
 		})
-		links.push({
+		sidebarLinks.value.push({
 			label: 'Log out',
 			icon: 'LogOut',
 		})
 	} else {
-		links.push({
+		sidebarLinks.value.push({
 			label: 'Log in',
 			icon: 'LogIn',
 		})
 	}
-	return links
+}
-})
 
 let isActive = (tab) => {
 	return tab.activeFor?.includes(router.currentRoute.value.name)

frontend/src/components/Modals/AssessmentModal.vue

@@ -0,0 +1,86 @@
+<template>
+	<Dialog
+		v-model="show"
+		:options="{
+			title: __('Add an assessment'),
+			size: 'sm',
+			actions: [
+				{
+					label: __('Submit'),
+					variant: 'solid',
+					onClick: (close) => addAssessment(close),
+				},
+			],
+		}"
+	>
+		<template #body-content>
+			<div class="space-y-4">
+				<FormControl
+					type="select"
+					:options="assessmentTypes"
+					v-model="assessmentType"
+					:label="__('Type')"
+				/>
+				<Link
+					v-model="assessment"
+					:doctype="assessmentType"
+					:label="__('Assessment')"
+				/>
+			</div>
+		</template>
+	</Dialog>
+</template>
+<script setup>
+import { Dialog, FormControl, createResource } from 'frappe-ui'
+import Link from '@/components/Controls/Link.vue'
+import { computed, ref } from 'vue'
+import { showToast } from '@/utils'
+
+const show = defineModel()
+const assessmentType = ref(null)
+const assessment = ref(null)
+const assessments = defineModel('assessments')
+
+const props = defineProps({
+	batch: {
+		type: String,
+		default: null,
+	},
+})
+
+const assessmentResource = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'LMS Assessment',
+				parent: props.batch,
+				parenttype: 'LMS Batch',
+				parentfield: 'assessment',
+				assessment_type: assessmentType.value,
+				assessment_name: assessment.value,
+			},
+		}
+	},
+})
+
+const addAssessment = (close) => {
+	assessmentResource.submit(
+		{},
+		{
+			onSuccess(data) {
+				assessments.value.reload()
+				showToast(__('Success'), __('Assessment added successfully'), 'check')
+				close()
+			},
+		}
+	)
+}
+
+const assessmentTypes = computed(() => {
+	return [
+		{ label: 'Quiz', value: 'LMS Quiz' },
+		{ label: 'Assignment', value: 'LMS Assignment' },
+	]
+})
+</script>

frontend/src/components/Modals/ChapterModal.vue

@@ -15,17 +15,24 @@
 		}"
 	>
 		<template #body-content>
-			<FormControl label="Title" v-model="chapter.title" class="mb-4" />
+			<FormControl
+				ref="chapterInput"
+				label="Title"
+				v-model="chapter.title"
+				class="mb-4"
+			/>
 		</template>
 	</Dialog>
 </template>
 <script setup>
 import { Dialog, FormControl, createResource } from 'frappe-ui'
-import { defineModel, reactive, watch, inject } from 'vue'
+import { defineModel, reactive, watch, ref } from 'vue'
-import { createToast, formatTime } from '@/utils/'
+import { createToast } from '@/utils/'
+import { capture } from '@/telemetry'
 
 const show = defineModel()
 const outline = defineModel('outline')
+const chapterInput = ref(null)
 
 const props = defineProps({
 	course: {
@@ -36,6 +43,7 @@ const props = defineProps({
 		type: Object,
 	},
 })
+
 const chapter = reactive({
 	title: '',
 })
@@ -91,10 +99,12 @@ const addChapter = (close) => {
 				}
 			},
 			onSuccess: (data) => {
+				capture('chapter_created')
 				chapterReference.submit(
 					{ name: data.name },
 					{
 						onSuccess(data) {
+							chapter.title = ''
 							outline.value.reload()
 							createToast({
 								text: 'Chapter added successfully',
@@ -158,4 +168,12 @@ watch(
 		chapter.title = newChapter?.title
 	}
 )
+
+watch(show, () => {
+	if (show.value) {
+		setTimeout(() => {
+			chapterInput.value.$el.querySelector('input').focus()
+		}, 100)
+	}
+})
 </script>

frontend/src/components/Modals/DiscussionModal.vue

@@ -1,7 +1,7 @@
 <template>
 	<Dialog
 		:options="{
-			title: props.title,
+			title: singularize(props.title),
 			size: '2xl',
 			actions: [
 				{
@@ -35,8 +35,8 @@
 </template>
 <script setup>
 import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
-import { reactive, defineModel, computed } from 'vue'
+import { reactive, defineModel } from 'vue'
-import { showToast } from '@/utils'
+import { showToast, singularize } from '@/utils'
 
 const topics = defineModel('reloadTopics')
 

frontend/src/components/Modals/EvaluationModal.vue

@@ -130,11 +130,20 @@ function submitEvaluation(close) {
 			close()
 		},
 		onError(err) {
+			let message = err.messages?.[0] || err
+			let unavailabilityMessage
+
+			if (typeof message === 'string') {
+				unavailabilityMessage = message?.includes('unavailable')
+			} else {
+				unavailabilityMessage = false
+			}
+
 			createToast({
-				title: 'Error',
+				title: unavailabilityMessage ? __('Evaluator is Unavailable') : '',
-				text: err.messages?.[0] || err,
+				text: message,
-				icon: 'x',
+				icon: unavailabilityMessage ? 'alert-circle' : 'x',
-				iconClasses: 'bg-red-600 text-white rounded-md p-px',
+				iconClasses: 'bg-yellow-600 text-white rounded-md p-px',
 				position: 'top-center',
 				timeout: 10,
 			})

frontend/src/components/Modals/Event.vue

@@ -0,0 +1,378 @@
+<template>
+	<Dialog
+		v-model="show"
+		:options="{
+			size: '2xl',
+		}"
+	>
+		<template #body>
+			<div class="flex text-base">
+				<div class="flex flex-col w-1/2 p-5">
+					<div class="text-lg font-semibold mb-4">
+						{{ event.title }}
+					</div>
+
+					<div class="flex flex-col space-y-4 text-sm text-gray-800">
+						<Tooltip :text="__('Email ID')">
+							<div class="flex items-center space-x-2 w-fit">
+								<User class="h-4 w-4 stroke-1.5" />
+								<span>
+									{{ event.member }}
+								</span>
+							</div>
+						</Tooltip>
+						<Tooltip :text="__('Course')">
+							<div class="flex items-center space-x-2 w-fit">
+								<BookOpen class="h-4 w-4 stroke-1.5" />
+								<span>
+									{{ event.course_title }}
+								</span>
+							</div>
+						</Tooltip>
+						<Tooltip v-if="event.batch_title" :text="__('Batch')">
+							<div class="flex items-center space-x-2 w-fit">
+								<Users class="h-4 w-4 stroke-1.5" />
+								<span>
+									{{ event.batch_title }}
+								</span>
+							</div>
+						</Tooltip>
+						<Tooltip :text="__('Date')">
+							<div class="flex items-center space-x-2 w-fit">
+								<Calendar class="h-4 w-4 stroke-1.5" />
+								<span>
+									{{ dayjs(event.date).format('DD MMM YYYY') }}
+								</span>
+							</div>
+						</Tooltip>
+						<Tooltip :text="__('Time')">
+							<div class="flex items-center space-x-2 w-fit">
+								<Clock class="h-4 w-4 stroke-1.5" />
+								<span>
+									{{ formatTime(event.start_time) }} -
+									{{ formatTime(event.end_time) }}
+								</span>
+							</div>
+						</Tooltip>
+					</div>
+					<div class="flex items-center space-x-2 mt-auto">
+						<Button
+							v-if="certificate.name"
+							@click="openCertificate(certificate)"
+							class="w-full"
+						>
+							<template #prefix>
+								<FileText class="h-4 w-4 stroke-1.5" />
+							</template>
+							{{ __('View Certificate') }}
+						</Button>
+						<Button v-else @click="openCallLink(event.venue)" class="w-full">
+							<template #prefix>
+								<Video class="h-4 w-4 stroke-1.5" />
+							</template>
+							<span>
+								{{ __('Join Meeting') }}
+							</span>
+						</Button>
+					</div>
+				</div>
+				<Tabs :tabs="tabs" v-model="tabIndex" class="border-l w-1/2">
+					<template #default="{ tab }">
+						<div
+							v-if="tab.label == 'Evaluation'"
+							class="flex flex-col space-y-4 p-5"
+						>
+							<div class="flex items-center justify-between">
+								<Rating v-model="evaluation.rating" :label="__('Rating')" />
+								<FormControl
+									type="select"
+									:options="statusOptions"
+									v-model="evaluation.status"
+									:label="__('Status')"
+									class="w-1/2"
+								/>
+							</div>
+							<Textarea
+								v-model="evaluation.summary"
+								:label="__('Summary')"
+								:rows="7"
+							/>
+							<Button variant="solid" @click="saveEvaluation()">
+								{{ __('Save') }}
+							</Button>
+						</div>
+						<div v-else class="flex flex-col space-y-4 p-5">
+							<FormControl
+								type="checkbox"
+								v-model="certificate.published"
+								:label="__('Published')"
+							/>
+							<Link
+								v-model="certificate.template"
+								:label="__('Template')"
+								doctype="Print Format"
+								:filters="{
+									doc_type: 'LMS Certificate',
+								}"
+							/>
+							<FormControl
+								type="date"
+								v-model="certificate.issue_date"
+								:label="__('Issue Date')"
+							/>
+							<FormControl
+								type="date"
+								v-model="certificate.expiry_date"
+								:label="__('Expiry Date')"
+							/>
+							<Button variant="solid" @click="saveCertificate()">
+								{{ __('Save') }}
+							</Button>
+						</div>
+					</template>
+				</Tabs>
+			</div>
+		</template>
+	</Dialog>
+</template>
+<script setup>
+import {
+	Dialog,
+	Button,
+	FormControl,
+	createResource,
+	Tabs,
+	Tooltip,
+	Textarea,
+} from 'frappe-ui'
+import {
+	User,
+	Calendar,
+	Clock,
+	Video,
+	BookOpen,
+	FileText,
+	GraduationCap,
+	Users,
+	ClipboardList,
+} from 'lucide-vue-next'
+import { inject, reactive, watch, ref, computed } from 'vue'
+import { formatTime, showToast } from '@/utils'
+import Rating from '@/components/Controls/Rating.vue'
+import Link from '@/components/Controls/Link.vue'
+
+const show = defineModel()
+const dayjs = inject('$dayjs')
+const tabIndex = ref(0)
+const showCertification = ref(false)
+
+const props = defineProps({
+	event: {
+		type: [Object, null],
+		required: true,
+	},
+})
+
+const evaluation = reactive({})
+
+const certificate = reactive({})
+
+const defaultTemplate = createResource({
+	url: 'frappe.client.get_value',
+	makeParams(values) {
+		return {
+			doctype: 'Property Setter',
+			fieldname: 'value',
+			filters: {
+				doc_type: 'LMS Certificate',
+				property: 'default_print_format',
+			},
+		}
+	},
+	auto: true,
+	onSuccess(data) {
+		certificate.template = data.value
+	},
+})
+
+const openCallLink = (link) => {
+	window.open(link, '_blank')
+}
+
+const evaluationResource = createResource({
+	url: 'lms.lms.api.save_evaluation_details',
+	makeParams(values) {
+		return {
+			member: props.event.member,
+			course: props.event.course,
+			batch_name: props.event.batch_name,
+			date: props.event.date,
+			start_time: props.event.start_time,
+			end_time: props.event.end_time,
+			status: evaluation.status,
+			rating: evaluation.rating,
+			summary: evaluation.summary,
+			evaluator: props.event.evaluator,
+		}
+	},
+	auto: false,
+	onSuccess(data) {
+		evaluation.name = data.name
+	},
+})
+
+const evaluationDetails = createResource({
+	url: 'frappe.client.get',
+	makeParams(values) {
+		return {
+			doctype: 'LMS Certificate Evaluation',
+			filters: {
+				member: props.event.member,
+				course: props.event.course,
+			},
+		}
+	},
+	onSuccess(data) {
+		for (const key in data) {
+			if (key in evaluation) evaluation[key] = data[key]
+			if (key == 'rating') evaluation.rating = data.rating * 5
+			if (evaluation.status == 'Pass') showCertification.value = true
+		}
+	},
+	auto: false,
+})
+
+const saveEvaluation = () => {
+	evaluationResource.submit(
+		{},
+		{
+			onSuccess: () => {
+				if (evaluation.status == 'Pass') {
+					showCertification.value = true
+				} else {
+					show.value = false
+				}
+				showToast(__('Success'), __('Evaluation saved successfully'), 'check')
+			},
+		}
+	)
+}
+
+const certificateResource = createResource({
+	url: 'lms.lms.api.save_certificate_details',
+	makeParams(values) {
+		return {
+			member: props.event.member,
+			course: props.event.course,
+			batch_name: props.event.batch_name,
+			published: certificate.published,
+			issue_date: certificate.issue_date,
+			expiry_date: certificate.expiry_date,
+			template: certificate.template,
+			evaluator: props.event.evaluator,
+		}
+	},
+	auto: false,
+	onSuccess(data) {
+		certificate.name = data
+	},
+})
+
+const certificateDetails = createResource({
+	url: 'frappe.client.get',
+	makeParams(values) {
+		return {
+			doctype: 'LMS Certificate',
+			filters: {
+				member: props.event.member,
+				course: props.event.course,
+			},
+		}
+	},
+	onSuccess(data) {
+		for (const key in data) {
+			if (key in certificate) certificate[key] = data[key]
+			certificate.name = data.name
+			showCertification.value = true
+		}
+	},
+	onError(err) {
+		certificate.template = defaultTemplate.data.value
+	},
+	auto: false,
+})
+
+const saveCertificate = () => {
+	certificateResource.submit(
+		{},
+		{
+			onSuccess: () => {
+				showToast(__('Success'), __('Certificate saved successfully'), 'check')
+			},
+		}
+	)
+}
+
+watch(show, () => {
+	if (show.value) {
+		evaluation.rating = 0
+		evaluation.status = 'Pending'
+		evaluation.summary = ''
+		evaluationDetails.reload()
+
+		certificate.published = true
+		certificate.issue_date = dayjs().format('YYYY-MM-DD')
+		certificate.expiry_date = null
+		certificate.template = null
+		certificate.name = null
+		certificateDetails.reload()
+	}
+})
+
+const openCertificate = (certificate) => {
+	window.open(
+		`/api/method/frappe.utils.print_format.download_pdf?doctype=LMS+Certificate&name=${
+			certificate.name
+		}&format=${encodeURIComponent(certificate.template)}`
+	)
+}
+
+const statusOptions = computed(() => {
+	return [
+		{
+			value: 'Pending',
+			label: __('Pending'),
+		},
+		{
+			value: 'In Progress',
+			label: __('In Progress'),
+		},
+		{
+			value: 'Pass',
+			label: __('Pass'),
+		},
+		{
+			value: 'Fail',
+			label: __('Fail'),
+		},
+	]
+})
+
+const tabs = computed(() => {
+	const tabsArray = [
+		{
+			label: __('Evaluation'),
+			icon: ClipboardList,
+		},
+	]
+
+	if (showCertification.value) {
+		tabsArray.push({
+			label: __('Certification'),
+			icon: GraduationCap,
+		})
+	}
+
+	return tabsArray
+})
+</script>

frontend/src/components/Modals/ExplanationVideos.vue

@@ -0,0 +1,34 @@
+<template>
+	<Dialog
+		v-model="show"
+		:options="{
+			size: '4xl',
+		}"
+	>
+		<template #body>
+			<div class="p-4">
+				<VideoBlock :file="file" />
+			</div>
+		</template>
+	</Dialog>
+</template>
+<script setup>
+import { Dialog } from 'frappe-ui'
+import { computed } from 'vue'
+import VideoBlock from '@/components/VideoBlock.vue'
+
+const show = defineModel()
+
+const props = defineProps({
+	type: {
+		type: [String, null],
+		required: true,
+	},
+})
+
+const file = computed(() => {
+	if (props.type == 'youtube') return '/assets/lms/frontend/Youtube.mp4'
+	if (props.type == 'quiz') return '/assets/lms/frontend/Quiz.mp4'
+	if (props.type == 'upload') return '/assets/lms/frontend/Upload.mp4'
+})
+</script>

frontend/src/components/Modals/Question.vue

@@ -0,0 +1,347 @@
+<template>
+	<Dialog v-model="show" :options="dialogOptions">
+		<template #body-content>
+			<div class="space-y-4">
+				<div
+					v-if="!editMode"
+					class="flex items-center text-xs text-gray-700 space-x-5"
+				>
+					<div class="flex items-center space-x-2">
+						<input
+							type="radio"
+							id="existing"
+							value="existing"
+							v-model="questionType"
+							class="w-3 h-3 accent-gray-900"
+						/>
+						<label for="existing">
+							{{ __('Add an existing question') }}
+						</label>
+					</div>
+
+					<div class="flex items-center space-x-2">
+						<input
+							type="radio"
+							id="new"
+							value="new"
+							v-model="questionType"
+							class="w-3 h-3"
+						/>
+						<label for="new">
+							{{ __('Create a new question') }}
+						</label>
+					</div>
+				</div>
+				<div v-if="questionType == 'new' || editMode" class="space-y-2">
+					<div>
+						<label class="block text-xs text-gray-600 mb-1">
+							{{ __('Question') }}
+						</label>
+						<TextEditor
+							:content="question.question"
+							@change="(val) => (question.question = val)"
+							:editable="true"
+							:fixedMenu="true"
+							editorClass="prose-sm max-w-none border-b border-x bg-gray-100 rounded-b-md py-1 px-2 min-h-[7rem]"
+						/>
+					</div>
+					<FormControl
+						v-model="question.marks"
+						:label="__('Marks')"
+						type="number"
+					/>
+					<FormControl
+						:label="__('Type')"
+						v-model="question.type"
+						type="select"
+						:options="['Choices', 'User Input']"
+						class="pb-2"
+					/>
+					<div v-if="question.type == 'Choices'" class="divide-y border-t">
+						<div v-for="n in 4" class="space-y-4 py-2">
+							<FormControl
+								:label="__('Option') + ' ' + n"
+								v-model="question[`option_${n}`]"
+							/>
+							<FormControl
+								:label="__('Explanation')"
+								v-model="question[`explanation_${n}`]"
+							/>
+							<FormControl
+								:label="__('Correct Answer')"
+								v-model="question[`is_correct_${n}`]"
+								type="checkbox"
+							/>
+						</div>
+					</div>
+					<div v-else v-for="n in 4" class="space-y-2">
+						<FormControl
+							:label="__('Possibility') + ' ' + n"
+							v-model="question[`possibility_${n}`]"
+						/>
+					</div>
+				</div>
+				<div v-else-if="questionType == 'existing'" class="space-y-2">
+					<Link
+						v-model="existingQuestion.question"
+						:label="__('Select a question')"
+						doctype="LMS Question"
+					/>
+					<FormControl
+						v-model="existingQuestion.marks"
+						:label="__('Marks')"
+						type="number"
+					/>
+				</div>
+			</div>
+		</template>
+	</Dialog>
+</template>
+<script setup>
+import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
+import { computed, watch, reactive, ref } from 'vue'
+import Link from '@/components/Controls/Link.vue'
+import { showToast } from '@/utils'
+
+const show = defineModel()
+const quiz = defineModel('quiz')
+const questionType = ref(null)
+const editMode = ref(false)
+
+const existingQuestion = reactive({
+	question: '',
+	marks: 0,
+})
+const question = reactive({
+	question: '',
+	type: 'Choices',
+	marks: 0,
+})
+
+const populateFields = () => {
+	let fields = ['option', 'is_correct', 'explanation', 'possibility']
+	let counter = 1
+	fields.forEach((field) => {
+		while (counter <= 4) {
+			question[`${field}_${counter}`] = field === 'is_correct' ? false : ''
+			counter++
+		}
+	})
+}
+
+populateFields()
+
+const props = defineProps({
+	title: {
+		type: String,
+		default: __('Add a new question'),
+	},
+	questionDetail: {
+		type: [Object, null],
+		required: true,
+	},
+})
+
+const questionData = createResource({
+	url: 'frappe.client.get',
+	makeParams() {
+		return {
+			doctype: 'LMS Question',
+			name: props.questionDetail.question,
+		}
+	},
+	auto: false,
+	onSuccess(data) {
+		let counter = 1
+		editMode.value = true
+		Object.keys(data).forEach((key) => {
+			if (Object.hasOwn(question, key)) question[key] = data[key]
+		})
+		while (counter <= 4) {
+			question[`is_correct_${counter}`] = data[`is_correct_${counter}`]
+				? true
+				: false
+			counter++
+		}
+		question.marks = props.questionDetail.marks
+	},
+})
+
+watch(show, () => {
+	if (show.value) {
+		editMode.value = false
+		if (props.questionDetail.question) questionData.fetch()
+		else {
+			;(question.question = ''), (question.marks = 0)
+			question.type = 'Choices'
+			existingQuestion.question = ''
+			existingQuestion.marks = 0
+			questionType.value = null
+			populateFields()
+		}
+
+		if (props.questionDetail.marks) question.marks = props.questionDetail.marks
+	}
+})
+
+const questionRow = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'LMS Quiz Question',
+				parent: quiz.value.data.name,
+				parentfield: 'questions',
+				parenttype: 'LMS Quiz',
+				...values,
+			},
+		}
+	},
+})
+
+const questionCreation = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'LMS Question',
+				...question,
+			},
+		}
+	},
+})
+
+const submitQuestion = (close) => {
+	if (props.questionDetail?.question) updateQuestion(close)
+	else addQuestion(close)
+}
+
+const addQuestion = (close) => {
+	if (questionType.value == 'existing') {
+		addQuestionRow(
+			{
+				question: existingQuestion.question,
+				marks: existingQuestion.marks,
+			},
+			close
+		)
+	} else {
+		questionCreation.submit(
+			{},
+			{
+				onSuccess(data) {
+					addQuestionRow(
+						{
+							question: data.name,
+							marks: question.marks,
+						},
+						close
+					)
+				},
+				onError(err) {
+					showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				},
+			}
+		)
+	}
+}
+
+const addQuestionRow = (question, close) => {
+	questionRow.submit(
+		{
+			...question,
+		},
+		{
+			onSuccess() {
+				show.value = false
+				showToast(__('Success'), __('Question added successfully'), 'check')
+				quiz.value.reload()
+				close()
+			},
+			onError(err) {
+				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				close()
+			},
+		}
+	)
+}
+
+const questionUpdate = createResource({
+	url: 'frappe.client.set_value',
+	auto: false,
+	makeParams(values) {
+		return {
+			doctype: 'LMS Question',
+			name: questionData.data?.name,
+			fieldname: {
+				...question,
+			},
+		}
+	},
+})
+
+const marksUpdate = createResource({
+	url: 'frappe.client.set_value',
+	auto: false,
+	makeParams(values) {
+		return {
+			doctype: 'LMS Quiz Question',
+			name: props.questionDetail.name,
+			fieldname: {
+				marks: question.marks,
+			},
+		}
+	},
+})
+
+const updateQuestion = (close) => {
+	questionUpdate.submit(
+		{},
+		{
+			onSuccess() {
+				marksUpdate.submit(
+					{},
+					{
+						onSuccess() {
+							show.value = false
+							showToast(
+								__('Success'),
+								__('Question updated successfully'),
+								'check'
+							)
+							quiz.value.reload()
+							close()
+						},
+					}
+				)
+			},
+			onError(err) {
+				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+			},
+		}
+	)
+}
+
+const dialogOptions = computed(() => {
+	return {
+		title: __(props.title),
+		size: 'xl',
+		actions: [
+			{
+				label: __('Submit'),
+				variant: 'solid',
+				onClick: (close) => {
+					submitQuestion(close)
+				},
+			},
+		],
+	}
+})
+</script>
+<style>
+input[type='radio']:checked {
+	background-color: theme('colors.gray.900') !important;
+	border-color: theme('colors.gray.900') !important;
+	--tw-ring-color: theme('colors.gray.900') !important;
+}
+</style>

frontend/src/components/Modals/Settings.vue

@@ -0,0 +1,328 @@
+<template>
+	<Dialog v-model="show" :options="{ size: '4xl' }">
+		<template #body>
+			<div class="flex h-[calc(100vh_-_8rem)]">
+				<div class="flex w-52 shrink-0 flex-col bg-gray-50 p-2">
+					<h1 class="mb-3 px-2 pt-2 text-lg font-semibold">
+						{{ __('Settings') }}
+					</h1>
+					<div v-for="tab in tabs" :key="tab.label">
+						<div
+							v-if="!tab.hideLabel"
+							class="mb-2 mt-3 flex cursor-pointer gap-1.5 px-1 text-base font-medium text-gray-600 transition-all duration-300 ease-in-out"
+						>
+							<span>{{ __(tab.label) }}</span>
+						</div>
+						<nav class="space-y-1">
+							<SidebarLink
+								v-for="item in tab.items"
+								:link="item"
+								:key="item.label"
+								class="w-full"
+								:class="
+									activeTab?.label == item.label
+										? 'bg-white shadow-sm'
+										: 'hover:bg-gray-100'
+								"
+								@click="activeTab = item"
+							/>
+						</nav>
+					</div>
+				</div>
+				<div
+					v-if="activeTab && data.doc"
+					:key="activeTab.label"
+					class="flex flex-1 flex-col px-10 py-8"
+				>
+					<Members
+						v-if="activeTab.label === 'Members'"
+						:label="activeTab.label"
+						:description="activeTab.description"
+						v-model:show="show"
+					/>
+					<Categories
+						v-else-if="activeTab.label === 'Categories'"
+						:label="activeTab.label"
+						:description="activeTab.description"
+					/>
+					<PaymentSettings
+						v-else-if="activeTab.label === 'Payment Gateway'"
+						:label="activeTab.label"
+						:description="activeTab.description"
+						:data="data"
+						:fields="activeTab.fields"
+					/>
+					<BrandSettings
+						v-else-if="activeTab.label === 'Branding'"
+						:label="activeTab.label"
+						:description="activeTab.description"
+						:fields="activeTab.fields"
+						:data="branding"
+					/>
+					<SettingDetails
+						v-else
+						:fields="activeTab.fields"
+						:label="activeTab.label"
+						:description="activeTab.description"
+						:data="data"
+					/>
+				</div>
+			</div>
+		</template>
+	</Dialog>
+</template>
+<script setup>
+import { Dialog, createDocumentResource, createResource } from 'frappe-ui'
+import { ref, computed, watch } from 'vue'
+import { useSettings } from '@/stores/settings'
+import SettingDetails from '../SettingDetails.vue'
+import SidebarLink from '@/components/SidebarLink.vue'
+import Members from '@/components/Members.vue'
+import Categories from '@/components/Categories.vue'
+import BrandSettings from '@/components/BrandSettings.vue'
+import PaymentSettings from '@/components/PaymentSettings.vue'
+
+const show = defineModel()
+const doctype = ref('LMS Settings')
+const activeTab = ref(null)
+const settingsStore = useSettings()
+
+const data = createDocumentResource({
+	doctype: doctype.value,
+	name: doctype.value,
+	fields: ['*'],
+	cache: doctype.value,
+	auto: true,
+})
+
+const branding = createResource({
+	url: 'lms.lms.api.get_branding',
+	auto: true,
+	cache: 'brand',
+})
+
+const tabsStructure = computed(() => {
+	return [
+		{
+			label: 'Settings',
+			hideLabel: true,
+			items: [
+				{
+					label: 'Members',
+					description: 'Manage the members of your learning system',
+					icon: 'UserRoundPlus',
+				},
+			],
+		},
+		{
+			label: 'Settings',
+			hideLabel: true,
+			items: [
+				{
+					label: 'Payment Gateway',
+					icon: 'DollarSign',
+					description:
+						'Configure the payment gateway and other payment related settings',
+					fields: [
+						{
+							label: 'Payment Gateway',
+							name: 'payment_gateway',
+							type: 'Link',
+							doctype: 'Payment Gateway',
+						},
+						{
+							label: 'Default Currency',
+							name: 'default_currency',
+							type: 'Link',
+							doctype: 'Currency',
+						},
+						{
+							label: 'Apply GST for India',
+							name: 'apply_gst',
+							type: 'checkbox',
+						},
+						{
+							label: 'Show USD equivalent amount',
+							name: 'show_usd_equivalent',
+							type: 'checkbox',
+						},
+						{
+							label: 'Apply rounding on equivalent',
+							name: 'apply_rounding',
+							type: 'checkbox',
+						},
+					],
+				},
+			],
+		},
+		{
+			label: 'Settings',
+			hideLabel: true,
+			items: [
+				{
+					label: 'Categories',
+					description: 'Manage the members of your learning system',
+					icon: 'Network',
+				},
+			],
+		},
+		{
+			label: 'Customise',
+			hideLabel: false,
+			items: [
+				{
+					label: 'Branding',
+					icon: 'Blocks',
+					fields: [
+						{
+							label: 'Brand Name',
+							name: 'app_name',
+							type: 'text',
+						},
+						{
+							label: 'Copyright',
+							name: 'copyright',
+							type: 'text',
+						},
+						{
+							label: 'Address',
+							name: 'address',
+							type: 'textarea',
+							rows: 4,
+						},
+						{
+							label: 'Footer "Powered By"',
+							name: 'footer_powered',
+							type: 'textarea',
+							rows: 4,
+						},
+						{
+							type: 'Column Break',
+						},
+						{
+							label: 'Logo',
+							name: 'banner_image',
+							type: 'Upload',
+						},
+						{
+							label: 'Favicon',
+							name: 'favicon',
+							type: 'Upload',
+						},
+						{
+							label: 'Footer Logo',
+							name: 'footer_logo',
+							type: 'Upload',
+						},
+					],
+				},
+				{
+					label: 'Sidebar',
+					icon: 'PanelLeftIcon',
+					description: 'Choose the items you want to show in the sidebar',
+					fields: [
+						{
+							label: 'Courses',
+							name: 'courses',
+							type: 'checkbox',
+						},
+						{
+							label: 'Batches',
+							name: 'batches',
+							type: 'checkbox',
+						},
+						{
+							label: 'Certified Participants',
+							name: 'certified_participants',
+							type: 'checkbox',
+						},
+						{
+							type: 'Column Break',
+						},
+						{
+							label: 'Jobs',
+							name: 'jobs',
+							type: 'checkbox',
+						},
+						{
+							label: 'Statistics',
+							name: 'statistics',
+							type: 'checkbox',
+						},
+						{
+							label: 'Notifications',
+							name: 'notifications',
+							type: 'checkbox',
+						},
+					],
+				},
+				{
+					label: 'Email Templates',
+					icon: 'MailPlus',
+					fields: [
+						{
+							label: 'Batch Confirmation Template',
+							name: 'batch_confirmation_template',
+							doctype: 'Email Template',
+							type: 'Link',
+						},
+						{
+							label: 'Certification Template',
+							name: 'certification_template',
+							doctype: 'Email Template',
+							type: 'Link',
+						},
+						{
+							label: 'Assignment Submission Template',
+							name: 'assignment_submission_template',
+							doctype: 'Email Template',
+							type: 'Link',
+						},
+					],
+				},
+				{
+					label: 'Signup',
+					icon: 'LogIn',
+					fields: [
+						{
+							label: 'Custom Content',
+							name: 'custom_signup_content',
+							type: 'Code',
+							mode: 'htmlmixed',
+							rows: 10,
+						},
+						{
+							label: 'Ask user category',
+							name: 'user_category',
+							type: 'checkbox',
+						},
+					],
+				},
+			],
+		},
+	]
+})
+
+const tabs = computed(() => {
+	return tabsStructure.value.map((tab) => {
+		return {
+			...tab,
+			items: tab.items.filter((item) => {
+				return !item.condition || item.condition()
+			}),
+		}
+	})
+})
+
+watch(show, async () => {
+	if (show.value) {
+		const currentTab = await tabs.value
+			.flatMap((tab) => tab.items)
+			.find((item) => item.label === settingsStore.activeTab)
+		activeTab.value = currentTab || tabs.value[0].items[0]
+	} else {
+		activeTab.value = null
+		settingsStore.isSettingsOpen = false
+	}
+})
+</script>

frontend/src/components/Modals/YouTubeExplanation.vue

@@ -1,31 +0,0 @@
-<template>
-	<Popover transition="default">
-		<template #target="{ isOpen, togglePopover }" class="flex w-full">
-			<slot v-bind="{ isOpen, togglePopover }"></slot>
-		</template>
-		<template #body>
-			<div
-				class="absolute left-0 mt-3 w-[35rem] max-w-lg -translate-x-1/2 transform rounded-lg bg-white px-4 sm:px-0 lg:max-w-3xl"
-			>
-				<div
-					class="overflow-hidden rounded-lg p-3 shadow-2xl ring-1 ring-black ring-opacity-5"
-				>
-					<video
-						controls
-						autoplay
-						muted
-						width="100%"
-						controlsList="nodownload"
-						oncontextmenu="return false;"
-						class="rounded-sm"
-					>
-						<source src="/Youtube.mov" type="video/mp4" />
-					</video>
-				</div>
-			</div>
-		</template>
-	</Popover>
-</template>
-<script setup>
-import { Popover } from 'frappe-ui'
-</script>

frontend/src/components/NoPermission.vue

@@ -24,7 +24,7 @@
 			<div>
 				{{ __('Please login to access this page.') }}
 			</div>
-			<Button variant="solid" @click="redirectToLogin()" class="mt-2">
+			<Button @click="redirectToLogin()" class="mt-4">
 				{{ __('Login') }}
 			</Button>
 		</div>

frontend/src/components/PaymentSettings.vue

@@ -0,0 +1,109 @@
+<template>
+	<div class="flex flex-col h-full">
+		<div class="flex items-center justify-between">
+			<div class="text-xl font-semibold mb-1">
+				{{ label }}
+			</div>
+			<!-- <Badge
+                v-if="isDirty"
+                :label="__('Not Saved')"
+                variant="subtle"
+                theme="orange"
+            /> -->
+		</div>
+		<div class="overflow-y-scroll">
+			<div class="flex space-x-4">
+				<SettingFields :fields="fields" :data="data.doc" class="w-1/2" />
+				<SettingFields
+					v-if="paymentGateway.data"
+					:fields="paymentGateway.data.fields"
+					:data="paymentGateway.data.data"
+					class="w-1/2"
+				/>
+			</div>
+		</div>
+		<div class="flex flex-row-reverse mt-auto">
+			<Button variant="solid" @click="update">
+				{{ __('Update') }}
+			</Button>
+		</div>
+	</div>
+</template>
+<script setup>
+import SettingFields from '@/components/SettingFields.vue'
+import { createResource, Badge, Button } from 'frappe-ui'
+import { watch, ref } from 'vue'
+
+const props = defineProps({
+	label: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+		required: true,
+	},
+	data: {
+		type: Object,
+		required: true,
+	},
+	fields: {
+		type: Array,
+		required: true,
+	},
+})
+
+const paymentGateway = createResource({
+	url: 'lms.lms.api.get_payment_gateway_details',
+	makeParams(values) {
+		return {
+			payment_gateway: props.data.doc.payment_gateway,
+		}
+	},
+	auto: true,
+})
+
+const saveSettings = createResource({
+	url: 'frappe.client.set_value',
+	makeParams(values) {
+		let fields = {}
+		Object.keys(paymentGateway.data.data).forEach((key) => {
+			if (
+				paymentGateway.data.data[key] &&
+				typeof paymentGateway.data.data[key] === 'object'
+			) {
+				fields[key] = paymentGateway.data.data[key].file_url
+			} else {
+				fields[key] = paymentGateway.data.data[key]
+			}
+		})
+
+		return {
+			doctype: paymentGateway.data.doctype,
+			name: paymentGateway.data.docname,
+			fieldname: fields,
+		}
+	},
+	auto: false,
+	onSuccess(data) {
+		paymentGateway.reload()
+	},
+})
+
+const update = () => {
+	props.fields.forEach((f) => {
+		if (f.type != 'Column Break') {
+			props.data.doc[f.name] = f.value
+		}
+	})
+	props.data.save.submit()
+	saveSettings.submit()
+}
+
+watch(
+	() => props.data.doc.payment_gateway,
+	() => {
+		paymentGateway.reload()
+	}
+)
+</script>

frontend/src/components/Quiz.vue

@@ -3,9 +3,7 @@
 		<div class="bg-blue-100 py-2 px-2 mb-4 rounded-md text-sm text-blue-800">
 			<div class="leading-relaxed">
 				{{
-					__('This quiz consists of {0} questions.').format(
+					__('This quiz consists of {0} questions.').format(questions.length)
-						quiz.data.questions.length
-					)
 				}}
 			</div>
 			<div v-if="quiz.data.passing_percentage" class="leading-relaxed">
@@ -59,7 +57,7 @@
 			</div>
 		</div>
 		<div v-else-if="!quizSubmission.data">
-			<div v-for="(question, qtidx) in quiz.data.questions">
+			<div v-for="(question, qtidx) in questions">
 				<div
 					v-if="qtidx == activeQuestion - 1 && questionDetails.data"
 					class="border rounded-md p-5"
@@ -86,7 +84,7 @@
 						</div>
 					</div>
 					<div
-						class="text-gray-900 font-semibold mt-2"
+						class="text-gray-900 font-semibold mt-2 leading-5"
 						v-html="questionDetails.data.question"
 					></div>
 					<div v-if="questionDetails.data.type == 'Choices'" v-for="index in 4">
@@ -166,7 +164,7 @@
 							{{
 								__('Question {0} of {1}').format(
 									activeQuestion,
-									quiz.data.questions.length
+									questions.length
 								)
 							}}
 						</div>
@@ -179,7 +177,7 @@
 							</span>
 						</Button>
 						<Button
-							v-else-if="activeQuestion != quiz.data.questions.length"
+							v-else-if="activeQuestion != questions.length"
 							@click="nextQuetion()"
 						>
 							<span>
@@ -250,6 +248,7 @@ const activeQuestion = ref(0)
 const currentQuestion = ref('')
 const selectedOptions = reactive([0, 0, 0, 0])
 const showAnswers = reactive([])
+let questions = reactive([])
 const possibleAnswer = ref(null)
 
 const props = defineProps({
@@ -270,15 +269,30 @@ const quiz = createResource({
 	cache: ['quiz', props.quizName],
 	auto: true,
 	onSuccess(data) {
-		if (data.shuffle_questions) {
+		populateQuestions()
-			data.questions = data.questions.sort(() => Math.random() - 0.5)
-		}
-		if (data.limit_questions_to) {
-			data.questions = data.questions.slice(0, data.limit_questions_to)
-		}
 	},
 })
 
+const populateQuestions = () => {
+	let data = quiz.data
+	if (data.shuffle_questions) {
+		questions = shuffleArray(data.questions)
+		if (data.limit_questions_to) {
+			questions = questions.slice(0, data.limit_questions_to)
+		}
+	} else {
+		questions = data.questions
+	}
+}
+
+const shuffleArray = (array) => {
+	for (let i = array.length - 1; i > 0; i--) {
+		const j = Math.floor(Math.random() * (i + 1))
+		;[array[i], array[j]] = [array[j], array[i]]
+	}
+	return array
+}
+
 const attempts = createResource({
 	url: 'frappe.client.get_list',
 	makeParams(values) {
@@ -310,7 +324,7 @@ const attempts = createResource({
 watch(
 	() => quiz.data,
 	() => {
-		if (quiz.data) {
+		if (quiz.data && quiz.data.max_attempts) {
 			attempts.reload()
 			resetQuiz()
 		}
@@ -425,7 +439,7 @@ const checkAnswer = () => {
 const addToLocalStorage = () => {
 	let quizData = JSON.parse(localStorage.getItem(quiz.data.title))
 	let questionData = {
-		question_index: activeQuestion.value,
+		question_name: currentQuestion.value,
 		answer: getAnswers().join(),
 		is_correct: showAnswers.filter((answer) => {
 			return answer != undefined
@@ -464,7 +478,7 @@ const submitQuiz = () => {
 
 const createSubmission = () => {
 	quizSubmission.reload().then(() => {
-		attempts.reload()
+		if (quiz.data && quiz.data.max_attempts) attempts.reload()
 	})
 }
 
@@ -473,6 +487,7 @@ const resetQuiz = () => {
 	selectedOptions.splice(0, selectedOptions.length, ...[0, 0, 0, 0])
 	showAnswers.length = 0
 	quizSubmission.reset()
+	populateQuestions()
 }
 
 const getSubmissionColumns = () => {

frontend/src/components/QuizPlugin.vue

@@ -0,0 +1,58 @@
+<template>
+	<Dialog
+		v-model="show"
+		:options="{
+			size: 'xl',
+		}"
+	>
+		<template #body>
+			<div class="p-5 space-y-4">
+				<div class="text-lg font-semibold">
+					{{ __('Add a quiz to your lesson') }}
+				</div>
+				<div>
+					<Link
+						v-model="quiz"
+						doctype="LMS Quiz"
+						:label="__('Select a quiz')"
+						:onCreate="(value, close) => redirectToQuizForm()"
+					/>
+				</div>
+				<div class="flex justify-end space-x-2">
+					<Button variant="solid" @click="addQuiz()">
+						{{ __('Save') }}
+					</Button>
+				</div>
+			</div>
+		</template>
+	</Dialog>
+</template>
+<script setup>
+import { Dialog, Button } from 'frappe-ui'
+import { onMounted, ref, nextTick } from 'vue'
+import Link from '@/components/Controls/Link.vue'
+
+const show = ref(false)
+const quiz = ref(null)
+
+const props = defineProps({
+	onQuizAddition: {
+		type: Function,
+		required: true,
+	},
+})
+
+onMounted(async () => {
+	await nextTick()
+	show.value = true
+})
+
+const addQuiz = () => {
+	props.onQuizAddition(quiz.value)
+	show.value = false
+}
+
+const redirectToQuizForm = () => {
+	window.open('/lms/quizzes/new', '_blank')
+}
+</script>

frontend/src/components/SettingDetails.vue

@@ -0,0 +1,70 @@
+<template>
+	<div class="flex flex-col justify-between h-full">
+		<div>
+			<div class="flex itemsc-center justify-between">
+				<div class="font-semibold mb-1">
+					{{ __(label) }}
+				</div>
+				<Badge
+					v-if="data.isDirty"
+					:label="__('Not Saved')"
+					variant="subtle"
+					theme="orange"
+				/>
+			</div>
+			<div class="text-xs text-gray-600">
+				{{ __(description) }}
+			</div>
+		</div>
+
+		<SettingFields :fields="fields" :data="data.doc" />
+		<div class="flex flex-row-reverse mt-auto">
+			<Button variant="solid" :loading="data.save.loading" @click="update">
+				{{ __('Update') }}
+			</Button>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import { Button, Badge } from 'frappe-ui'
+import SettingFields from '@/components/SettingFields.vue'
+
+const props = defineProps({
+	fields: {
+		type: Array,
+		required: true,
+	},
+	data: {
+		type: Object,
+		required: true,
+	},
+	label: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+	},
+})
+
+const update = () => {
+	props.fields.forEach((f) => {
+		if (f.type != 'Column Break') {
+			props.data.doc[f.name] = f.value
+		}
+	})
+	props.data.save.submit()
+}
+</script>
+
+<style>
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
+	font-family: revert;
+}
+
+.CodeMirror {
+	border-radius: 12px;
+}
+</style>

frontend/src/components/SettingFields.vue

@@ -0,0 +1,137 @@
+<template>
+	<div
+		class="my-5"
+		:class="{ 'flex justify-between w-full': columns.length > 1 }"
+	>
+		<div v-for="(column, index) in columns" :key="index">
+			<div
+				class="flex flex-col space-y-5"
+				:class="columns.length > 1 ? 'w-72' : 'w-full'"
+			>
+				<div v-for="field in column">
+					<Link
+						v-if="field.type == 'Link'"
+						v-model="data[field.name]"
+						:doctype="field.doctype"
+						:label="__(field.label)"
+					/>
+
+					<div v-else-if="field.type == 'Code'">
+						<div>
+							{{ __(field.label) }}
+						</div>
+						<Codemirror
+							v-model:value="data[field.name]"
+							:height="200"
+							:options="{
+								mode: field.mode,
+								theme: 'seti',
+							}"
+						/>
+					</div>
+
+					<div v-else-if="field.type == 'Upload'">
+						<div class="text-sm text-gray-600 mb-1">
+							{{ __(field.label) }}
+						</div>
+						<FileUploader
+							v-if="!data[field.name]"
+							:fileTypes="['image/*']"
+							:validateFile="validateFile"
+							@success="(file) => (data[field.name] = file)"
+						>
+							<template
+								v-slot="{ file, progress, uploading, openFileSelector }"
+							>
+								<div class="">
+									<Button @click="openFileSelector" :loading="uploading">
+										{{
+											uploading ? `Uploading ${progress}%` : 'Upload an image'
+										}}
+									</Button>
+								</div>
+							</template>
+						</FileUploader>
+						<div v-else>
+							<div class="flex items-center text-sm">
+								<div class="border rounded-md p-2 mr-2">
+									<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
+								</div>
+								<div class="flex flex-col flex-wrap">
+									<span class="break-all">
+										{{ data[field.name]?.file_name }}
+									</span>
+									<span class="text-sm text-gray-500 mt-1">
+										{{ getFileSize(data[field.name]?.file_size) }}
+									</span>
+								</div>
+								<X
+									@click="data[field.name] = null"
+									class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
+								/>
+							</div>
+						</div>
+					</div>
+
+					<FormControl
+						v-else
+						:key="field.name"
+						v-model="data[field.name]"
+						:label="__(field.label)"
+						:type="field.type"
+						:rows="field.rows"
+						:options="field.options"
+					/>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup>
+import { FormControl, FileUploader, Button } from 'frappe-ui'
+import { computed } from 'vue'
+import { getFileSize, validateFile } from '@/utils'
+import { X, FileText } from 'lucide-vue-next'
+import Link from '@/components/Controls/Link.vue'
+import Codemirror from 'codemirror-editor-vue3'
+import 'codemirror/theme/seti.css'
+import 'codemirror/mode/htmlmixed/htmlmixed.js'
+
+const props = defineProps({
+	fields: {
+		type: Array,
+		required: true,
+	},
+	data: {
+		type: Object,
+		required: true,
+	},
+})
+
+const columns = computed(() => {
+	const cols = []
+	let currentColumn = []
+
+	props.fields.forEach((field) => {
+		if (field.type === 'Column Break') {
+			if (currentColumn.length > 0) {
+				cols.push(currentColumn)
+				currentColumn = []
+			}
+		} else {
+			if (field.type == 'checkbox') {
+				field.value = props.data[field.name] ? true : false
+			} else {
+				field.value = props.data[field.name]
+			}
+			currentColumn.push(field)
+		}
+	})
+
+	if (currentColumn.length > 0) {
+		cols.push(currentColumn)
+	}
+
+	return cols
+})
+</script>

frontend/src/components/UploadPlugin.vue

@@ -0,0 +1,53 @@
+<template>
+	<FileUploader
+		:fileTypes="['image/*', 'video/*', 'audio/*', '.pdf']"
+		:validateFile="validateFile"
+		@success="(data) => addFile(data)"
+		ref="fileUploader"
+		class="hide"
+	/>
+</template>
+<script setup>
+import { FileUploader } from 'frappe-ui'
+import { onMounted, ref, nextTick } from 'vue'
+
+const fileUploader = ref(null)
+const emit = defineEmits(['fileUploaded'])
+
+const props = defineProps({
+	onFileUploaded: {
+		type: Function,
+		required: true,
+	},
+})
+
+onMounted(async () => {
+	await nextTick()
+	const fileInput = fileUploader.value.$el.querySelector('input[type="file"]')
+	if (fileInput) {
+		fileInput.click()
+	}
+})
+
+const addFile = (file) => {
+	props.onFileUploaded({
+		file_url: file.file_url,
+		file_type: file.file_type,
+	})
+}
+
+const validateFile = (file) => {
+	let extension = file.name.split('.').pop().toLowerCase()
+	if (!['jpg', 'jpeg', 'png', 'mp4', 'mov', 'mp3', 'pdf'].includes(extension)) {
+		return 'Only image and video files are allowed.'
+	}
+}
+
+const isVideo = (type) => {
+	return ['mov', 'mp4', 'avi', 'mkv', 'webm'].includes(type.toLowerCase())
+}
+
+const isAudio = (type) => {
+	return ['mp3', 'wav', 'ogg'].includes(type.toLowerCase())
+}
+</script>

frontend/src/components/UserDropdown.vue

@@ -1,5 +1,5 @@
 <template>
-	<Dropdown :options="userDropdownOptions">
+	<Dropdown class="p-2" :options="userDropdownOptions">
 		<template v-slot="{ open }">
 			<button
 				class="flex h-12 py-2 items-center rounded-md duration-300 ease-in-out"
@@ -11,11 +11,11 @@
 						: 'hover:bg-gray-200 px-2 w-52'
 				"
 			>
-				<span
+				<img
-					v-if="branding.data?.brand_html"
+					v-if="branding.data?.banner_image"
-					v-html="branding.data?.brand_html"
+					:src="branding.data?.banner_image.file_url"
 					class="w-8 h-8 rounded flex-shrink-0"
-				></span>
+				/>
 				<LMSLogo v-else class="w-8 h-8 rounded flex-shrink-0" />
 				<div
 					class="flex flex-1 flex-col text-left duration-300 ease-in-out"
@@ -28,11 +28,10 @@
 					<div class="text-base font-medium text-gray-900 leading-none">
 						<span
 							v-if="
-								branding.data?.brand_name &&
+								branding.data?.app_name && branding.data?.app_name != 'Frappe'
-								branding.data?.brand_name != 'Frappe'
 							"
 						>
-							{{ branding.data?.brand_name }}
+							{{ branding.data?.app_name }}
 						</span>
 						<span v-else> Learning </span>
 					</div>
@@ -56,27 +55,31 @@
 			</button>
 		</template>
 	</Dropdown>
+	<SettingsModal
+		v-if="userResource.data?.is_moderator"
+		v-model="showSettingsModal"
+	/>
 </template>
 
 <script setup>
 import LMSLogo from '@/components/Icons/LMSLogo.vue'
 import { sessionStore } from '@/stores/session'
 import { Dropdown } from 'frappe-ui'
-import {
+import Apps from '@/components/Apps.vue'
-	ChevronDown,
+import { ChevronDown, LogIn, LogOut, User, Settings } from 'lucide-vue-next'
-	LogIn,
-	LogOut,
-	User,
-	ArrowRightLeft,
-} from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
 import { convertToTitleCase } from '../utils'
 import { usersStore } from '@/stores/user'
+import { useSettings } from '@/stores/settings'
+import { markRaw, watch, ref } from 'vue'
+import SettingsModal from '@/components/Modals/Settings.vue'
 
 const router = useRouter()
 const { logout, branding } = sessionStore()
 let { userResource } = usersStore()
+const settingsStore = useSettings()
 let { isLoggedIn } = sessionStore()
+const showSettingsModal = ref(false)
 
 const props = defineProps({
 	isCollapsed: {
@@ -85,6 +88,13 @@ const props = defineProps({
 	},
 })
 
+watch(
+	() => settingsStore.isSettingsOpen,
+	(value) => {
+		showSettingsModal.value = value
+	}
+)
+
 const userDropdownOptions = [
 	{
 		icon: User,
@@ -97,11 +107,7 @@ const userDropdownOptions = [
 		},
 	},
 	{
-		icon: ArrowRightLeft,
+		component: markRaw(Apps),
-		label: 'Switch to Desk',
-		onClick: () => {
-			window.location.href = '/app'
-		},
 		condition: () => {
 			let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
 			let system_user = cookies.get('system_user')
@@ -109,6 +115,16 @@ const userDropdownOptions = [
 			else return false
 		},
 	},
+	{
+		icon: Settings,
+		label: 'Settings',
+		onClick: () => {
+			settingsStore.isSettingsOpen = true
+		},
+		condition: () => {
+			return userResource.data?.is_moderator
+		},
+	},
 	{
 		icon: LogOut,
 		label: 'Log out',

frontend/src/components/VideoBlock.vue

@@ -1,10 +1,15 @@
 <template>
 	<div ref="videoContainer" class="video-block group relative">
-		<video @timeupdate="updateTime" @ended="videoEnded" class="rounded-lg">
+		<video
+			@timeupdate="updateTime"
+			@ended="videoEnded"
+			class="rounded-lg border border-gray-100"
+			ref="videoRef"
+		>
 			<source :src="fileURL" :type="type" />
 		</video>
 		<div
-			class="flex items-center space-x-2 bg-gray-200 rounded-lg p-0.5 absolute bottom-3 w-[98%] left-0 right-0 mx-auto"
+			class="flex items-center space-x-2 bg-gray-200 rounded-md p-0.5 absolute bottom-3 w-[98%] left-0 right-0 mx-auto"
 		>
 			<Button variant="ghost">
 				<template #icon>
@@ -67,7 +72,6 @@ const props = defineProps({
 
 onMounted(() => {
 	setTimeout(() => {
-		videoRef.value = document.querySelector('video')
 		videoRef.value.onloadedmetadata = () => {
 			duration.value = videoRef.value.duration
 		}

frontend/src/pages/BatchForm.vue

@@ -13,13 +13,9 @@
 				<div class="text-lg font-semibold mb-4">
 					{{ __('Details') }}
 				</div>
-				<div class="grid grid-cols-2 gap-10 mb-4">
+				<div class="grid grid-cols-2 gap-10 mb-4 space-y-2">
 					<div>
-						<FormControl
+						<FormControl v-model="batch.title" :label="__('Title')" />
-							v-model="batch.title"
-							:label="__('Title')"
-							class="mb-4"
-						/>
 					</div>
 					<div class="flex flex-col space-y-2">
 						<FormControl
@@ -236,6 +232,7 @@ import MultiSelect from '@/components/Controls/MultiSelect.vue'
 import { useRouter } from 'vue-router'
 import { getFileSize, showToast } from '../utils'
 import { X, FileText } from 'lucide-vue-next'
+import { capture } from '@/telemetry'
 
 const router = useRouter()
 const user = inject('$user')
@@ -274,6 +271,8 @@ onMounted(() => {
 	if (!user.data) window.location.href = '/login'
 	if (props.batchName != 'new') {
 		batchDetail.reload()
+	} else {
+		capture('batch_form_opened')
 	}
 	window.addEventListener('keydown', keyboardShortcut)
 })
@@ -377,6 +376,7 @@ const createNewBatch = () => {
 		{},
 		{
 			onSuccess(data) {
+				capture('batch_created')
 				router.push({
 					name: 'BatchDetail',
 					params: {
@@ -447,7 +447,7 @@ const breadcrumbs = computed(() => {
 	}
 	crumbs.push({
 		label: props.batchName == 'new' ? 'New Batch' : 'Edit Batch',
-		route: { name: 'BatchCreation', params: { batchName: props.batchName } },
+		route: { name: 'BatchForm', params: { batchName: props.batchName } },
 	})
 	return crumbs
 })

frontend/src/pages/Batches.vue

@@ -5,19 +5,27 @@
 		>
 			<Breadcrumbs
 				class="h-7"
-				:items="[{ label: __('All Batches'), route: { name: 'Batches' } }]"
+				:items="[{ label: __('Batches'), route: { name: 'Batches' } }]"
 			/>
-			<div class="flex">
+			<div class="flex space-x-2">
+				<div class="w-44">
+					<Select
+						v-if="categories.data?.length"
+						v-model="currentCategory"
+						:options="categories.data"
+						:placeholder="__('Category')"
+					/>
+				</div>
 				<router-link
 					v-if="user.data?.is_moderator"
 					:to="{
-						name: 'BatchCreation',
+						name: 'BatchForm',
 						params: { batchName: 'new' },
 					}"
 				>
 					<Button variant="solid">
 						<template #prefix>
-							<Plus class="h-4 w-4" />
+							<Plus class="h-4 w-4 stroke-1.5" />
 						</template>
 						{{ __('New Batch') }}
 					</Button>
@@ -33,7 +41,7 @@
 			</div>
 			<Tabs
 				v-model="tabIndex"
-				:tabs="tabs"
+				:tabs="makeTabs"
 				tablistClass="overflow-x-visible flex-wrap !gap-3 md:flex-nowrap"
 			>
 				<template #tab="{ tab, selected }">
@@ -87,13 +95,29 @@
 	</div>
 </template>
 <script setup>
-import { createListResource, Breadcrumbs, Button, Tabs, Badge } from 'frappe-ui'
+import {
+	createListResource,
+	createResource,
+	Breadcrumbs,
+	Button,
+	Tabs,
+	Badge,
+	Select,
+} from 'frappe-ui'
 import { Plus } from 'lucide-vue-next'
 import BatchCard from '@/components/BatchCard.vue'
-import { inject, ref, computed } from 'vue'
+import { inject, ref, computed, onMounted, watch } from 'vue'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
+const currentCategory = ref(null)
+
+onMounted(() => {
+	let queries = new URLSearchParams(location.search)
+	if (queries.has('category')) {
+		currentCategory.value = queries.get('category')
+	}
+})
 
 const batches = createListResource({
 	doctype: 'LMS Batch',
@@ -102,35 +126,76 @@ const batches = createListResource({
 	auto: true,
 })
 
-const tabIndex = ref(0)
+const categories = createResource({
-const tabs = [
+	url: 'lms.lms.api.get_categories',
-	{
+	makeParams() {
-		label: 'Upcoming',
+		return {
-		batches: computed(() => batches.data?.upcoming || []),
+			doctype: 'LMS Batch',
-		count: computed(() => batches.data?.upcoming?.length),
+			filters: {
+				published: 1,
 			},
-]
+		}
+	},
+	cache: ['batchCategories'],
+	auto: true,
+	transform(data) {
+		data.unshift({
+			label: '',
+			value: null,
+		})
+	},
+})
 
-if (user.data?.is_moderator) {
+const tabIndex = ref(0)
+let tabs
+
+const makeTabs = computed(() => {
+	tabs = []
+	addToTabs('Upcoming')
+
+	if (user.data?.is_moderator) {
+		addToTabs('Archived')
+		addToTabs('Private')
+	}
+
+	if (user.data) {
+		addToTabs('Enrolled')
+	}
+
+	return tabs
+})
+
+const getBatches = (type) => {
+	if (currentCategory.value && currentCategory.value != '') {
+		return batches.data[type].filter(
+			(batch) => batch.category == currentCategory.value
+		)
+	}
+	return batches.data[type]
+}
+
+const addToTabs = (label) => {
+	let batches = getBatches(label.toLowerCase().split(' ').join('_'))
 	tabs.push({
-		label: 'Archived',
+		label,
-		batches: computed(() => batches.data?.archived),
+		batches: computed(() => batches),
-		count: computed(() => batches.data?.archived?.length),
+		count: computed(() => batches.length),
-	})
-	tabs.push({
-		label: 'Private',
-		batches: computed(() => batches.data?.private),
-		count: computed(() => batches.data?.private?.length),
-	})
-}
-if (user.data) {
-	tabs.push({
-		label: 'Enrolled',
-		batches: computed(() => batches.data?.enrolled),
-		count: computed(() => batches.data?.enrolled?.length),
 	})
 }
 
+watch(
+	() => currentCategory.value,
+	() => {
+		let queries = new URLSearchParams(location.search)
+		if (currentCategory.value) {
+			queries.set('category', currentCategory.value)
+		} else {
+			queries.delete('category')
+		}
+		history.pushState(null, '', `${location.pathname}?${queries.toString()}`)
+	}
+)
+
 const pageMeta = computed(() => {
 	return {
 		title: 'Batches',

frontend/src/pages/Billing.vue

@@ -1,44 +1,50 @@
 <template>
 	<div class="">
+		<header
+			class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
+		>
+			<Breadcrumbs
+				class="h-7"
+				:items="[{ label: __('Billing Details'), route: { name: 'Billing' } }]"
+			/>
+		</header>
 		<div
 			v-if="access.data?.access && orderSummary.data"
-			class="mt-10 w-1/2 mx-auto"
+			class="pt-5 pb-10 mx-5"
 		>
-			<div class="text-3xl font-bold">
+			<!-- <div class="mb-5">
-				{{ __('Billing Details') }}
+				<div class="text-lg font-semibold">
+					{{ __('Address') }}
 				</div>
-			<div class="text-gray-600 mt-1">
+			</div> -->
-				{{ __('Enter the billing information to complete the payment.') }}
+			<div class="flex flex-col lg:flex-row justify-between">
+				<div
+					class="h-fit bg-gray-100 rounded-md p-5 space-y-4 lg:order-last mb-10 lg:mt-10 text-sm font-medium lg:w-1/4"
+				>
+					<div class="flex items-center justify-between space-x-2">
+						<div class="text-gray-600">
+							{{ __('Ordered Item') }}
 						</div>
-			<div class="border rounded-md p-5 mt-5">
+						<div class="">
-				<div class="text-xl font-semibold">
-					{{ __('Summary') }}
-				</div>
-				<div class="text-gray-600 mt-1">
-					{{ __('Review the details of your purchase.') }}
-				</div>
-				<div class="mt-5">
-					<div class="flex items-center justify-between">
-						<div>
 							{{ orderSummary.data.title }}
 						</div>
+					</div>
 					<div
-							:class="{
+						v-if="orderSummary.data.gst_applied"
-								'font-semibold text-xl': !orderSummary.data.gst_applied,
+						class="flex items-center justify-between"
-							}"
 					>
-							{{
+						<div class="text-gray-600">
-								orderSummary.data.gst_applied
+							{{ __('Original Amount') }}
-									? orderSummary.data.original_amount_formatted
+						</div>
-									: orderSummary.data.total_amount_formatted
+						<div class="">
-							}}
+							{{ orderSummary.data.original_amount_formatted }}
 						</div>
 					</div>
 					<div
 						v-if="orderSummary.data.gst_applied"
 						class="flex items-center justify-between mt-2"
 					>
-						<div>
+						<div class="text-gray-600">
 							{{ __('GST Amount') }}
 						</div>
 						<div>
@@ -46,102 +52,74 @@
 						</div>
 					</div>
 					<div
-						v-if="orderSummary.data.gst_applied"
+						class="flex items-center justify-between border-t border-gray-400 pt-4 mt-2"
-						class="flex items-center justify-between mt-2"
 					>
-						<div>
+						<div class="text-lg font-semibold">
-							{{ __('Total Amount') }}
+							{{ __('Total') }}
 						</div>
-						<div class="font-semibold text-2xl">
+						<div class="text-lg font-semibold">
 							{{ orderSummary.data.total_amount_formatted }}
 						</div>
 					</div>
 				</div>
 
-				<div class="text-xl font-semibold mt-10">
+				<div class="flex-1 lg:mr-10">
+					<div class="mb-5">
+						<div class="text-lg font-semibold">
 							{{ __('Address') }}
 						</div>
-				<div class="text-gray-600 mt-1">
-					{{ __('Specify your billing address correctly.') }}
 					</div>
-				<div class="grid grid-cols-2 gap-5 mt-4">
+					<div class="grid grid-cols-1 md:grid-cols-2 gap-5">
-					<div>
+						<div class="space-y-4">
-						<div class="mt-4">
+							<FormControl
-							<div class="mb-1.5 text-sm text-gray-700">
+								:label="__('Billing Name')"
-								{{ __('Billing Name') }}
+								v-model="billingDetails.billing_name"
-							</div>
+							/>
-							<Input type="text" v-model="billingDetails.billing_name" />
+							<FormControl
-						</div>
+								:label="__('Address Line 1')"
-						<div class="mt-4">
+								v-model="billingDetails.address_line1"
-							<div class="mb-1.5 text-sm text-gray-700">
+							/>
-								{{ __('Address Line 1') }}
+							<FormControl
-							</div>
+								:label="__('Address Line 2')"
-							<Input type="text" v-model="billingDetails.address_line1" />
+								v-model="billingDetails.address_line2"
-						</div>
+							/>
-						<div class="mt-4">
+							<FormControl :label="__('City')" v-model="billingDetails.city" />
-							<div class="mb-1.5 text-sm text-gray-700">
+							<FormControl
-								{{ __('Address Line 2') }}
+								:label="__('State')"
-							</div>
+								v-model="billingDetails.state"
-							<Input type="text" v-model="billingDetails.address_line2" />
+							/>
-						</div>
-						<div class="mt-4">
-							<div class="mb-1.5 text-sm text-gray-700">
-								{{ __('City') }}
-							</div>
-							<Input type="text" v-model="billingDetails.city" />
-						</div>
-						<div class="mt-4">
-							<div class="mb-1.5 text-sm text-gray-700">
-								{{ __('State') }}
-							</div>
-							<Input type="text" v-model="billingDetails.state" />
-						</div>
-					</div>
-					<div>
-						<div class="mt-4">
-							<div class="mb-1.5 text-sm text-gray-700">
-								{{ __('Country') }}
 						</div>
+						<div class="space-y-4">
 							<Link
 								doctype="Country"
 								:value="billingDetails.country"
 								@change="(option) => changeCurrency(option)"
+								:label="__('Country')"
+							/>
+							<FormControl
+								:label="__('Postal Code')"
+								v-model="billingDetails.pincode"
+							/>
+							<FormControl
+								:label="__('Phone Number')"
+								v-model="billingDetails.phone"
 							/>
-						</div>
-						<div class="mt-4">
-							<div class="mb-1.5 text-sm text-gray-700">
-								{{ __('Postal Code') }}
-							</div>
-							<Input type="text" v-model="billingDetails.pincode" />
-						</div>
-						<div class="mt-4">
-							<div class="mb-1.5 text-sm text-gray-700">
-								{{ __('Phone Number') }}
-							</div>
-							<Input type="text" v-model="billingDetails.phone" />
-						</div>
-						<div class="mt-4">
-							<div class="mb-1.5 text-sm text-gray-700">
-								{{ __('Source') }}
-							</div>
 							<Link
 								doctype="LMS Source"
 								:value="billingDetails.source"
 								@change="(option) => (billingDetails.source = option)"
+								:label="__('Where did you hear about us?')"
+							/>
+							<FormControl
+								v-if="billingDetails.country == 'India'"
+								:label="__('GST Number')"
+								v-model="billingDetails.gstin"
+							/>
+							<FormControl
+								v-if="billingDetails.country == 'India'"
+								:label="__('Pan Number')"
+								v-model="billingDetails.pan"
 							/>
-						</div>
-						<div v-if="billingDetails.country == 'India'" class="mt-4">
-							<div class="mb-1.5 text-sm text-gray-700">
-								{{ __('GST Number') }}
-							</div>
-							<Input type="text" v-model="billingDetails.gstin" />
-						</div>
-						<div v-if="billingDetails.country == 'India'" class="mt-4">
-							<div class="mb-1.5 text-sm text-gray-700">
-								{{ __('Pan Number') }}
-							</div>
-							<Input type="text" v-model="billingDetails.pan" />
-						</div>
 						</div>
 					</div>
 					<Button variant="solid" class="mt-8" @click="generatePaymentLink()">
@@ -149,6 +127,7 @@
 					</Button>
 				</div>
 			</div>
+		</div>
 		<div v-else-if="access.data?.message">
 			<NotPermitted
 				:text="access.data.message"
@@ -167,11 +146,18 @@
 	</div>
 </template>
 <script setup>
-import { Input, Button, createResource } from 'frappe-ui'
+import {
+	Input,
+	Button,
+	createResource,
+	FormControl,
+	Breadcrumbs,
+	Tooltip,
+} from 'frappe-ui'
 import { reactive, inject, onMounted, ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
 import NotPermitted from '@/components/NotPermitted.vue'
-import { createToast } from '@/utils/'
+import { showToast } from '@/utils/'
 
 const user = inject('$user')
 
@@ -202,8 +188,8 @@ const access = createResource({
 		name: props.name,
 	},
 	onSuccess(data) {
-		orderSummary.submit()
 		setBillingDetails(data.address)
+		orderSummary.submit()
 	},
 })
 
@@ -224,84 +210,49 @@ const orderSummary = createResource({
 const billingDetails = reactive({})
 
 const setBillingDetails = (data) => {
-	billingDetails.billing_name = data.billing_name || ''
+	billingDetails.billing_name = data?.billing_name || ''
-	billingDetails.address_line1 = data.address_line1 || ''
+	billingDetails.address_line1 = data?.address_line1 || ''
-	billingDetails.address_line2 = data.address_line2 || ''
+	billingDetails.address_line2 = data?.address_line2 || ''
-	billingDetails.city = data.city || ''
+	billingDetails.city = data?.city || ''
-	billingDetails.state = data.state || ''
+	billingDetails.state = data?.state || ''
-	billingDetails.country = data.country || ''
+	billingDetails.country = data?.country || ''
-	billingDetails.pincode = data.pincode || ''
+	billingDetails.pincode = data?.pincode || ''
-	billingDetails.phone = data.phone || ''
+	billingDetails.phone = data?.phone || ''
-	billingDetails.source = data.source || ''
+	billingDetails.source = data?.source || ''
-	billingDetails.gstin = data.gstin || ''
+	billingDetails.gstin = data?.gstin || ''
-	billingDetails.pan = data.pan || ''
+	billingDetails.pan = data?.pan || ''
 }
 
-const paymentOptions = createResource({
+const paymentLink = createResource({
-	url: 'lms.lms.utils.get_payment_options',
+	url: 'lms.lms.payments.get_payment_link',
 	makeParams(values) {
 		return {
 			doctype: props.type == 'course' ? 'LMS Course' : 'LMS Batch',
 			docname: props.name,
-			phone: billingDetails.phone,
+			title: orderSummary.data.title,
-			country: billingDetails.country,
+			amount: orderSummary.data.original_amount,
+			total_amount: orderSummary.data.amount,
+			currency: orderSummary.data.currency,
+			address: billingDetails,
 		}
 	},
 })
 
 const generatePaymentLink = () => {
-	paymentOptions.submit(
+	paymentLink.submit(
 		{},
 		{
-			validate(params) {
+			validate() {
+				if (!billingDetails.source) {
+					return __('Please let us know where you heard about us from.')
+				}
 				return validateAddress()
 			},
 			onSuccess(data) {
-				data.handler = (response) => {
+				window.location.href = data
-					let doctype = props.type == 'course' ? 'LMS Course' : 'LMS Batch'
-					let docname = props.name
-					handleSuccess(response, doctype, docname, data.order_id)
-				}
-				let rzp1 = new Razorpay(data)
-				rzp1.open()
 			},
 			onError(err) {
-				showError(err)
+				showToast(__('Error'), err.messages?.[0] || err, 'x')
-			},
-		}
-	)
-}
-
-const paymentResource = createResource({
-	url: 'lms.lms.utils.verify_payment',
-	makeParams(values) {
-		return {
-			response: values.response,
-			doctype: props.type == 'course' ? 'LMS Course' : 'LMS Batch',
-			docname: props.name,
-			address: billingDetails,
-			order_id: values.orderId,
-		}
-	},
-})
-
-const handleSuccess = (response, doctype, docname, orderId) => {
-	paymentResource.submit(
-		{
-			response: response,
-			orderId: orderId,
-		},
-		{
-			onSuccess(data) {
-				createToast({
-					title: 'Success',
-					text: 'Payment Successful',
-					icon: 'check',
-					iconClasses: 'bg-green-600 text-white rounded-md p-px',
-				})
-				setTimeout(() => {
-					window.location.href = data
-				}, 3000)
 			},
 		}
 	)

frontend/src/pages/CertifiedParticipants.vue

@@ -6,9 +6,10 @@
 		<div>
 			<FormControl
 				type="text"
-				placeholder="Search Participants"
+				placeholder="Search"
 				v-model="searchQuery"
 				@input="participants.reload()"
+				class="w-40"
 			>
 				<template #prefix>
 					<Search class="w-4 stroke-1.5 text-gray-600" name="search" />
@@ -18,7 +19,10 @@
 	</header>
 
 	<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 m-5">
-		<div v-if="participants.data" v-for="participant in participants.data">
+		<div
+			v-if="participants.data?.length"
+			v-for="participant in participantsList"
+		>
 			<router-link
 				:to="{
 					name: 'Profile',
@@ -59,12 +63,7 @@ const searchQuery = ref('')
 const participants = createResource({
 	url: 'lms.lms.api.get_certified_participants',
 	method: 'GET',
-	debounce: 300,
+	cache: 'certified-participants',
-	makeParams(values) {
-		return {
-			search_query: searchQuery.value,
-		}
-	},
 	auto: true,
 })
 
@@ -79,5 +78,16 @@ const pageMeta = computed(() => {
 	}
 })
 
+const participantsList = computed(() => {
+	if (searchQuery.value) {
+		return participants.data.filter((participant) => {
+			return participant.full_name
+				.toLowerCase()
+				.includes(searchQuery.value.toLowerCase())
+		})
+	}
+	return participants.data
+})
+
 updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/CourseForm.vue

@@ -109,6 +109,14 @@
 								/>
 							</div>
 						</div>
+						<div class="w-1/2 mb-4">
+							<Link
+								doctype="LMS Category"
+								v-model="course.category"
+								:label="__('Category')"
+								:onCreate="(value, close) => openSettings(close)"
+							/>
+						</div>
 						<MultiSelect
 							v-model="instructors"
 							doctype="User"
@@ -119,7 +127,7 @@
 						<div class="text-lg font-semibold mt-5 mb-4">
 							{{ __('Settings') }}
 						</div>
-						<div class="grid grid-cols-2 gap-10 mb-4">
+						<div class="grid grid-cols-3 gap-10 mb-4">
 							<div
 								v-if="user.data?.is_moderator"
 								class="flex flex-col space-y-3"
@@ -147,11 +155,18 @@
 									v-model="course.featured"
 									:label="__('Featured')"
 								/>
+							</div>
+							<div class="flex flex-col space-y-3">
 								<FormControl
 									type="checkbox"
 									v-model="course.disable_self_learning"
 									:label="__('Disable Self Enrollment')"
 								/>
+								<FormControl
+									type="checkbox"
+									v-model="course.enable_certification"
+									:label="__('Completion Certificate')"
+								/>
 							</div>
 						</div>
 					</div>
@@ -214,17 +229,20 @@ import {
 	showToast,
 	getFileSize,
 	updateDocumentTitle,
-} from '../utils'
+} from '@/utils'
 import Link from '@/components/Controls/Link.vue'
 import { FileText, X } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
 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 router = useRouter()
 const instructors = ref([])
+const settingsStore = useSettings()
 
 const props = defineProps({
 	courseName: {
@@ -244,6 +262,7 @@ const course = reactive({
 	featured: false,
 	upcoming: false,
 	disable_self_learning: false,
+	enable_certification: false,
 	paid_course: false,
 	course_price: '',
 	currency: '',
@@ -260,6 +279,8 @@ onMounted(() => {
 
 	if (props.courseName !== 'new') {
 		courseResource.reload()
+	} else {
+		capture('course_form_opened')
 	}
 	window.addEventListener('keydown', keyboardShortcut)
 })
@@ -337,6 +358,7 @@ const courseResource = createResource({
 			'disable_self_learning',
 			'paid_course',
 			'featured',
+			'enable_certification',
 		]
 		for (let idx in checkboxes) {
 			let key = checkboxes[idx]
@@ -379,9 +401,10 @@ const submitCourse = () => {
 	} else {
 		courseCreationResource.submit(course, {
 			onSuccess(data) {
+				capture('course_created')
 				showToast('Success', 'Course created successfully', 'check')
 				router.push({
-					name: 'CreateCourse',
+					name: 'CourseForm',
 					params: { courseName: data.name },
 				})
 			},
@@ -407,7 +430,7 @@ const validateMandatoryFields = () => {
 		}
 	}
 	if (course.paid_course && (!course.course_price || !course.currency)) {
-		return 'Course price and currency are mandatory for paid courses'
+		return __('Course price and currency are mandatory for paid courses')
 	}
 }
 
@@ -423,7 +446,7 @@ watch(
 const validateFile = (file) => {
 	let extension = file.name.split('.').pop().toLowerCase()
 	if (!['jpg', 'jpeg', 'png', 'webp'].includes(extension)) {
-		return 'Only image file is allowed.'
+		return __('Only image file is allowed.')
 	}
 }
 
@@ -450,6 +473,12 @@ const removeImage = () => {
 	course.course_image = null
 }
 
+const openSettings = (close) => {
+	close()
+	settingsStore.activeTab = 'Categories'
+	settingsStore.isSettingsOpen = true
+}
+
 const check_permission = () => {
 	let user_is_instructor = false
 	if (user.data?.is_moderator) return
@@ -480,7 +509,7 @@ const breadcrumbs = computed(() => {
 	}
 	crumbs.push({
 		label: props.courseName == 'new' ? 'New Course' : 'Edit Course',
-		route: { name: 'CreateCourse', params: { courseName: props.courseName } },
+		route: { name: 'CourseForm', params: { courseName: props.courseName } },
 	})
 	return crumbs
 })

frontend/src/pages/Courses.vue

@@ -5,22 +5,33 @@
 		>
 			<Breadcrumbs
 				class="h-7"
-				:items="[{ label: __('All Courses'), route: { name: 'Courses' } }]"
+				:items="[{ label: __('Courses'), route: { name: 'Courses' } }]"
 			/>
-			<div class="flex space-x-2">
+			<div class="flex space-x-2 justify-end">
+				<div class="w-44">
+					<FormControl
+						v-if="categories.data?.length"
+						type="select"
+						v-model="currentCategory"
+						:options="categories.data"
+						:placeholder="__('Category')"
+					/>
+				</div>
+				<div class="w-36">
 					<FormControl
 						type="text"
-					placeholder="Search Course"
+						placeholder="Search"
 						v-model="searchQuery"
 						@input="courses.reload()"
 					>
 						<template #prefix>
-						<Search class="w-4 stroke-1.5 text-gray-600" name="search" />
+							<Search class="w-4 h-4 stroke-1.5 text-gray-600" name="search" />
 						</template>
 					</FormControl>
+				</div>
 				<router-link
 					:to="{
-						name: 'CreateCourse',
+						name: 'CourseForm',
 						params: {
 							courseName: 'new',
 						},
@@ -117,11 +128,19 @@ import {
 } from 'frappe-ui'
 import CourseCard from '@/components/CourseCard.vue'
 import { Plus, Search } from 'lucide-vue-next'
-import { ref, computed, inject } from 'vue'
+import { ref, computed, inject, onMounted, watch } from 'vue'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
 const searchQuery = ref('')
+const currentCategory = ref(null)
+
+onMounted(() => {
+	let queries = new URLSearchParams(location.search)
+	if (queries.has('category')) {
+		currentCategory.value = queries.get('category')
+	}
+})
 
 const courses = createResource({
 	url: 'lms.lms.utils.get_courses',
@@ -134,29 +153,30 @@ let tabs
 
 const makeTabs = computed(() => {
 	tabs = []
-	addToTabs('Live', getCourses('live'))
+	addToTabs('Live')
-	addToTabs('New', getCourses('new'))
+	addToTabs('New')
-	addToTabs('Upcoming', getCourses('upcoming'))
+	addToTabs('Upcoming')
 
 	if (user.data) {
-		addToTabs('Enrolled', getCourses('enrolled'))
+		addToTabs('Enrolled')
 
 		if (
 			user.data.is_moderator ||
 			user.data.is_instructor ||
 			courses.data?.created?.length
 		) {
-			addToTabs('Created', getCourses('created'))
+			addToTabs('Created')
 		}
 
 		if (user.data.is_moderator) {
-			addToTabs('Under Review', getCourses('under_review'))
+			addToTabs('Under Review')
 		}
 	}
 	return tabs
 })
 
-const addToTabs = (label, courses) => {
+const addToTabs = (label) => {
+	let courses = getCourses(label.toLowerCase().split(' ').join('_'))
 	tabs.push({
 		label,
 		courses: computed(() => courses),
@@ -165,14 +185,57 @@ const addToTabs = (label, courses) => {
 }
 
 const getCourses = (type) => {
+	let courseList = courses.data[type]
 	if (searchQuery.value) {
-		return courses.data[type].filter((course) =>
+		let query = searchQuery.value.toLowerCase()
-			course.title.toLowerCase().includes(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
 		)
 	}
-	return courses.data[type]
+	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,
+			},
+		}
+	},
+	cache: ['courseCategories'],
+	auto: true,
+	transform(data) {
+		data.unshift({
+			label: '',
+			value: null,
+		})
+	},
+})
+
+watch(
+	() => currentCategory.value,
+	() => {
+		let queries = new URLSearchParams(location.search)
+		if (currentCategory.value) {
+			queries.set('category', currentCategory.value)
+		} else {
+			queries.delete('category')
+		}
+		history.pushState(null, '', `${location.pathname}?${queries.toString()}`)
+	}
+)
+
 const pageMeta = computed(() => {
 	return {
 		title: 'Courses',

frontend/src/pages/JobDetail.vue

@@ -50,9 +50,9 @@
 				</Button>
 			</div>
 		</header>
-		<div v-if="job.data" class="w-3/4 mx-auto">
+		<div v-if="job.data" class="max-w-3xl mx-auto">
 			<div class="p-4">
-				<div class="flex mb-4">
+				<div class="flex mb-10">
 					<img
 						:src="job.data.company_logo"
 						class="w-16 h-16 rounded-lg object-contain mr-4"
@@ -62,8 +62,9 @@
 						<div class="text-2xl font-semibold mb-4">
 							{{ job.data.job_title }}
 						</div>
-						<div class="grid grid-cols-3 gap-8">
+						<div
-							<div class="grid grid-cols-1 gap-2">
+							class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-2 md:gap-y-4"
+						>
 							<div class="flex items-center space-x-2">
 								<Building2 class="h-4 w-4 stroke-1.5" />
 								<span>{{ job.data.company_name }}</span>
@@ -72,20 +73,16 @@
 								<MapPin class="h-4 w-4 stroke-1.5" />
 								<span>{{ job.data.location }}</span>
 							</div>
-							</div>
-							<div class="grid grid-cols-1 gap-2">
 							<div class="flex items-center space-x-2">
 								<ClipboardType class="h-4 w-4 stroke-1.5" />
 								<span>{{ job.data.type }}</span>
 							</div>
 							<div class="flex items-center space-x-2">
 								<CalendarDays class="h-4 w-4 stroke-1.5" />
-									<span>{{
+								<span>
-										dayjs(job.data.creation).format('DD MMM YYYY')
+									{{ dayjs(job.data.creation).format('DD MMM YYYY') }}
-									}}</span>
+								</span>
 							</div>
-							</div>
-							<div class="grid grid-cols-1 h-fit">
 							<div
 								v-if="applicationCount.data"
 								class="flex items-center space-x-2"
@@ -99,7 +96,6 @@
 						</div>
 					</div>
 				</div>
-				</div>
 				<p
 					v-html="job.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-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal mt-6"

frontend/src/pages/Lesson.vue

@@ -58,7 +58,7 @@
 						<router-link
 							v-if="allowEdit()"
 							:to="{
-								name: 'CreateLesson',
+								name: 'LessonForm',
 								params: {
 									courseName: courseName,
 									chapterNumber: props.chapterNumber,
@@ -90,6 +90,17 @@
 								</span>
 							</Button>
 						</router-link>
+						<router-link
+							v-else
+							:to="{
+								name: 'CourseDetail',
+								params: { courseName: courseName },
+							}"
+						>
+							<Button>
+								{{ __('Back to Course') }}
+							</Button>
+						</router-link>
 					</div>
 				</div>
 
@@ -109,7 +120,7 @@
 				</div>
 				<div
 					v-if="
-						lesson.data.instructor_content?.blocks?.length &&
+						JSON.parse(lesson.data.instructor_content)?.blocks?.length > 1 &&
 						allowInstructorContent()
 					"
 					class="bg-gray-100 p-3 rounded-md mt-6"
@@ -160,12 +171,12 @@
 						{{ lesson.data.course_title }}
 					</div>
 					<div v-if="user && lesson.data.membership" class="text-sm mt-3">
-						{{ Math.ceil(lesson.data.membership.progress) }}% completed
+						{{ Math.ceil(lessonProgress) }}% {{ __('completed') }}
 					</div>
 
 					<ProgressBar
 						v-if="user && lesson.data.membership"
-						:progress="lesson.data.membership.progress"
+						:progress="lessonProgress"
 					/>
 				</div>
 				<CourseOutline
@@ -179,7 +190,7 @@
 </template>
 <script setup>
 import { createResource, Breadcrumbs, Button } from 'frappe-ui'
-import { computed, watch, inject, ref } from 'vue'
+import { computed, watch, inject, ref, onMounted, onBeforeUnmount } from 'vue'
 import CourseOutline from '@/components/CourseOutline.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { useRoute } from 'vue-router'
@@ -196,6 +207,9 @@ const route = useRoute()
 const allowDiscussions = ref(false)
 const editor = ref(null)
 const instructorEditor = ref(null)
+const lessonProgress = ref(0)
+const timer = ref(0)
+let timerInterval
 
 const props = defineProps({
 	courseName: {
@@ -212,6 +226,10 @@ const props = defineProps({
 	},
 })
 
+onMounted(() => {
+	startTimer()
+})
+
 const lesson = createResource({
 	url: 'lms.lms.utils.get_lesson',
 	cache: ['lesson', props.courseName, props.chapterNumber, props.lessonNumber],
@@ -224,9 +242,12 @@ const lesson = createResource({
 	},
 	auto: true,
 	onSuccess(data) {
-		markProgress(data)
+		lessonProgress.value = data.membership?.progress
 		if (data.content) editor.value = renderEditor('editor', data.content)
-		if (data.instructor_content?.blocks?.length)
+		if (
+			data.instructor_content &&
+			JSON.parse(data.instructor_content)?.blocks?.length > 1
+		)
 			instructorEditor.value = renderEditor(
 				'instructor-content',
 				data.instructor_content
@@ -256,8 +277,10 @@ const renderEditor = (holder, content) => {
 	})
 }
 
-const markProgress = (data) => {
+const markProgress = () => {
-	if (user.data && !data.progress) progress.submit()
+	if (user.data && !lesson.data?.progress) {
+		progress.submit()
+	}
 }
 
 const progress = createResource({
@@ -268,6 +291,9 @@ const progress = createResource({
 			course: props.courseName,
 		}
 	},
+	onSuccess(data) {
+		lessonProgress.value = data
+	},
 })
 
 const breadcrumbs = computed(() => {
@@ -304,10 +330,27 @@ watch(
 				chapter: newChapterNumber,
 				lesson: newLessonNumber,
 			})
+			clearInterval(timerInterval)
+			timer.value = 0
+			startTimer()
 		}
 	}
 )
 
+const startTimer = () => {
+	timerInterval = setInterval(() => {
+		timer.value++
+		if (timer.value == 30) {
+			clearInterval(timerInterval)
+			markProgress()
+		}
+	}, 1000)
+}
+
+onBeforeUnmount(() => {
+	clearInterval(timerInterval)
+})
+
 const checkIfDiscussionsAllowed = () => {
 	let quizPresent = false
 	JSON.parse(lesson.data?.content)?.blocks?.forEach((block) => {
@@ -408,6 +451,10 @@ updateDocumentTitle(pageMeta)
 	max-width: unset;
 }
 
+.codex-editor__redactor {
+	padding-bottom: 0px !important;
+}
+
 .codeBoxHolder {
 	display: flex;
 	flex-direction: column;
@@ -497,4 +544,13 @@ updateDocumentTitle(pageMeta)
 	color: #383a42;
 	background-color: #fafafa;
 }
+
+.codeBoxTextArea {
+	line-height: 1.7;
+}
+
+iframe {
+	border-top: 3px solid theme('colors.gray.700');
+	border-bottom: 3px solid theme('colors.gray.700');
+}
 </style>

frontend/src/pages/LessonForm.vue

@@ -43,7 +43,7 @@
 							<div
 								v-show="openInstructorEditor"
 								id="instructor-notes"
-								class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal mt-6 py-3"
+								class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal py-3"
 							></div>
 						</div>
 					</div>
@@ -54,7 +54,7 @@
 							</label>
 							<div
 								id="content"
-								class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal mt-6 py-3"
+								class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal py-3"
 							></div>
 						</div>
 					</div>
@@ -62,7 +62,7 @@
 			</div>
 			<div class="">
 				<div class="sticky top-0 p-5">
-					<LessonPlugins :editor="editor" :notesEditor="instructorEditor" />
+					<LessonHelp />
 				</div>
 			</div>
 		</div>
@@ -70,16 +70,25 @@
 </template>
 <script setup>
 import { Breadcrumbs, FormControl, createResource, Button } from 'frappe-ui'
-import { computed, reactive, onMounted, inject, ref, watch } from 'vue'
+import {
+	computed,
+	reactive,
+	onMounted,
+	inject,
+	ref,
+	onBeforeUnmount,
+} from 'vue'
 import EditorJS from '@editorjs/editorjs'
-import LessonPlugins from '@/components/LessonPlugins.vue'
+import LessonHelp from '@/components/LessonHelp.vue'
 import { ChevronRight } from 'lucide-vue-next'
 import { updateDocumentTitle, createToast, getEditorTools } from '@/utils'
+import { capture } from '@/telemetry'
 
 const editor = ref(null)
 const instructorEditor = ref(null)
 const user = inject('$user')
 const openInstructorEditor = ref(false)
+let autoSaveInterval
 
 const props = defineProps({
 	courseName: {
@@ -100,6 +109,7 @@ onMounted(() => {
 	if (!user.data?.is_moderator && !user.data?.is_instructor) {
 		window.location.href = '/login'
 	}
+	capture('lesson_form_opened')
 	editor.value = renderEditor('content')
 	instructorEditor.value = renderEditor('instructor-notes')
 })
@@ -107,7 +117,7 @@ onMounted(() => {
 const renderEditor = (holder) => {
 	return new EditorJS({
 		holder: holder,
-		tools: getEditorTools(),
+		tools: getEditorTools(true),
 		autofocus: true,
 	})
 }
@@ -133,7 +143,17 @@ const lessonDetails = createResource({
 			Object.keys(data.lesson).forEach((key) => {
 				lesson[key] = data.lesson[key]
 			})
-			lesson.include_in_preview = data.include_in_preview ? true : false
+			lesson.include_in_preview = data?.lesson?.include_in_preview
+				? true
+				: false
+			addLessonContent(data)
+			addInstructorNotes(data)
+			enableAutoSave()
+		}
+	},
+})
+
+const addLessonContent = (data) => {
 	editor.value.isReady.then(() => {
 		if (data.lesson.content) {
 			editor.value.render(JSON.parse(data.lesson.content))
@@ -144,11 +164,12 @@ const lessonDetails = createResource({
 			})
 		}
 	})
+}
+
+const addInstructorNotes = (data) => {
 	instructorEditor.value.isReady.then(() => {
 		if (data.lesson.instructor_content) {
-					instructorEditor.value.render(
+			instructorEditor.value.render(JSON.parse(data.lesson.instructor_content))
-						JSON.parse(data.lesson.instructor_content)
-					)
 		} else if (data.lesson.instructor_notes) {
 			let blocks = convertToJSON(data.lesson)
 			instructorEditor.value.render({
@@ -156,8 +177,16 @@ const lessonDetails = createResource({
 			})
 		}
 	})
-		}
+}
-	},
+
+const enableAutoSave = () => {
+	autoSaveInterval = setInterval(() => {
+		saveLesson()
+	}, 10000)
+}
+
+onBeforeUnmount(() => {
+	clearInterval(autoSaveInterval)
 })
 
 const newLessonResource = createResource({
@@ -335,6 +364,7 @@ const createNewLesson = () => {
 					{ lesson: data.name },
 					{
 						onSuccess() {
+							capture('lesson_created')
 							showToast('Success', 'Lesson created successfully', 'check')
 							lessonDetails.reload()
 						},
@@ -357,9 +387,6 @@ const editCurrentLesson = () => {
 			validate() {
 				return validateLesson()
 			},
-			onSuccess() {
-				showToast('Success', 'Lesson updated successfully', 'check')
-			},
 			onError(err) {
 				showToast('Error', err.message, 'x')
 			},
@@ -398,7 +425,7 @@ const breadcrumbs = computed(() => {
 		},
 		{
 			label: lessonDetails.data?.course_title,
-			route: { name: 'CourseDetail', params: { courseName: props.courseName } },
+			route: { name: 'CourseForm', params: { courseName: props.courseName } },
 		},
 	]
 
@@ -418,7 +445,7 @@ const breadcrumbs = computed(() => {
 	crumbs.push({
 		label: lessonDetails?.data?.lesson ? 'Edit Lesson' : 'Create Lesson',
 		route: {
-			name: 'CreateLesson',
+			name: 'LessonForm',
 			params: {
 				courseName: props.courseName,
 				chapterNumber: props.chapterNumber,
@@ -439,7 +466,8 @@ const pageMeta = computed(() => {
 updateDocumentTitle(pageMeta)
 </script>
 <style>
-.embed-tool__caption {
+.embed-tool__caption,
+.cdx-simple-image__caption {
 	display: none;
 }
 
@@ -447,6 +475,10 @@ updateDocumentTitle(pageMeta)
 	max-width: none;
 }
 
+.codex-editor--narrow .ce-toolbar__actions {
+	right: 100%;
+}
+
 .ce-toolbar__content {
 	max-width: none;
 }
@@ -519,10 +551,6 @@ updateDocumentTitle(pageMeta)
 	cursor: pointer;
 }
 
-.codeBoxSelectItem:hover {
-	opacity: 0.7;
-}
-
 .codeBoxSelectedItem {
 	background-color: lightblue !important;
 }
@@ -540,4 +568,17 @@ updateDocumentTitle(pageMeta)
 	color: #383a42;
 	background-color: #fafafa;
 }
+
+.codeBoxTextArea {
+	line-height: 1.7;
+}
+
+.prose :where(pre):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
+	overflow-x: unset;
+}
+
+iframe {
+	border-top: 3px solid theme('colors.gray.700');
+	border-bottom: 3px solid theme('colors.gray.700');
+}
 </style>

frontend/src/pages/Profile.vue

@@ -146,7 +146,7 @@ const coverImage = createResource({
 
 const setActiveTab = () => {
 	let fragments = route.path.split('/')
-	let sections = ['certificates', 'roles', 'evaluations']
+	let sections = ['certificates', 'roles', 'slots', 'schedule']
 	sections.forEach((section) => {
 		if (fragments.includes(section)) {
 			activeTab.value = convertToTitleCase(section)
@@ -161,7 +161,8 @@ watchEffect(() => {
 			About: { name: 'ProfileAbout' },
 			Certificates: { name: 'ProfileCertificates' },
 			Roles: { name: 'ProfileRoles' },
-			Evaluations: { name: 'ProfileEvaluator' },
+			Slots: { name: 'ProfileEvaluator' },
+			Schedule: { name: 'ProfileEvaluationSchedule' },
 		}[activeTab.value]
 		router.push(route)
 	}
@@ -185,8 +186,13 @@ const isSessionUser = () => {
 const getTabButtons = () => {
 	let buttons = [{ label: 'About' }, { label: 'Certificates' }]
 	if ($user.data?.is_moderator) buttons.push({ label: 'Roles' })
-	if (isSessionUser() && $user.data?.is_evaluator)
+	if (
-		buttons.push({ label: 'Evaluations' })
+		isSessionUser() &&
+		($user.data?.is_evaluator || $user.data?.is_moderator)
+	) {
+		buttons.push({ label: 'Slots' })
+		buttons.push({ label: 'Schedule' })
+	}
 
 	return buttons
 }

frontend/src/pages/ProfileAbout.vue

@@ -16,7 +16,7 @@
 		<h2 class="mb-3 text-lg font-semibold text-gray-900">
 			{{ __('Achievements') }}
 		</h2>
-		<div class="grid grid-cols-5 gap-4">
+		<div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-4">
 			<div v-for="badge in badges.data">
 				<Popover trigger="hover" :leaveDelay="Number(0.01)">
 					<template #target>
@@ -142,7 +142,7 @@ const shareOnSocial = (badge, medium) => {
 	const summary = `I am happy to announce that I earned the ${
 		badge.badge
 	} badge on ${dayjs(badge.issued_on).format('DD MMM YYYY')} at ${
-		branding.data?.brand_name
+		branding.data?.app_name
 	}.`
 
 	if (medium == 'LinkedIn')

frontend/src/pages/ProfileEvaluationSchedule.vue

@@ -0,0 +1,102 @@
+<template>
+	<div class="mt-7 mb-20">
+		<div class="flex h-screen flex-col overflow-hidden">
+			<Calendar
+				v-if="evaluations.data?.length"
+				:config="{
+					defaultMode: 'Month',
+					disableModes: ['Day', 'Week'],
+					redundantCellHeight: 100,
+					enableShortcuts: false,
+				}"
+				:events="evaluations.data"
+				@click="(event) => openEvent(event)"
+			>
+				<template #header="{ currentMonthYear, decrement, increment }">
+					<div class="mb-2 flex justify-between">
+						<span class="text-lg font-semibold">
+							{{ currentMonthYear }}
+						</span>
+						<div class="flex gap-x-1">
+							<Button
+								@click="decrement()"
+								variant="ghost"
+								class="h-4 w-4"
+								icon="chevron-left"
+							/>
+							<Button
+								@click="increment()"
+								variant="ghost"
+								class="h-4 w-4"
+								icon="chevron-right"
+							/>
+						</div>
+					</div>
+				</template>
+			</Calendar>
+		</div>
+	</div>
+	<Event v-model="showEvent" :event="currentEvent" />
+</template>
+<script setup>
+import { Calendar, createListResource, Button } from 'frappe-ui'
+import { inject, ref } from 'vue'
+import Event from '@/components/Modals/Event.vue'
+
+const user = inject('$user')
+const currentEvent = ref(null)
+const showEvent = ref(false)
+
+const props = defineProps({
+	profile: {
+		type: Object,
+		required: true,
+	},
+})
+
+const evaluations = createListResource({
+	doctype: 'LMS Certificate Request',
+	filters: {
+		evaluator: user.data?.name,
+	},
+	fields: [
+		'name',
+		'member_name',
+		'member',
+		'course',
+		'course_title',
+		'batch_name',
+		'batch_title',
+		'evaluator',
+		'evaluator_name',
+		'date',
+		'start_time',
+		'end_time',
+		'google_meet_link',
+	],
+	auto: true,
+	orderBy: 'creation desc',
+	limit: 100,
+	cache: ['schedule', user.data?.name],
+	transform(data) {
+		return data.map((d) => {
+			let mappedData = Object.assign({}, d)
+
+			mappedData.title = `${d.member_name}'s Evaluation`
+			mappedData.participant = d.member_name
+			mappedData.id = d.name
+			mappedData.venue = d.google_meet_link
+			mappedData.fromDate = `${d.date} ${d.start_time}`
+			mappedData.toDate = `${d.date} ${d.end_time}`
+			mappedData.color = 'green'
+
+			return mappedData
+		})
+	},
+})
+
+const openEvent = (event) => {
+	currentEvent.value = event.calendarEvent
+	showEvent.value = true
+}
+</script>

frontend/src/pages/QuizForm.vue

@@ -0,0 +1,432 @@
+<template>
+	<header
+		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
+	>
+		<Breadcrumbs :items="breadcrumbs" />
+		<Button variant="solid" @click="submitQuiz()">
+			{{ __('Save') }}
+		</Button>
+	</header>
+	<div class="w-3/4 mx-auto py-5">
+		<!-- Details -->
+		<div class="mb-8">
+			<div class="text-sm font-semibold mb-4">
+				{{ __('Details') }}
+			</div>
+			<FormControl
+				v-model="quiz.title"
+				:label="
+					quizDetails.data?.name
+						? __('Title')
+						: __('Enter a title and save the quiz to proceed')
+				"
+			/>
+			<div v-if="quizDetails.data?.name">
+				<div class="grid grid-cols-3 gap-5 mt-4 mb-8">
+					<FormControl
+						v-model="quiz.max_attempts"
+						:label="__('Maximun Attempts')"
+					/>
+					<FormControl
+						v-model="quiz.total_marks"
+						:label="__('Total Marks')"
+						disabled
+					/>
+					<FormControl
+						v-model="quiz.passing_percentage"
+						:label="__('Passing Percentage')"
+					/>
+				</div>
+
+				<!-- Settings -->
+				<div class="mb-8">
+					<div class="text-sm font-semibold mb-4">
+						{{ __('Settings') }}
+					</div>
+					<div class="grid grid-cols-3 gap-5 my-4">
+						<FormControl
+							v-model="quiz.show_answers"
+							type="checkbox"
+							:label="__('Show Answers')"
+						/>
+						<FormControl
+							v-model="quiz.show_submission_history"
+							type="checkbox"
+							:label="__('Show Submission History')"
+						/>
+					</div>
+				</div>
+
+				<div class="mb-8">
+					<div class="text-sm font-semibold mb-4">
+						{{ __('Shuffle Settings') }}
+					</div>
+					<div class="grid grid-cols-3">
+						<FormControl
+							v-model="quiz.shuffle_questions"
+							type="checkbox"
+							:label="__('Shuffle Questions')"
+						/>
+						<FormControl
+							v-if="quiz.shuffle_questions"
+							v-model="quiz.limit_questions_to"
+							:label="__('Limit Questions To')"
+						/>
+					</div>
+				</div>
+
+				<!-- Questions -->
+				<div>
+					<div class="flex items-center justify-between mb-4">
+						<div class="text-sm font-semibold">
+							{{ __('Questions') }}
+						</div>
+						<Button @click="openQuestionModal()">
+							<template #prefix>
+								<Plus class="w-4 h-4" />
+							</template>
+							{{ __('New Question') }}
+						</Button>
+					</div>
+					<ListView
+						:columns="questionColumns"
+						:rows="quiz.questions"
+						row-key="name"
+						:options="{
+							showTooltip: false,
+						}"
+					>
+						<ListHeader
+							class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+						>
+							<ListHeaderItem :item="item" v-for="item in questionColumns" />
+						</ListHeader>
+						<ListRows>
+							<ListRow
+								:row="row"
+								v-slot="{ idx, column, item }"
+								v-for="row in quiz.questions"
+								@click="openQuestionModal(row)"
+							>
+								<ListRowItem :item="item">
+									<div
+										v-if="column.key == 'question_detail'"
+										class="text-xs truncate h-4"
+										v-html="item"
+									></div>
+									<div v-else class="text-xs">
+										{{ item }}
+									</div>
+								</ListRowItem>
+							</ListRow>
+						</ListRows>
+						<ListSelectBanner>
+							<template #actions="{ unselectAll, selections }">
+								<div class="flex gap-2">
+									<Button
+										variant="ghost"
+										@click="deleteQuestions(selections, unselectAll)"
+									>
+										<Trash2 class="h-4 w-4 stroke-1.5" />
+									</Button>
+								</div>
+							</template>
+						</ListSelectBanner>
+					</ListView>
+				</div>
+			</div>
+		</div>
+	</div>
+	<Question
+		v-model="showQuestionModal"
+		:questionDetail="currentQuestion"
+		v-model:quiz="quizDetails"
+		:title="
+			currentQuestion.question
+				? __('Edit the question')
+				: __('Add a new question')
+		"
+	/>
+</template>
+<script setup>
+import {
+	Breadcrumbs,
+	createResource,
+	FormControl,
+	ListView,
+	ListHeader,
+	ListHeaderItem,
+	ListRows,
+	ListRow,
+	ListRowItem,
+	ListSelectBanner,
+	Button,
+} from 'frappe-ui'
+import {
+	computed,
+	reactive,
+	ref,
+	onMounted,
+	inject,
+	onBeforeUnmount,
+	watch,
+	isReactive,
+} from 'vue'
+import { Plus, Trash2 } from 'lucide-vue-next'
+import Question from '@/components/Modals/Question.vue'
+import { showToast, updateDocumentTitle } from '@/utils'
+import { useRouter } from 'vue-router'
+
+const showQuestionModal = ref(false)
+const currentQuestion = reactive({
+	question: '',
+	marks: 0,
+	name: '',
+})
+const user = inject('$user')
+const router = useRouter()
+
+const props = defineProps({
+	quizID: {
+		type: String,
+		required: true,
+	},
+})
+
+const quiz = reactive({
+	title: '',
+	total_marks: 0,
+	passing_percentage: 0,
+	max_attempts: 0,
+	limit_questions_to: 0,
+	show_answers: true,
+	show_submission_history: false,
+	shuffle_questions: false,
+	questions: [],
+})
+
+onMounted(() => {
+	if (
+		props.quizID == 'new' &&
+		!user.data?.is_moderator &&
+		!user.data?.is_instructor
+	) {
+		router.push({ name: 'Courses' })
+	}
+	if (props.quizID !== 'new') {
+		quizDetails.reload()
+	}
+	window.addEventListener('keydown', keyboardShortcut)
+})
+
+const keyboardShortcut = (e) => {
+	if (
+		e.key === 's' &&
+		(e.ctrlKey || e.metaKey) &&
+		!e.target.classList.contains('ProseMirror')
+	) {
+		submitQuiz()
+		e.preventDefault()
+	}
+}
+
+onBeforeUnmount(() => {
+	window.removeEventListener('keydown', keyboardShortcut)
+})
+
+watch(
+	() => props.quizID !== 'new',
+	(newVal) => {
+		if (newVal) {
+			quizDetails.reload()
+		}
+	}
+)
+
+const quizDetails = createResource({
+	url: 'frappe.client.get',
+	makeParams(values) {
+		return { doctype: 'LMS Quiz', name: props.quizID }
+	},
+	auto: false,
+	onSuccess(data) {
+		Object.keys(data).forEach((key) => {
+			if (Object.hasOwn(quiz, key)) quiz[key] = data[key]
+		})
+
+		let checkboxes = [
+			'show_answers',
+			'show_submission_history',
+			'shuffle_questions',
+		]
+		for (let idx in checkboxes) {
+			let key = checkboxes[idx]
+			quiz[key] = quiz[key] ? true : false
+		}
+	},
+})
+
+const quizCreate = createResource({
+	url: 'frappe.client.insert',
+	auto: false,
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'LMS Quiz',
+				...quiz,
+			},
+		}
+	},
+})
+
+const quizUpdate = createResource({
+	url: 'frappe.client.set_value',
+	auto: false,
+	makeParams(values) {
+		return {
+			doctype: 'LMS Quiz',
+			name: values.quizID,
+			fieldname: {
+				total_marks: calculateTotalMarks(),
+				...quiz,
+			},
+		}
+	},
+})
+
+const submitQuiz = () => {
+	if (quizDetails.data?.name) updateQuiz()
+	else createQuiz()
+}
+
+const createQuiz = () => {
+	quizCreate.submit(
+		{},
+		{
+			onSuccess(data) {
+				showToast(__('Success'), __('Quiz created successfully'), 'check')
+				router.push({
+					name: 'QuizForm',
+					params: { quizID: data.name },
+				})
+			},
+			onError(err) {
+				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+			},
+		}
+	)
+}
+
+const updateQuiz = () => {
+	quizUpdate.submit(
+		{ quizID: quizDetails.data?.name },
+		{
+			onSuccess(data) {
+				quiz.total_marks = data.total_marks
+				showToast(__('Success'), __('Quiz updated successfully'), 'check')
+			},
+			onError(err) {
+				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+			},
+		}
+	)
+}
+
+const calculateTotalMarks = () => {
+	let totalMarks = 0
+	if (quiz.limit_questions_to && quiz.questions.length > 0)
+		return quiz.questions[0].marks * quiz.limit_questions_to
+	quiz.questions.forEach((question) => {
+		totalMarks += question.marks
+	})
+	return totalMarks
+}
+
+const questionColumns = computed(() => {
+	return [
+		{
+			label: __('ID'),
+			key: 'question',
+			width: '25%',
+		},
+		{
+			label: __('Question'),
+			key: __('question_detail'),
+			width: '60%',
+		},
+		{
+			label: __('Marks'),
+			key: 'marks',
+			width: '10%',
+		},
+	]
+})
+
+const openQuestionModal = (question = null) => {
+	if (question) {
+		currentQuestion.question = question.question
+		currentQuestion.marks = question.marks
+		currentQuestion.name = question.name
+	} else {
+		currentQuestion.question = ''
+		currentQuestion.marks = 0
+		currentQuestion.name = ''
+	}
+	showQuestionModal.value = true
+}
+
+const deleteQuestionResource = createResource({
+	url: 'lms.lms.api.delete_documents',
+	makeParams(values) {
+		return {
+			doctype: 'LMS Quiz Question',
+			documents: values.questions,
+		}
+	},
+})
+
+const deleteQuestions = (selections, unselectAll) => {
+	deleteQuestionResource.submit(
+		{
+			questions: Array.from(selections),
+		},
+		{
+			onSuccess() {
+				showToast(__('Success'), __('Questions deleted successfully'), 'check')
+				quizDetails.reload()
+				unselectAll()
+			},
+		}
+	)
+}
+
+const breadcrumbs = computed(() => {
+	let crumbs = [
+		{
+			label: __('Quizzes'),
+			route: {
+				name: 'Quizzes',
+			},
+		},
+	]
+	/* if (quizDetails.data) {
+		crumbs.push({
+			label: quiz.title,
+		})
+	} */
+	crumbs.push({
+		label: props.quizID == 'new' ? __('New Quiz') : quizDetails.data?.title,
+		route: { name: 'QuizForm', params: { quizID: props.quizID } },
+	})
+	return crumbs
+})
+
+const pageMeta = computed(() => {
+	return {
+		title: props.quizID == 'new' ? __('New Quiz') : quizDetails.data?.title,
+		description: __('Form to create and edit quizzes'),
+	}
+})
+
+updateDocumentTitle(pageMeta)
+</script>

frontend/src/pages/QuizSubmission.vue

@@ -0,0 +1,48 @@
+<template>
+	<header
+		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
+	>
+		<Breadcrumbs :items="breadcrumbs" />
+	</header>
+	<div class="w-1/2 mx-auto py-10">
+		<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 { useRouter } from 'vue-router'
+
+const user = inject('$user')
+const router = useRouter()
+
+onMounted(() => {
+	if (!user.data) {
+		router.push({ name: 'Courses' })
+	}
+})
+
+const props = defineProps({
+	quizID: {
+		type: String,
+		required: true,
+	},
+})
+
+const title = createResource({
+	url: 'frappe.client.get_value',
+	params: {
+		doctype: 'LMS Quiz',
+		fieldname: 'title',
+		filters: {
+			name: props.quizID,
+		},
+	},
+	auto: true,
+})
+
+const breadcrumbs = computed(() => {
+	return [{ label: __('Quiz Submission') }, { label: title.data?.title }]
+})
+</script>

frontend/src/pages/Quizzes.vue

@@ -0,0 +1,136 @@
+<template>
+	<header
+		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
+	>
+		<Breadcrumbs :items="breadcrumbs" />
+		<router-link
+			:to="{
+				name: 'QuizForm',
+				params: {
+					quizID: 'new',
+				},
+			}"
+		>
+			<Button variant="solid">
+				<template #prefix>
+					<Plus class="w-4 h-4" />
+				</template>
+				{{ __('New Quiz') }}
+			</Button>
+		</router-link>
+	</header>
+	<div v-if="quizzes.data?.length" class="w-3/4 mx-auto py-5">
+		<ListView
+			:columns="quizColumns"
+			:rows="quizzes.data"
+			row-key="name"
+			:options="{ showTooltip: false, selectable: false }"
+		>
+			<ListHeader
+				class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+			>
+				<ListHeaderItem :item="item" v-for="item in quizColumns">
+				</ListHeaderItem>
+			</ListHeader>
+			<ListRows>
+				<router-link
+					v-for="row in quizzes.data"
+					:to="{
+						name: 'QuizForm',
+						params: {
+							quizID: row.name,
+						},
+					}"
+				>
+					<ListRow :row="row" />
+				</router-link>
+			</ListRows>
+		</ListView>
+	</div>
+</template>
+<script setup>
+import {
+	Breadcrumbs,
+	createListResource,
+	ListView,
+	ListRows,
+	ListRow,
+	ListHeader,
+	ListHeaderItem,
+	Button,
+} from 'frappe-ui'
+import { useRouter } from 'vue-router'
+import { computed, inject, onMounted } from 'vue'
+import { Plus } from 'lucide-vue-next'
+import { updateDocumentTitle } from '@/utils'
+
+const user = inject('$user')
+const router = useRouter()
+
+onMounted(() => {
+	if (!user.data?.is_moderator && !user.data?.is_instructor) {
+		router.push({ name: 'Courses' })
+	}
+})
+
+const quizFilter = computed(() => {
+	if (user.data?.is_moderator) return {}
+	return {
+		owner: user.data?.name,
+	}
+})
+
+const quizzes = createListResource({
+	doctype: 'LMS Quiz',
+	filters: quizFilter,
+	fields: ['name', 'title', 'passing_percentage', 'total_marks'],
+	auto: true,
+	cache: ['quizzes', user.data?.name],
+	orderBy: 'modified desc',
+	onSuccess(data) {
+		data.forEach((row) => {})
+	},
+})
+
+const quizColumns = computed(() => {
+	return [
+		{
+			label: __('Title'),
+			key: 'title',
+			width: 2,
+		},
+		{
+			label: __('Total Marks'),
+			key: 'total_marks',
+			width: 1,
+			align: 'center',
+		},
+		{
+			label: __('Passing Percentage'),
+			key: 'passing_percentage',
+			width: 1,
+			align: 'center',
+		},
+	]
+})
+
+const breadcrumbs = computed(() => {
+	return [
+		{
+			label: __('Quizzes'),
+			route: {
+				name: 'Quizzes',
+			},
+		},
+	]
+})
+
+const pageMeta = computed(() => {
+	return {
+		title: __('Quizzes'),
+		description: __('List of quizzes'),
+	}
+})
+
+updateDocumentTitle(pageMeta)
+</script>

frontend/src/router.js

@@ -79,9 +79,15 @@ const routes = [
 			},
 			{
 				name: 'ProfileEvaluator',
-				path: 'evaluations',
+				path: 'slots',
 				component: () => import('@/pages/ProfileEvaluator.vue'),
 			},
+			{
+				name: 'ProfileEvaluationSchedule',
+				path: 'schedule',
+				component: () =>
+					import('@/pages/ProfileEvaluationSchedule.vue'),
+			},
 		],
 	},
 	{
@@ -97,20 +103,20 @@ const routes = [
 	},
 	{
 		path: '/courses/:courseName/edit',
-		name: 'CreateCourse',
+		name: 'CourseForm',
-		component: () => import('@/pages/CreateCourse.vue'),
+		component: () => import('@/pages/CourseForm.vue'),
 		props: true,
 	},
 	{
 		path: '/courses/:courseName/learn/:chapterNumber-:lessonNumber/edit',
-		name: 'CreateLesson',
+		name: 'LessonForm',
-		component: () => import('@/pages/CreateLesson.vue'),
+		component: () => import('@/pages/LessonForm.vue'),
 		props: true,
 	},
 	{
 		path: '/batches/:batchName/edit',
-		name: 'BatchCreation',
+		name: 'BatchForm',
-		component: () => import('@/pages/BatchCreation.vue'),
+		component: () => import('@/pages/BatchForm.vue'),
 		props: true,
 	},
 	{
@@ -141,6 +147,23 @@ const routes = [
 		component: () => import('@/pages/Badge.vue'),
 		props: true,
 	},
+	{
+		path: '/quizzes',
+		name: 'Quizzes',
+		component: () => import('@/pages/Quizzes.vue'),
+	},
+	{
+		path: '/quizzes/:quizID',
+		name: 'QuizForm',
+		component: () => import('@/pages/QuizForm.vue'),
+		props: true,
+	},
+	{
+		path: '/quiz/:quizID',
+		name: 'Quiz',
+		component: () => import('@/pages/QuizSubmission.vue'),
+		props: true,
+	},
 ]
 
 let router = createRouter({

frontend/src/stores/session.js

@@ -5,7 +5,7 @@ import router from '@/router'
 import { ref, computed } from 'vue'
 
 export const sessionStore = defineStore('lms-session', () => {
-	let { userResource } = usersStore()
+	let { userResource, allUsers } = usersStore()
 
 	function sessionUser() {
 		let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
@@ -17,6 +17,9 @@ export const sessionStore = defineStore('lms-session', () => {
 	}
 
 	let user = ref(sessionUser())
+	if (user.value) {
+		allUsers.reload()
+	}
 	const isLoggedIn = computed(() => !!user.value)
 
 	const login = createResource({
@@ -50,11 +53,18 @@ export const sessionStore = defineStore('lms-session', () => {
 		},
 	})
 
+	const sidebarSettings = createResource({
+		url: 'lms.lms.api.get_sidebar_settings',
+		cache: 'Sidebar Settings',
+		auto: false,
+	})
+
 	return {
 		user,
 		isLoggedIn,
 		login,
 		logout,
 		branding,
+		sidebarSettings,
 	}
 })

frontend/src/stores/settings.js

@@ -0,0 +1,12 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+export const useSettings = defineStore('settings', () => {
+	const isSettingsOpen = ref(false)
+	const activeTab = ref(null)
+
+	return {
+		isSettingsOpen,
+		activeTab,
+	}
+})

frontend/src/stores/user.js

@@ -15,7 +15,6 @@ export const usersStore = defineStore('lms-users', () => {
 	const allUsers = createResource({
 		url: 'lms.lms.api.get_all_users',
 		cache: ['allUsers'],
-		auto: true,
 	})
 
 	return {

frontend/src/telemetry.ts

@@ -0,0 +1,98 @@
+import { useStorage } from "@vueuse/core";
+import { call } from "frappe-ui";
+import "../../../frappe/frappe/public/js/lib/posthog.js";
+
+const APP = "lms";
+const SITENAME = window.location.hostname;
+
+declare global {
+  interface Window {
+    posthog: any;
+  }
+}
+
+const telemetry = useStorage("telemetry", {
+  enabled: false,
+  project_id: "",
+  host: "",
+});
+
+export async function init() {
+  await set_enabled();
+  if (!telemetry.value.enabled) return;
+  try {
+    await set_credentials();
+    window.posthog.init(telemetry.value.project_id, {
+      api_host: telemetry.value.host,
+      autocapture: false,
+      person_profiles: "always",
+      capture_pageview: true,
+      capture_pageleave: true,
+      disable_session_recording: false,
+      session_recording: {
+        maskAllInputs: false,
+        maskInputOptions: {
+          password: true,
+        },
+      },
+      loaded: (posthog) => {
+        window.posthog = posthog;
+        window.posthog.identify(SITENAME);
+      },
+    });
+  } catch (e) {
+    console.trace("Failed to initialize telemetry", e);
+    telemetry.value.enabled = false;
+  }
+}
+
+async function set_enabled() {
+  if (telemetry.value.enabled) return;
+
+  await call("lms.lms.telemetry.is_enabled").then((res) => {
+    telemetry.value.enabled = res;
+  });
+}
+
+async function set_credentials() {
+  if (!telemetry.value.enabled) return;
+  if (telemetry.value.project_id && telemetry.value.host) return;
+
+  await call("lms.lms.telemetry.get_credentials").then((res) => {
+    telemetry.value.project_id = res.project_id;
+    telemetry.value.host = res.telemetry_host;
+  });
+}
+
+interface CaptureOptions {
+  data: {
+    user: string;
+    [key: string]: string | number | boolean | object;
+  };
+}
+
+export function capture(
+  event: string,
+  options: CaptureOptions = { data: { user: "" } }
+) {
+  if (!telemetry.value.enabled) return;
+  window.posthog.capture(`${APP}_${event}`, options);
+}
+
+export function recordSession() {
+  if (!telemetry.value.enabled) return;
+  if (window.posthog && window.posthog.__loaded) {
+    window.posthog.startSessionRecording();
+  }
+}
+
+export function stopSession() {
+  if (!telemetry.value.enabled) return;
+  if (
+    window.posthog &&
+    window.posthog.__loaded &&
+    window.posthog.sessionRecordingStarted()
+  ) {
+    window.posthog.stopSessionRecording();
+  }
+}

frontend/src/translation.js

@@ -2,6 +2,7 @@ import { createResource } from 'frappe-ui'
 
 export default function translationPlugin(app) {
 	app.config.globalProperties.__ = translate
+	window.__ = translate
 	if (!window.translatedMessages) fetchTranslations()
 }
 

frontend/src/utils/code.ts

@@ -62,7 +62,7 @@ export class CodeBox {
 
 	static get toolbox() {
 		const app = createApp({
-			render: () => h(Code, { size: 24, strokeWidth: 2, color: 'black' }),
+			render: () => h(Code, { size: 18, strokeWidth: 1.5, color: 'black' }),
 		});
 
 		const div = document.createElement('div');

frontend/src/utils/customEmbed.js

@@ -1,32 +0,0 @@
-import Embed from '@editorjs/embed'
-import VideoBlock from '@/components/VideoBlock.vue'
-import { createApp } from 'vue'
-
-export class CustomEmbed extends Embed {
-	render() {
-		const container = super.render()
-		const { service, source, embed } = this.data
-
-		if (service === 'youtube' || service === 'vimeo') {
-			// Remove the iframe or existing embed content
-			container.innerHTML = ''
-
-			// Create a placeholder element for Vue component
-			const vueContainer = document.createElement('div')
-			vueContainer.setAttribute('data-service', service)
-			vueContainer.setAttribute('data-video-id', this.data.source)
-
-			// Append the Vue placeholder
-			container.appendChild(vueContainer)
-			console.log(source)
-			// Mount the Vue component (using a global Vue instance)
-			const app = createApp(VideoBlock, {
-				file: source,
-				type: 'video/youtube',
-			})
-			app.mount(vueContainer)
-		}
-
-		return container
-	}
-}

frontend/src/utils/index.js

@@ -10,6 +10,7 @@ import InlineCode from '@editorjs/inline-code'
 import { watch } from 'vue'
 import dayjs from '@/utils/dayjs'
 import Embed from '@editorjs/embed'
+import SimpleImage from '@editorjs/simple-image'
 
 export function createToast(options) {
 	toast({
@@ -79,15 +80,18 @@ export function getFileSize(file_size) {
 	return value
 }
 
-export function showToast(title, text, icon) {
+export function showToast(title, text, icon, iconClasses = null) {
+	if (!iconClasses) {
+		iconClasses =
+			icon == 'check'
+				? 'bg-green-600 text-white rounded-md p-px'
+				: 'bg-red-600 text-white rounded-md p-px'
+	}
 	createToast({
 		title: title,
 		text: htmlToText(text),
 		icon: icon,
-		iconClasses:
+		iconClasses: iconClasses,
-			icon == 'check'
-				? 'bg-green-600 text-white rounded-md p-px'
-				: 'bg-red-600 text-white rounded-md p-px',
 		position: icon == 'check' ? 'bottom-right' : 'top-center',
 		timeout: 5,
 	})
@@ -133,6 +137,7 @@ export function getEditorTools() {
 		header: Header,
 		quiz: Quiz,
 		upload: Upload,
+		image: SimpleImage,
 		paragraph: {
 			class: Paragraph,
 			inlineToolbar: true,
@@ -144,9 +149,9 @@ export function getEditorTools() {
 			class: CodeBox,
 			config: {
 				themeURL:
-					'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/styles/dracula.min.css', // Optional
+					'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/styles/atom-one-dark.min.css',
-				themeName: 'atom-one-dark', // Optional
+				themeName: 'atom-one-dark',
-				useDefaultTheme: 'dark', // Optional. This also determines the background color of the language select drop-down
+				useDefaultTheme: 'dark',
 			},
 		},
 		list: {
@@ -164,16 +169,74 @@ export function getEditorTools() {
 			inlineToolbar: false,
 			config: {
 				services: {
-					youtube: true,
+					youtube: {
+						regex: /(?:https?:\/\/)?(?:www\.)?(?:(?:youtu\.be\/)|(?:youtube\.com)\/(?:v\/|u\/\w\/|embed\/|watch))(?:(?:\?v=)?([^#&?=]*))?((?:[?&]\w*=\w*)*)/,
+						embedUrl:
+							'https://www.youtube.com/embed/<%= remote_id %>',
+						html: '<iframe style="width:100%; height: 30rem;" frameborder="0" allowfullscreen></iframe>',
+						height: 320,
+						width: 580,
+						id: ([id, params]) => {
+							if (!params && id) {
+								return id
+							}
+
+							const paramsMap = {
+								start: 'start',
+								end: 'end',
+								t: 'start',
+								// eslint-disable-next-line camelcase
+								time_continue: 'start',
+								list: 'list',
+							}
+
+							let newParams = params
+								.slice(1)
+								.split('&')
+								.map((param) => {
+									const [name, value] = param.split('=')
+
+									if (!id && name === 'v') {
+										id = value
+
+										return null
+									}
+
+									if (!paramsMap[name]) {
+										return null
+									}
+
+									if (
+										value === 'LL' ||
+										value.startsWith('RDMM') ||
+										value.startsWith('FL')
+									) {
+										return null
+									}
+
+									return `${paramsMap[name]}=${value}`
+								})
+								.filter((param) => !!param)
+
+							return id + '?' + newParams.join('&')
+						},
+					},
 					vimeo: true,
 					codepen: true,
-					aparat: true,
+					aparat: {
+						regex: /(?:http[s]?:\/\/)?(?:www.)?aparat\.com\/v\/([^\/\?\&]+)\/?/,
+						embedUrl:
+							'https://www.aparat.com/video/video/embed/videohash/<%= remote_id %>/vt/frame',
+						html: '<iframe style="margin: 0 auto; width: 100%; height: 25rem;" frameborder="0" scrolling="no" allowtransparency="true"></iframe>',
+						height: 300,
+						width: 600,
+					},
 					github: true,
 					slides: {
-						regex: /https:\/\/docs\.google\.com\/presentation\/d\/e\/([A-Za-z0-9_-]+)\/pub/,
+						regex: /https:\/\/docs\.google\.com\/presentation\/d\/([A-Za-z0-9_-]+)\/pub/,
 						embedUrl:
-							'https://docs.google.com/presentation/d/e/<%= remote_id %>/embed',
+							'https://docs.google.com/presentation/d/<%= remote_id %>/embed',
-						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>",
+						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px; margin: 1rem 0' frameborder='0' allowfullscreen='true'></iframe>",
 					},
 					drive: {
 						regex: /https:\/\/drive\.google\.com\/file\/d\/([A-Za-z0-9_-]+)\/view(\?.+)?/,
@@ -197,7 +260,7 @@ export function getEditorTools() {
 						regex: /https:\/\/docs\.google\.com\/presentation\/d\/([A-Za-z0-9_-]+)\/edit(\?.+)?/,
 						embedUrl:
 							'https://docs.google.com/presentation/d/<%= remote_id %>/embed',
-						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px;' frameborder='0' allowfullscreen='true'></iframe>",
+						html: "<iframe style='width: 100%; height: 30rem; border: 1px solid #D3D3D3; border-radius: 12px; margin: 1rem 0;' frameborder='0' allowfullscreen='true'></iframe>",
 					},
 					codesandbox: {
 						regex: /^https:\/\/codesandbox\.io\/(?:embed\/)?([A-Za-z0-9_-]+)(?:\?[^\/]*)?$/,
@@ -361,15 +424,15 @@ export function getSidebarLinks() {
 				'Courses',
 				'CourseDetail',
 				'Lesson',
-				'CreateCourse',
+				'CourseForm',
-				'CreateLesson',
+				'LessonForm',
 			],
 		},
 		{
 			label: 'Batches',
 			icon: 'Users',
 			to: 'Batches',
-			activeFor: ['Batches', 'BatchDetail', 'Batch', 'BatchCreation'],
+			activeFor: ['Batches', 'BatchDetail', 'Batch', 'BatchForm'],
 		},
 		{
 			label: 'Certified Participants',
@@ -420,3 +483,26 @@ export function getLineStartPosition(string, position) {
 
 	return position
 }
+
+export function singularize(word) {
+	const endings = {
+		ves: 'fe',
+		ies: 'y',
+		i: 'us',
+		zes: 'ze',
+		ses: 's',
+		es: 'e',
+		s: '',
+	}
+	return word.replace(
+		new RegExp(`(${Object.keys(endings).join('|')})$`),
+		(r) => endings[r]
+	)
+}
+
+export const validateFile = (file) => {
+	let extension = file.name.split('.').pop().toLowerCase()
+	if (!['jpg', 'jpeg', 'png', 'webp'].includes(extension)) {
+		return __('Only image file is allowed.')
+	}
+}

frontend/src/utils/quiz.js

@@ -1,7 +1,9 @@
 import QuizBlock from '@/components/QuizBlock.vue'
-import { createApp } from 'vue'
+import QuizPlugin from '@/components/QuizPlugin.vue'
+import { createApp, h } from 'vue'
 import { usersStore } from '../stores/user'
 import translationPlugin from '../translation'
+import { CircleHelp } from 'lucide-vue-next'
 
 export class Quiz {
 	constructor({ data, api, readOnly }) {
@@ -9,17 +11,31 @@ export class Quiz {
 		this.readOnly = readOnly
 	}
 
+	static get toolbox() {
+		const app = createApp({
+			render: () =>
+				h(CircleHelp, { size: 18, strokeWidth: 1.5, color: 'black' }),
+		})
+
+		const div = document.createElement('div')
+		app.mount(div)
+
+		return {
+			title: __('Quiz'),
+			icon: div.innerHTML,
+		}
+	}
+
 	static get isReadOnlySupported() {
 		return true
 	}
 
 	render() {
 		this.wrapper = document.createElement('div')
-		if (this.data) {
+		if (Object.keys(this.data).length) {
-			let renderedQuiz = this.renderQuiz(this.data.quiz)
+			this.renderQuiz(this.data.quiz)
-			if (!this.readOnly) {
+		} else {
-				this.wrapper.innerHTML = renderedQuiz
+			this.renderQuizModal()
-			}
 		}
 		return this.wrapper
 	}
@@ -27,7 +43,7 @@ export class Quiz {
 	renderQuiz(quiz) {
 		if (this.readOnly) {
 			const app = createApp(QuizBlock, {
-				quiz: quiz, // Pass quiz content as prop
+				quiz: quiz,
 			})
 			app.use(translationPlugin)
 			const { userResource } = usersStore()
@@ -35,11 +51,23 @@ export class Quiz {
 			app.mount(this.wrapper)
 			return
 		}
-		return `<div class='border rounded-md p-10 text-center mb-2'>
+		this.wrapper.innerHTML = `<div class='border rounded-md p-10 text-center mb-2'>
             <span class="font-medium">
                 Quiz: ${quiz}
             </span>
         </div>`
+		return
+	}
+
+	renderQuizModal() {
+		const app = createApp(QuizPlugin, {
+			onQuizAddition: (quiz) => {
+				this.data.quiz = quiz
+				this.renderQuiz(quiz)
+			},
+		})
+		app.use(translationPlugin)
+		app.mount(this.wrapper)
 	}
 
 	save(blockContent) {

frontend/src/utils/upload.js

@@ -1,6 +1,9 @@
 import AudioBlock from '@/components/AudioBlock.vue'
 import VideoBlock from '@/components/VideoBlock.vue'
-import { createApp } from 'vue'
+import UploadPlugin from '@/components/UploadPlugin.vue'
+import { h, createApp } from 'vue'
+import { Upload as UploadIcon } from 'lucide-vue-next'
+import translationPlugin from '../translation'
 
 export class Upload {
 	constructor({ data, api, readOnly }) {
@@ -8,17 +11,38 @@ export class Upload {
 		this.readOnly = readOnly
 	}
 
+	static get toolbox() {
+		const app = createApp({
+			render: () =>
+				h(UploadIcon, { size: 18, strokeWidth: 1.5, color: 'black' }),
+		})
+
+		const div = document.createElement('div')
+		app.mount(div)
+
+		return {
+			title: 'Upload',
+			icon: div.innerHTML,
+		}
+	}
+
 	static get isReadOnlySupported() {
 		return true
 	}
 
 	render() {
 		this.wrapper = document.createElement('div')
-		this.renderUpload(this.data)
+
+		if (this.data && this.data.file_url) {
+			this.renderFile(this.data)
+		} else {
+			this.renderFileUploader()
+		}
+
 		return this.wrapper
 	}
 
-	renderUpload(file) {
+	renderFile(file) {
 		if (this.isVideo(file.file_type)) {
 			const app = createApp(VideoBlock, {
 				file: file.file_url,
@@ -44,6 +68,25 @@ export class Upload {
 		}
 	}
 
+	renderFileUploader() {
+		const app = createApp(UploadPlugin, {
+			onFileUploaded: (file) => {
+				this.data.file_url = file.file_url
+				this.data.file_type = file.file_type
+				this.renderFile(file)
+			},
+		})
+		app.use(translationPlugin)
+		app.mount(this.wrapper)
+	}
+
+	validate(savedData) {
+		if (!savedData.file_url || !savedData.file_type) {
+			return false
+		}
+		return true
+	}
+
 	save(blockContent) {
 		return {
 			file_url: this.data.file_url,

lms/__init__.py

@@ -1 +1 @@
-__version__ = "2.0.0"
+__version__ = "2.7.0"

lms/config/desktop.py

@@ -1,13 +0,0 @@
-from frappe import _
-
-
-def get_data():
-	return [
-		{
-			"module_name": "Community",
-			"color": "grey",
-			"icon": "octicon octicon-file-directory",
-			"type": "module",
-			"label": _("Community"),
-		}
-	]

lms/config/docs.py

@@ -1,12 +0,0 @@
-"""
-Configuration for docs
-"""
-
-# source_link = "https://github.com/[org_name]/community"
-# docs_base_url = "https://[org_name].github.io/community"
-# headline = "App that does everything"
-# sub_heading = "Yes, you got that right the first time, everything"
-
-
-def get_context(context):
-	context.brand_html = "Community"

lms/fixtures/lms_category.json

@@ -0,0 +1,51 @@
+[
+ {
+  "category": "Web Development",
+  "docstatus": 0,
+  "doctype": "LMS Category",
+  "modified": "2024-09-20 12:58:16.841571",
+  "name": "Web Development"
+ },
+ {
+  "category": "Business",
+  "docstatus": 0,
+  "doctype": "LMS Category",
+  "modified": "2024-09-20 12:58:32.304850",
+  "name": "Business"
+ },
+ {
+  "category": "Design",
+  "docstatus": 0,
+  "doctype": "LMS Category",
+  "modified": "2024-09-20 12:59:12.621022",
+  "name": "Design"
+ },
+ {
+  "category": "Personal Development",
+  "docstatus": 0,
+  "doctype": "LMS Category",
+  "modified": "2024-09-20 12:59:19.287404",
+  "name": "Personal Development"
+ },
+ {
+  "category": "Finance",
+  "docstatus": 0,
+  "doctype": "LMS Category",
+  "modified": "2024-09-20 12:58:28.579714",
+  "name": "Finance"
+ },
+ {
+  "category": "Frontend",
+  "docstatus": 0,
+  "doctype": "LMS Category",
+  "modified": "2024-05-08 14:05:16.979275",
+  "name": "Frontend"
+ },
+ {
+  "category": "Framework",
+  "docstatus": 0,
+  "doctype": "LMS Category",
+  "modified": "2023-06-15 18:01:41.598282",
+  "name": "Framework"
+ }
+]

lms/hooks.py

@@ -4,9 +4,11 @@ app_name = "frappe_lms"
 app_title = "Frappe LMS"
 app_publisher = "Frappe"
 app_description = "Frappe LMS App"
-app_icon = "octicon octicon-file-directory"
+app_icon_url = "/assets/lms/images/lms-logo.png"
+app_icon_title = "Learning"
+app_icon_route = "/lms"
 app_color = "grey"
-app_email = "school@frappe.io"
+app_email = "jannat@frappe.io"
 app_license = "AGPL"
 
 # Includes in <head>
@@ -61,8 +63,6 @@ web_include_js = ["website.bundle.js"]
 after_install = "lms.install.after_install"
 after_sync = "lms.install.after_sync"
 before_uninstall = "lms.install.before_uninstall"
-
-
 setup_wizard_requires = "assets/lms/js/setup_wizard.js"
 
 # Desk Notifications
@@ -115,7 +115,7 @@ scheduler_events = {
 	"daily": ["lms.job.doctype.job_opportunity.job_opportunity.update_job_openings"],
 }
 
-fixtures = ["Custom Field", "Function", "Industry"]
+fixtures = ["Custom Field", "Function", "Industry", "LMS Category"]
 
 # Testing
 # -------
@@ -177,50 +177,14 @@ update_website_context = [
 
 jinja = {
 	"methods": [
-		"lms.page_renderers.get_profile_url",
+		"lms.lms.utils.get_signup_optin_checks",
-		"lms.overrides.user.get_enrolled_courses",
-		"lms.overrides.user.get_course_membership",
-		"lms.overrides.user.get_authored_courses",
-		"lms.overrides.user.get_palette",
-		"lms.lms.utils.get_membership",
-		"lms.lms.utils.get_lessons",
 		"lms.lms.utils.get_tags",
+		"lms.lms.utils.get_lesson_count",
 		"lms.lms.utils.get_instructors",
-		"lms.lms.utils.get_students",
-		"lms.lms.utils.get_average_rating",
-		"lms.lms.utils.is_certified",
 		"lms.lms.utils.get_lesson_index",
 		"lms.lms.utils.get_lesson_url",
-		"lms.lms.utils.get_chapters",
+		"lms.page_renderers.get_profile_url",
-		"lms.lms.utils.get_slugified_chapter_title",
+		"lms.overrides.user.get_palette",
-		"lms.lms.utils.get_progress",
-		"lms.lms.utils.render_html",
-		"lms.lms.utils.is_mentor",
-		"lms.lms.utils.is_cohort_staff",
-		"lms.lms.utils.get_mentors",
-		"lms.lms.utils.get_reviews",
-		"lms.lms.utils.is_eligible_to_review",
-		"lms.lms.utils.get_initial_members",
-		"lms.lms.utils.get_sorted_reviews",
-		"lms.lms.utils.is_instructor",
-		"lms.lms.utils.convert_number_to_character",
-		"lms.lms.utils.get_signup_optin_checks",
-		"lms.lms.utils.get_popular_courses",
-		"lms.lms.utils.format_amount",
-		"lms.lms.utils.first_lesson_exists",
-		"lms.lms.utils.get_courses_under_review",
-		"lms.lms.utils.has_course_instructor_role",
-		"lms.lms.utils.has_course_moderator_role",
-		"lms.lms.utils.get_certificates",
-		"lms.lms.utils.format_number",
-		"lms.lms.utils.get_lesson_count",
-		"lms.lms.utils.get_all_memberships",
-		"lms.lms.utils.get_filtered_membership",
-		"lms.lms.utils.show_start_learing_cta",
-		"lms.lms.utils.can_create_courses",
-		"lms.lms.utils.get_telemetry_boot_info",
-		"lms.lms.utils.is_onboarding_complete",
-		"lms.www.utils.is_student",
 	],
 	"filters": [],
 }
@@ -267,3 +231,13 @@ profile_url_prefix = "/users/"
 signup_form_template = "lms.plugins.show_custom_signup"
 
 on_session_creation = "lms.overrides.user.on_session_creation"
+
+add_to_apps_screen = [
+	{
+		"name": "lms",
+		"logo": "/assets/lms/images/lms-logo.png",
+		"title": "Learning",
+		"route": "/lms",
+		"has_permission": "lms.lms.api.check_app_permission",
+	}
+]

lms/lms/api.py

@@ -6,6 +6,8 @@ from frappe.translate import get_all_translations
 from frappe import _
 from frappe.query_builder import DocType
 from frappe.query_builder.functions import Count
+from frappe.utils import time_diff, now_datetime, get_datetime
+from typing import Optional
 
 
 @frappe.whitelist()
@@ -265,7 +267,9 @@ def get_chart_details():
 			"upcoming": 0,
 		},
 	)
-	details.users = frappe.db.count("User", {"enabled": 1})
+	details.users = frappe.db.count(
+		"User", {"enabled": 1, "name": ["not in", ("Administrator", "Guest")]}
+	)
 	details.completions = frappe.db.count(
 		"LMS Enrollment", {"progress": ["like", "%100%"]}
 	)
@@ -285,11 +289,13 @@ def get_file_info(file_url):
 @frappe.whitelist(allow_guest=True)
 def get_branding():
 	"""Get branding details."""
-	return {
+	website_settings = frappe.get_single("Website Settings")
-		"brand_name": frappe.db.get_single_value("Website Settings", "app_name"),
+	image_fields = ["banner_image", "footer_logo", "favicon"]
-		"brand_html": frappe.db.get_single_value("Website Settings", "brand_html"),
+
-		"favicon": frappe.db.get_single_value("Website Settings", "favicon"),
+	for field in image_fields:
-	}
+		website_settings.update({field: get_file_info(website_settings.get(field))})
+
+	return website_settings
 
 
 @frappe.whitelist()
@@ -330,13 +336,12 @@ def get_evaluator_details(evaluator):
 
 
 @frappe.whitelist(allow_guest=True)
-def get_certified_participants(search_query=""):
+def get_certified_participants():
 	LMSCertificate = DocType("LMS Certificate")
 	participants = (
 		frappe.qb.from_(LMSCertificate)
 		.select(LMSCertificate.member)
 		.distinct()
-		.where(LMSCertificate.member_name.like(f"%{search_query}%"))
 		.where(LMSCertificate.published == 1)
 		.orderby(LMSCertificate.creation, order=frappe.qb.desc)
 		.run(as_dict=1)
@@ -542,3 +547,210 @@ def update_index(lessons, chapter):
 		frappe.db.set_value(
 			"Lesson Reference", {"lesson": row, "parent": chapter}, "idx", lessons.index(row) + 1
 		)
+
+
+@frappe.whitelist(allow_guest=True)
+def get_categories(doctype, filters):
+	categoryOptions = []
+
+	categories = frappe.get_all(
+		doctype,
+		filters,
+		pluck="category",
+	)
+	categories = list(set(categories))
+
+	for category in categories:
+		if category:
+			categoryOptions.append({"label": category, "value": category})
+
+	return categoryOptions
+
+
+@frappe.whitelist()
+def get_members(start=0, search=""):
+	"""Get members for the given search term and start index.
+	Args: start (int): Start index for the query.
+	    search (str): Search term to filter the results.
+	Returns: List of members.
+	"""
+
+	filters = {"enabled": 1, "name": ["not in", ["Administrator", "Guest"]]}
+
+	if search:
+		filters["full_name"] = ["like", f"%{search}%"]
+
+	members = frappe.get_all(
+		"User",
+		filters=filters,
+		fields=["name", "full_name", "user_image", "username", "last_active"],
+		page_length=20,
+		start=start,
+	)
+
+	for member in members:
+		roles = frappe.get_roles(member.name)
+		if "Moderator" in roles:
+			member.role = "Moderator"
+		elif "Course Creator" in roles:
+			member.role = "Course Creator"
+		elif "Batch Evaluator" in roles:
+			member.role = "Batch Evaluator"
+		elif "LMS Student" in roles:
+			member.role = "LMS Student"
+
+	return members
+
+
+def check_app_permission():
+	"""Check if the user has permission to access the app."""
+	if frappe.session.user == "Administrator":
+		return True
+
+	roles = frappe.get_roles()
+	lms_roles = ["Moderator", "Course Creator", "Batch Evaluator", "LMS Student"]
+	if any(role in roles for role in lms_roles):
+		return True
+
+	return False
+
+
+@frappe.whitelist()
+def save_evaluation_details(
+	member,
+	course,
+	batch_name,
+	evaluator,
+	date,
+	start_time,
+	end_time,
+	status,
+	rating,
+	summary,
+):
+	"""
+	Save evaluation details for a member against a course.
+	"""
+	evaluation = frappe.db.exists(
+		"LMS Certificate Evaluation", {"member": member, "course": course}
+	)
+
+	details = {
+		"date": date,
+		"start_time": start_time,
+		"end_time": end_time,
+		"status": status,
+		"rating": rating / 5,
+		"summary": summary,
+		"batch_name": batch_name,
+	}
+
+	if evaluation:
+		frappe.db.set_value("LMS Certificate Evaluation", evaluation, details)
+		return evaluation
+	else:
+		doc = frappe.new_doc("LMS Certificate Evaluation")
+		details.update(
+			{
+				"member": member,
+				"course": course,
+				"evaluator": evaluator,
+			}
+		)
+		doc.update(details)
+		doc.insert()
+		return doc.name
+
+
+@frappe.whitelist()
+def save_certificate_details(
+	member,
+	course,
+	batch_name,
+	evaluator,
+	issue_date,
+	expiry_date,
+	template,
+	published=True,
+):
+	"""
+	Save certificate details for a member against a course.
+	"""
+	certificate = frappe.db.exists("LMS Certificate", {"member": member, "course": course})
+
+	details = {
+		"published": published,
+		"issue_date": issue_date,
+		"expiry_date": expiry_date,
+		"template": template,
+		"batch_name": batch_name,
+	}
+
+	if certificate:
+		frappe.db.set_value("LMS Certificate", certificate, details)
+		return certificate
+	else:
+		doc = frappe.new_doc("LMS Certificate")
+		details.update(
+			{
+				"member": member,
+				"course": course,
+				"evaluator": evaluator,
+			}
+		)
+		doc.update(details)
+		doc.insert()
+		return doc.name
+
+
+@frappe.whitelist()
+def delete_documents(doctype, documents):
+	frappe.only_for("Moderator")
+	for doc in documents:
+		frappe.delete_doc(doctype, doc)
+
+
+@frappe.whitelist()
+def get_payment_gateway_details(payment_gateway):
+	fields = []
+	gateway = frappe.get_doc("Payment Gateway", payment_gateway)
+
+	if gateway.gateway_controller is None:
+		try:
+			data = frappe.get_doc(f"{payment_gateway} Settings").as_dict()
+			meta = frappe.get_meta(f"{payment_gateway} Settings").fields
+			doctype = f"{payment_gateway} Settings"
+			docname = f"{payment_gateway} Settings"
+		except Exception:
+			frappe.throw(_("{0} Settings not found").format(payment_gateway))
+	else:
+		try:
+			data = frappe.get_doc(gateway.gateway_settings, gateway.gateway_controller).as_dict()
+			meta = frappe.get_meta(gateway.gateway_settings).fields
+			doctype = gateway.gateway_settings
+			docname = gateway.gateway_controller
+		except Exception:
+			frappe.throw(_("{0} Settings not found").format(payment_gateway))
+
+	for row in meta:
+		if row.fieldtype not in ["Column Break", "Section Break"]:
+			if row.fieldtype in ["Attach", "Attach Image"]:
+				fieldtype = "Upload"
+				data[row.fieldname] = get_file_info(data.get(row.fieldname))
+			else:
+				fieldtype = row.fieldtype
+
+			fields.append(
+				{
+					"label": row.label,
+					"name": row.fieldname,
+					"type": fieldtype,
+				}
+			)
+
+	return {
+		"fields": fields,
+		"data": data,
+		"doctype": doctype,
+		"docname": docname,
+	}

lms/lms/doctype/course_chapter/course_chapter.py

@@ -7,5 +7,4 @@ from frappe.utils.telemetry import capture
 
 
 class CourseChapter(Document):
-	def after_insert(self):
+	pass
-		capture("chapter_created", "lms")

lms/lms/doctype/course_lesson/course_lesson.js

@@ -1,148 +1,4 @@
 // Copyright (c) 2021, FOSS United and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Course Lesson", {
+frappe.ui.form.on("Course Lesson", {});
-	setup: function (frm) {
-		frm.trigger("setup_help");
-	},
-	setup_help(frm) {
-		let quiz_link = `<a href="/app/lms-quiz"> ${__("Quiz List")} </a>`;
-		let exercise_link = `<a href="/app/lms-exercise"> ${__(
-			"Exercise List"
-		)} </a>`;
-		let file_link = `<a href="/app/file"> ${__("File DocType")} </a>`;
-
-		frm.get_field("help").html(`
-            <p>${__(
-				"You can add some more additional content to the lesson using a special syntax. The table below mentions all types of dynamic content that you can add to the lessons and the syntax for the same."
-			)}</p>
-            <table class="table">
-                <tr style="background-color: var(--fg-hover-color); font-weight: bold">
-                    <th style="width: 20%;">
-                        ${__("Content Type")}
-                    </th>
-                    <th style="width: 40%;">
-                        ${__("Syntax")}
-                    </th>
-                    <th>
-                        ${__("Description")}
-                    </th>
-                </tr>
-                <tr>
-                    <td>
-                        ${__("YouTube Video")}
-                    </td>
-                    <td>
-                        {{ YouTubeVideo("unique_embed_id") }}
-                    </td>
-                    <td>
-                        <span>
-                            ${__(
-								"Copy and paste the syntax in the editor. Replace 'embed_src' with the embed source that YouTube provides. To get the source, follow the steps mentioned below."
-							)}
-                        </span>
-                        <ul class="p-4">
-                            <li>
-                                ${__("Upload the video on youtube.")}
-                            </li>
-                            <li>
-                                ${__(
-									"When you share a youtube video, it shows an option called Embed."
-								)}
-                            </li>
-                            <li>
-                                ${__(
-									"On clicking it, it provides an iframe. Copy the source (src) of the iframe and paste it here."
-								)}
-                            </li>
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        ${__("Quiz")}
-                    </td>
-                    <td>
-                        {{ Quiz("lms_quiz_id") }}
-                    </td>
-                    <td>
-                        ${__(
-							"Copy and paste the syntax in the editor. Replace 'lms_quiz_id' with the ID of the Quiz you want to add. You can get the ID of the quiz from the {0}.",
-							[quiz_link]
-						)}
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        ${__("Video")}
-                    </td>
-                    <td>
-                        {{ Video("url_of_source") }}
-                    </td>
-                    <td>
-                        ${__(
-							"Upload a video from your local machine to the {0}. Copy and paste this syntax in the editor. Replace 'url_of_source' with the File URL field of the document you created in the File DocType.",
-							[file_link]
-						)}
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        ${"Exercise"}
-                    </td>
-                    <td>
-                        {{ Exercise("exercise_id") }}
-                    </td>
-                    <td>
-                        ${__(
-							"Copy and paste the syntax in the editor. Replace 'exercise_id' with the ID of the Exercise you want to add. You can get the ID of the exercise from the {0}.",
-							[exercise_link]
-						)}
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        ${__("Assignment")}
-                    </td>
-                    <td>
-                        {{ Assignment("id-filetype") }}
-                    </td>
-                </tr>
-            </table>
-            <hr>
-            <table class="table">
-                <tr style="background-color: var(--fg-hover-color); font-weight: bold">
-                    <th style="width: 90%">
-                        ${__("Supported File Types for Assignment")}
-                    </th>
-                    <th>
-                        ${__("Syntax")}
-                    </th>
-                </tr>
-                <tr>
-                    <td>
-                        .doc, .docx, .xml
-                    <td>
-                        ${__("Document")}
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        .pdf
-                    </td>
-                    <td>
-                        ${__("PDF")}
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        .png, .jpg, .jpeg
-                    </td>
-                    <td>
-                        ${__("Image")}
-                    </td>
-                </tr>
-            </table>
-        `);
-	},
-});

lms/lms/doctype/course_lesson/course_lesson.py

@@ -24,9 +24,6 @@ class CourseLesson(Document):
 		for section in dynamic_documents:
 			self.update_lesson_name_in_document(section)
 
-	def after_insert(self):
-		capture("lesson_created", "lms")
-
 	def update_lesson_name_in_document(self, section):
 		doctype_map = {"Exercise": "LMS Exercise", "Quiz": "LMS Quiz"}
 		macros = find_macros(self.body)
@@ -93,7 +90,7 @@ def save_progress(lesson, course):
 		"LMS Enrollment", {"course": course, "member": frappe.session.user}
 	)
 	if not membership:
-		return 0
+		return
 
 	frappe.db.set_value("LMS Enrollment", membership, "current_lesson", lesson)
 
@@ -104,7 +101,7 @@ def save_progress(lesson, course):
 	if frappe.db.exists(
 		"LMS Course Progress", {"lesson": lesson, "member": frappe.session.user}
 	):
-		return 0
+		return
 
 	frappe.get_doc(
 		{
@@ -116,12 +113,22 @@ def save_progress(lesson, course):
 	).save(ignore_permissions=True)
 
 	progress = get_course_progress(course)
-	frappe.db.set_value("LMS Enrollment", membership, "progress", progress)
+	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.
 	enrollment = frappe.get_doc("LMS Enrollment", membership)
+	enrollment.progress = progress
+	enrollment.save()
 	enrollment.run_method("on_change")
+
 	return progress
 
 
+def capture_progress_for_analytics(progress, course):
+	if progress in [25, 50, 75, 100]:
+		capture("course_progress", "lms", properties={"course": course, "progress": progress})
+
+
 def get_quiz_progress(lesson):
 	lesson_details = frappe.db.get_value(
 		"Course Lesson", lesson, ["body", "content"], as_dict=1

lms/lms/doctype/invite_request/test_invite_request.py

@@ -11,74 +11,4 @@ from lms.lms.doctype.invite_request.invite_request import (
 
 
 class TestInviteRequest(unittest.TestCase):
-	@classmethod
+	pass
-	def setUpClass(self):
-		create_invite_request("test_invite@example.com")
-
-	def test_create_invite_request(self):
-		if frappe.db.exists("Invite Request", {"invite_email": "test_invite@example.com"}):
-			invite = frappe.db.get_value(
-				"Invite Request",
-				filters={"invite_email": "test_invite@example.com"},
-				fieldname=["invite_email", "status", "signup_email"],
-				as_dict=True,
-			)
-			self.assertEqual(invite.status, "Approved")
-			self.assertEqual(invite.signup_email, None)
-
-	def test_create_invite_request_update(self):
-		if frappe.db.exists("Invite Request", {"invite_email": "test_invite@example.com"}):
-
-			data = {
-				"signup_email": "test_invite@example.com",
-				"username": "test_invite",
-				"full_name": "Test Invite",
-				"password": "Test@invite",
-				"invite_code": frappe.db.get_value(
-					"Invite Request", {"invite_email": "test_invite@example.com"}, "name"
-				),
-			}
-
-			update_invite(data)
-			invite = frappe.db.get_value(
-				"Invite Request",
-				filters={"invite_email": "test_invite@example.com"},
-				fieldname=[
-					"invite_email",
-					"status",
-					"signup_email",
-					"full_name",
-					"username",
-					"invite_code",
-					"name",
-				],
-				as_dict=True,
-			)
-			self.assertEqual(invite.signup_email, "test_invite@example.com")
-			self.assertEqual(invite.full_name, "Test Invite")
-			self.assertEqual(invite.username, "test_invite")
-			self.assertEqual(invite.invite_code, invite.name)
-			self.assertEqual(invite.status, "Registered")
-
-			user = frappe.db.get_value(
-				"User",
-				"test_invite@example.com",
-				fieldname=["first_name", "username", "send_welcome_email", "user_type"],
-				as_dict=True,
-			)
-			self.assertTrue(user)
-			self.assertEqual(user.first_name, invite.full_name.split(" ")[0])
-			self.assertEqual(user.username, invite.username)
-			self.assertEqual(user.send_welcome_email, 0)
-			self.assertEqual(user.user_type, "Website User")
-
-	@classmethod
-	def tearDownClass(self):
-		if frappe.db.exists("User", "test_invite@example.com"):
-			frappe.delete_doc("User", "test_invite@example.com")
-
-		invite_request = frappe.db.exists(
-			"Invite Request", {"invite_email": "test_invite@example.com"}
-		)
-		if invite_request:
-			frappe.delete_doc("Invite Request", invite_request)

lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json

@@ -86,7 +86,6 @@
    "label": "Comments"
   },
   {
-   "fetch_from": "course.evaluator",
    "fieldname": "evaluator",
    "fieldtype": "Link",
    "label": "Evaluator",

lms/lms/doctype/lms_batch/lms_batch.json

@@ -103,6 +103,7 @@
    "fieldname": "start_date",
    "fieldtype": "Date",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Start Date",
    "reqd": 1
   },
@@ -127,6 +128,7 @@
   {
    "fieldname": "start_time",
    "fieldtype": "Time",
+   "in_list_view": 1,
    "label": "Start Time",
    "reqd": 1
   },
@@ -165,6 +167,7 @@
   {
    "fieldname": "category",
    "fieldtype": "Link",
+   "in_standard_filter": 1,
    "label": "Category",
    "options": "LMS Category"
   },
@@ -325,7 +328,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-06-24 16:24:45.536453",
+ "modified": "2024-07-18 18:06:37.229885",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch",

lms/lms/doctype/lms_batch/lms_batch.py

@@ -8,18 +8,14 @@ import json
 from frappe import _
 from datetime import timedelta
 from frappe.model.document import Document
-from frappe.utils import (
+from frappe.utils import cint, format_date, format_datetime, get_time, getdate, add_days
-	cint,
-	format_date,
-	format_datetime,
-	get_time,
-)
 from lms.lms.utils import (
 	get_lessons,
 	get_lesson_index,
 	get_lesson_url,
 	get_quiz_details,
 	get_assignment_details,
+	update_payment_record,
 )
 from frappe.email.doctype.email_template.email_template import get_email_template
 
@@ -31,6 +27,7 @@ class LMSBatch(Document):
 		self.validate_batch_end_date()
 		self.validate_duplicate_courses()
 		self.validate_duplicate_students()
+		self.validate_payments_app()
 		self.validate_duplicate_assessments()
 		self.validate_membership()
 		self.validate_timetable()
@@ -60,6 +57,12 @@ class LMSBatch(Document):
 				_("Course {0} has already been added to this batch.").format(frappe.bold(title))
 			)
 
+	def validate_payments_app(self):
+		if self.paid_batch:
+			installed_apps = frappe.get_installed_apps()
+			if "payments" not in installed_apps:
+				frappe.throw(_("Please install the Payments app to create a paid batches."))
+
 	def validate_duplicate_assessments(self):
 		assessments = [row.assessment_name for row in self.assessment]
 		for assessment in self.assessment:
@@ -73,21 +76,23 @@ class LMSBatch(Document):
 					)
 				)
 
+	def validate_evaluation_end_date(self):
+		if self.evaluation_end_date and self.evaluation_end_date < self.end_date:
+			frappe.throw(_("Evaluation end date cannot be less than the batch end date."))
+
 	def send_confirmation_mail(self):
 		for student in self.students:
 			outgoing_email_account = frappe.get_cached_value(
 				"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
 			)
-			if not student.confirmation_email_sent and (
+			if (
-				outgoing_email_account or frappe.conf.get("mail_login")
+				not student.confirmation_email_sent
+				and getdate(student.creation) >= add_days(getdate(), -2)
+				and (outgoing_email_account or frappe.conf.get("mail_login"))
 			):
 				self.send_mail(student)
 				student.confirmation_email_sent = 1
 
-	def validate_evaluation_end_date(self):
-		if self.evaluation_end_date and self.evaluation_end_date < self.end_date:
-			frappe.throw(_("Evaluation end date cannot be less than the batch end date."))
-
 	def send_mail(self, student):
 		subject = _("Enrollment Confirmation for the Next Training Batch")
 		template = "batch_confirmation"
@@ -96,6 +101,7 @@ class LMSBatch(Document):
 		)
 
 		args = {
+			"title": self.title,
 			"student_name": student.student_name,
 			"start_time": self.start_time,
 			"start_date": self.start_date,
@@ -166,23 +172,9 @@ class LMSBatch(Document):
 					_("Row #{0} Date cannot be outside the batch duration.").format(schedule.idx)
 				)
 
-
+	def on_payment_authorized(self, payment_status):
-@frappe.whitelist()
+		if payment_status in ["Authorized", "Completed"]:
-def remove_student(student, batch_name):
+			update_payment_record("LMS Batch", self.name)
-	frappe.only_for("Moderator")
-	frappe.db.delete("Batch Student", {"student": student, "parent": batch_name})
-
-
-@frappe.whitelist()
-def remove_course(course, parent):
-	frappe.only_for("Moderator")
-	frappe.db.delete("Batch Course", {"course": course, "parent": parent})
-
-
-@frappe.whitelist()
-def remove_assessment(assessment, parent):
-	frappe.only_for("Moderator")
-	frappe.db.delete("LMS Assessment", {"assessment_name": assessment, "parent": parent})
 
 
 @frappe.whitelist()

lms/lms/doctype/lms_category/lms_category.json

@@ -15,12 +15,13 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Category",
+   "reqd": 1,
    "unique": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-06-15 15:14:11.341961",
+ "modified": "2024-09-23 19:33:49.593950",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Category",
@@ -55,5 +56,6 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
- "title_field": "category"
+ "title_field": "category",
+ "track_changes": 1
 }