Revert "chore: merge 'develop' into 'main'"

chore: merge 'develop' into 'main'

.github/helper/install_dependencies.sh

@@ -5,7 +5,7 @@ echo "Setting Up System Dependencies..."
 
 sudo apt update
 sudo apt remove mysql-server mysql-client
-sudo apt-get install libcups2-dev redis-server mariadb-client
+sudo apt install libcups2-dev redis-server mariadb-client-10.6
 
 install_wkhtmltopdf() {
   wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb

.github/workflows/build.yml

@@ -1,64 +0,0 @@
-name: Build Container Image
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    tags:
-      - "*"
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        arch: [amd64, arm64]
-
-    permissions:
-      packages: write
-
-    steps:
-      - name: Checkout Entire Repository
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/${{ matrix.arch }}
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          
-      - name: Set Branch
-        run: |
-          export APPS_JSON='[{"url": "https://github.com/frappe/lms","branch": "main"}]'
-          echo "APPS_JSON_BASE64=$(echo $APPS_JSON | base64 -w 0)" >> $GITHUB_ENV
-          echo "FRAPPE_BRANCH=version-15" >> $GITHUB_ENV
-
-      - name: Set Image Tag
-        run: |
-          echo "IMAGE_TAG=stable" >> $GITHUB_ENV
-      - uses: actions/checkout@v4
-        with:
-          repository: frappe/frappe_docker
-          path: builds
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          context: builds
-          file: builds/images/layered/Containerfile
-          tags: >
-            ghcr.io/${{ github.repository }}:${{ github.ref_name }},
-            ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }}
-          build-args: |
-            "FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}"
-            "APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}"

.github/workflows/ui-tests.yml

@@ -24,7 +24,7 @@ jobs:
 
     services:
       mariadb:
-        image: mariadb:10.8
+        image: mariadb:10.6
         env:
           MARIADB_ROOT_PASSWORD: 123
         ports:

.gitmodules

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

README.md

@@ -1,174 +1,115 @@
-<div align="center" markdown="1">
+<p align="center">
+  <a href="https://www.frappelms.com/">
+    <img src="https://frappe.io/files/lms.png" alt="Frappe LMS" width="50px" height="50px">
+  </a>
+  <p align="center">Easy to use, open source, learning management system.</p>
+</p>
 
-<img src=".github/lms-logo.png" alt="Frappe Learning logo" width="80" height="80"/>
-<h1>Frappe Learning</h1>
 
-**Easy to use, open source, Learning Management System**
+&nbsp;
 
-![Tests](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/vandxn/main&style=flat&logo=cypress)
+<p align="center">
+    <a href="https://www.producthunt.com/posts/frappe-lms?utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_souce=badge-frappe&#0045;lms" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=396079&theme=dark&period=weekly&topic_id=204" alt="Frappe&#0032;LMS - Easy&#0032;to&#0032;use&#0044;&#0032;100&#0037;&#0032;open&#0032;source&#0032;learning&#0032;management&#0032;system | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+</p>
 
+
+<div align="center" style="max-height: 40px;">
+    <a href="https://frappecloud.com/lms/signup">
+        <img src=".github/try-on-f-cloud.svg" height="40">
+    </a>
 </div>
 
+&nbsp;
 
-<div align="center">
+<p align="center">
-	<img src=".github/hero.png?v=5" alt="Hero Image" width="72%" />
+	<a href="https://dashboard.cypress.io/projects/vandxn/runs">
-</div>
+    <img alt="cypress" src="https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/vandxn/main&style=flat&logo=cypress">
-<br />
+  </a>
-<div align="center">
+  <a href="https://github.com/frappe/lms/blob/main/LICENSE">
-	<a href="https://frappe.io/learning">Website</a>
+    <img alt="license" src="https://img.shields.io/badge/license-AGPLv3-blue">
-	-
+  </a>
-	<a href="https://docs.frappe.io/learning">Documentation</a>
+</p>
-</div>
 
-## Frappe Learning
+<img width="1402" alt="Lesson" src="https://frappelms.com/files/banner.png">
-Frappe Learning is an easy-to-use learning system that helps you bring structure to your content.
-
-### Motivation
-In 2021, we were looking for a Learning Management System to launch [Mon.School](https://mon.school) for FOSS United. We checked out Moodle, but it didn’t feel right. The forms were unnecessarily lengthy and the UI was confusing. It shouldn't be this hard to create a course right? So I started making a learning system for Mon.School which soon became a product in itself. The aim is to have a simple platform that anyone can use to launch a course of their own and make knowledge sharing easier.
-
-### Key Features
-
-- **Structured Learning**: Design a course with a 3-level hierarchy, where your courses have chapters and you can group your lessons within these chapters. This ensures that the context of the lesson is set by the chapter.
-
-- **Live Classes**: Group learners into batches based on courses and duration. You can then create Zoom live class for these batches right from the app. Learners get to see the list of live classes they have to take as a part of this batch.
-
-- **Quizzes and Assignments**: Create quizzes where questions can have single-choice, multiple-choice options, or can be open ended. Instructors can also add assignments which learners can submit as PDF's or Documents.
-
-- **Getting Certified**: Once a learner has completed the course or batch, you can grant them a certificate. The app provides an inbuilt certificate template. You can use this or else create a template of your own and use that instead.
 
 <details>
-<summary>View Screenshots</summary>
+	<summary>Show more screenshots</summary>
-
+	<img width="1520" alt="ss1" src="https://user-images.githubusercontent.com/31363128/210056046-584bc8aa-d28c-4514-b031-73817012837d.png">
-
+	<img width="830" alt="ss2" src="https://user-images.githubusercontent.com/31363128/210056097-36849182-6db0-43a2-8c62-5333cd2aedf4.png">
-![Batch](.github/batch.png)
+	<img width="941" alt="ss3" src="https://user-images.githubusercontent.com/31363128/210056134-01a7c429-1ef4-434e-9d43-128dda35d7e5.png">
-<div align="center">
-	<sub>
-		Create batches to group your learners
-	</sub>
-</div>
-<br>
-
-
-![Quiz](.github/quiz.png)
-<div align="center">
-	<sub>
-		Evaluate their knowledge by quizzes
-	</sub>
-</div>
-<br>
-
-
-![Cerficicate](.github/certificate.png)
-<div align="center">
-	<sub>
-		Autenticate their work with certification
-	</sub>
-</div>
 </details>
 
+Frappe LMS is an easy-to-use, open-source learning management system. You can use it to create and share online courses. The app has a clear UI that helps students focus only on what's important and assists in distraction-free learning.
 
-### Under the Hood
+You can create courses and lessons through simple forms. Lessons can be in the form of text, videos, quizzes or a combination of all these. You can keep your students engaged with quizzes to help revise and test the concepts learned. Course Instructors and Students can reach out to each other through the discussions section available for each lesson and get queries resolved.
 
-- [**Frappe Framework**](https://github.com/frappe/frappe): A full-stack web application framework.
+## Features
+- Create online courses. 📚
+- Add detailed descriptions and preview videos to the course. 🎬
+- Add videos, quizzes, and assignments to your lessons and make them interesting and interactive 📝
+- Discussions section below each lesson where instructors and students can interact with each other. 💬
+- Create batches to group your students based on courses and track their progress 🏛
+- Statistics dashboard that provides all important numbers at a glimpse. 📈
+- Job Board where users can post and look for jobs. 💼
+- People directory with each person's profile page 👨‍👩‍👧‍👦
+- Set cover image, profile photo, short bio, and other professional information. 🦹🏼‍♀️
+- Simple layout that optimizes readability 🤓
+- Delightful user experience in overall usage ✨
 
-- [**Frappe UI**](https://github.com/frappe/frappe-ui): A Vue-based UI library, to provide a modern user interface.
+## Tech Stack
 
-## Production Setup
+Frappe LMS is built on [Frappe Framework](https://frappeframework.com) which is a batteries-included python web framework.
+These are some of the tools it's built on:
+- [Python](https://www.python.org)
+- [Redis](https://redis.io/)
+- [MariaDB](https://mariadb.org/)
+- [Socket.io](https://socket.io/)
 
-### Managed Hosting
+## Local Setup
-
-You can try [Frappe Cloud](https://frappecloud.com), a simple, user-friendly and sophisticated [open-source](https://github.com/frappe/press) platform to host Frappe applications with peace of mind.
-
-It takes care of installation, setup, upgrades, monitoring, maintenance and support of your Frappe deployments. It is a fully featured developer platform with an ability to manage and control multiple Frappe deployments.
-
-<div>
-	<a href="https://frappecloud.com/lms/signup" target="_blank">
-		<picture>
-			<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/try-on-fc-white.png">
-			<img src="https://frappe.io/files/try-on-fc-black.png" alt="Try on Frappe Cloud" height="28" />
-		</picture>
-	</a>
-</div>
-
-### Self Hosting
-
-Follow these steps to set up Frappe Learning in production:
-
-**Step 1**: Download the easy install script
-
-```bash
-wget https://frappe.io/easy-install.py
-```
-
-**Step 2**: Run the deployment command
-
-```bash
-python3 ./easy-install.py deploy \
-    --project=learning_prod_setup \
-    --email=your_email.example.com \
-    --image=ghcr.io/frappe/lms \
-    --version=stable \
-    --app=lms \
-    --sitename subdomain.domain.tld
-```
-
-Replace the following parameters with your values:
-- `your_email.example.com`: Your email address
-- `subdomain.domain.tld`: Your domain name where Learning will be hosted
-
-The script will set up a production-ready instance of Frappe Learning with all the necessary configurations in about 5 minutes.
-
-## Development Setup
 
 ### Docker
+You need Docker, docker-compose, and git setup on your machine. Refer to [Docker documentation](https://docs.docker.com/). After that, run the following commands:
+```
+git clone https://github.com/frappe/lms
+cd apps/lms/docker
+docker-compose up
+```
 
-You need Docker, docker-compose and git setup on your machine. Refer [Docker documentation](https://docs.docker.com/). After that, follow below steps:
+Wait for some time until the setup script creates a site. After that, you can access `http://localhost:8000` in your browser and the app's login screen should appear.
+You'll have to go through the setup wizard to set up the website the first time you access it. Log in using the following credentials to complete the setup wizard.
 
-**Step 1**: Setup folder and download the required files
+```
+Username: Administrator
+password: admin
+```
 
-    mkdir frappe-learning
+### Frappe Bench
-    cd frappe-learning
 
-    # Download the docker-compose file
+Currently, this app depends on the `develop` branch of [frappe](https://github.com/frappe/frappe).
-    wget -O docker-compose.yml https://raw.githubusercontent.com/frappe/lms/develop/docker/docker-compose.yml
 
-    # Download the setup script
+1. Setup frappe-bench by following [this guide](https://frappeframework.com/docs/v14/user/en/installation)
-    wget -O init.sh https://raw.githubusercontent.com/frappe/lms/develop/docker/init.sh
+1. In the frappe-bench directory, run `bench start` and keep it running. Open a new terminal session and cd into the `frappe-bench` directory.
+1. Run the following commands:
+    ```sh
+    bench new-site lms.test
+    bench get-app lms
+    bench --site lms.test install-app lms
+    bench --site lms.test add-to-hosts
 
-**Step 2**: Run the container and daemonize it
+ 1. Now, you can access the site at `http://lms.test:8000`
 
-    docker compose up -d
 
-**Step 3**: The site [http://lms.localhost:8000/lms](http://lms.localhost:8000/lms) should now be available. The default credentials are:
+## Deployment
-- Username: Administrator
+Frappe LMS is an app built on top of the Frappe Framework. So, you can follow any deployment guide for hosting a Frappe Framework-based site.
-- Password: admin
 
-### Local
+### Managed Hosting
+Frappe LMS can be deployed in a few clicks on [Frappe Cloud](https://frappecloud.com/marketplace/apps/lms).
 
-To setup the repository locally follow the steps mentioned below:
+### Self-hosting
+If you want to self-host, you can follow official [Frappe Bench Installation](https://github.com/frappe/bench#installation) instructions.
 
-1. Install bench and setup a `frappe-bench` directory by following the [Installation Steps](https://frappeframework.com/docs/user/en/installation)
+## Bugs and Feature Requests
-1. Start the server by running `bench start`
+If you find any bugs or have a feature idea for the app, feel free to report them here on [GitHub Issues](https://github.com/frappe/lms/issues). Make sure you share enough information (app screenshots, browser console screenshots, stack traces, etc) for project maintainers.
-1. In a separate terminal window, create a new site by running `bench new-site learning.test`
-1. Map your site to localhost with the command `bench --site learning.test add-to-hosts`
-1. Get the Learning app. Run `bench get-app https://github.com/frappe/lms`
-1. Run `bench --site learning.test install-app lms`.
-1. Now open the URL `http://learning.test:8000/lms` in your browser, you should see the app running
 
-## Learn and connect
+## License
-
+Distributed under [GNU AFFERO GENERAL PUBLIC LICENSE](license.txt)
-- [Telegram Public Group](https://t.me/frappelms)
-- [Discuss Forum](https://discuss.frappe.io/c/lms/70)
-- [Documentation](https://docs.frappe.io/learning)
-- [YouTube](https://www.youtube.com/channel/UCn3bV5kx77HsVwtnlCeEi_A)
-
-<br>
-<br>
-<div align="center" style="padding-top: 0.75rem;">
-	<a href="https://frappe.io" target="_blank">
-		<picture>
-			<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/Frappe-white.png">
-			<img src="https://frappe.io/files/Frappe-black.png" alt="Frappe Technologies" height="28"/>
-		</picture>
-	</a>
-</div>

cypress.config.js

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

cypress/e2e/course_creation.cy.js

@@ -5,7 +5,7 @@ describe("Course Creation", () => {
 		cy.visit("/lms/courses");
 
 		// Create a course
-		cy.get("header").children().last().children().last().click();
+		cy.get("a").contains("New Course").click();
 		cy.wait(1000);
 		cy.url().should("include", "/courses/new/edit");
 
@@ -31,35 +31,12 @@ 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("label")
+		cy.get(".search-input").click().type("frappe");
-			.contains("Category")
+		cy.wait(1000);
-			.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();
@@ -73,7 +50,7 @@ describe("Course Creation", () => {
 			.should("be.visible")
 			.within(() => {
 				cy.get("label").contains("Title").type("Test Chapter");
-				cy.button("Create").click();
+				cy.button("Add Chapter").click();
 			});
 
 		// Add Lesson
@@ -84,7 +61,21 @@ 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."
 		);
@@ -128,6 +119,12 @@ 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/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 name: lms
 services:
   mariadb:
-    image: mariadb:10.8
+    image: mariadb:10.6
     command:
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci

frontend/package.json

@@ -18,25 +18,19 @@
     "@editorjs/nested-list": "^1.4.2",
     "@editorjs/paragraph": "^2.11.3",
     "@editorjs/simple-image": "^1.6.0",
-    "@editorjs/table": "^2.4.2",
-    "ace-builds": "^1.36.2",
-    "apexcharts": "^4.3.0",
     "chart.js": "^4.4.1",
-    "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.89",
+    "frappe-ui": "^0.1.56",
     "lucide-vue-next": "^0.383.0",
     "markdown-it": "^14.0.0",
     "pinia": "^2.0.33",
     "socket.io-client": "^4.7.2",
     "tailwindcss": "^3.3.3",
-    "typescript": "^5.7.2",
     "vue": "^3.4.23",
     "vue-chartjs": "^5.3.0",
     "vue-draggable-next": "^2.2.1",
     "vue-router": "^4.0.12",
-    "vue3-apexcharts": "^1.8.0",
     "vuedraggable": "4.1.0"
   },
   "devDependencies": {

frontend/src/App.vue

@@ -14,10 +14,8 @@ 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) {
@@ -28,7 +26,6 @@ const Layout = computed(() => {
 })
 
 onMounted(async () => {
-	if (!userResource.data) return
 	await initTelemetry()
 })
 

frontend/src/components/Annoucements.vue

@@ -25,7 +25,7 @@
 	</div>
 </template>
 <script setup>
-import { createResource, Avatar } from 'frappe-ui'
+import { createListResource, Avatar } from 'frappe-ui'
 import { timeAgo } from '@/utils'
 
 const props = defineProps({
@@ -35,15 +35,24 @@ const props = defineProps({
 	},
 })
 
-const communications = createResource({
+const communications = createListResource({
-	url: 'lms.lms.api.get_announcements',
+	doctype: 'Communication',
-	makeParams(value) {
+	fields: [
-		return {
+		'subject',
-			batch: props.batch,
+		'content',
-		}
+		'recipients',
+		'cc',
+		'communication_date',
+		'sender',
+		'sender_full_name',
+	],
+	filters: {
+		reference_doctype: 'LMS Batch',
+		reference_name: props.batch,
 	},
+	orderBy: 'communication_date desc',
 	auto: true,
-	cache: ['announcement', props.batch],
+	cache: ['batch', props.batch],
 })
 </script>
 <style>

frontend/src/components/AppSidebar.vue

@@ -1,18 +1,18 @@
 <template>
 	<div
 		class="flex h-full flex-col justify-between transition-all duration-300 ease-in-out bg-gray-50"
-		:class="sidebarStore.isSidebarCollapsed ? 'w-14' : 'w-56'"
+		:class="isSidebarCollapsed ? 'w-14' : 'w-56'"
 	>
 		<div
 			class="flex flex-col overflow-hidden"
-			:class="sidebarStore.isSidebarCollapsed ? 'items-center' : ''"
+			:class="isSidebarCollapsed ? 'items-center' : ''"
 		>
-			<UserDropdown :isCollapsed="sidebarStore.isSidebarCollapsed" />
+			<UserDropdown :isCollapsed="isSidebarCollapsed" />
 			<div class="flex flex-col" v-if="sidebarSettings.data">
 				<SidebarLink
 					v-for="link in sidebarLinks"
 					:link="link"
-					:isCollapsed="sidebarStore.isSidebarCollapsed"
+					:isCollapsed="isSidebarCollapsed"
 					class="mx-2 my-0.5"
 				/>
 			</div>
@@ -22,11 +22,11 @@
 			>
 				<div
 					class="flex items-center justify-between pr-2 cursor-pointer"
-					:class="sidebarStore.isSidebarCollapsed ? 'pl-3' : 'pl-4'"
+					:class="isSidebarCollapsed ? 'pl-3' : 'pl-4'"
 					@click="showWebPages = !showWebPages"
 				>
 					<div
-						v-if="!sidebarStore.isSidebarCollapsed"
+						v-if="!isSidebarCollapsed"
 						class="flex items-center text-sm text-gray-600 my-1"
 					>
 						<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
@@ -53,7 +53,7 @@
 					<SidebarLink
 						v-for="link in sidebarSettings.data.web_pages"
 						:link="link"
-						:isCollapsed="sidebarStore.isSidebarCollapsed"
+						:isCollapsed="isSidebarCollapsed"
 						class="mx-2 my-0.5"
 						:showControls="isModerator ? true : false"
 						@openModal="openPageModal"
@@ -64,19 +64,17 @@
 		</div>
 		<SidebarLink
 			:link="{
-				label: sidebarStore.isSidebarCollapsed ? 'Expand' : 'Collapse',
+				label: isSidebarCollapsed ? 'Expand' : 'Collapse',
 			}"
-			:isCollapsed="sidebarStore.isSidebarCollapsed"
+			:isCollapsed="isSidebarCollapsed"
-			@click="toggleSidebar()"
+			@click="isSidebarCollapsed = !isSidebarCollapsed"
 			class="m-2"
 		>
 			<template #icon>
 				<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
 					<CollapseSidebar
 						class="h-4.5 w-4.5 text-gray-700 duration-300 ease-in-out"
-						:class="{
+						:class="{ '[transform:rotateY(180deg)]': isSidebarCollapsed }"
-							'[transform:rotateY(180deg)]': sidebarStore.isSidebarCollapsed,
-						}"
 					/>
 				</span>
 			</template>
@@ -98,24 +96,19 @@ import { ref, onMounted, inject, watch } from 'vue'
 import { getSidebarLinks } from '../utils'
 import { usersStore } from '@/stores/user'
 import { sessionStore } from '@/stores/session'
-import { useSidebar } from '@/stores/sidebar'
-import { useSettings } from '@/stores/settings'
 import { ChevronRight, Plus } from 'lucide-vue-next'
 import { createResource, Button } from 'frappe-ui'
 import PageModal from '@/components/Modals/PageModal.vue'
 
 const { user, sidebarSettings } = sessionStore()
 const { userResource } = usersStore()
-let sidebarStore = useSidebar()
 const socket = inject('$socket')
 const unreadCount = ref(0)
 const sidebarLinks = ref(getSidebarLinks())
 const showPageModal = ref(false)
 const isModerator = ref(false)
-const isInstructor = ref(false)
 const pageToEdit = ref(null)
 const showWebPages = ref(false)
-const settingsStore = useSettings()
 
 onMounted(() => {
 	socket.on('publish_lms_notifications', (data) => {
@@ -174,59 +167,6 @@ const addNotifications = () => {
 	}
 }
 
-const addQuizzes = () => {
-	if (isInstructor.value || isModerator.value) {
-		sidebarLinks.value.push({
-			label: 'Quizzes',
-			icon: 'CircleHelp',
-			to: 'Quizzes',
-			activeFor: ['Quizzes', 'QuizForm'],
-		})
-	}
-}
-
-const addAssignments = () => {
-	if (isInstructor.value || isModerator.value) {
-		sidebarLinks.value.push({
-			label: 'Assignments',
-			icon: 'Pencil',
-			to: 'Assignments',
-			activeFor: ['Assignments', 'AssignmentForm'],
-		})
-	}
-}
-
-const addPrograms = () => {
-	let activeFor = ['Programs', 'ProgramForm']
-	let index = 1
-	let canAddProgram = false
-
-	if (
-		!isInstructor.value &&
-		!isModerator.value &&
-		settingsStore.learningPaths.data
-	) {
-		sidebarLinks.value = sidebarLinks.value.filter(
-			(link) => link.label !== 'Courses'
-		)
-		activeFor.push('CourseDetail')
-		activeFor.push('Lesson')
-		index = 0
-		canAddProgram = true
-	} else if (isInstructor.value || isModerator.value) {
-		canAddProgram = true
-	}
-
-	if (canAddProgram) {
-		sidebarLinks.value.splice(index, 0, {
-			label: 'Programs',
-			icon: 'Route',
-			to: 'Programs',
-			activeFor: activeFor,
-		})
-	}
-}
-
 const openPageModal = (link) => {
 	showPageModal.value = true
 	pageToEdit.value = link
@@ -257,14 +197,8 @@ const getSidebarFromStorage = () => {
 watch(userResource, () => {
 	if (userResource.data) {
 		isModerator.value = userResource.data.is_moderator
-		isInstructor.value = userResource.data.is_instructor
-		addPrograms()
-		addQuizzes()
-		addAssignments()
 	}
 })
 
-const toggleSidebar = () => {
+let isSidebarCollapsed = ref(getSidebarFromStorage())
-	sidebarStore.isSidebarCollapsed = !sidebarStore.isSidebarCollapsed
-}
 </script>

frontend/src/components/AssessmentPlugin.vue

@@ -1,75 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			size: 'xl',
-		}"
-	>
-		<template #body>
-			<div class="p-5 space-y-4">
-				<div v-if="type == 'quiz'" class="text-lg font-semibold">
-					{{ __('Add a quiz to your lesson') }}
-				</div>
-				<div v-else class="text-lg font-semibold">
-					{{ __('Add an assignment to your lesson') }}
-				</div>
-				<div>
-					<Link
-						v-if="type == 'quiz'"
-						v-model="quiz"
-						doctype="LMS Quiz"
-						:label="__('Select a quiz')"
-						:onCreate="(value, close) => redirectToForm()"
-					/>
-					<Link
-						v-else
-						v-model="assignment"
-						doctype="LMS Assignment"
-						:label="__('Select an assignment')"
-						:onCreate="(value, close) => redirectToForm()"
-					/>
-				</div>
-				<div class="flex justify-end space-x-2">
-					<Button variant="solid" @click="addAssessment()">
-						{{ __('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 assignment = ref(null)
-
-const props = defineProps({
-	type: {
-		type: String,
-		required: true,
-	},
-	onAddition: {
-		type: Function,
-		required: true,
-	},
-})
-
-onMounted(async () => {
-	await nextTick()
-	show.value = true
-})
-
-const addAssessment = () => {
-	props.onAddition(props.type == 'quiz' ? quiz.value : assignment.value)
-	show.value = false
-}
-
-const redirectToForm = () => {
-	if (props.type == 'quiz') window.open('/lms/quizzes/new', '_blank')
-	else window.open('/lms/assignments/new', '_blank')
-}
-</script>

frontend/src/components/Assessments.vue

@@ -1,15 +1,7 @@
 <template>
 	<div>
-		<div class="flex items-center justify-between mb-4">
+		<div class="text-lg font-semibold mb-4">
-			<div class="text-lg font-semibold">
+			{{ __('Assessments') }}
-				{{ __('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
@@ -17,89 +9,41 @@
 				:rows="assessments.data"
 				row-key="name"
 				:options="{
+					selectable: false,
 					showTooltip: false,
-					getRowRoute: (row) => getRowRoute(row),
+					getRowRoute: (row) => {
-					selectable: user.data?.is_student ? false : true,
+						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 v-if="column.key == 'assessment_type'">
-									{{ row[column.key] == 'LMS Quiz' ? 'Quiz' : 'Assignment' }}
-								</div>
-								<div v-else-if="column.key == 'title'">
-									{{ row[column.key] }}
-								</div>
-								<div v-else-if="isNaN(row[column.key])">
-									<Badge :theme="getStatusTheme(row[column.key])">
-										{{ row[column.key] }}
-									</Badge>
-								</div>
-								<div v-else>
-									{{ 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 {
+import { ListView, createResource } from 'frappe-ui'
-	ListView,
+import { inject } from 'vue'
-	ListRow,
-	ListRows,
-	ListHeader,
-	ListHeaderItem,
-	ListRowItem,
-	ListSelectBanner,
-	createResource,
-	Button,
-	Badge,
-} 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: {
@@ -130,93 +74,25 @@ 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: {
-					assignmentID: row.assessment_name,
-					submissionName: row.submission.name,
-				},
-			}
-		} else {
-			return {
-				name: 'AssignmentSubmission',
-				params: {
-					assignmentID: row.assessment_name,
-					submissionName: 'new',
-				},
-			}
-		}
-	} else {
-		return {
-			name: 'QuizPage',
-			params: {
-				quizID: row.assessment_name,
-			},
-		}
-	}
-}
-
-const canSeeAddButton = () => {
-	return user.data?.is_moderator || user.data?.is_evaluator
-}
-
 const getAssessmentColumns = () => {
 	let columns = [
 		{
 			label: 'Assessment',
 			key: 'title',
-			width: '25rem',
 		},
 		{
 			label: 'Type',
 			key: 'assessment_type',
-			width: '15rem',
 		},
 	]
 
 	if (!user.data?.is_moderator) {
 		columns.push({
-			label: 'Status/Percentage',
+			label: 'Status/Score',
 			key: 'status',
-			align: 'left',
+			align: 'center',
-			width: '10rem',
 		})
 	}
 	return columns
 }
-
-const getStatusTheme = (status) => {
-	if (status === 'Pass') {
-		return 'green'
-	} else if (status === 'Not Graded') {
-		return 'orange'
-	} else {
-		return 'red'
-	}
-}
 </script>

frontend/src/components/Assignment.vue

@@ -1,448 +0,0 @@
-<template>
-	<div
-		v-if="assignment.data"
-		class="grid grid-cols-[68%,32%] h-full"
-		:class="{ 'border rounded-lg': !showTitle }"
-	>
-		<div class="border-r p-5 overflow-y-auto h-[calc(100vh-3.2rem)]">
-			<div v-if="showTitle" class="text-lg font-semibold mb-5">
-				<div v-if="submissionName === 'new'">
-					{{ __('Submission by') }} {{ user.data?.full_name }}
-				</div>
-				<div v-else>
-					{{ __('Submission by') }} {{ submissionResource.doc?.member_name }}
-				</div>
-			</div>
-			<div class="text-sm text-gray-600 font-medium mb-2">
-				{{ __('Question') }}:
-			</div>
-			<div
-				v-html="assignment.data.question"
-				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"
-			></div>
-		</div>
-
-		<div class="flex flex-col">
-			<div class="p-5">
-				<div class="flex items-center justify-between mb-4">
-					<div class="font-semibold">
-						{{ __('Submission') }}
-					</div>
-					<div class="flex items-center space-x-2">
-						<Badge v-if="isDirty" theme="orange">
-							{{ __('Not Saved') }}
-						</Badge>
-						<Badge
-							v-else-if="submissionResource.doc?.status"
-							:theme="statusTheme"
-							size="lg"
-						>
-							{{ submissionResource.doc?.status }}
-						</Badge>
-						<Button variant="solid" @click="submitAssignment()">
-							{{ __('Save') }}
-						</Button>
-					</div>
-				</div>
-				<div
-					v-if="
-						submissionName != 'new' &&
-						!['Pass', 'Fail'].includes(submissionResource.doc?.status) &&
-						submissionResource.doc?.owner == user.data?.name
-					"
-					class="bg-blue-100 p-3 rounded-md leading-5 text-sm mb-4"
-				>
-					{{ __("You've successfully submitted the assignment.") }}
-					{{
-						__(
-							"Once the moderator grades your submission, you'll find the details here."
-						)
-					}}
-					{{ __('Feel free to make edits to your submission if needed.') }}
-				</div>
-				<div v-if="showUploader()">
-					<div class="text-xs text-gray-600 mt-1 mb-2">
-						{{ __('Add your assignment as {0}').format(assignment.data.type) }}
-					</div>
-					<FileUploader
-						v-if="!submissionFile"
-						:fileTypes="getType()"
-						:validateFile="validateFile"
-						@success="(file) => saveSubmission(file)"
-					>
-						<template #default="{ uploading, progress, openFileSelector }">
-							<Button @click="openFileSelector" :loading="uploading">
-								{{
-									uploading
-										? __('Uploading {0}%').format(progress)
-										: __('Upload File')
-								}}
-							</Button>
-						</template>
-					</FileUploader>
-					<div v-else>
-						<div class="flex items-center">
-							<div class="border rounded-md p-2 mr-2">
-								<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
-							</div>
-							<a
-								:href="submissionFile.file_url"
-								target="_blank"
-								class="flex flex-col cursor-pointer !no-underline"
-							>
-								<span>
-									{{ submissionFile.file_name }}
-								</span>
-								<span class="text-sm text-gray-500 mt-1">
-									{{ getFileSize(submissionFile.file_size) }}
-								</span>
-							</a>
-							<X
-								v-if="canModifyAssignment"
-								@click="removeSubmission()"
-								class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
-							/>
-						</div>
-					</div>
-				</div>
-				<div v-else-if="assignment.data.type == 'URL'">
-					<div class="text-xs text-gray-600 mb-1">
-						{{ __('Enter a URL') }}
-					</div>
-					<FormControl
-						v-model="answer"
-						type="text"
-						:readonly="!canModifyAssignment"
-					/>
-				</div>
-				<div v-else>
-					<div class="text-sm mb-4">
-						{{ __('Write your answer here') }}
-					</div>
-					<TextEditor
-						:content="answer"
-						@change="(val) => (answer = 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>
-
-				<div
-					v-if="
-						user.data?.name == submissionResource.doc?.owner &&
-						submissionResource.doc?.comments
-					"
-					class="mt-8 p-3 bg-blue-100 rounded-md"
-				>
-					<div class="text-sm text-gray-600 font-medium mb-2">
-						{{ __('Comments by Evaluator') }}:
-					</div>
-					<div class="leading-5">
-						{{ submissionResource.doc.comments }}
-					</div>
-				</div>
-
-				<!-- Grading -->
-				<div v-if="canGradeSubmission" class="mt-8 space-y-4">
-					<div class="font-semibold mb-2">
-						{{ __('Grading') }}
-					</div>
-					<FormControl
-						v-if="submissionResource.doc"
-						v-model="submissionResource.doc.status"
-						:label="__('Grade')"
-						type="select"
-						:options="submissionStatusOptions"
-					/>
-					<FormControl
-						v-if="submissionResource.doc"
-						v-model="submissionResource.doc.comments"
-						:label="__('Comments')"
-						type="textarea"
-					/>
-				</div>
-			</div>
-		</div>
-	</div>
-</template>
-<script setup>
-import {
-	Badge,
-	Button,
-	call,
-	createResource,
-	createDocumentResource,
-	FileUploader,
-	FormControl,
-	TextEditor,
-} from 'frappe-ui'
-import { computed, inject, onMounted, onBeforeUnmount, ref, watch } from 'vue'
-import { FileText, X } from 'lucide-vue-next'
-import { showToast, getFileSize } from '@/utils'
-import { useRouter } from 'vue-router'
-
-const submissionFile = ref(null)
-const answer = ref(null)
-const router = useRouter()
-const user = inject('$user')
-const showTitle = router.currentRoute.value.name == 'AssignmentSubmission'
-const isDirty = ref(false)
-
-const props = defineProps({
-	assignmentID: {
-		type: String,
-		required: true,
-	},
-	submissionName: {
-		type: String,
-		default: 'new',
-	},
-})
-
-onMounted(() => {
-	window.addEventListener('keydown', keyboardShortcut)
-})
-
-const keyboardShortcut = (e) => {
-	if (e.key === 's' && (e.ctrlKey || e.metaKey)) {
-		submitAssignment()
-		e.preventDefault()
-	}
-}
-
-onBeforeUnmount(() => {
-	window.removeEventListener('keydown', keyboardShortcut)
-})
-
-const assignment = createResource({
-	url: 'frappe.client.get',
-	params: {
-		doctype: 'LMS Assignment',
-		name: props.assignmentID,
-	},
-	auto: true,
-	onSuccess(data) {
-		if (props.submissionName != 'new') {
-			submissionResource.reload()
-		}
-	},
-})
-
-const newSubmission = createResource({
-	url: 'frappe.client.insert',
-	makeParams(values) {
-		let doc = {
-			doctype: 'LMS Assignment Submission',
-			assignment: props.assignmentID,
-			member: user.data?.name,
-		}
-		if (showUploader()) {
-			doc.assignment_attachment = submissionFile.value.file_url
-		} else {
-			doc.answer = answer.value
-		}
-		return {
-			doc: doc,
-		}
-	},
-})
-
-const imageResource = createResource({
-	url: 'lms.lms.api.get_file_info',
-	makeParams(values) {
-		return {
-			file_url: values.image,
-		}
-	},
-	auto: false,
-	onSuccess(data) {
-		submissionFile.value = data
-	},
-})
-
-const submissionResource = createDocumentResource({
-	doctype: 'LMS Assignment Submission',
-	name: props.submissionName,
-	onError(err) {
-		showToast(__('Error'), __(err.messages?.[0] || err), 'x')
-	},
-	auto: false,
-	cache: [user.data?.name, props.assignmentID],
-})
-
-watch(submissionResource, () => {
-	if (submissionResource.doc) {
-		if (submissionResource.doc.assignment_attachment) {
-			imageResource.reload({
-				image: submissionResource.doc.assignment_attachment,
-			})
-		}
-		if (submissionResource.doc.answer) {
-			answer.value = submissionResource.doc.answer
-		}
-
-		if (submissionResource.isDirty) {
-			isDirty.value = true
-		} else if (showUploader() && !submissionFile.value) {
-			isDirty.value = true
-		} else if (!showUploader() && !answer.value) {
-			isDirty.value = true
-		} else {
-			isDirty.value = false
-		}
-	}
-})
-
-watch(submissionFile, () => {
-	if (props.submissionName == 'new' && submissionFile.value) {
-		isDirty.value = true
-	}
-})
-
-const submitAssignment = () => {
-	if (props.submissionName != 'new') {
-		let evaluator =
-			submissionResource.doc && submissionResource.doc.owner != user.data?.name
-				? user.data?.name
-				: null
-		submissionResource.setValue.submit(
-			{
-				...submissionResource.doc,
-				evaluator: evaluator,
-			},
-			{
-				onSuccess(data) {
-					showToast(__('Success'), __('Changes saved successfully'), 'check')
-				},
-			}
-		)
-	} else {
-		addNewSubmission()
-	}
-}
-
-const addNewSubmission = () => {
-	newSubmission.submit(
-		{},
-		{
-			onSuccess(data) {
-				showToast('Success', 'Assignment submitted successfully.', 'check')
-				if (router.currentRoute.value.name == 'AssignmentSubmission') {
-					router.push({
-						name: 'AssignmentSubmission',
-						params: {
-							assignmentID: props.assignmentID,
-							submissionName: data.name,
-						},
-					})
-				} else {
-					markLessonProgress()
-					router.go()
-				}
-				submissionResource.name = data.name
-				submissionResource.reload()
-			},
-			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
-			},
-		}
-	)
-}
-
-const saveSubmission = (file) => {
-	submissionFile.value = file
-}
-
-const markLessonProgress = () => {
-	if (router.currentRoute.value.name == 'Lesson') {
-		let courseName = router.currentRoute.value.params.courseName
-		let chapterNumber = router.currentRoute.value.params.chapterNumber
-		let lessonNumber = router.currentRoute.value.params.lessonNumber
-
-		call('lms.lms.api.mark_lesson_progress', {
-			course: courseName,
-			chapter_number: chapterNumber,
-			lesson_number: lessonNumber,
-		})
-	}
-}
-
-const getType = () => {
-	const type = assignment.data?.type
-	if (type == 'Image') {
-		return ['image/*']
-	} else if (type == 'Document') {
-		return [
-			'.doc',
-			'.docx',
-			'.xml',
-			'application/msword',
-			'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-		]
-	} else if (type == 'PDF') {
-		return ['.pdf']
-	}
-}
-
-const validateFile = (file) => {
-	let type = assignment.data?.type
-	let extension = file.name.split('.').pop().toLowerCase()
-	if (type == 'Image' && !['jpg', 'jpeg', 'png'].includes(extension)) {
-		return 'Only image file is allowed.'
-	} else if (
-		type == 'Document' &&
-		!['doc', 'docx', 'xml'].includes(extension)
-	) {
-		return 'Only document file is allowed.'
-	} else if (type == 'PDF' && !['pdf'].includes(extension)) {
-		return 'Only PDF file is allowed.'
-	}
-}
-
-const removeSubmission = () => {
-	submissionFile.value = null
-}
-
-const canGradeSubmission = computed(() => {
-	return (
-		(user.data?.is_moderator ||
-			user.data?.is_evaluator ||
-			user.data?.is_instructor) &&
-		props.submissionName != 'new' &&
-		router.currentRoute.value.name == 'AssignmentSubmission'
-	)
-})
-
-const canModifyAssignment = computed(() => {
-	return (
-		!submissionResource.doc ||
-		(submissionResource.doc?.owner == user.data?.name &&
-			submissionResource.doc?.status == 'Not Graded')
-	)
-})
-
-const submissionStatusOptions = computed(() => {
-	return [
-		{ label: 'Not Graded', value: 'Not Graded' },
-		{ label: 'Pass', value: 'Pass' },
-		{ label: 'Fail', value: 'Fail' },
-	]
-})
-
-const statusTheme = computed(() => {
-	if (!submissionResource.doc) {
-		return 'orange'
-	} else if (submissionResource.doc.status == 'Pass') {
-		return 'green'
-	} else if (submissionResource.doc.status == 'Not Graded') {
-		return 'blue'
-	} else {
-		return 'red'
-	}
-})
-
-const showUploader = () => {
-	return ['PDF', 'Image', 'Document'].includes(assignment.data?.type)
-}
-</script>

frontend/src/components/AssignmentBlock.vue

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

frontend/src/components/AudioBlock.vue

@@ -56,6 +56,7 @@ const props = defineProps({
 onMounted(() => {
 	setTimeout(() => {
 		audio.value = document.querySelector('audio')
+		console.log(audio.value)
 		audio.value.onloadedmetadata = () => {
 			duration.value = audio.value.duration
 		}

frontend/src/components/BatchCourses.vue

@@ -1,14 +1,18 @@
 <template>
 	<div>
 		<div class="flex items-center justify-between mb-4">
-			<div class="text-lg font-semibold">
+			<div class="text-xl font-semibold">
 				{{ __('Courses') }}
 			</div>
-			<Button v-if="canSeeAddButton()" @click="openCourseModal()">
+			<Button
+				v-if="user.data?.is_moderator"
+				variant="solid"
+				@click="openCourseModal()"
+			>
 				<template #prefix>
 					<Plus class="h-4 w-4" />
 				</template>
-				{{ __('Add') }}
+				{{ __('Add Course') }}
 			</Button>
 		</div>
 		<div v-if="courses.data?.length">
@@ -84,7 +88,6 @@ import {
 	ListRowItem,
 } from 'frappe-ui'
 import { Plus, Trash2 } from 'lucide-vue-next'
-import { showToast } from '@/utils'
 
 const showCourseModal = ref(false)
 const user = inject('$user')
@@ -118,43 +121,34 @@ const getCoursesColumns = () => {
 		},
 		{
 			label: 'Lessons',
-			key: 'lessons',
+			key: 'lesson_count',
 			align: 'right',
 		},
 		{
 			label: 'Enrollments',
 			align: 'right',
-			key: 'enrollments',
+			key: 'enrollment_count',
 		},
 	]
 }
 
-const deleteCourses = createResource({
+const removeCourse = createResource({
-	url: 'lms.lms.api.delete_documents',
+	url: 'frappe.client.delete',
 	makeParams(values) {
 		return {
 			doctype: 'Batch Course',
-			documents: values.courses,
+			name: values.course,
 		}
 	},
 })
 
 const removeCourses = (selections, unselectAll) => {
-	deleteCourses.submit(
+	selections.forEach(async (course) => {
-		{
+		removeCourse.submit({ course })
-			courses: Array.from(selections),
+	})
-		},
+	setTimeout(() => {
-		{
+		courses.reload()
-			onSuccess(data) {
+		unselectAll()
-				courses.reload()
+	}, 1000)
-				showToast(__('Success'), __('Courses deleted successfully'), 'check')
-				unselectAll()
-			},
-		}
-	)
-}
-
-const canSeeAddButton = () => {
-	return user.data?.is_moderator || user.data?.is_evaluator
 }
 </script>

frontend/src/components/BatchOverlay.vue

@@ -75,7 +75,6 @@
 			variant="solid"
 			class="w-full mt-2"
 			v-else-if="batch.data.allow_self_enrollment && batch.data.seats_left"
-			@click="enrollInBatch()"
 		>
 			{{ __('Enroll Now') }}
 		</Button>
@@ -98,13 +97,11 @@
 </template>
 <script setup>
 import { inject, computed } from 'vue'
-import { Badge, Button, createResource } from 'frappe-ui'
+import { Badge, Button } from 'frappe-ui'
 import { BookOpen, Clock, Globe } from 'lucide-vue-next'
-import { formatNumberIntoCurrency, formatTime, showToast } from '@/utils'
+import { formatNumberIntoCurrency, formatTime } from '@/utils'
 import DateRange from '@/components/Common/DateRange.vue'
-import { useRouter } from 'vue-router'
 
-const router = useRouter()
 const user = inject('$user')
 
 const props = defineProps({
@@ -114,39 +111,6 @@ const props = defineProps({
 	},
 })
 
-const enroll = createResource({
-	url: 'lms.lms.utils.enroll_in_batch',
-	makeParams(values) {
-		return {
-			batch: props.batch.data.name,
-		}
-	},
-})
-
-const enrollInBatch = () => {
-	if (!user.data) {
-		window.location.href = `/login?redirect-to=/batches/details/${props.batch.data.name}`
-	}
-	enroll.submit(
-		{},
-		{
-			onSuccess(data) {
-				showToast(
-					__('Success'),
-					__('You have been enrolled in this batch'),
-					'check'
-				)
-				router.push({
-					name: 'Batch',
-					params: {
-						batchName: props.batch.data.name,
-					},
-				})
-			},
-		}
-	)
-}
-
 const seats_left = computed(() => {
 	if (props.batch.data?.seat_count) {
 		return props.batch.data?.seat_count - props.batch.data?.students?.length

frontend/src/components/BatchStudents.vue

@@ -1,199 +1,80 @@
 <template>
-	<div class="">
+	<Button class="float-right mb-3" variant="solid" @click="openStudentModal()">
-		<div class="w-full flex items-center justify-between pb-4">
+		<template #prefix>
-			<div class="font-medium text-gray-600">
+			<Plus class="h-4 w-4" />
-				{{ __('Statistics') }}
+		</template>
-			</div>
+		{{ __('Add Student') }}
-		</div>
+	</Button>
-		<div class="grid grid-cols-3 gap-5 mb-8">
+	<div class="text-lg font-semibold mb-4">
-			<div class="flex items-center shadow py-2 px-3 rounded-md">
+		{{ __('Students') }}
-				<div class="p-2 rounded-md bg-gray-100 mr-3">
-					<User class="w-18 h-18 stroke-1.5 text-gray-700" />
-				</div>
-				<div class="flex flex-col">
-					<span class="text-xl font-semibold mb-1">
-						{{ students.data?.length }}
-					</span>
-					<span class="text-gray-700">
-						{{ __('Students') }}
-					</span>
-				</div>
-			</div>
-
-			<div class="flex items-center shadow py-2 px-3 rounded-md">
-				<div class="p-2 rounded-md bg-gray-100 mr-3">
-					<BookOpen class="w-18 h-18 stroke-1.5 text-gray-700" />
-				</div>
-				<div class="flex flex-col">
-					<span class="text-xl font-semibold mb-1">
-						{{ batch.courses?.length }}
-					</span>
-					<span class="text-gray-700">
-						{{ __('Courses') }}
-					</span>
-				</div>
-			</div>
-
-			<div class="flex items-center shadow py-2 px-3 rounded-md">
-				<div class="p-2 rounded-md bg-gray-100 mr-3">
-					<ShieldCheck class="w-18 h-18 stroke-1.5 text-gray-700" />
-				</div>
-				<div class="flex flex-col">
-					<span class="text-xl font-semibold mb-1">
-						{{ assessmentCount }}
-					</span>
-					<span class="text-gray-700">
-						{{ __('Assessments') }}
-					</span>
-				</div>
-			</div>
-		</div>
-		<div class="mb-8">
-			<div class="text-gray-600 font-medium">
-				{{ __('Progress') }}
-			</div>
-			<ApexChart
-				v-if="showProgressChart"
-				:options="chartOptions"
-				:series="chartData"
-				type="bar"
-				height="350"
-			/>
-			<div
-				class="flex items-center justify-center text-sm text-gray-700 space-x-4"
-			>
-				<div class="flex items-center space-x-2">
-					<div class="w-3 h-3" style="background-color: #0f736b"></div>
-					<div>
-						{{ __('Courses') }}
-					</div>
-				</div>
-				<div class="flex items-center space-x-2">
-					<div class="w-3 h-3" style="background-color: #0070cc"></div>
-					<div>
-						{{ __('Assessments') }}
-					</div>
-				</div>
-			</div>
-		</div>
 	</div>
-
+	<div v-if="students.data?.length">
-	<div>
+		<ListView
-		<div class="flex items-center justify-between mb-4">
+			:columns="getStudentColumns()"
-			<div class="text-gray-600 font-medium">
+			:rows="students.data"
-				{{ __('Students') }}
+			row-key="name"
-			</div>
+			:options="{ showTooltip: false }"
-			<Button @click="openStudentModal()">
+		>
-				<template #prefix>
+			<ListHeader
-					<Plus class="h-4 w-4" />
+				class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
-				</template>
-				{{ __('Add') }}
-			</Button>
-		</div>
-
-		<div v-if="students.data?.length">
-			<ListView
-				:columns="getStudentColumns()"
-				:rows="students.data"
-				row-key="name"
-				:options="{
-					showTooltip: false,
-				}"
 			>
-				<ListHeader
+				<ListHeaderItem :item="item" v-for="item in getStudentColumns()">
-					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+					<template #prefix="{ item }">
-				>
+						<component
-					<ListHeaderItem
+							v-if="item.icon"
-						:item="item"
+							:is="item.icon"
-						v-for="item in getStudentColumns()"
+							class="h-4 w-4 stroke-1.5 ml-4"
-						:title="item.label"
+						/>
-					>
-						<template #prefix="{ item }">
-							<FeatherIcon
-								v-if="item.icon"
-								:name="item.icon"
-								class="h-4 w-4 stroke-1.5"
-							/>
-						</template>
-					</ListHeaderItem>
-				</ListHeader>
-				<ListRows>
-					<ListRow
-						:row="row"
-						v-for="row in students.data"
-						class="group cursor-pointer"
-						@click="openStudentProgressModal(row)"
-					>
-						<template #default="{ column, item }">
-							<ListRowItem :item="row[column.key]" :align="column.align">
-								<template #prefix>
-									<div v-if="column.key == 'full_name'">
-										<Avatar
-											class="flex items-center"
-											:image="row['user_image']"
-											:label="item"
-											size="sm"
-										/>
-									</div>
-								</template>
-								<div
-									v-if="column.key == 'progress'"
-									class="flex items-center space-x-4 w-full"
-								>
-									<ProgressBar :progress="row[column.key]" size="sm" />
-								</div>
-								<div
-									v-else-if="column.key == 'copy'"
-									class="invisible group-hover:visible"
-								>
-									<Button variant="ghost" @click="copyEmail(row)">
-										<template #icon>
-											<Clipboard class="h-4 w-4 stroke-1.5" />
-										</template>
-									</Button>
-								</div>
-								<div v-else>
-									{{ row[column.key] }}
-								</div>
-							</ListRowItem>
-						</template>
-					</ListRow>
-				</ListRows>
-				<ListSelectBanner>
-					<template #actions="{ unselectAll, selections }">
-						<div class="flex gap-2">
-							<Button
-								variant="ghost"
-								@click="removeStudents(selections, unselectAll)"
-							>
-								<Trash2 class="h-4 w-4 stroke-1.5" />
-							</Button>
-						</div>
 					</template>
-				</ListSelectBanner>
+				</ListHeaderItem>
-			</ListView>
+			</ListHeader>
-		</div>
+			<ListRows>
-		<div v-else class="text-sm italic text-gray-600">
+				<ListRow :row="row" v-for="row in students.data">
-			{{ __('There are no students in this batch.') }}
+					<template #default="{ column, item }">
-		</div>
+						<ListRowItem :item="row[column.key]" :align="column.align">
+							<template #prefix>
+								<div v-if="column.key == 'full_name'">
+									<Avatar
+										class="flex items-center"
+										:image="row['user_image']"
+										:label="item"
+										size="sm"
+									/>
+								</div>
+							</template>
+							<div>
+								{{ row[column.key] }}
+							</div>
+						</ListRowItem>
+					</template>
+				</ListRow>
+			</ListRows>
+			<ListSelectBanner>
+				<template #actions="{ unselectAll, selections }">
+					<div class="flex gap-2">
+						<Button
+							variant="ghost"
+							@click="removeStudents(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">
+		{{ __('There are no students in this batch.') }}
 	</div>
-
 	<StudentModal
-		:batch="props.batch.name"
+		:batch="props.batch"
 		v-model="showStudentModal"
 		v-model:reloadStudents="students"
 	/>
-	<BatchStudentProgress
-		:student="selectedStudent"
-		v-model="showStudentProgressModal"
-	/>
 </template>
 <script setup>
 import {
-	Avatar,
-	Button,
 	createResource,
-	FeatherIcon,
 	ListHeader,
 	ListHeaderItem,
 	ListSelectBanner,
@@ -201,217 +82,76 @@ import {
 	ListRows,
 	ListView,
 	ListRowItem,
+	Avatar,
+	Button,
 } from 'frappe-ui'
-import {
+import { Trash2, Plus } from 'lucide-vue-next'
-	BookOpen,
+import { ref } from 'vue'
-	Clipboard,
-	Plus,
-	ShieldCheck,
-	Trash2,
-	User,
-} from 'lucide-vue-next'
-import { ref, watch } from 'vue'
 import StudentModal from '@/components/Modals/StudentModal.vue'
-import { showToast } from '@/utils'
-import ProgressBar from '@/components/ProgressBar.vue'
-import BatchStudentProgress from '@/components/Modals/BatchStudentProgress.vue'
-import ApexChart from 'vue3-apexcharts'
 
 const showStudentModal = ref(false)
-const showStudentProgressModal = ref(false)
-const selectedStudent = ref(null)
-const chartData = ref(null)
-const chartOptions = ref(null)
-const showProgressChart = ref(false)
-const assessmentCount = ref(0)
 
 const props = defineProps({
 	batch: {
-		type: Object,
+		type: String,
 		default: null,
 	},
 })
 
 const students = createResource({
 	url: 'lms.lms.utils.get_batch_students',
-	cache: ['students', props.batch.name],
+	cache: ['students', props.batch],
 	params: {
-		batch: props.batch?.name,
+		batch: props.batch,
 	},
 	auto: true,
-	onSuccess(data) {
-		chartData.value = getChartData()
-		showProgressChart.value = true
-	},
 })
 
 const getStudentColumns = () => {
-	let columns = [
+	return [
 		{
 			label: 'Full Name',
 			key: 'full_name',
-			width: '20rem',
+			width: 2,
-			icon: 'user',
 		},
 		{
-			label: 'Progress',
+			label: 'Courses Done',
-			key: 'progress',
+			key: 'courses_completed',
-			width: '10rem',
+			align: 'center',
-			icon: 'activity',
+		},
+		{
+			label: 'Assessments Done',
+			key: 'assessments_completed',
+			align: 'center',
 		},
 		{
 			label: 'Last Active',
 			key: 'last_active',
-			width: '15rem',
-			align: 'center',
-			icon: 'clock',
-		},
-		{
-			label: '',
-			key: 'copy',
 		},
 	]
-
-	return columns
 }
 
 const openStudentModal = () => {
 	showStudentModal.value = true
 }
 
-const openStudentProgressModal = (row) => {
+const removeStudent = createResource({
-	showStudentProgressModal.value = true
+	url: 'frappe.client.delete',
-	selectedStudent.value = row
-}
-
-const deleteStudents = createResource({
-	url: 'lms.lms.api.delete_documents',
 	makeParams(values) {
 		return {
 			doctype: 'Batch Student',
-			documents: values.students,
+			name: values.student,
 		}
 	},
 })
 
 const removeStudents = (selections, unselectAll) => {
-	deleteStudents.submit(
+	selections.forEach(async (student) => {
-		{
+		removeStudent.submit({ student })
-			students: Array.from(selections),
-		},
-		{
-			onSuccess(data) {
-				students.reload()
-				showToast(__('Success'), __('Students deleted successfully'), 'check')
-				unselectAll()
-			},
-		}
-	)
-}
-
-const getChartData = () => {
-	let categories = {}
-
-	Object.keys(students.data?.[0].courses).forEach((course) => {
-		categories[course] = {
-			value: 0,
-			type: 'course',
-			label: course,
-		}
 	})
-
+	setTimeout(() => {
-	Object.keys(students.data?.[0].assessments).forEach((assessment) => {
+		students.reload()
-		categories[assessment] = {
+		unselectAll()
-			value: 0,
+	}, 500)
-			type: 'assessment',
-			label: assessment,
-		}
-	})
-
-	students.data.forEach((student) => {
-		Object.keys(student.courses).forEach((course) => {
-			if (student.courses[course] === 100) {
-				categories[course].value += 1
-			}
-		})
-
-		Object.keys(student.assessments).forEach((assessment) => {
-			if (student.assessments[assessment] === 100) {
-				categories[assessment].value += 1
-			}
-		})
-	})
-
-	chartOptions.value = getChartOptions(categories)
-	return [
-		{
-			name: __('Completed by Students'),
-			data: Object.values(categories).map((item) => item.value),
-		},
-	]
 }
-
-const getChartOptions = (categories) => {
-	const courseColor = '#0F736B'
-	const assessmentColor = '#0070CC'
-	const maxY =
-		students.data?.length % 5
-			? students.data?.length + (5 - (students.data?.length % 5))
-			: students.data?.length
-
-	return {
-		chart: {
-			type: 'bar',
-			height: 50,
-			toolbar: {
-				show: false,
-			},
-		},
-		plotOptions: {
-			bar: {
-				distributed: true,
-				borderRadius: 0,
-				horizontal: true,
-				barHeight: '30%',
-			},
-		},
-		colors: Object.values(categories).map((item) =>
-			item.type === 'course' ? courseColor : assessmentColor
-		),
-		xaxis: {
-			categories: Object.values(categories).map((item) => item.label),
-			labels: {
-				style: {
-					fontSize: '10px',
-				},
-				rotate: 0,
-				formatter: function (value) {
-					return value.length > 20 ? `${value.substring(0, 20)}...` : value // Trim long labels
-				},
-			},
-		},
-		yaxis: {
-			max: maxY,
-			min: 0,
-			stepSize: 10,
-			tickAmount: maxY / 5,
-		},
-	}
-}
-
-const copyEmail = (row) => {
-	navigator.clipboard.writeText(row.email)
-	showToast(__('Success'), __('Email copied to clipboard'), 'check')
-}
-
-watch(students, () => {
-	if (students.data?.length) {
-		assessmentCount.value = Object.keys(students.data?.[0].assessments).length
-	}
-})
 </script>
-<style>
-.apexcharts-legend {
-	display: none !important;
-}
-</style>

frontend/src/components/BrandSettings.vue

@@ -1,92 +0,0 @@
-<template>
-	<div class="flex flex-col justify-between min-h-0">
-		<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>
-		<div class="overflow-y-auto">
-			<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>
-	</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,
-		},
-		{
-			onSuccess(data) {
-				isDirty.value = false
-			},
-		}
-	)
-}
-
-watch(props.data, (newData) => {
-	if (newData && !isDirty.value) {
-		isDirty.value = true
-	}
-})
-</script>

frontend/src/components/Categories.vue

@@ -1,151 +0,0 @@
-<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

@@ -92,7 +92,7 @@
 													{{ option.label }}
 												</div>
 												<div
-													v-if="option.description"
+													v-if="option.label != option.description"
 													class="text-xs text-gray-700"
 													v-html="option.description"
 												></div>

frontend/src/components/Controls/CodeEditor.vue

@@ -1,204 +0,0 @@
-<template>
-	<div
-		class="editor flex flex-col gap-1"
-		:style="{
-			height: height,
-		}"
-	>
-		<span class="text-xs" v-if="label">
-			{{ label }}
-		</span>
-		<div
-			ref="editor"
-			class="h-auto flex-1 overflow-hidden overscroll-none !rounded border border-outline-gray-2 bg-surface-gray-2 dark:bg-gray-900"
-		/>
-		<span
-			class="mt-1 text-xs text-gray-600"
-			v-show="description"
-			v-html="description"
-		></span>
-		<Button
-			v-if="showSaveButton"
-			@click="emit('save', aceEditor?.getValue())"
-			class="mt-3"
-		>
-			{{ __('Save') }}
-		</Button>
-	</div>
-</template>
-<script setup lang="ts">
-import { useDark } from '@vueuse/core'
-import ace from 'ace-builds'
-import 'ace-builds/src-min-noconflict/ext-searchbox'
-import 'ace-builds/src-min-noconflict/theme-chrome'
-import 'ace-builds/src-min-noconflict/theme-twilight'
-import { PropType, onMounted, ref, watch } from 'vue'
-import { Button } from 'frappe-ui'
-
-const isDark = useDark({
-	attribute: 'data-theme',
-})
-
-const props = defineProps({
-	modelValue: {
-		type: [Object, String, Array],
-	},
-	type: {
-		type: String as PropType<'JSON' | 'HTML' | 'Python' | 'JavaScript' | 'CSS'>,
-		default: 'JSON',
-	},
-	label: {
-		type: String,
-		default: '',
-	},
-	readonly: {
-		type: Boolean,
-		default: false,
-	},
-	height: {
-		type: String,
-		default: '250px',
-	},
-	showLineNumbers: {
-		type: Boolean,
-		default: false,
-	},
-	autofocus: {
-		type: Boolean,
-		default: true,
-	},
-	showSaveButton: {
-		type: Boolean,
-		default: false,
-	},
-	description: {
-		type: String,
-		default: '',
-	},
-})
-
-const emit = defineEmits(['save', 'update:modelValue'])
-const editor = ref<HTMLElement | null>(null)
-let aceEditor = null as ace.Ace.Editor | null
-
-onMounted(() => {
-	setupEditor()
-})
-
-const setupEditor = () => {
-	aceEditor = ace.edit(editor.value as HTMLElement)
-	resetEditor(props.modelValue as string, true)
-	aceEditor.setReadOnly(props.readonly)
-	aceEditor.setOptions({
-		fontSize: '12px',
-		useWorker: false,
-		showGutter: props.showLineNumbers,
-		wrap: props.showLineNumbers,
-	})
-	if (props.type === 'CSS') {
-		import('ace-builds/src-noconflict/mode-css').then(() => {
-			aceEditor?.session.setMode('ace/mode/css')
-		})
-	} else if (props.type === 'JavaScript') {
-		import('ace-builds/src-noconflict/mode-javascript').then(() => {
-			aceEditor?.session.setMode('ace/mode/javascript')
-		})
-	} else if (props.type === 'Python') {
-		import('ace-builds/src-noconflict/mode-python').then(() => {
-			aceEditor?.session.setMode('ace/mode/python')
-		})
-	} else if (props.type === 'JSON') {
-		import('ace-builds/src-noconflict/mode-json').then(() => {
-			aceEditor?.session.setMode('ace/mode/json')
-		})
-	} else {
-		import('ace-builds/src-noconflict/mode-html').then(() => {
-			aceEditor?.session.setMode('ace/mode/html')
-		})
-	}
-	aceEditor.on('blur', () => {
-		try {
-			let value = aceEditor?.getValue() || ''
-			if (props.type === 'JSON') {
-				value = JSON.parse(value)
-			}
-			if (value === props.modelValue) return
-			if (!props.showSaveButton && !props.readonly) {
-				emit('update:modelValue', value)
-			}
-		} catch (e) {
-			// do nothing
-		}
-	})
-}
-
-const getModelValue = () => {
-	let value = props.modelValue || ''
-	try {
-		if (props.type === 'JSON' || typeof value === 'object') {
-			value = JSON.stringify(value, null, 2)
-		}
-	} catch (e) {
-		// do nothing
-	}
-	return value as string
-}
-
-function resetEditor(value: string, resetHistory = false) {
-	value = getModelValue()
-	aceEditor?.setValue(value)
-	aceEditor?.clearSelection()
-	aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
-	props.autofocus && aceEditor?.focus()
-	if (resetHistory) {
-		aceEditor?.session.getUndoManager().reset()
-	}
-}
-
-watch(isDark, () => {
-	aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
-})
-
-watch(
-	() => props.type,
-	() => {
-		setupEditor()
-	}
-)
-
-watch(
-	() => props.modelValue,
-	() => {
-		resetEditor(props.modelValue as string)
-	}
-)
-
-defineExpose({ resetEditor })
-</script>
-<style scoped>
-.editor .ace_editor {
-	height: 100%;
-	width: 100%;
-	border-radius: 5px;
-	overscroll-behavior: none;
-}
-.editor :deep(.ace_scrollbar-h) {
-	display: none;
-}
-.editor :deep(.ace_search) {
-	@apply dark:bg-gray-800 dark:text-gray-200;
-	@apply dark:border-gray-800;
-}
-.editor :deep(.ace_searchbtn) {
-	@apply dark:bg-gray-800 dark:text-gray-200;
-	@apply dark:border-gray-800;
-}
-.editor :deep(.ace_button) {
-	@apply dark:bg-gray-800 dark:text-gray-200;
-}
-
-.editor :deep(.ace_search_field) {
-	@apply dark:bg-gray-900 dark:text-gray-200;
-	@apply dark:border-gray-800;
-}
-</style>

frontend/src/components/Controls/Link.vue

@@ -2,7 +2,6 @@
 	<div class="space-y-1.5">
 		<label class="block" :class="labelClasses" v-if="attrs.label">
 			{{ attrs.label }}
-			<span class="text-red-500" v-if="attrs.required">*</span>
 		</label>
 		<Autocomplete
 			ref="autocomplete"
@@ -29,8 +28,8 @@
 				<slot name="item-label" v-bind="{ active, selected, option }" />
 			</template>
 
-			<template #footer="{ value, close }">
+			<template v-if="attrs.onCreate" #footer="{ value, close }">
-				<div v-if="attrs.onCreate">
+				<div>
 					<Button
 						variant="ghost"
 						class="w-full !justify-start"
@@ -42,21 +41,8 @@
 						</template>
 					</Button>
 				</div>
-				<div>
-					<Button
-						variant="ghost"
-						class="w-full !justify-start"
-						:label="__('Clear')"
-						@click="() => clearValue(close)"
-					>
-						<template #prefix>
-							<X class="h-4 w-4 stroke-1.5" />
-						</template>
-					</Button>
-				</div>
 			</template>
 		</Autocomplete>
-		<p v-if="description" class="text-sm text-gray-600">{{ description }}</p>
 	</div>
 </template>
 
@@ -64,7 +50,7 @@
 import Autocomplete from '@/components/Controls/Autocomplete.vue'
 import { watchDebounced } from '@vueuse/core'
 import { createResource, Button } from 'frappe-ui'
-import { Plus, X } from 'lucide-vue-next'
+import { Plus } from 'lucide-vue-next'
 import { useAttrs, computed, ref } from 'vue'
 
 const props = defineProps({
@@ -80,14 +66,12 @@ const props = defineProps({
 		type: String,
 		default: '',
 	},
-	description: {
-		type: String,
-		default: '',
-	},
 })
 
 const emit = defineEmits(['update:modelValue', 'change'])
+
 const attrs = useAttrs()
+
 const valuePropPassed = computed(() => 'value' in attrs)
 
 const value = computed({
@@ -124,7 +108,6 @@ 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,
@@ -133,7 +116,7 @@ const options = createResource({
 	transform: (data) => {
 		return data.map((option) => {
 			return {
-				label: option.label || option.value,
+				label: option.value,
 				value: option.value,
 				description: option.description,
 			}
@@ -141,7 +124,7 @@ const options = createResource({
 	},
 })
 
-const reload = (val) => {
+function reload(val) {
 	options.update({
 		params: {
 			txt: val,
@@ -152,11 +135,6 @@ const reload = (val) => {
 	options.reload()
 }
 
-const clearValue = (close) => {
-	emit(valuePropPassed.value ? 'change' : 'update:modelValue', '')
-	close()
-}
-
 const labelClasses = computed(() => {
 	return [
 		{

frontend/src/components/Controls/MultiSelect.vue

@@ -2,7 +2,6 @@
 	<div>
 		<label class="block mb-1" :class="labelClasses" v-if="label">
 			{{ label }}
-			<span class="text-red-500" v-if="required">*</span>
 		</label>
 		<div class="grid grid-cols-3 gap-1">
 			<Button
@@ -116,9 +115,6 @@ const props = defineProps({
 		type: Function,
 		default: (value) => `${value} is an Invalid value`,
 	},
-	required: {
-		type: Boolean,
-	},
 })
 
 const values = defineModel()
@@ -156,11 +152,24 @@ const filterOptions = createResource({
 	url: 'frappe.desk.search.search_link',
 	method: 'POST',
 	cache: [text.value, props.doctype],
-	auto: true,
 	params: {
 		txt: text.value,
 		doctype: props.doctype,
 	},
+	/* transform: (data) => {
+        let allData = data
+            .filter((c) => {
+                return c.description.split(', ')[1]
+            })
+            .map((option) => {
+                let email = option.description.split(', ')[1]
+                return {
+                    label: option.label || email,
+                    value: email,
+                }
+            })
+        return allData
+    }, */
 })
 
 const options = computed(() => {

frontend/src/components/Controls/Rating.vue

@@ -1,27 +1,18 @@
 <template>
-	<div class="space-y-1">
+	<div class="flex text-center">
-		<label class="block text-xs text-gray-600" v-if="props.label">
+		<div v-for="index in 5">
-			{{ props.label }}
+			<Star
-		</label>
+				:class="index <= rating ? 'fill-orange-500' : ''"
-		<div class="flex text-center">
+				class="h-6 w-6 fill-gray-400 text-gray-50 mr-1 cursor-pointer"
-			<div
+				@click="markRating(index)"
-				v-for="index in 5"
+			/>
-				@mouseover="hoveredRating = index"
-				@mouseleave="hoveredRating = 0"
-			>
-				<Star
-					class="fill-gray-400 text-gray-50 stroke-1 mr-1 cursor-pointer"
-					:class="iconClasses(index)"
-					@click="markRating(index)"
-				/>
-			</div>
 		</div>
 	</div>
 </template>
 
 <script setup>
 import { Star } from 'lucide-vue-next'
-import { ref, watch } from 'vue'
+import { ref } from 'vue'
 
 const props = defineProps({
 	id: {
@@ -32,36 +23,10 @@ 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'])
-const rating = ref(props.modelValue)
+let rating = ref(props.modelValue)
-const hoveredRating = ref(0)
 
 let emitChange = (value) => {
 	emit('update:modelValue', value)
@@ -71,11 +36,4 @@ function markRating(index) {
 	emitChange(index)
 	rating.value = index
 }
-
-watch(
-	() => props.modelValue,
-	(newVal) => {
-		rating.value = newVal
-	}
-)
 </script>

frontend/src/components/CourseCard.vue

@@ -10,13 +10,13 @@
 			:style="{ backgroundImage: 'url(\'' + encodeURI(course.image) + '\')' }"
 		>
 			<div
-				class="flex items-center flex-wrap space-x-1 relative top-4 px-2 w-fit"
+				class="flex items-center flex-wrap space-y-1 space-x-1 relative top-4 px-2 w-fit"
 			>
 				<Badge v-if="course.featured" variant="subtle" theme="green" size="md">
 					{{ __('Featured') }}
 				</Badge>
 				<Badge
-					variant="subtle"
+					variant="outline"
 					theme="gray"
 					size="md"
 					v-for="tag in course.tags"
@@ -30,36 +30,36 @@
 		</div>
 		<div class="flex flex-col flex-auto p-4">
 			<div class="flex items-center justify-between mb-2">
-				<div v-if="course.lessons">
+				<div v-if="course.lesson_count">
 					<Tooltip :text="__('Lessons')">
 						<span class="flex items-center">
 							<BookOpen class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
-							{{ course.lessons }}
+							{{ course.lesson_count }}
 						</span>
 					</Tooltip>
 				</div>
 
-				<div v-if="course.enrollments">
+				<div v-if="course.enrollment_count">
 					<Tooltip :text="__('Enrolled Students')">
 						<span class="flex items-center">
 							<Users class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
-							{{ course.enrollments }}
+							{{ course.enrollment_count }}
 						</span>
 					</Tooltip>
 				</div>
 
-				<div v-if="course.rating">
+				<div v-if="course.avg_rating">
 					<Tooltip :text="__('Average Rating')">
 						<span class="flex items-center">
 							<Star class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
-							{{ course.rating }}
+							{{ course.avg_rating }}
 						</span>
 					</Tooltip>
 				</div>
 
 				<div v-if="course.status != 'Approved'">
 					<Badge
-						variant="subtle"
+						variant="solid"
 						:theme="course.status === 'Under Review' ? 'orange' : 'blue'"
 						size="sm"
 					>

frontend/src/components/CourseCardOverlay.vue

@@ -87,29 +87,27 @@
 					</span>
 				</Button>
 			</router-link>
-			<div class="space-y-4">
+			<div class="mt-8 mb-4 font-medium">
-				<div class="mt-8 font-medium">
+				{{ __('This course has:') }}
-					{{ __('This course has:') }}
+			</div>
-				</div>
+			<div class="flex items-center mb-3">
-				<div class="flex items-center">
+				<BookOpen class="h-5 w-5 stroke-1.5 text-gray-600" />
-					<BookOpen class="h-4 w-4 stroke-1.5 text-gray-600" />
+				<span class="ml-2">
-					<span class="ml-2">
+					{{ course.data.lesson_count }} {{ __('Lessons') }}
-						{{ course.data.lessons }} {{ __('Lessons') }}
+				</span>
-					</span>
+			</div>
-				</div>
+			<div class="flex items-center mb-3">
-				<div class="flex items-center">
+				<Users class="h-5 w-5 stroke-1.5 text-gray-600" />
-					<Users class="h-4 w-4 stroke-1.5 text-gray-600" />
+				<span class="ml-2">
-					<span class="ml-2">
+					{{ course.data.enrollment_count_formatted }}
-						{{ formatAmount(course.data.enrollments) }}
+					{{ __('Enrolled Students') }}
-						{{ __('Enrolled Students') }}
+				</span>
-					</span>
+			</div>
-				</div>
+			<div class="flex items-center">
-				<div v-if="parseInt(course.data.rating) > 0" class="flex items-center">
+				<Star class="h-5 w-5 stroke-1.5 fill-orange-500 text-gray-50" />
-					<Star class="h-4 w-4 stroke-1.5 fill-orange-500 text-gray-50" />
+				<span class="ml-2">
-					<span class="ml-2">
+					{{ course.data.avg_rating }} {{ __('Rating') }}
-						{{ course.data.rating }} {{ __('Rating') }}
+				</span>
-					</span>
-				</div>
 			</div>
 		</div>
 	</div>
@@ -118,8 +116,7 @@
 import { BookOpen, Users, Star } from 'lucide-vue-next'
 import { computed, inject } from 'vue'
 import { Button, createResource } from 'frappe-ui'
-import { showToast, formatAmount } from '@/utils/'
+import { createToast } from '@/utils/'
-import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
@@ -141,11 +138,11 @@ const video_link = computed(() => {
 
 function enrollStudent() {
 	if (!user.data) {
-		showToast(
+		createToast({
-			__('Please Login'),
+			title: 'Please Login',
-			__('You need to login first to enroll for this course'),
+			icon: 'alert-circle',
-			'alert-circle'
+			iconClasses: 'text-yellow-600 bg-yellow-100',
-		)
+		})
 		setTimeout(() => {
 			window.location.href = `/login?redirect-to=${window.location.pathname}`
 		}, 2000)
@@ -158,14 +155,11 @@ function enrollStudent() {
 				course: props.course.data.name,
 			})
 			.then(() => {
-				capture('enrolled_in_course', {
+				createToast({
-					course: props.course.data.name,
+					title: 'Enrolled Successfully',
+					icon: 'check',
+					iconClasses: 'text-green-600 bg-green-100',
 				})
-				showToast(
-					__('Success'),
-					__('You have been enrolled in this course'),
-					'check'
-				)
 				setTimeout(() => {
 					router.push({
 						name: 'Lesson',
@@ -175,7 +169,7 @@ function enrollStudent() {
 							lessonNumber: 1,
 						},
 					})
-				}, 2000)
+				}, 3000)
 			})
 	}
 }
@@ -208,6 +202,7 @@ const certificate = createResource({
 		}
 	},
 	onSuccess(data) {
+		console.log(data)
 		window.open(
 			`/api/method/frappe.utils.print_format.download_pdf?doctype=LMS+Certificate&name=${
 				data.name

frontend/src/components/CourseInstructors.vue

@@ -1,5 +1,5 @@
 <template>
-	<span v-if="instructors?.length == 1">
+	<span v-if="instructors.length == 1">
 		<router-link
 			:to="{
 				name: 'Profile',
@@ -9,7 +9,7 @@
 			{{ instructors[0].full_name }}
 		</router-link>
 	</span>
-	<span v-if="instructors?.length == 2">
+	<span v-if="instructors.length == 2">
 		<router-link
 			:to="{
 				name: 'Profile',
@@ -28,7 +28,7 @@
 			{{ instructors[1].first_name }}
 		</router-link>
 	</span>
-	<span v-if="instructors?.length > 2">
+	<span v-if="instructors.length > 2">
 		<router-link
 			:to="{
 				name: 'Profile',
@@ -37,7 +37,7 @@
 		>
 			{{ instructors[0].first_name }}
 		</router-link>
-		and {{ instructors?.length - 1 }} others
+		and {{ instructors.length - 1 }} others
 	</span>
 </template>
 <script setup>

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 leading-5">
+			<div class="font-semibold text-lg">
 				{{ __(title) }}
 			</div>
 			<Button size="sm" v-if="allowEdit" @click="openChapterModal()">
@@ -16,7 +16,7 @@
 		</div>
 		<div
 			:class="{
-				'shadow rounded-md py-2 px-2': showOutline && outline.data?.length,
+				'shadow rounded-md pt-2 px-2': showOutline && outline.data?.length,
 			}"
 		>
 			<Disclosure
@@ -25,42 +25,21 @@
 				:key="chapter.name"
 				:defaultOpen="openChapterDetail(chapter.idx)"
 			>
-				<DisclosureButton ref="" class="flex items-center w-full p-2 group">
+				<DisclosureButton ref="" class="flex w-full p-2">
 					<ChevronRight
 						:class="{
 							'rotate-90 transform duration-200': open,
 							'duration-200': !open,
-							hidden: chapter.is_scorm_package,
 							open: index == 1,
 						}"
-						class="h-4 w-4 text-gray-900 stroke-1"
+						class="h-4 w-4 text-gray-900 stroke-1 mr-2"
 					/>
-					<div
+					<div class="text-base text-left font-medium leading-5">
-						class="text-base text-left font-medium leading-5 ml-2"
-						@click="redirectToChapter(chapter)"
-					>
 						{{ chapter.title }}
 					</div>
-					<div class="flex ml-auto space-x-4">
-						<Tooltip :text="__('Edit Chapter')" placement="bottom">
-							<FilePenLine
-								v-if="allowEdit"
-								@click.prevent="openChapterModal(chapter)"
-								class="h-4 w-4 text-gray-900 invisible group-hover:visible"
-							/>
-						</Tooltip>
-						<Tooltip :text="__('Delete Chapter')" placement="bottom">
-							<Trash2
-								v-if="allowEdit"
-								@click.prevent="trashChapter(chapter.name)"
-								class="h-4 w-4 text-red-500 invisible group-hover:visible"
-							/>
-						</Tooltip>
-					</div>
 				</DisclosureButton>
-				<DisclosurePanel v-if="!chapter.is_scorm_package">
+				<DisclosurePanel>
 					<Draggable
-						v-if="!chapter.is_scorm_package"
 						:list="chapter.lessons"
 						:disabled="!allowEdit"
 						item-key="name"
@@ -97,7 +76,7 @@
 										<Trash2
 											v-if="allowEdit"
 											@click.prevent="trashLesson(lesson.name, chapter.name)"
-											class="h-4 w-4 text-red-500 ml-auto invisible group-hover:visible"
+											class="h-4 w-4 stroke-1.5 text-gray-700 ml-auto invisible group-hover:visible"
 										/>
 										<Check
 											v-if="lesson.is_complete"
@@ -110,7 +89,6 @@
 					</Draggable>
 					<div v-if="allowEdit" class="flex mt-2 mb-4 pl-8">
 						<router-link
-							v-if="!chapter.is_scorm_package"
 							:to="{
 								name: 'LessonForm',
 								params: {
@@ -124,6 +102,9 @@
 								{{ __('Add Lesson') }}
 							</Button>
 						</router-link>
+						<Button class="ml-2" @click="openChapterModal(chapter)">
+							{{ __('Edit Chapter') }}
+						</Button>
 					</div>
 				</DisclosurePanel>
 			</Disclosure>
@@ -137,30 +118,26 @@
 	/>
 </template>
 <script setup>
-import { Button, createResource, Tooltip } from 'frappe-ui'
+import { Button, createResource } from 'frappe-ui'
-import { getCurrentInstance, inject, ref } from 'vue'
+import { ref } from 'vue'
 import Draggable from 'vuedraggable'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue'
 import {
-	Check,
 	ChevronRight,
-	FileText,
-	FilePenLine,
-	HelpCircle,
 	MonitorPlay,
+	HelpCircle,
+	FileText,
+	Check,
 	Trash2,
 } from 'lucide-vue-next'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute } from 'vue-router'
 import ChapterModal from '@/components/Modals/ChapterModal.vue'
 import { showToast } from '@/utils'
 
 const route = useRoute()
-const router = useRouter()
+const expandAll = ref(true)
-const user = inject('$user')
 const showChapterModal = ref(false)
 const currentChapter = ref(null)
-const app = getCurrentInstance()
-const { $dialog } = app.appContext.config.globalProperties
 
 const props = defineProps({
 	courseName: {
@@ -225,25 +202,9 @@ const updateLessonIndex = createResource({
 })
 
 const trashLesson = (lessonName, chapterName) => {
-	$dialog({
+	deleteLesson.submit({
-		title: __('Delete this lesson?'),
+		lesson: lessonName,
-		message: __(
+		chapter: chapterName,
-			'Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?'
-		),
-		actions: [
-			{
-				label: __('Delete'),
-				theme: 'red',
-				variant: 'solid',
-				onClick(close) {
-					deleteLesson.submit({
-						lesson: lessonName,
-						chapter: chapterName,
-					})
-					close()
-				},
-			},
-		],
 	})
 }
 
@@ -268,61 +229,6 @@ const updateOutline = (e) => {
 		idx: e.newIndex,
 	})
 }
-
-const deleteChapter = createResource({
-	url: 'lms.lms.api.delete_chapter',
-	makeParams(values) {
-		return {
-			chapter: values.chapter,
-		}
-	},
-	onSuccess() {
-		outline.reload()
-		showToast('Success', 'Chapter deleted successfully', 'check')
-	},
-})
-
-const trashChapter = (chapterName) => {
-	$dialog({
-		title: __('Delete this chapter?'),
-		message: __(
-			'Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?'
-		),
-		actions: [
-			{
-				label: __('Delete'),
-				theme: 'red',
-				variant: 'solid',
-				onClick(close) {
-					deleteChapter.submit({ chapter: chapterName })
-					close()
-				},
-			},
-		],
-	})
-}
-
-const redirectToChapter = (chapter) => {
-	if (!chapter.is_scorm_package) return
-	event.preventDefault()
-	if (props.allowEdit) return
-	if (!user.data) {
-		showToast(
-			__('You are not enrolled'),
-			__('Please enroll for this course to view this lesson'),
-			'alert-circle'
-		)
-		return
-	}
-
-	router.push({
-		name: 'SCORMChapter',
-		params: {
-			courseName: props.courseName,
-			chapterName: chapter.name,
-		},
-	})
-}
 </script>
 <style>
 .outline-lesson:has(.router-link-active) {

frontend/src/components/CourseReviews.vue

@@ -76,7 +76,7 @@ const props = defineProps({
 		required: true,
 	},
 	avg_rating: {
-		type: String,
+		type: Number,
 		required: true,
 	},
 	membership: {

frontend/src/components/LessonContent.vue

@@ -9,7 +9,7 @@
 			allowfullscreen
 		></iframe>
 	</div>
-	<div v-for="block in content?.split('\n\n')">
+	<div v-for="block in content.split('\n\n')">
 		<div v-if="block.includes('{{ YouTubeVideo')">
 			<iframe
 				class="youtube-video"
@@ -37,7 +37,7 @@
 			<iframe
 				:src="getPDFSource(block)"
 				width="100%"
-				height="700px"
+				height="400"
 				frameborder="0"
 				allowfullscreen
 			></iframe>

frontend/src/components/LessonHelp.vue

@@ -1,96 +0,0 @@
-<template>
-	<div class="space-y-5">
-		<div class="space-y-2">
-			<div class="flex items-center text-sm font-medium space-x-2">
-				<span>
-					{{ __('What does include in preview mean?') }}
-				</span>
-			</div>
-			<div class="text-xs text-gray-600 mb-1 leading-5">
-				{{
-					__(
-						'If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users.'
-					)
-				}}
-			</div>
-		</div>
-
-		<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 text-sm font-medium space-x-2 cursor-pointer"
-				@click="openHelpDialog('upload')"
-			>
-				<span class="leading-5">
-					{{ __(contentMap['upload']) }}
-				</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>
-					{{ __(contentMap['youtube']) }}
-				</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" :title="title" :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 title = ref(null)
-const contentMap = {
-	quiz: 'How to add a Quiz?',
-	upload: 'How to upload content from your system?',
-	youtube: 'How to add a YouTube Video?',
-}
-
-const openHelpDialog = (contentType) => {
-	type.value = contentType
-	title.value = contentMap[contentType]
-	showExplanation.value = true
-}
-</script>

frontend/src/components/LessonPlugins.vue

@@ -0,0 +1,174 @@
+<template>
+	<div class="text-lg font-semibold">
+		{{ __('Components') }}
+	</div>
+	<div class="mt-5 space-y-4">
+		<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">
+			<Link
+				:value="quiz"
+				class="flex-1"
+				doctype="LMS Quiz"
+				:label="__('Add an existing quiz')"
+				@change="(option) => addQuiz(option)"
+			/>
+			<router-link
+				:to="{
+					name: 'QuizCreation',
+					params: {
+						quizID: 'new',
+					},
+				}"
+				class="self-end ml-2"
+			>
+				<Button>
+					<template #icon>
+						<Plus class="h-4 w-4 stroke-1.5" />
+					</template>
+				</Button>
+			</router-link>
+		</div>
+		<div class="">
+			<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="">
+			<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 = (value) => {
+	getCurrentEditor().caret.setToLastBlock('end', 0)
+	if (value) {
+		getCurrentEditor().blocks.insert('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,30 +1,33 @@
 <template>
-	<div class="flex items-center justify-between mb-5">
+	<Button
-		<div class="text-lg font-semibold">
+		v-if="user.data.is_moderator"
-			{{ __('Live Class') }}
+		variant="solid"
-		</div>
+		class="float-right mb-5"
-		<Button v-if="user.data.is_moderator" @click="openLiveClassModal">
+		@click="openLiveClassModal"
-			<template #prefix>
+	>
-				<Plus class="h-4 w-4" />
+		<template #prefix>
-			</template>
+			<Plus class="h-4 w-4" />
-			<span>
+		</template>
-				{{ __('Add') }}
+		<span>
-			</span>
+			{{ __('Add Live Class') }}
-		</Button>
+		</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 text-sm text-gray-700 p-3"
+			class="flex flex-col border rounded-md h-full p-3"
 		>
-			<div class="font-semibold text-gray-900 text-lg mb-4">
+			<div class="font-semibold text-lg mb-4">
 				{{ cls.title }}
 			</div>
-			<div class="leading-5 text-gray-700 text-sm mb-4">
+			<div class="mb-4">
 				{{ cls.description }}
 			</div>
 			<div class="flex items-center mb-2">
-				<Calendar class="w-4 h-4 stroke-1.5 text-gray-700" />
+				<Calendar class="w-4 h-4 stroke-1.5" />
 				<span class="ml-2">
 					{{ dayjs(cls.date).format('DD MMMM YYYY') }}
 				</span>
@@ -35,9 +38,8 @@
 					{{ formatTime(cls.time) }}
 				</span>
 			</div>
-			<div class="flex items-center space-x-2 text-gray-900 mt-auto">
+			<div class="flex items-center space-x-2 mt-auto">
 				<a
-					v-if="user.data?.is_moderator || user.data?.is_evaluator"
 					:href="cls.start_url"
 					target="_blank"
 					class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
@@ -46,10 +48,9 @@
 					{{ __('Start') }}
 				</a>
 				<a
-					v-if="cls.date <= dayjs().format('YYYY-MM-DD')"
 					:href="cls.join_url"
 					target="_blank"
-					class="w-full cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
+					class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
 				>
 					<Video class="h-4 w-4 stroke-1.5" />
 					{{ __('Join') }}
@@ -89,6 +90,7 @@ const liveClasses = createListResource({
 	doctype: 'LMS Live Class',
 	filters: {
 		batch_name: props.batch,
+		date: ['>=', new Date()],
 	},
 	fields: [
 		'title',

frontend/src/components/Members.vue

@@ -1,13 +1,13 @@
 <template>
-	<div class="flex min-h-0 flex-col text-base">
+	<div class="text-base p-4">
 		<div class="flex items-center justify-between">
 			<div>
-				<div class="text-xl font-semibold mb-1">
+				<div class="font-semibold mb-1">
 					{{ __(label) }}
 				</div>
-				<!-- <div class="text-xs text-gray-600">
+				<div class="text-xs text-gray-600">
 					{{ __(description) }}
-				</div> -->
+				</div>
 			</div>
 			<div class="flex item-center space-x-2">
 				<FormControl
@@ -16,104 +16,74 @@
 					type="text"
 					:debounce="300"
 				/>
-				<Button @click="() => (showForm = !showForm)">
+				<Button @click="() => (showForm = true)">
 					<template #icon>
-						<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
+						<Plus class="h-3 w-3 stroke-1.5" />
-						<X v-else class="h-3 w-3 stroke-1.5" />
 					</template>
 				</Button>
 			</div>
 		</div>
+		<div class="my-4">
+			<!-- Form to add new member -->
+			<div v-if="showForm" class="flex items-center space-x-2 mb-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>
 
-		<!-- 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
-										class="px-1"
-										v-if="member.role && getRole(member.role) !== 'Student'"
-									>
-										<Badge
-											:variant="'subtle'"
-											:ref_for="true"
-											theme="blue"
-											size="sm"
-											label="Badge"
-										>
-											{{ getRole(member.role) }}
-										</Badge>
-									</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"
+				v-for="member in memberList"
-				class="flex justify-center mt-4"
+				class="grid grid-cols-5 grid-flow-row py-2 cursor-pointer"
 			>
-				<Button @click="members.reload()">
+				<div
-					<template #prefix>
+					@click="openProfile(member.username)"
-						<RefreshCw class="h-3 w-3 stroke-1.5" />
+					class="flex items-center space-x-2 col-span-2"
-					</template>
+				>
-					{{ __('Load More') }}
+					<Avatar
-				</Button>
+						:image="member.user_image"
+						:label="member.full_name"
+						size="sm"
+					/>
+					<div>
+						{{ member.full_name }}
+					</div>
+				</div>
+				<div class="text-sm text-gray-700 col-span-2">
+					{{ member.name }}
+				</div>
+				<div class="text-sm text-gray-700 justify-self-end">
+					{{ getRole(member.role) }}
+				</div>
 			</div>
 		</div>
+		<div v-if="hasNextPage" class="flex justify-center">
+			<Button variant="solid" @click="members.reload()">
+				<template #prefix>
+					<RefreshCw class="h-3 w-3 stroke-1.5" />
+				</template>
+				{{ __('Load More') }}
+			</Button>
+		</div>
 	</div>
 </template>
 <script setup lang="ts">
-import { createResource, Avatar, Button, FormControl, Badge } from 'frappe-ui'
+import { createResource, Avatar, Button, FormControl } from 'frappe-ui'
 import { useRouter } from 'vue-router'
-import { ref, watch, reactive, inject } from 'vue'
+import { ref, watch, reactive } from 'vue'
-import { RefreshCw, Plus, X } from 'lucide-vue-next'
+import { RefreshCw, Plus } from 'lucide-vue-next'
 
 const router = useRouter()
 const show = defineModel('show')
@@ -122,7 +92,6 @@ const start = ref(0)
 const memberList = ref([])
 const hasNextPage = ref(false)
 const showForm = ref(false)
-const dayjs = inject('$dayjs')
 
 const member = reactive({
 	email: '',

frontend/src/components/MobileLayout.vue

@@ -5,11 +5,9 @@
 		</div>
 		<div
 			v-if="sidebarSettings.data"
-			class="fixed flex items-center justify-around border-t border-gray-300 bottom-0 z-10 w-full bg-white standalone:pb-4"
+			class="fixed flex justify-around border-t border-gray-300 bottom-0 z-10 w-full bg-white standalone:pb-4"
 			:style="{
-				gridTemplateColumns: `repeat(${
+				gridTemplateColumns: `repeat(${sidebarLinks.length}, minmax(0, 1fr))`,
-					sidebarLinks.length + 1
-				}, minmax(0, 1fr))`,
 			}"
 		>
 			<button
@@ -25,46 +23,15 @@
 					:class="[isActive(tab) ? 'text-gray-900' : 'text-gray-600']"
 				/>
 			</button>
-			<Popover
-				trigger="hover"
-				popoverClass="bottom-28 mx-2"
-				placement="top-start"
-			>
-				<template #target>
-					<component
-						:is="icons['List']"
-						class="h-6 w-6 stroke-1.5 text-gray-600"
-					/>
-				</template>
-				<template #body-main>
-					<div class="text-base p-5 space-y-4">
-						<div
-							v-for="link in otherLinks"
-							:key="link.label"
-							class="flex items-center space-x-2"
-							@click="handleClick(link)"
-						>
-							<component
-								:is="icons[link.icon]"
-								class="h-4 w-4 stroke-1.5 text-gray-600"
-							/>
-							<div>
-								{{ link.label }}
-							</div>
-						</div>
-					</div>
-				</template>
-			</Popover>
 		</div>
 	</div>
 </template>
 <script setup>
 import { getSidebarLinks } from '../utils'
 import { useRouter } from 'vue-router'
-import { watch, ref, onMounted } from 'vue'
+import { computed, ref, onMounted } from 'vue'
 import { sessionStore } from '@/stores/session'
 import { usersStore } from '@/stores/user'
-import { Popover } from 'frappe-ui'
 import * as icons from 'lucide-vue-next'
 
 const { logout, user, sidebarSettings } = sessionStore()
@@ -72,7 +39,6 @@ let { isLoggedIn } = sessionStore()
 const router = useRouter()
 let { userResource } = usersStore()
 const sidebarLinks = ref(getSidebarLinks())
-const otherLinks = ref([])
 
 onMounted(() => {
 	sidebarSettings.reload(
@@ -86,53 +52,37 @@ onMounted(() => {
 						)
 					}
 				})
-
+				addAccessLinks()
-				addOtherLinks()
 			},
 		}
 	)
 })
 
-const addOtherLinks = () => {
+const addAccessLinks = () => {
 	if (user) {
-		otherLinks.value.push({
+		sidebarLinks.value.push({
-			label: 'Notifications',
-			icon: 'Bell',
-			to: 'Notifications',
-		})
-		otherLinks.value.push({
 			label: 'Profile',
 			icon: 'UserRound',
+			activeFor: [
+				'Profile',
+				'ProfileAbout',
+				'ProfileCertification',
+				'ProfileEvaluator',
+				'ProfileRoles',
+			],
 		})
-		otherLinks.value.push({
+		sidebarLinks.value.push({
 			label: 'Log out',
 			icon: 'LogOut',
 		})
 	} else {
-		otherLinks.value.push({
+		sidebarLinks.value.push({
 			label: 'Log in',
 			icon: 'LogIn',
 		})
 	}
 }
 
-watch(userResource, () => {
-	if (
-		userResource.data &&
-		(userResource.data.is_moderator || userResource.data.is_instructor)
-	) {
-		addQuizzes()
-	}
-})
-
-const addQuizzes = () => {
-	otherLinks.value.push({
-		label: 'Quizzes',
-		icon: 'CircleHelp',
-		to: 'Quizzes',
-	})
-}
-
 let isActive = (tab) => {
 	return tab.activeFor?.includes(router.currentRoute.value.name)
 }

frontend/src/components/Modals/AnnouncementModal.vue

@@ -18,7 +18,6 @@
 				<div class="">
 					<div class="mb-1.5 text-sm text-gray-600">
 						{{ __('Subject') }}
-						<span class="text-red-500">*</span>
 					</div>
 					<Input type="text" v-model="announcement.subject" />
 				</div>
@@ -45,7 +44,7 @@
 <script setup>
 import { Dialog, Input, TextEditor, createResource } from 'frappe-ui'
 import { reactive } from 'vue'
-import { showToast } from '@/utils/'
+import { createToast } from '@/utils/'
 
 const show = defineModel()
 
@@ -95,14 +94,22 @@ const makeAnnouncement = (close) => {
 			},
 			onSuccess() {
 				close()
-				showToast(
+				createToast({
-					__('Success'),
+					title: 'Success',
-					__('Announcement has been sent successfully'),
+					text: 'Announcement has been sent successfully',
-					'check'
+					icon: 'Check',
-				)
+					iconClasses: 'bg-green-600 text-white rounded-md p-px',
+				})
 			},
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'check')
+				createToast({
+					title: 'Error',
+					text: err.messages?.[0] || err,
+					icon: 'x',
+					iconClasses: 'bg-red-600 text-white rounded-md p-px',
+					position: 'top-center',
+					timeout: 10,
+				})
 			},
 		}
 	)

frontend/src/components/Modals/AssessmentModal.vue

@@ -1,86 +0,0 @@
-<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/BatchCourseModal.vue

@@ -14,12 +14,7 @@
 		}"
 	>
 		<template #body-content>
-			<Link
+			<Link doctype="LMS Course" v-model="course" :label="__('Course')" />
-				doctype="LMS Course"
-				v-model="course"
-				:label="__('Course')"
-				:required="true"
-			/>
 			<Link
 				doctype="Course Evaluator"
 				v-model="evaluator"

frontend/src/components/Modals/BatchStudentProgress.vue

@@ -1,113 +0,0 @@
-<template>
-	<Dialog v-model="show" :options="{}">
-		<template #body>
-			<div class="p-5 space-y-8 text-base">
-				<div class="flex items-center space-x-2">
-					<Avatar :image="student.user_image" size="3xl" />
-					<div class="space-y-1">
-						<div class="flex items-center space-x-2">
-							<div class="text-xl font-semibold">
-								{{ student.full_name }}
-							</div>
-							<Badge :theme="student.progress === 100 ? 'green' : 'red'">
-								{{ student.progress }}% {{ __('Complete') }}
-							</Badge>
-						</div>
-						<div class="text-sm text-gray-700">
-							{{ student.email }}
-						</div>
-					</div>
-				</div>
-
-				<!-- Assessments -->
-				<div>
-					<div>
-						<div
-							class="grid grid-cols-[70%,30%] border-b pl-2 pb-1 mb-2 text-xs text-gray-700 font-medium"
-						>
-							<span>
-								{{ __('Assessment') }}
-							</span>
-							<span>
-								{{ __('Progress') }}
-							</span>
-						</div>
-						<div
-							v-for="assessment in Object.keys(student.assessments)"
-							class="grid grid-cols-[70%,30%] pl-2 mb-2 text-gray-700 font-medium"
-						>
-							<span>
-								{{ assessment }}
-							</span>
-							<span v-if="isAssignment(student.assessments[assessment])">
-								<Badge :theme="getStatusTheme(student.assessments[assessment])">
-									{{ student.assessments[assessment] }}
-								</Badge>
-							</span>
-							<span v-else>
-								{{ student.assessments[assessment] }}
-							</span>
-						</div>
-					</div>
-				</div>
-
-				<!-- Courses -->
-				<div>
-					<div>
-						<div
-							class="grid grid-cols-[70%,30%] mb-2 text-xs text-gray-700 border-b pl-2 pb-1 font-medium"
-						>
-							<span>
-								{{ __('Courses') }}
-							</span>
-							<span>
-								{{ __('Progress') }}
-							</span>
-						</div>
-						<div
-							v-for="course in Object.keys(student.courses)"
-							class="grid grid-cols-[70%,30%] pl-2 mb-2 text-gray-700 font-medium"
-						>
-							<span>
-								{{ course }}
-							</span>
-							<span>
-								{{ Math.floor(student.courses[course]) }}
-							</span>
-						</div>
-					</div>
-				</div>
-
-				<!-- <span class="mt-4">
-                    {{ student }}
-                </span> -->
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import { Avatar, Badge, Dialog } from 'frappe-ui'
-import ProgressBar from '@/components/ProgressBar.vue'
-
-const show = defineModel()
-const props = defineProps({
-	student: {
-		type: Object,
-		default: null,
-	},
-})
-
-const isAssignment = (value) => {
-	return isNaN(value)
-}
-
-const getStatusTheme = (status) => {
-	if (status === 'Pass') {
-		return 'green'
-	} else if (status == 'Not Graded') {
-		return 'orange'
-	} else {
-		return 'red'
-	}
-}
-</script>

frontend/src/components/Modals/BulkCertificates.vue

@@ -1,132 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			title: __('Generate Certificates'),
-			size: 'lg',
-			actions: [
-				{
-					label: 'Create',
-					variant: 'solid',
-					onClick: ({ close }) => {
-						generateCertificates(close)
-					},
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<div class="space-y-4">
-				<FormControl
-					type="select"
-					v-model="details.course"
-					:label="__('Course')"
-					:options="getCourses()"
-				/>
-				<Link
-					v-model="details.evaluator"
-					:label="__('Evaluator')"
-					doctype="Course Evaluator"
-				/>
-				<FormControl
-					type="date"
-					v-model="details.issue_date"
-					:label="__('Issue Date')"
-				/>
-				<FormControl
-					type="date"
-					v-model="details.expiry_date"
-					:label="__('Expiry Date')"
-				/>
-				<Link
-					v-model="details.template"
-					:label="__('Template')"
-					doctype="Print Format"
-					:filters="{
-						doc_type: 'LMS Certificate',
-					}"
-				/>
-				<Switch
-					size="sm"
-					:label="__('Published')"
-					:description="
-						__(
-							'Enabling this will publish the certificate on the certified participants page.'
-						)
-					"
-					v-model="details.published"
-				/>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import { inject, reactive } from 'vue'
-import { createResource, Dialog, FormControl, Switch } from 'frappe-ui'
-import Link from '@/components/Controls/Link.vue'
-import { showToast } from '@/utils'
-
-const show = defineModel()
-const dayjs = inject('$dayjs')
-const details = reactive({
-	issue_date: dayjs().format('YYYY-MM-DD'),
-	expiry_date: null,
-	template: null,
-	evaluator: null,
-	published: true,
-})
-
-const props = defineProps({
-	batch: {
-		type: [Object, null],
-		required: true,
-	},
-})
-
-const createCertificate = createResource({
-	url: 'frappe.client.insert',
-	makeParams(values) {
-		return {
-			doc: {
-				doctype: 'LMS Certificate',
-				issue_date: details.issue_date,
-				expiry_date: details.expiry_date,
-				template: details.template,
-				published: details.published,
-				course: values.course,
-				batch: values.batch,
-				member: values.member,
-				evaluator: details.evaluator,
-			},
-		}
-	},
-})
-
-const generateCertificates = (close) => {
-	props.batch?.students.forEach((student) => {
-		createCertificate.submit(
-			{
-				course: details.course,
-				batch: props.batch.name,
-				member: student,
-			},
-			{
-				onError(err) {
-					showToast(__('Error'), err.messages?.[0] || err, 'x')
-				},
-			}
-		)
-	})
-	close()
-	showToast(__('Success'), __('Certificates generated successfully'), 'check')
-}
-
-const getCourses = () => {
-	return props.batch?.courses.map((course) => {
-		return {
-			label: course.course,
-			value: course.course,
-		}
-	})
-}
-</script>

frontend/src/components/Modals/ChapterModal.vue

@@ -2,11 +2,11 @@
 	<Dialog
 		v-model="show"
 		:options="{
-			title: chapterDetail ? __('Edit Chapter') : __('Add Chapter'),
+			title: __('Add Chapter'),
 			size: 'lg',
 			actions: [
 				{
-					label: chapterDetail ? __('Edit') : __('Create'),
+					label: chapterDetail ? __('Edit Chapter') : __('Add Chapter'),
 					variant: 'solid',
 					onClick: (close) =>
 						chapterDetail ? editChapter(close) : addChapter(close),
@@ -15,77 +15,18 @@
 		}"
 	>
 		<template #body-content>
-			<div class="space-y-4 text-base">
+			<FormControl label="Title" v-model="chapter.title" class="mb-4" />
-				<FormControl label="Title" v-model="chapter.title" :required="true" />
-				<Switch
-					size="sm"
-					:label="__('SCORM Package')"
-					:description="
-						__(
-							'Enable this only if you want to upload a SCORM package as a chapter.'
-						)
-					"
-					v-model="chapter.is_scorm_package"
-				/>
-				<div v-if="chapter.is_scorm_package">
-					<FileUploader
-						v-if="!chapter.scorm_package"
-						:fileTypes="['.zip']"
-						:validateFile="validateFile"
-						@success="(file) => (chapter.scorm_package = file)"
-					>
-						<template v-slot="{ file, progress, uploading, openFileSelector }">
-							<div class="mb-4">
-								<Button @click="openFileSelector" :loading="uploading">
-									{{
-										uploading ? `Uploading ${progress}%` : 'Upload an zip 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-5 w-5 stroke-1.5 text-gray-700" />
-							</div>
-							<div class="flex flex-col">
-								<span>
-									{{ chapter.scorm_package.file_name }}
-								</span>
-								<span class="text-sm text-gray-500 mt-1">
-									{{ getFileSize(chapter.scorm_package.file_size) }}
-								</span>
-							</div>
-							<X
-								@click="() => (chapter.scorm_package = null)"
-								class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
-							/>
-						</div>
-					</div>
-				</div>
-			</div>
 		</template>
 	</Dialog>
 </template>
 <script setup>
-import {
+import { Dialog, FormControl, createResource } from 'frappe-ui'
-	Button,
-	createResource,
-	Dialog,
-	FileUploader,
-	FormControl,
-	Switch,
-} from 'frappe-ui'
 import { defineModel, reactive, watch } from 'vue'
-import { showToast, getFileSize } from '@/utils/'
+import { createToast } from '@/utils/'
 import { capture } from '@/telemetry'
-import { FileText, X } from 'lucide-vue-next'
-import { useSettings } from '@/stores/settings'
 
 const show = defineModel()
 const outline = defineModel('outline')
-const settingsStore = useSettings()
 
 const props = defineProps({
 	course: {
@@ -96,22 +37,32 @@ const props = defineProps({
 		type: Object,
 	},
 })
-
 const chapter = reactive({
 	title: '',
-	is_scorm_package: 0,
-	scorm_package: null,
 })
 
 const chapterResource = createResource({
-	url: 'lms.lms.api.upsert_chapter',
+	url: 'frappe.client.insert',
 	makeParams(values) {
 		return {
-			title: chapter.title,
+			doc: {
-			course: props.course,
+				doctype: 'Course Chapter',
-			is_scorm_package: chapter.is_scorm_package,
+				title: chapter.title,
-			scorm_package: chapter.scorm_package,
+				description: chapter.description,
+				course: props.course,
+			},
+		}
+	},
+})
+
+const chapterEditResource = createResource({
+	url: 'frappe.client.set_value',
+	makeParams(values) {
+		return {
+			doctype: 'Course Chapter',
 			name: props.chapterDetail?.name,
+			fieldname: 'title',
+			value: chapter.title,
 		}
 	},
 })
@@ -131,12 +82,14 @@ const chapterReference = createResource({
 	},
 })
 
-const addChapter = async (close) => {
+const addChapter = (close) => {
 	chapterResource.submit(
 		{},
 		{
 			validate() {
-				return validateChapter()
+				if (!chapter.title) {
+					return 'Title is required'
+				}
 			},
 			onSuccess: (data) => {
 				capture('chapter_created')
@@ -144,48 +97,29 @@ const addChapter = async (close) => {
 					{ name: data.name },
 					{
 						onSuccess(data) {
-							cleanChapter()
-							if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-								settingsStore.onboardingDetails.reload()
-							}
 							outline.value.reload()
-							showToast(
+							createToast({
-								__('Success'),
+								text: 'Chapter added successfully',
-								__('Chapter added successfully'),
+								icon: 'check',
-								'check'
+								iconClasses: 'bg-green-600 text-white rounded-md p-px',
-							)
+							})
 						},
 						onError(err) {
-							showToast(__('Error'), err.messages?.[0] || err, 'x')
+							showError(err)
 						},
 					}
 				)
 				close()
 			},
 			onError(err) {
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
+				showError(err)
 			},
 		}
 	)
 }
 
-const validateChapter = () => {
-	if (!chapter.title) {
-		return __('Title is required')
-	}
-	if (chapter.is_scorm_package && !chapter.scorm_package) {
-		return __('Please upload a SCORM package')
-	}
-}
-
-const cleanChapter = () => {
-	chapter.title = ''
-	chapter.is_scorm_package = 0
-	chapter.scorm_package = null
-}
-
 const editChapter = (close) => {
-	chapterResource.submit(
+	chapterEditResource.submit(
 		{},
 		{
 			validate() {
@@ -195,29 +129,35 @@ const editChapter = (close) => {
 			},
 			onSuccess() {
 				outline.value.reload()
-				showToast(__('Success'), __('Chapter updated successfully'), 'check')
+				createToast({
+					text: 'Chapter updated successfully',
+					icon: 'check',
+					iconClasses: 'bg-green-600 text-white rounded-md p-px',
+				})
 				close()
 			},
 			onError(err) {
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
+				showError(err)
 			},
 		}
 	)
 }
 
+const showError = (err) => {
+	createToast({
+		title: 'Error',
+		text: err.messages?.[0] || err,
+		icon: 'x',
+		iconClasses: 'bg-red-600 text-white rounded-md p-px',
+		position: 'top-center',
+		timeout: 10,
+	})
+}
+
 watch(
 	() => props.chapterDetail,
 	(newChapter) => {
 		chapter.title = newChapter?.title
-		chapter.is_scorm_package = newChapter?.is_scorm_package
-		chapter.scorm_package = newChapter?.scorm_package
 	}
 )
-
-const validateFile = (file) => {
-	let extension = file.name.split('.').pop().toLowerCase()
-	if (extension !== 'zip') {
-		return __('Only zip files are allowed')
-	}
-}
 </script>

frontend/src/components/Modals/EditProfile.vue

@@ -69,18 +69,7 @@
 					:label="__('Headline')"
 					class="mb-4"
 				/>
-
+				<FormControl type="textarea" v-model="profile.bio" :label="__('Bio')" />
-				<div class="mb-4">
-					<div class="mb-1.5 text-sm text-gray-600">
-						{{ __('Bio') }}
-					</div>
-					<TextEditor
-						:fixedMenu="true"
-						@change="(val) => (profile.bio = val)"
-						:content="profile.bio"
-						editorClass="prose-sm py-2 px-2 min-h-[200px] border-gray-300 hover:border-gray-400 rounded-md bg-gray-200"
-					/>
-				</div>
 			</div>
 		</template>
 	</Dialog>
@@ -92,7 +81,6 @@ import {
 	FileUploader,
 	Button,
 	createResource,
-	TextEditor,
 } from 'frappe-ui'
 import { reactive, watch, defineModel } from 'vue'
 import { FileText, X } from 'lucide-vue-next'

frontend/src/components/Modals/EvaluationModal.vue

@@ -131,16 +131,10 @@ function submitEvaluation(close) {
 		},
 		onError(err) {
 			let message = err.messages?.[0] || err
-			let unavailabilityMessage
+			let unavailabilityMessage = message.includes('unavailable')
-
-			if (typeof message === 'string') {
-				unavailabilityMessage = message?.includes('unavailable')
-			} else {
-				unavailabilityMessage = false
-			}
 
 			createToast({
-				title: unavailabilityMessage ? __('Evaluator is Unavailable') : '',
+				title: unavailabilityMessage ? 'Evaluator is Unavailable' : 'Error',
 				text: message,
 				icon: unavailabilityMessage ? 'alert-circle' : 'x',
 				iconClasses: 'bg-yellow-600 text-white rounded-md p-px',
@@ -154,12 +148,10 @@ function submitEvaluation(close) {
 const getCourses = () => {
 	let courses = []
 	for (const course of props.courses) {
-		if (course.evaluator) {
+		courses.push({
-			courses.push({
+			label: course.title,
-				label: course.title,
+			value: course.course,
-				value: course.course,
+		})
-			})
-		}
 	}
 	return courses
 }

frontend/src/components/Modals/Event.vue

@@ -1,378 +0,0 @@
-<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

@@ -1,39 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			size: '4xl',
-			title: title,
-		}"
-	>
-		<template #body-content>
-			<div>
-				<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,
-	},
-	title: {
-		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/LiveClassModal.vue

@@ -22,7 +22,6 @@
 							v-model="liveClass.title"
 							:label="__('Title')"
 							class="mb-4"
-							:required="true"
 						/>
 						<Tooltip
 							:text="
@@ -36,7 +35,6 @@
 								type="time"
 								:label="__('Time')"
 								class="mb-4"
-								:required="true"
 							/>
 						</Tooltip>
 						<FormControl
@@ -44,7 +42,6 @@
 							type="select"
 							:options="getTimezoneOptions()"
 							:label="__('Timezone')"
-							:required="true"
 						/>
 					</div>
 					<div>
@@ -53,7 +50,6 @@
 							type="date"
 							class="mb-4"
 							:label="__('Date')"
-							:required="true"
 						/>
 						<Tooltip :text="__('Duration of the live class in minutes')">
 							<FormControl
@@ -61,7 +57,6 @@
 								v-model="liveClass.duration"
 								:label="__('Duration')"
 								class="mb-4"
-								:required="true"
 							/>
 						</Tooltip>
 						<FormControl
@@ -161,34 +156,25 @@ const submitLiveClass = (close) => {
 	return createLiveClass.submit(liveClass, {
 		validate() {
 			if (!liveClass.title) {
-				return __('Please enter a title.')
+				return 'Please enter a title.'
 			}
 			if (!liveClass.date) {
-				return __('Please select a date.')
+				return 'Please select a date.'
+			}
+			if (dayjs(liveClass.date).isSameOrBefore(dayjs(), 'day')) {
+				return 'Please select a future date.'
 			}
 			if (!liveClass.time) {
-				return __('Please select a time.')
+				return 'Please select a time.'
-			}
-			if (!liveClass.timezone) {
-				return __('Please select a timezone.')
 			}
 			if (!valideTime()) {
-				return __('Please enter a valid time in the format HH:mm.')
+				return 'Please enter a valid time in the format HH:mm.'
-			}
-			const liveClassDateTime = dayjs(`${liveClass.date}T${liveClass.time}`).tz(
-				liveClass.timezone,
-				true
-			)
-			if (
-				liveClassDateTime.isSameOrBefore(
-					dayjs().tz(liveClass.timezone, false),
-					'minute'
-				)
-			) {
-				return __('Please select a future date and time.')
 			}
 			if (!liveClass.duration) {
-				return __('Please select a duration.')
+				return 'Please select a duration.'
+			}
+			if (!liveClass.timezone) {
+				return 'Please select a timezone.'
 			}
 		},
 		onSuccess() {

frontend/src/components/Modals/Question.vue

@@ -12,9 +12,9 @@
 							id="existing"
 							value="existing"
 							v-model="questionType"
-							class="w-3 h-3 cursor-pointer"
+							class="w-3 h-3 accent-gray-900"
 						/>
-						<label for="existing" class="cursor-pointer">
+						<label for="existing">
 							{{ __('Add an existing question') }}
 						</label>
 					</div>
@@ -25,9 +25,9 @@
 							id="new"
 							value="new"
 							v-model="questionType"
-							class="w-3 h-3 cursor-pointer"
+							class="w-3 h-3"
 						/>
-						<label for="new" class="cursor-pointer">
+						<label for="new">
 							{{ __('Create a new question') }}
 						</label>
 					</div>
@@ -54,16 +54,14 @@
 						:label="__('Type')"
 						v-model="question.type"
 						type="select"
-						:options="['Choices', 'User Input', 'Open Ended']"
+						:options="['Choices', 'User Input']"
 						class="pb-2"
-						:required="true"
 					/>
 					<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}`]"
-								:required="n <= 2 ? true : false"
 							/>
 							<FormControl
 								:label="__('Explanation')"
@@ -76,15 +74,10 @@
 							/>
 						</div>
 					</div>
-					<div
+					<div v-else v-for="n in 4" class="space-y-2">
-						v-else-if="question.type == 'User Input'"
-						v-for="n in 4"
-						class="space-y-2"
-					>
 						<FormControl
 							:label="__('Possibility') + ' ' + n"
 							v-model="question[`possibility_${n}`]"
-							:required="n == 1 ? true : false"
 						/>
 					</div>
 				</div>
@@ -130,7 +123,7 @@ const populateFields = () => {
 	let counter = 1
 	fields.forEach((field) => {
 		while (counter <= 4) {
-			question[`${field}_${counter}`] = field === 'is_correct' ? false : null
+			question[`${field}_${counter}`] = field === 'is_correct' ? false : ''
 			counter++
 		}
 	})
@@ -219,7 +212,7 @@ const questionCreation = createResource({
 })
 
 const submitQuestion = (close) => {
-	if (props.questionDetail?.question) updateQuestion(close)
+	if (questionData.data?.name) updateQuestion(close)
 	else addQuestion(close)
 }
 
@@ -246,7 +239,7 @@ const addQuestion = (close) => {
 					)
 				},
 				onError(err) {
-					showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+					showToast(__('Error'), __(err.message?.[0] || err), 'x')
 				},
 			}
 		)
@@ -266,7 +259,7 @@ const addQuestionRow = (question, close) => {
 				close()
 			},
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				showToast(__('Error'), __(err.message?.[0] || err), 'x')
 				close()
 			},
 		}
@@ -319,12 +312,13 @@ const updateQuestion = (close) => {
 							quiz.value.reload()
 							close()
 						},
+						onError(err) {
+							showToast(__('Error'), __(err.message?.[0] || err), 'x')
+							close()
+						},
 					}
 				)
 			},
-			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
-			},
 		}
 	)
 }

frontend/src/components/Modals/Settings.vue

@@ -1,12 +1,12 @@
 <template>
-	<Dialog v-model="show" :options="{ size: '4xl' }">
+	<Dialog v-model="show" :options="{ size: '3xl' }">
 		<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-for="tab in tabs">
 						<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"
@@ -17,7 +17,6 @@
 							<SidebarLink
 								v-for="item in tab.items"
 								:link="item"
-								:key="item.label"
 								class="w-full"
 								:class="
 									activeTab?.label == item.label
@@ -31,8 +30,7 @@
 				</div>
 				<div
 					v-if="activeTab && data.doc"
-					:key="activeTab.label"
+					class="flex flex-1 flex-col overflow-y-auto"
-					class="flex flex-1 flex-col px-10 py-8"
 				>
 					<Members
 						v-if="activeTab.label === 'Members'"
@@ -40,25 +38,6 @@
 						: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"
@@ -72,20 +51,15 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, createDocumentResource, createResource } from 'frappe-ui'
+import { Dialog, createDocumentResource } 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,
@@ -95,51 +69,17 @@ const data = createDocumentResource({
 	auto: true,
 })
 
-const branding = createResource({
+const tabs = computed(() => {
-	url: 'lms.lms.api.get_branding',
+	let _tabs = [
-	auto: true,
-	cache: 'brand',
-})
-
-const tabsStructure = computed(() => {
-	return [
 		{
 			label: 'Settings',
 			hideLabel: true,
 			items: [
 				{
-					label: 'General',
+					label: 'Members',
-					icon: 'Wrench',
+					description: 'Manage the members of your learning system',
-					fields: [
+					icon: 'UserRoundPlus',
-						{
-							label: 'Enable Learning Paths',
-							name: 'enable_learning_paths',
-							description:
-								'This will enforce students to go through programs assigned to them in the correct order.',
-							type: 'checkbox',
-						},
-						{
-							label: 'Send calendar invite for evaluations',
-							name: 'send_calendar_invite_for_evaluations',
-							description:
-								'If enabled, it sends google calendar invite to the student for evaluations.',
-							type: 'checkbox',
-						},
-						{
-							label: 'Unsplash Access Key',
-							name: 'unsplash_access_key',
-							description:
-								'Optional. If this is set, students can pick a cover image from the unsplash library for their profile page. https://unsplash.com/documentation#getting-started.',
-							type: 'text',
-						},
-					],
 				},
-			],
-		},
-		{
-			label: 'Settings',
-			hideLabel: true,
-			items: [
 				{
 					label: 'Payment Gateway',
 					icon: 'DollarSign',
@@ -147,10 +87,14 @@ const tabsStructure = computed(() => {
 						'Configure the payment gateway and other payment related settings',
 					fields: [
 						{
-							label: 'Payment Gateway',
+							label: 'Razorpay Key',
-							name: 'payment_gateway',
+							name: 'razorpay_key',
-							type: 'Link',
+							type: 'text',
-							doctype: 'Payment Gateway',
+						},
+						{
+							label: 'Razorpay Secret',
+							name: 'razorpay_secret',
+							type: 'password',
 						},
 						{
 							label: 'Default Currency',
@@ -158,6 +102,9 @@ const tabsStructure = computed(() => {
 							type: 'Link',
 							doctype: 'Currency',
 						},
+						{
+							type: 'Column Break',
+						},
 						{
 							label: 'Apply GST for India',
 							name: 'apply_gst',
@@ -178,72 +125,13 @@ const tabsStructure = computed(() => {
 			],
 		},
 		{
-			label: 'Lists',
+			label: 'Settings',
-			hideLabel: false,
+			hideLabel: true,
 			items: [
-				{
-					label: 'Members',
-					description: 'Manage the members of your learning system',
-					icon: 'UserRoundPlus',
-				},
-				{
-					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: 'Logo',
-							name: 'banner_image',
-							type: 'Upload',
-						},
-						{
-							label: 'Favicon',
-							name: 'favicon',
-							type: 'Upload',
-						},
-						{
-							label: 'Footer Logo',
-							name: 'footer_logo',
-							type: 'Upload',
-						},
-						{
-							label: 'Address',
-							name: 'address',
-							type: 'textarea',
-							rows: 2,
-						},
-						{
-							label: 'Footer "Powered By"',
-							name: 'footer_powered',
-							type: 'textarea',
-							rows: 4,
-						},
-						{
-							label: 'Copyright',
-							name: 'copyright',
-							type: 'text',
-						},
-					],
-				},
 				{
 					label: 'Sidebar',
 					icon: 'PanelLeftIcon',
-					description: 'Choose the items you want to show in the sidebar',
+					description: 'Customize the sidebar as per your needs',
 					fields: [
 						{
 							label: 'Courses',
@@ -280,9 +168,16 @@ const tabsStructure = computed(() => {
 						},
 					],
 				},
+			],
+		},
+		{
+			label: 'Settings',
+			hideLabel: true,
+			items: [
 				{
 					label: 'Email Templates',
 					icon: 'MailPlus',
+					description: 'Create email templates with the content you want',
 					fields: [
 						{
 							label: 'Batch Confirmation Template',
@@ -304,51 +199,81 @@ const tabsStructure = computed(() => {
 						},
 					],
 				},
+			],
+		},
+		{
+			label: 'Settings',
+			hideLabel: true,
+			items: [
 				{
 					label: 'Signup',
 					icon: 'LogIn',
+					description:
+						'Customize the signup page to inform users about your terms and policies',
 					fields: [
 						{
-							label: 'Custom Content',
+							label: 'Show terms of use on signup',
-							name: 'custom_signup_content',
+							name: 'terms_of_use',
-							type: 'Code',
+							type: 'checkbox',
-							mode: 'htmlmixed',
-							rows: 10,
 						},
 						{
-							label: 'Ask for Occupation',
+							label: 'Terms of Use Page',
+							name: 'terms_page',
+							type: 'Link',
+							doctype: 'Web Page',
+						},
+						{
+							label: 'Show privacy policy on signup',
+							name: 'privacy_policy',
+							type: 'checkbox',
+						},
+						{
+							label: 'Privacy Policy Page',
+							name: 'privacy_policy_page',
+							type: 'Link',
+							doctype: 'Web Page',
+						},
+						{
+							type: 'Column Break',
+						},
+						{
+							label: 'Show cookie policy on signup',
+							name: 'cookie_policy',
+							type: 'checkbox',
+						},
+						{
+							label: 'Cookie Policy Page',
+							name: 'cookie_policy_page',
+							type: 'Link',
+							doctype: 'Web Page',
+						},
+						{
+							label: 'Ask user category during signup',
 							name: 'user_category',
 							type: 'checkbox',
-							description:
-								'Enable this option to ask users to select their occupation during the signup process.',
 						},
 					],
 				},
 			],
 		},
 	]
-})
 
-const tabs = computed(() => {
+	return _tabs.map((tab) => {
-	return tabsStructure.value.map((tab) => {
+		tab.items = tab.items.filter((item) => {
-		return {
+			if (item.condition) {
-			...tab,
+				return item.condition()
-			items: tab.items.filter((item) => {
+			}
-				return !item.condition || item.condition()
+			return true
-			}),
+		})
-		}
+		return tab
 	})
 })
 
-watch(show, async () => {
+watch(show, () => {
 	if (show.value) {
-		const currentTab = await tabs.value
+		activeTab.value = tabs.value[0].items[0]
-			.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/StudentModal.vue

@@ -28,7 +28,6 @@
 import { Dialog, createResource } from 'frappe-ui'
 import { ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
-import { showToast } from '@/utils'
 
 const students = defineModel('reloadStudents')
 const student = ref()
@@ -62,11 +61,8 @@ const addStudent = (close) => {
 		{
 			onSuccess() {
 				students.value.reload()
-				student.value = null
 				close()
-			},
+				student.value = null
-			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
 			},
 		}
 	)

frontend/src/components/Modals/YouTubeExplanation.vue

@@ -0,0 +1,31 @@
+<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 @click="redirectToLogin()" class="mt-4">
+			<Button variant="solid" @click="redirectToLogin()" class="mt-2">
 				{{ __('Login') }}
 			</Button>
 		</div>

frontend/src/components/OnboardingBanner.vue

@@ -1,151 +0,0 @@
-<template>
-	<div v-if="showOnboardingBanner && onboardingDetails.data">
-		<Tooltip :text="__('Skip Onboarding')" placement="left">
-			<X
-				class="w-4 h-4 stroke-1 absolute top-2 right-2 cursor-pointer mr-1"
-				@click="skipOnboarding.reload()"
-			/>
-		</Tooltip>
-		<div class="flex items-center justify-evenly bg-gray-100 p-10">
-			<div
-				@click="redirectToCourseForm()"
-				class="flex items-center space-x-2"
-				:class="{
-					'cursor-pointer': !onboardingDetails.data.course_created?.length,
-				}"
-			>
-				<span
-					v-if="onboardingDetails.data.course_created?.length"
-					class="py-1 px-1 bg-white rounded-full"
-				>
-					<Check class="h-4 w-4 stroke-2 text-green-600" />
-				</span>
-				<span v-else class="font-semibold bg-white px-2 py-1 rounded-full">
-					1
-				</span>
-				<span class="text-lg font-semibold">
-					{{ __('Create a course') }}
-				</span>
-			</div>
-			<div
-				@click="redirectToChapterForm()"
-				class="flex items-center space-x-2"
-				:class="{
-					'cursor-pointer':
-						onboardingDetails.data.course_created?.length &&
-						!onboardingDetails.data.chapter_created?.length,
-					'text-gray-400': !onboardingDetails.data.course_created?.length,
-				}"
-			>
-				<span
-					v-if="onboardingDetails.data.chapter_created?.length"
-					class="py-1 px-1 bg-white rounded-full"
-				>
-					<Check class="h-4 w-4 stroke-2 text-green-600" />
-				</span>
-				<span v-else class="font-semibold bg-white px-2 py-1 rounded-full">
-					2
-				</span>
-				<span class="text-lg font-semibold">
-					{{ __('Add a chapter') }}
-				</span>
-			</div>
-			<div
-				@click="redirectToLessonForm()"
-				class="flex items-center space-x-2"
-				:class="{
-					'cursor-pointer':
-						onboardingDetails.data.course_created?.length &&
-						onboardingDetails.data.chapter_created?.length,
-					'text-gray-400':
-						!onboardingDetails.data.course_created?.length ||
-						!onboardingDetails.data.chapter_created?.length,
-				}"
-			>
-				<span
-					v-if="onboardingDetails.data.lesson_created?.length"
-					class="py-1 px-1 bg-white rounded-full"
-				>
-					<Check class="h-4 w-4 stroke-2 text-green-600" />
-				</span>
-				<span class="font-semibold bg-white px-2 py-1 rounded-full"> 3 </span>
-				<span class="text-lg font-semibold">
-					{{ __('Add a lesson') }}
-				</span>
-			</div>
-		</div>
-	</div>
-</template>
-<script setup lang="ts">
-import { ref, watch } from 'vue'
-import { Check, X } from 'lucide-vue-next'
-import { useRouter } from 'vue-router'
-import { useSettings } from '@/stores/settings'
-import { createResource, Tooltip } from 'frappe-ui'
-
-const showOnboardingBanner = ref(false)
-const settings = useSettings()
-const onboardingDetails = settings.onboardingDetails
-const router = useRouter()
-
-watch(onboardingDetails, () => {
-	if (!onboardingDetails.data?.is_onboarded) {
-		showOnboardingBanner.value = true
-	} else {
-		showOnboardingBanner.value = false
-	}
-})
-
-const redirectToCourseForm = () => {
-	if (onboardingDetails.data?.course_created.length) {
-		return
-	} else {
-		router.push({ name: 'CourseForm', params: { courseName: 'new' } })
-	}
-}
-
-const redirectToChapterForm = () => {
-	if (!onboardingDetails.data?.course_created.length) {
-		return
-	} else {
-		router.push({
-			name: 'CourseForm',
-			params: {
-				courseName: onboardingDetails.data?.first_course,
-			},
-		})
-	}
-}
-
-const redirectToLessonForm = () => {
-	if (!onboardingDetails.data?.course_created.length) {
-		return
-	} else if (!onboardingDetails.data?.chapter_created.length) {
-		return
-	} else {
-		router.push({
-			name: 'LessonForm',
-			params: {
-				courseName: onboardingDetails.data?.first_course,
-				chapterNumber: 1,
-				lessonNumber: 1,
-			},
-		})
-	}
-}
-
-const skipOnboarding = createResource({
-	url: 'frappe.client.set_value',
-	makeParams() {
-		return {
-			doctype: 'LMS Settings',
-			name: 'LMS Settings',
-			fieldname: 'is_onboarding_complete',
-			value: 1,
-		}
-	},
-	onSuccess(data) {
-		onboardingDetails.reload()
-	},
-})
-</script>

frontend/src/components/PaymentSettings.vue

@@ -1,109 +0,0 @@
-<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/ProgressBar.vue

@@ -1,44 +1,24 @@
 <template>
-	<Tooltip :text="`${props.progress}%`">
+	<div class="w-full bg-gray-200 rounded-full h-1 my-2">
-		<div class="w-full bg-gray-200 rounded-full h-1 my-2">
+		<div
-			<div
+			class="bg-gray-900 h-1 rounded-full"
-				class="bg-gray-900 rounded-full"
+			:style="{ width: progressBarWidth }"
-				:class="progressBarHeight"
+		></div>
-				:style="{ width: progressBarWidth }"
+	</div>
-			></div>
-		</div>
-	</Tooltip>
 </template>
 
 <script setup>
 import { computed } from 'vue'
-import { Tooltip } from 'frappe-ui'
 
 const props = defineProps({
 	progress: {
 		type: Number,
 		default: 0,
 	},
-	size: {
-		type: String,
-		default: 'sm',
-	},
 })
 
 const progressBarWidth = computed(() => {
 	const formattedPercentage = Math.min(Math.ceil(props.progress), 100)
 	return `${formattedPercentage}%`
 })
-
-const progressBarHeight = computed(() => {
-	if (props.size === 'sm') {
-		return 'h-1'
-	}
-	if (props.size === 'md') {
-		return 'h-2'
-	}
-	if (props.size === 'lg') {
-		return 'h-3'
-	}
-})
 </script>

frontend/src/components/Quiz.vue

@@ -1,27 +1,11 @@
 <template>
 	<div v-if="quiz.data">
-		<div
+		<div class="bg-blue-100 py-2 px-2 mb-4 rounded-md text-sm text-blue-800">
-			class="bg-blue-100 space-y-1 py-2 px-2 mb-4 rounded-md text-sm text-blue-800"
+			<div class="leading-relaxed">
-		>
-			<div class="leading-5">
 				{{
 					__('This quiz consists of {0} questions.').format(questions.length)
 				}}
 			</div>
-			<div v-if="quiz.data?.duration" class="leading-5">
-				{{
-					__(
-						'Please ensure that you complete all the questions in {0} minutes.'
-					).format(quiz.data.duration)
-				}}
-			</div>
-			<div v-if="quiz.data?.duration" class="leading-5">
-				{{
-					__(
-						'If you fail to do so, the quiz will be automatically submitted when the timer ends.'
-					)
-				}}
-			</div>
 			<div v-if="quiz.data.passing_percentage" class="leading-relaxed">
 				{{
 					__(
@@ -38,16 +22,14 @@
 					)
 				}}
 			</div>
+			<div v-if="quiz.data.time" class="leading-relaxed">
+				{{
+					__(
+						'The quiz has a time limit. For each question you will be given {0} seconds.'
+					).format(quiz.data.time)
+				}}
+			</div>
 		</div>
-
-		<div v-if="quiz.data.duration" class="flex items-center space-x-2 my-4">
-			<span class="text-gray-600 text-xs"> {{ __('Time') }}: </span>
-			<ProgressBar :progress="timerProgress" />
-			<span class="font-semibold">
-				{{ formatTimer(timer) }}
-			</span>
-		</div>
-
 		<div v-if="activeQuestion == 0">
 			<div class="border text-center p-20 rounded-md">
 				<div class="font-semibold text-lg">
@@ -81,12 +63,19 @@
 					class="border rounded-md p-5"
 				>
 					<div class="flex justify-between">
-						<div class="text-sm text-gray-600">
+						<div class="text-sm">
 							<span class="mr-2">
 								{{ __('Question {0}').format(activeQuestion) }}:
 							</span>
-							<span>
+							<span v-if="questionDetails.data.type == 'User Input'">
-								{{ getInstructions(questionDetails.data) }}
+								{{ __('Type your answer') }}
+							</span>
+							<span v-else>
+								{{
+									questionDetails.data.multiple
+										? __('Choose all answers that apply')
+										: __('Choose one answer')
+								}}
 							</span>
 						</div>
 						<div class="text-gray-900 text-sm font-semibold item-left">
@@ -95,7 +84,7 @@
 						</div>
 					</div>
 					<div
-						class="text-gray-900 font-semibold mt-2 leading-5"
+						class="text-gray-900 font-semibold mt-2"
 						v-html="questionDetails.data.question"
 					></div>
 					<div v-if="questionDetails.data.type == 'Choices'" v-for="index in 4">
@@ -118,17 +107,15 @@
 								class="w-3.5 h-3.5 text-gray-900 rounded-sm focus:ring-gray-200"
 								@change="markAnswer(index)"
 							/>
+
 							<div
 								v-else-if="quiz.data.show_answers"
 								v-for="(answer, idx) in showAnswers"
 							>
 								<div v-if="index - 1 == idx">
-									<CheckCircle
+									<CheckCircle v-if="answer" class="w-4 h-4 text-green-500" />
-										v-if="answer == 1"
-										class="w-4 h-4 text-green-500"
-									/>
 									<MinusCircle
-										v-else-if="answer == 2"
+										v-else-if="questionDetails.data[`is_correct_${index}`]"
 										class="w-4 h-4 text-green-500"
 									/>
 									<XCircle
@@ -152,7 +139,7 @@
 							{{ questionDetails.data[`explanation_${index}`] }}
 						</div>
 					</div>
-					<div v-else-if="questionDetails.data.type == 'User Input'">
+					<div v-else>
 						<FormControl
 							v-model="possibleAnswer"
 							type="textarea"
@@ -172,18 +159,8 @@
 							</Badge>
 						</div>
 					</div>
-					<div v-else>
+					<div class="flex items-center justify-between mt-5">
-						<TextEditor
+						<div>
-							class="mt-4"
-							:content="possibleAnswer"
-							@change="(val) => (possibleAnswer = 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>
-					<div class="flex items-center justify-between mt-4">
-						<div class="text-sm text-gray-600">
 							{{
 								__('Question {0} of {1}').format(
 									activeQuestion,
@@ -192,11 +169,7 @@
 							}}
 						</div>
 						<Button
-							v-if="
+							v-if="quiz.data.show_answers && !showAnswers.length"
-								quiz.data.show_answers &&
-								!showAnswers.length &&
-								questionDetails.data.type != 'Open Ended'
-							"
 							@click="checkAnswer()"
 						>
 							<span>
@@ -220,18 +193,11 @@
 				</div>
 			</div>
 		</div>
-		<div v-else class="border rounded-md p-20 text-center space-y-4">
+		<div v-else class="border rounded-md p-20 text-center">
 			<div class="text-lg font-semibold">
 				{{ __('Quiz Summary') }}
 			</div>
-			<div v-if="quizSubmission.data.is_open_ended">
+			<div>
-				{{
-					__(
-						"Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
-					)
-				}}
-			</div>
-			<div v-else>
 				{{
 					__(
 						'You got {0}% correct answers with a score of {1} out of {2}'
@@ -270,32 +236,20 @@
 	</div>
 </template>
 <script setup>
-import {
+import { Badge, Button, createResource, ListView } from 'frappe-ui'
-	Badge,
+import { ref, watch, reactive, inject } from 'vue'
-	Button,
-	call,
-	createResource,
-	ListView,
-	TextEditor,
-	FormControl,
-} from 'frappe-ui'
-import { ref, watch, reactive, inject, computed } from 'vue'
 import { createToast } from '@/utils/'
 import { CheckCircle, XCircle, MinusCircle } from 'lucide-vue-next'
 import { timeAgo } from '@/utils'
-import { useRouter } from 'vue-router'
+import FormControl from 'frappe-ui/src/components/FormControl.vue'
-import ProgressBar from '@/components/ProgressBar.vue'
-
 const user = inject('$user')
+
 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 timer = ref(0)
-let timerInterval = null
-const router = useRouter()
 
 const props = defineProps({
 	quizName: {
@@ -316,7 +270,6 @@ const quiz = createResource({
 	auto: true,
 	onSuccess(data) {
 		populateQuestions()
-		setupTimer()
 	},
 })
 
@@ -332,37 +285,6 @@ const populateQuestions = () => {
 	}
 }
 
-const setupTimer = () => {
-	if (quiz.data.duration) {
-		timer.value = quiz.data.duration * 60
-	}
-}
-
-const startTimer = () => {
-	timerInterval = setInterval(() => {
-		timer.value--
-		if (timer.value == 0) {
-			clearInterval(timerInterval)
-			submitQuiz()
-		}
-	}, 1000)
-}
-
-const formatTimer = (seconds) => {
-	const hrs = Math.floor(seconds / 3600)
-		.toString()
-		.padStart(2, '0')
-	const mins = Math.floor((seconds % 3600) / 60)
-		.toString()
-		.padStart(2, '0')
-	const secs = (seconds % 60).toString().padStart(2, '0')
-	return hrs != '00' ? `${hrs}:${mins}:${secs}` : `${mins}:${secs}`
-}
-
-const timerProgress = computed(() => {
-	return (timer.value / (quiz.data.duration * 60)) * 100
-})
-
 const shuffleArray = (array) => {
 	for (let i = array.length - 1; i > 0; i--) {
 		const j = Math.floor(Math.random() * (i + 1))
@@ -402,9 +324,6 @@ const attempts = createResource({
 watch(
 	() => quiz.data,
 	() => {
-		if (quiz.data) {
-			populateQuestions()
-		}
 		if (quiz.data && quiz.data.max_attempts) {
 			attempts.reload()
 			resetQuiz()
@@ -450,7 +369,6 @@ watch(
 const startQuiz = () => {
 	activeQuestion.value = 1
 	localStorage.removeItem(quiz.data.title)
-	if (quiz.data.duration) startTimer()
 }
 
 const markAnswer = (index) => {
@@ -501,8 +419,8 @@ const checkAnswer = () => {
 				selectedOptions.forEach((option, index) => {
 					if (option) {
 						showAnswers[index] = option && data[index]
-					} else if (data[index] == 2) {
+					} else if (questionDetails.data[`is_correct_${index + 1}`]) {
-						showAnswers[index] = 2
+						showAnswers[index] = 0
 					} else {
 						showAnswers[index] = undefined
 					}
@@ -532,10 +450,9 @@ const addToLocalStorage = () => {
 }
 
 const nextQuetion = () => {
-	if (!quiz.data.show_answers && questionDetails.data?.type != 'Open Ended') {
+	if (!quiz.data.show_answers) {
 		checkAnswer()
 	} else {
-		if (questionDetails.data?.type == 'Open Ended') addToLocalStorage()
 		resetQuestion()
 	}
 }
@@ -550,8 +467,7 @@ const resetQuestion = () => {
 
 const submitQuiz = () => {
 	if (!quiz.data.show_answers) {
-		if (questionDetails.data.type == 'Open Ended') addToLocalStorage()
+		checkAnswer()
-		else checkAnswer()
 		setTimeout(() => {
 			createSubmission()
 		}, 500)
@@ -561,16 +477,9 @@ const submitQuiz = () => {
 }
 
 const createSubmission = () => {
-	quizSubmission.submit(
+	quizSubmission.reload().then(() => {
-		{},
+		if (quiz.data && quiz.data.max_attempts) attempts.reload()
-		{
+	})
-			onSuccess(data) {
-				markLessonProgress()
-				if (quiz.data && quiz.data.max_attempts) attempts.reload()
-				if (quiz.data.duration) clearInterval(timerInterval)
-			},
-		}
-	)
 }
 
 const resetQuiz = () => {
@@ -579,24 +488,6 @@ const resetQuiz = () => {
 	showAnswers.length = 0
 	quizSubmission.reset()
 	populateQuestions()
-	setupTimer()
-}
-
-const getInstructions = (question) => {
-	if (question.type == 'Choices')
-		if (question.multiple) return __('Choose all answers that apply')
-		else return __('Choose one answer')
-	else return __('Type your answer')
-}
-
-const markLessonProgress = () => {
-	if (router.currentRoute.value.name == 'Lesson') {
-		call('lms.lms.api.mark_lesson_progress', {
-			course: router.currentRoute.value.params.courseName,
-			chapter_number: router.currentRoute.value.params.chapterNumber,
-			lesson_number: router.currentRoute.value.params.lessonNumber,
-		})
-	}
 }
 
 const getSubmissionColumns = () => {

frontend/src/components/SettingDetails.vue

@@ -1,23 +1,34 @@
 <template>
-	<div class="flex flex-col justify-between h-full">
+	<div class="flex flex-col justify-between h-full p-4">
 		<div>
-			<div class="flex itemsc-center justify-between">
+			<div class="font-semibold mb-1">
-				<div class="text-xl font-semibold leading-none mb-1">
+				{{ __(label) }}
-					{{ __(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>
-
+		<div class="flex space-x-8 my-5">
-		<SettingFields :fields="fields" :data="data.doc" />
+			<div v-for="(column, index) in columns" :key="index">
+				<div class="flex flex-col space-y-4 w-60">
+					<div v-for="field in column">
+						<Link
+							v-if="field.type == 'Link'"
+							v-model="field.value"
+							:doctype="field.doctype"
+							:label="field.label"
+						/>
+						<FormControl
+							v-else
+							:key="field.name"
+							v-model="field.value"
+							:label="field.label"
+							:type="field.type"
+						/>
+					</div>
+				</div>
+			</div>
+		</div>
 		<div class="flex flex-row-reverse mt-auto">
 			<Button variant="solid" :loading="data.save.loading" @click="update">
 				{{ __('Update') }}
@@ -27,9 +38,9 @@
 </template>
 
 <script setup>
-import { Button, Badge } from 'frappe-ui'
+import { FormControl, Button } from 'frappe-ui'
-import SettingFields from '@/components/SettingFields.vue'
+import { computed } from 'vue'
-import { showToast } from '@/utils'
+import Link from '@/components/Controls/Link.vue'
 
 const props = defineProps({
 	fields: {
@@ -49,30 +60,37 @@ const props = defineProps({
 	},
 })
 
-const update = () => {
+const columns = computed(() => {
-	props.fields.forEach((f) => {
+	const cols = []
-		if (f.type != 'Column Break') {
+	let currentColumn = []
-			props.data.doc[f.name] = f.value
+
+	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.doc[field.name] ? true : false
+			} else {
+				field.value = props.data.doc[field.name]
+			}
+			currentColumn.push(field)
 		}
 	})
-	props.data.save.submit(
+
-		{},
+	if (currentColumn.length > 0) {
-		{
+		cols.push(currentColumn)
-			onError(err) {
+	}
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
+
-			},
+	return cols
-		}
+})
-	)
+
+const update = () => {
+	props.fields.forEach((f) => {
+		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

@@ -1,145 +0,0 @@
-<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'">
-						<CodeEditor
-							:label="__(field.label)"
-							type="HTML"
-							description="The HTML you add here will be shown on your sign up page."
-							v-model="data[field.name]"
-							height="250px"
-							class="shrink-0"
-							:showLineNumbers="true"
-						>
-						</CodeEditor>
-					</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 space-x-2">
-								<div
-									class="flex items-center justify-center rounded border border-outline-gray-1 w-[15rem] py-5"
-								>
-									<img :src="data[field.name]?.file_url" class="h-6 rounded" />
-								</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>
-
-					<Switch
-						v-else-if="field.type == 'checkbox'"
-						size="sm"
-						:label="__(field.label)"
-						:description="__(field.description)"
-						v-model="data[field.name]"
-					/>
-
-					<FormControl
-						v-else
-						:key="field.name"
-						v-model="data[field.name]"
-						:label="__(field.label)"
-						:type="field.type"
-						:rows="field.rows"
-						:options="field.options"
-						:description="field.description"
-					/>
-				</div>
-			</div>
-		</div>
-	</div>
-</template>
-<script setup>
-import { FormControl, FileUploader, Button, Switch } from 'frappe-ui'
-import { computed } from 'vue'
-import { getFileSize, validateFile } from '@/utils'
-import { X } from 'lucide-vue-next'
-import Link from '@/components/Controls/Link.vue'
-import CodeEditor from '@/components/Controls/CodeEditor.vue'
-
-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/SidebarLink.vue

@@ -7,7 +7,7 @@
 	>
 		<div
 			class="flex items-center w-full duration-300 ease-in-out group"
-			:class="isCollapsed ? 'p-1 relative' : 'px-2 py-1'"
+			:class="isCollapsed ? 'p-1' : 'px-2 py-1'"
 		>
 			<Tooltip :text="link.label" placement="right">
 				<slot name="icon">
@@ -27,17 +27,9 @@
 						: 'ml-2 w-auto opacity-100'
 				"
 			>
-				{{ __(link.label) }}
+				{{ link.label }}
 			</span>
-			<span
+			<span v-if="link.count" class="!ml-auto block text-xs text-gray-600">
-				v-if="link.count"
-				class="!ml-auto block text-xs text-gray-600"
-				:class="
-					isCollapsed && link.count > 9
-						? 'absolute top-[2px] right-0 bg-white'
-						: ''
-				"
-			>
 				{{ link.count }}
 			</span>
 			<div

frontend/src/components/UploadPlugin.vue

@@ -1,53 +0,0 @@
-<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

@@ -11,11 +11,11 @@
 						: 'hover:bg-gray-200 px-2 w-52'
 				"
 			>
-				<img
+				<span
-					v-if="branding.data?.banner_image"
+					v-if="branding.data?.brand_html"
-					:src="branding.data?.banner_image.file_url"
+					v-html="branding.data?.brand_html"
 					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,10 +28,11 @@
 					<div class="text-base font-medium text-gray-900 leading-none">
 						<span
 							v-if="
-								branding.data?.app_name && branding.data?.app_name != 'Frappe'
+								branding.data?.brand_name &&
+								branding.data?.brand_name != 'Frappe'
 							"
 						>
-							{{ branding.data?.app_name }}
+							{{ branding.data?.brand_name }}
 						</span>
 						<span v-else> Learning </span>
 					</div>
@@ -66,20 +67,25 @@ import LMSLogo from '@/components/Icons/LMSLogo.vue'
 import { sessionStore } from '@/stores/session'
 import { Dropdown } from 'frappe-ui'
 import Apps from '@/components/Apps.vue'
-import { ChevronDown, LogIn, LogOut, User, Settings } from 'lucide-vue-next'
+import {
+	ChevronDown,
+	LogIn,
+	LogOut,
+	User,
+	ArrowRightLeft,
+	Settings,
+} from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
 import { convertToTitleCase } from '../utils'
 import { usersStore } from '@/stores/user'
-import { useSettings } from '@/stores/settings'
+import { ref, markRaw } from 'vue'
-import { markRaw, watch, ref } from 'vue'
 import SettingsModal from '@/components/Modals/Settings.vue'
 
 const router = useRouter()
+const showSettingsModal = ref(false)
 const { logout, branding } = sessionStore()
 let { userResource } = usersStore()
-const settingsStore = useSettings()
 let { isLoggedIn } = sessionStore()
-const showSettingsModal = ref(false)
 
 const props = defineProps({
 	isCollapsed: {
@@ -88,13 +94,6 @@ const props = defineProps({
 	},
 })
 
-watch(
-	() => settingsStore.isSettingsOpen,
-	(value) => {
-		showSettingsModal.value = value
-	}
-)
-
 const userDropdownOptions = [
 	{
 		icon: User,
@@ -119,7 +118,7 @@ const userDropdownOptions = [
 		icon: Settings,
 		label: 'Settings',
 		onClick: () => {
-			settingsStore.isSettingsOpen = true
+			showSettingsModal.value = true
 		},
 		condition: () => {
 			return userResource.data?.is_moderator

frontend/src/components/VideoBlock.vue

@@ -3,15 +3,12 @@
 		<video
 			@timeupdate="updateTime"
 			@ended="videoEnded"
-			@click="togglePlay"
+			class="rounded-lg border border-gray-100"
-			oncontextmenu="return false"
-			class="rounded-lg border border-gray-100 group cursor-pointer"
-			ref="videoRef"
 		>
 			<source :src="fileURL" :type="type" />
 		</video>
 		<div
-			class="flex items-center space-x-2 bg-gray-200 rounded-md p-0.5 absolute bottom-3 w-[98%] left-0 right-0 mx-auto invisible group-hover:visible"
+			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>
@@ -74,6 +71,7 @@ const props = defineProps({
 
 onMounted(() => {
 	setTimeout(() => {
+		videoRef.value = document.querySelector('video')
 		videoRef.value.onloadedmetadata = () => {
 			duration.value = videoRef.value.duration
 		}
@@ -108,14 +106,6 @@ const pauseVideo = () => {
 	playing.value = false
 }
 
-const togglePlay = () => {
-	if (playing.value) {
-		pauseVideo()
-	} else {
-		playVideo()
-	}
-}
-
 const videoEnded = () => {
 	playing.value = false
 }

frontend/src/main.js

@@ -5,7 +5,6 @@ import router from './router'
 import App from './App.vue'
 import { createPinia } from 'pinia'
 import dayjs from '@/utils/dayjs'
-import { createDialog } from '@/utils/dialogs'
 import translationPlugin from './translation'
 import { usersStore } from './stores/user'
 import { sessionStore } from './stores/session'
@@ -37,4 +36,3 @@ let { isLoggedIn } = sessionStore()
 app.provide('$user', userResource)
 app.provide('$allUsers', allUsers)
 app.config.globalProperties.$user = userResource
-app.config.globalProperties.$dialog = createDialog

frontend/src/pages/AssignmentForm.vue

@@ -1,191 +0,0 @@
-<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" />
-		<div class="space-x-2">
-			<router-link
-				v-if="assignment.doc?.name"
-				:to="{
-					name: 'AssignmentSubmissionList',
-					query: {
-						assignmentID: assignment.doc.name,
-					},
-				}"
-			>
-				<Button>
-					{{ __('Submission List') }}
-				</Button>
-			</router-link>
-			<Button variant="solid" @click="saveAssignment()">
-				{{ __('Save') }}
-			</Button>
-		</div>
-	</header>
-	<div class="w-3/4 mx-auto py-5">
-		<div class="font-semibold mb-4">
-			{{ __('Details') }}
-		</div>
-		<div class="grid grid-cols-2 gap-5 mt-4 mb-8">
-			<FormControl
-				v-model="model.title"
-				:label="__('Title')"
-				:required="true"
-			/>
-			<FormControl
-				v-model="model.type"
-				type="select"
-				:options="assignmentOptions"
-				:label="__('Type')"
-				:required="true"
-			/>
-		</div>
-		<div>
-			<div class="text-xs text-gray-600 mb-2">
-				{{ __('Question') }}
-				<span class="text-ink-red-3">*</span>
-			</div>
-			<TextEditor
-				:content="model.question"
-				@change="(val) => (model.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>
-	</div>
-</template>
-<script setup>
-import {
-	Breadcrumbs,
-	Button,
-	createDocumentResource,
-	createResource,
-	FormControl,
-	TextEditor,
-} from 'frappe-ui'
-import {
-	computed,
-	inject,
-	onMounted,
-	onBeforeUnmount,
-	reactive,
-	watch,
-} from 'vue'
-import { showToast } from '@/utils'
-import { useRouter } from 'vue-router'
-
-const user = inject('$user')
-const router = useRouter()
-
-const props = defineProps({
-	assignmentID: {
-		type: String,
-		required: true,
-	},
-})
-
-const model = reactive({
-	title: '',
-	type: 'PDF',
-	question: '',
-})
-
-onMounted(() => {
-	if (
-		props.assignmentID == 'new' &&
-		!user.data?.is_moderator &&
-		!user.data?.is_instructor
-	) {
-		router.push({ name: 'Courses' })
-	}
-	if (props.assignmentID !== 'new') {
-		assignment.reload()
-	}
-	window.addEventListener('keydown', keyboardShortcut)
-})
-
-const keyboardShortcut = (e) => {
-	if (e.key === 's' && (e.ctrlKey || e.metaKey)) {
-		saveAssignment()
-		e.preventDefault()
-	}
-}
-
-onBeforeUnmount(() => {
-	window.removeEventListener('keydown', keyboardShortcut)
-})
-
-const assignment = createDocumentResource({
-	doctype: 'LMS Assignment',
-	name: props.assignmentID,
-	auto: false,
-})
-
-const newAssignment = createResource({
-	url: 'frappe.client.insert',
-	makeParams(values) {
-		return {
-			doc: {
-				doctype: 'LMS Assignment',
-				...values,
-			},
-		}
-	},
-	onSuccess(data) {
-		router.push({ name: 'AssignmentForm', params: { assignmentID: data.name } })
-	},
-	onError(err) {
-		showToast(__('Error'), __(err.messages?.[0] || err), 'x')
-	},
-})
-
-const saveAssignment = () => {
-	if (props.assignmentID == 'new') {
-		newAssignment.submit({
-			...model,
-		})
-	} else {
-		assignment.setValue.submit(
-			{
-				...model,
-			},
-			{
-				onSuccess(data) {
-					showToast(__('Success'), __('Assignment saved successfully'), 'check')
-					assignment.reload()
-				},
-				onError(err) {
-					showToast(__('Error'), __(err.messages?.[0] || err), 'x')
-				},
-			}
-		)
-	}
-}
-
-watch(assignment, () => {
-	Object.keys(assignment.doc).forEach((key) => {
-		model[key] = assignment.doc[key]
-	})
-})
-
-const breadcrumbs = computed(() => [
-	{
-		label: __('Assignments'),
-		route: { name: 'Assignments' },
-	},
-	{
-		label: assignment.doc ? assignment.doc.title : __('New Assignment'),
-	},
-])
-
-const assignmentOptions = computed(() => {
-	return [
-		{ label: 'PDF', value: 'PDF' },
-		{ label: 'Image', value: 'Image' },
-		{ label: 'Document', value: 'Document' },
-		{ label: 'Text', value: 'Text' },
-		{ label: 'URL', value: 'URL' },
-	]
-})
-</script>

frontend/src/pages/AssignmentSubmission.vue

@@ -3,20 +3,137 @@
 		class="flex justify-between sticky top-0 z-10 border-b bg-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
+		<Button variant="solid" @click="submitAssignment()">
+			{{ __('Save') }}
+		</Button>
 	</header>
-	<div class="overflow-hidden h-[calc(100vh-3.2rem)]">
+	<div class="container py-5">
-		<Assignment :assignmentID="assignmentID" :submissionName="submissionName" />
+		<div
+			v-if="submissionResource.data"
+			class="bg-blue-100 p-2 rounded-md leading-5 text-sm italic"
+		>
+			{{ __("You've successfully submitted the assignment.") }}
+			{{
+				__(
+					"Once the moderator grades your submission, you'll find the details here."
+				)
+			}}
+			{{ __('Feel free to make edits to your submission if needed.') }}
+		</div>
+		<div v-if="assignment.data">
+			<div>
+				<div class="text-xl font-semibold hidden">
+					{{ __('Question') }}
+				</div>
+				<div class="text-sm mt-1 hidden">
+					{{
+						__('Read the question carefully before attempting the assignment.')
+					}}
+				</div>
+				<div
+					v-html="assignment.data.question"
+					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"
+				></div>
+			</div>
+			<div class="">
+				<div class="text-xl font-semibold mt-10">
+					{{ __('Submission') }}
+				</div>
+				<div v-if="showUploader()">
+					<div class="text-sm mt-1 mb-4">
+						{{ __('Add your assignment as {0}').format(assignment.data.type) }}
+					</div>
+					<FileUploader
+						v-if="!submissionFile"
+						:fileTypes="getType()"
+						:validateFile="validateFile"
+						@success="(file) => saveSubmission(file)"
+					>
+						<template
+							#default="{
+								file,
+								uploading,
+								progress,
+								uploaded,
+								message,
+								error,
+								total,
+								success,
+								openFileSelector,
+							}"
+						>
+							<Button @click="openFileSelector" :loading="uploading">
+								{{
+									uploading
+										? __('Uploading {0}%').format(progress)
+										: __('Upload File')
+								}}
+							</Button>
+						</template>
+					</FileUploader>
+					<div v-else>
+						<div class="flex items-center">
+							<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">
+								<span>
+									{{ submissionFile.file_name }}
+								</span>
+								<span class="text-sm text-gray-500 mt-1">
+									{{ getFileSize(submissionFile.file_size) }}
+								</span>
+							</div>
+							<X
+								@click="removeSubmission()"
+								class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
+							/>
+						</div>
+					</div>
+				</div>
+				<div v-else-if="assignment.data.type == 'URL'">
+					<div class="text-sm mb-4">
+						{{ __('Enter a URL') }}
+					</div>
+					<FormControl v-model="answer" />
+				</div>
+				<div v-else>
+					<div class="text-sm mb-4">
+						{{ __('Write your answer here') }}
+					</div>
+					<TextEditor
+						:content="answer"
+						@change="(val) => (answer = 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>
+			</div>
+		</div>
 	</div>
 </template>
 <script setup>
-import { Breadcrumbs, createResource } from 'frappe-ui'
+import {
-import { computed, inject, onMounted } from 'vue'
+	Breadcrumbs,
-import Assignment from '@/components/Assignment.vue'
+	createResource,
+	FileUploader,
+	Button,
+	FormControl,
+	TextEditor,
+} from 'frappe-ui'
+import { FileText, X } from 'lucide-vue-next'
+import { computed, inject, onMounted, ref } from 'vue'
+import { showToast, getFileSize } from '../utils'
+import { useRouter } from 'vue-router'
 
 const user = inject('$user')
+const submissionFile = ref(null)
+const answer = ref(null)
+const router = useRouter()
 
 const props = defineProps({
-	assignmentID: {
+	assignmentName: {
 		type: String,
 		required: true,
 	},
@@ -26,40 +143,186 @@ const props = defineProps({
 	},
 })
 
-const title = createResource({
+const assignment = createResource({
-	url: 'frappe.client.get_value',
+	url: 'frappe.client.get',
 	params: {
 		doctype: 'LMS Assignment',
-		fieldname: 'title',
+		name: props.assignmentName,
-		filters: {
-			name: props.assignmentID,
-		},
 	},
 	auto: true,
 })
 
+const showUploader = () => {
+	return ['PDF', 'Image', 'Document'].includes(assignment.data?.type)
+}
+
+const updateSubmission = createResource({
+	url: 'frappe.client.set_value',
+	makeParams(values) {
+		let fieldname = {}
+		if (showUploader()) {
+			fieldname.assignment_attachment = submissionFile.value.file_url
+		} else {
+			fieldname.answer = answer.value
+		}
+		return {
+			doctype: 'LMS Assignment Submission',
+			name: props.submissionName,
+			fieldname: fieldname,
+		}
+	},
+})
+
+const imageResource = createResource({
+	url: 'lms.lms.api.get_file_info',
+	makeParams(values) {
+		return {
+			file_url: values.image,
+		}
+	},
+	auto: false,
+	onSuccess(data) {
+		submissionFile.value = data
+	},
+})
+
+const newSubmission = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		let doc = {
+			doctype: 'LMS Assignment Submission',
+			assignment: props.assignmentName,
+			member: user.data?.name,
+		}
+		if (showUploader()) {
+			doc.assignment_attachment = submissionFile.value.file_url
+		} else {
+			doc.answer = answer.value
+		}
+		return {
+			doc: doc,
+		}
+	},
+})
+
+const submissionResource = createResource({
+	url: 'frappe.client.get_value',
+	params: {
+		doctype: 'LMS Assignment Submission',
+		fieldname: showUploader() ? 'assignment_attachment' : 'answer',
+		filters: {
+			name: props.submissionName,
+		},
+	},
+	onSuccess(data) {
+		if (data.assignment_attachment)
+			imageResource.reload({ image: data.assignment_attachment })
+		if (data.answer) answer.value = data.answer
+	},
+})
 onMounted(() => {
 	if (!user.data) {
 		window.location.href = '/login'
 	}
+	if (props.submissionName != 'new') {
+		submissionResource.reload()
+	}
 })
 
+const submitAssignment = () => {
+	if (props.submissionName != 'new') {
+		updateSubmission.submit(
+			{},
+			{
+				onSuccess(data) {
+					showToast('Success', 'Submission updated successfully.', 'check')
+				},
+				onError(err) {
+					showToast('Error', err.messages?.[0] || err, 'x')
+				},
+			}
+		)
+	} else {
+		addNewSubmission()
+	}
+}
+
+const addNewSubmission = () => {
+	newSubmission.submit(
+		{},
+		{
+			onSuccess(data) {
+				showToast('Success', 'Assignment submitted successfully.', 'check')
+				router.push({
+					name: 'AssignmentSubmission',
+					params: {
+						assignmentName: props.assignmentName,
+						submissionName: data.name,
+					},
+				})
+			},
+			onError(err) {
+				showToast('Error', err.messages?.[0] || err, 'x')
+			},
+		}
+	)
+}
+
 const breadcrumbs = computed(() => {
 	let crumbs = [
 		{
-			label: 'Submissions',
+			label: 'Assignment',
-			route: { name: 'AssignmentSubmissionList' },
 		},
 		{
-			label: title.data?.title,
+			label: assignment.data?.title,
 			route: {
 				name: 'AssignmentSubmission',
 				params: {
-					assignmentID: props.assignmentID,
+					assignmentName: assignment.data?.name,
 				},
 			},
 		},
 	]
 	return crumbs
 })
+
+const saveSubmission = (file) => {
+	submissionFile.value = file
+}
+
+const getType = () => {
+	const type = assignment.data?.type
+	if (type == 'Image') {
+		return ['image/*']
+	} else if (type == 'Document') {
+		return [
+			'.doc',
+			'.docx',
+			'.xml',
+			'application/msword',
+			'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+		]
+	} else if (type == 'PDF') {
+		return ['.pdf']
+	}
+}
+
+const validateFile = (file) => {
+	let type = assignment.data?.type
+	let extension = file.name.split('.').pop().toLowerCase()
+	if (type == 'Image' && !['jpg', 'jpeg', 'png'].includes(extension)) {
+		return 'Only image file is allowed.'
+	} else if (
+		type == 'Document' &&
+		!['doc', 'docx', 'xml'].includes(extension)
+	) {
+		return 'Only document file is allowed.'
+	} else if (type == 'PDF' && !['pdf'].includes(extension)) {
+		return 'Only PDF file is allowed.'
+	}
+}
+
+const removeSubmission = () => {
+	submissionFile.value = null
+}
 </script>

frontend/src/pages/AssignmentSubmissionList.vue

@@ -1,217 +0,0 @@
-<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="md:w-3/4 md:mx-auto py-5 mx-5">
-		<div class="grid grid-cols-3 gap-5 mb-5">
-			<Link
-				doctype="LMS Assignment"
-				v-model="assignmentID"
-				:placeholder="__('Assignment')"
-			/>
-			<Link doctype="User" v-model="member" :placeholder="__('Member')" />
-			<FormControl
-				v-model="status"
-				type="select"
-				:options="statusOptions"
-				:placeholder="__('Status')"
-			/>
-		</div>
-		<ListView
-			v-if="submissions.loading || submissions.data?.length"
-			:columns="submissionColumns"
-			:rows="submissions.data"
-			rowKey="name"
-		>
-			<ListHeader
-				class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
-			>
-				<ListHeaderItem :item="item" v-for="item in submissionColumns" />
-			</ListHeader>
-			<ListRows>
-				<router-link
-					v-for="row in submissions.data"
-					:to="{
-						name: 'AssignmentSubmission',
-						params: {
-							assignmentID: row.assignment,
-							submissionName: row.name,
-						},
-					}"
-				>
-					<ListRow :row="row">
-						<template #default="{ column, item }">
-							<ListRowItem :item="row[column.key]" :align="column.align">
-								<div v-if="column.key == 'status'">
-									<Badge :theme="getStatusTheme(row[column.key])">
-										{{ row[column.key] }}
-									</Badge>
-								</div>
-								<div v-else>
-									{{ row[column.key] }}
-								</div>
-							</ListRowItem>
-						</template>
-					</ListRow>
-				</router-link>
-			</ListRows>
-		</ListView>
-		<div
-			v-else
-			class="text-center p-5 text-gray-600 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-		>
-			<Pencil class="size-8 mx-auto stroke-1 text-gray-500" />
-			<div class="text-xl font-medium">
-				{{ __('No submissions') }}
-			</div>
-			<div class="leading-5">
-				{{ __('There are no submissions for this assignment.') }}
-			</div>
-		</div>
-	</div>
-</template>
-<script setup>
-import {
-	Badge,
-	Breadcrumbs,
-	createListResource,
-	FormControl,
-	ListView,
-	ListHeader,
-	ListHeaderItem,
-	ListRows,
-	ListRow,
-	ListRowItem,
-} from 'frappe-ui'
-import { computed, inject, onMounted, ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
-import { Pencil } from 'lucide-vue-next'
-import Link from '@/components/Controls/Link.vue'
-
-const user = inject('$user')
-const dayjs = inject('$dayjs')
-const router = useRouter()
-const assignmentID = ref('')
-const member = ref('')
-const status = ref('')
-
-onMounted(() => {
-	if (!user.data?.is_instructor && !user.data?.is_moderator) {
-		router.push({ name: 'Courses' })
-	}
-	assignmentID.value = router.currentRoute.value.query.assignmentID
-	member.value = router.currentRoute.value.query.member
-	status.value = router.currentRoute.value.query.status
-	reloadSubmissions()
-})
-
-const getAssignmentFilters = () => {
-	let filters = {}
-	if (assignmentID.value) {
-		filters.assignment = assignmentID.value
-	}
-	if (member.value) {
-		filters.member = member.value
-	}
-	if (status.value) {
-		filters.status = status.value
-	}
-	return filters
-}
-
-const submissions = createListResource({
-	doctype: 'LMS Assignment Submission',
-	fields: [
-		'name',
-		'assignment',
-		'assignment_title',
-		'member_name',
-		'creation',
-		'status',
-	],
-	orderBy: 'creation desc',
-	transform(data) {
-		return data.map((row) => {
-			return {
-				...row,
-				creation: dayjs(row.creation).fromNow(),
-			}
-		})
-	},
-})
-
-// watch changes in assignmentID, member, and status and if changes in any then reload submissions. Also update the url query params for the same
-watch([assignmentID, member, status], () => {
-	router.push({
-		query: {
-			assignmentID: assignmentID.value,
-			member: member.value,
-			status: status.value,
-		},
-	})
-	reloadSubmissions()
-})
-
-const reloadSubmissions = () => {
-	submissions.update({
-		filters: getAssignmentFilters(),
-	})
-	submissions.reload()
-}
-
-const submissionColumns = computed(() => {
-	return [
-		{
-			label: 'Member',
-			key: 'member_name',
-			width: 1,
-		},
-		{
-			label: 'Assignment',
-			key: 'assignment_title',
-			width: 2,
-		},
-		{
-			label: 'Submitted',
-			key: 'creation',
-			width: 1,
-			align: 'left',
-		},
-		{
-			label: 'Status',
-			key: 'status',
-			width: 1,
-			align: 'center',
-		},
-	]
-})
-
-const statusOptions = computed(() => {
-	return [
-		{ label: '', value: '' },
-		{ label: 'Pass', value: 'Pass' },
-		{ label: 'Fail', value: 'Fail' },
-		{ label: 'Not Graded', value: 'Not Graded' },
-	]
-})
-
-const getStatusTheme = (status) => {
-	if (status === 'Pass') {
-		return 'green'
-	} else if (status === 'Not Graded') {
-		return 'blue'
-	} else {
-		return 'red'
-	}
-}
-
-const breadcrumbs = computed(() => {
-	return [
-		{
-			label: 'Assignment Submissions',
-		},
-	]
-})
-</script>

frontend/src/pages/Assignments.vue

@@ -1,187 +0,0 @@
-<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: 'AssignmentForm',
-				params: {
-					assignmentID: 'new',
-				},
-			}"
-		>
-			<Button variant="solid">
-				<template #prefix>
-					<Plus class="w-4 h-4" />
-				</template>
-				{{ __('New') }}
-			</Button>
-		</router-link>
-	</header>
-
-	<div class="md:w-3/4 md:mx-auto py-5 mx-5">
-		<div class="grid grid-cols-3 gap-5 mb-5">
-			<FormControl v-model="titleFilter" :placeholder="__('Search by title')" />
-			<FormControl
-				v-model="typeFilter"
-				type="select"
-				:options="assignmentTypes"
-				:placeholder="__('Type')"
-			/>
-		</div>
-		<ListView
-			v-if="assignments.data?.length"
-			:columns="assignmentColumns"
-			:rows="assignments.data"
-			row-key="name"
-			:options="{
-				showTooltip: false,
-				selectable: false,
-				getRowRoute: (row) => ({
-					name: 'AssignmentForm',
-					params: {
-						assignmentID: row.name,
-					},
-				}),
-			}"
-		>
-		</ListView>
-		<div
-			v-else
-			class="text-center p-5 text-gray-600 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-		>
-			<Pencil class="size-10 mx-auto stroke-1 text-gray-500" />
-			<div class="text-xl font-medium">
-				{{ __('No assignments found') }}
-			</div>
-			<div class="leading-5">
-				{{
-					__(
-						'You have not created any assignments yet. To create a new assignment, click on the "New" button above.'
-					)
-				}}
-			</div>
-		</div>
-		<div
-			v-if="assignments.data && assignments.hasNextPage"
-			class="flex justify-center my-5"
-		>
-			<Button @click="assignments.next()">
-				{{ __('Load More') }}
-			</Button>
-		</div>
-	</div>
-</template>
-<script setup>
-import {
-	Breadcrumbs,
-	Button,
-	createListResource,
-	FormControl,
-	ListView,
-} from 'frappe-ui'
-import { computed, inject, onMounted, ref, watch } from 'vue'
-import { Plus, Pencil } from 'lucide-vue-next'
-import { useRouter } from 'vue-router'
-
-const user = inject('$user')
-const dayjs = inject('$dayjs')
-const titleFilter = ref('')
-const typeFilter = ref('')
-const router = useRouter()
-
-onMounted(() => {
-	if (!user.data?.is_moderator && !user.data?.is_instructor) {
-		router.push({ name: 'Courses' })
-	}
-
-	titleFilter.value = router.currentRoute.value.query.title
-	typeFilter.value = router.currentRoute.value.query.type
-})
-
-watch([titleFilter, typeFilter], () => {
-	router.push({
-		query: {
-			title: titleFilter.value,
-			type: typeFilter.value,
-		},
-	})
-	reloadAssignments()
-})
-
-const reloadAssignments = () => {
-	assignments.update({
-		filters: assignmentFilter.value,
-	})
-	assignments.reload()
-}
-
-const assignmentFilter = computed(() => {
-	let filters = {}
-	if (titleFilter.value) {
-		filters.title = ['like', `%${titleFilter.value}%`]
-	}
-	if (typeFilter.value) {
-		filters.type = typeFilter.value
-	}
-	if (!user.data?.is_moderator) {
-		filters.owner = user.data?.email
-	}
-	return filters
-})
-
-const assignments = createListResource({
-	doctype: 'LMS Assignment',
-	fields: ['name', 'title', 'type', 'creation'],
-	orderBy: 'modified desc',
-	cache: ['assignments'],
-	transform(data) {
-		return data.map((row) => {
-			return {
-				...row,
-				creation: dayjs(row.creation).fromNow(),
-			}
-		})
-	},
-})
-
-const assignmentColumns = computed(() => {
-	return [
-		{
-			label: __('Title'),
-			key: 'title',
-			width: 2,
-		},
-		{
-			label: __('Type'),
-			key: 'type',
-			width: 1,
-			align: 'left',
-		},
-		{
-			label: __('Created'),
-			key: 'creation',
-			width: 1,
-			align: 'center',
-		},
-	]
-})
-
-const assignmentTypes = computed(() => {
-	let types = ['', 'Document', 'Image', 'PDF', 'URL', 'Text']
-	return types.map((type) => {
-		return {
-			label: __(type),
-			value: type,
-		}
-	})
-})
-
-const breadcrumbs = computed(() => [
-	{
-		label: 'Assignments',
-		route: { name: 'Assignments' },
-	},
-])
-</script>

frontend/src/pages/Batch.vue

@@ -4,30 +4,18 @@
 			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="breadcrumbs" />
-			<div class="flex items-center space-x-2">
+			<Button v-if="user.data?.is_moderator" @click="openAnnouncementModal()">
-				<Button
+				<span>
-					v-if="user.data?.is_moderator"
+					{{ __('Make an Announcement') }}
-					@click="openCertificateDialog = true"
+				</span>
-				>
+				<template #suffix>
-					{{ __('Generate Certificates') }}
+					<SendIcon class="h-4 stroke-1.5" />
-				</Button>
+				</template>
-				<Button v-if="user.data?.is_moderator" @click="openAnnouncementModal()">
+			</Button>
-					<span>
-						{{ __('Make an Announcement') }}
-					</span>
-					<template #suffix>
-						<SendIcon class="h-4 stroke-1.5" />
-					</template>
-				</Button>
-			</div>
 		</header>
 		<div v-if="batch.data" class="grid grid-cols-[70%,30%] h-screen">
-			<div class="border-r">
+			<div class="border-r-2">
-				<Tabs
+				<Tabs v-model="tabIndex" :tabs="tabs" tablistClass="overflow-y-hidden">
-					v-model="tabIndex"
-					:tabs="tabs"
-					tablistClass="overflow-y-hidden bg-white"
-				>
 					<template #tab="{ tab, selected }" class="overflow-x-hidden">
 						<div>
 							<button
@@ -59,15 +47,15 @@
 							<div v-if="tab.label == 'Courses'">
 								<BatchCourses :batch="batch.data.name" />
 							</div>
-							<div v-else-if="tab.label == 'Dashboard' && isStudent">
-								<BatchDashboard :batch="batch" :isStudent="isStudent" />
-							</div>
 							<div v-else-if="tab.label == 'Dashboard'">
-								<BatchStudents :batch="batch.data" />
+								<BatchDashboard :batch="batch" :isStudent="isStudent" />
 							</div>
 							<div v-else-if="tab.label == 'Live Class'">
 								<LiveClass :batch="batch.data.name" />
 							</div>
+							<div v-else-if="tab.label == 'Students'">
+								<BatchStudents :batch="batch.data.name" />
+							</div>
 							<div v-else-if="tab.label == 'Assessments'">
 								<Assessments :batch="batch.data.name" />
 							</div>
@@ -89,12 +77,12 @@
 				</Tabs>
 			</div>
 			<div class="p-5">
-				<div class="text-xl font-semibold mb-2">
+				<div class="text-2xl font-semibold mb-2">
 					{{ batch.data.title }}
 				</div>
 				<div v-html="batch.data.description" class="leading-5 mb-2"></div>
 
-				<div class="flex items-center avatar-group overlap mb-5">
+				<div class="flex avatar-group overlap mb-5">
 					<div
 						class="h-6 mr-1"
 						:class="{
@@ -177,7 +165,6 @@
 			</div>
 		</div>
 	</div>
-	<BulkCertificates v-model="openCertificateDialog" :batch="batch.data" />
 </template>
 <script setup>
 import { Breadcrumbs, Button, createResource, Tabs, Badge } from 'frappe-ui'
@@ -195,7 +182,6 @@ import {
 	SendIcon,
 	MessageCircle,
 	Globe,
-	ShieldCheck,
 } from 'lucide-vue-next'
 import { formatTime, updateDocumentTitle } from '@/utils'
 import BatchDashboard from '@/components/BatchDashboard.vue'
@@ -207,11 +193,9 @@ import Announcements from '@/components/Annoucements.vue'
 import AnnouncementModal from '@/components/Modals/AnnouncementModal.vue'
 import Discussions from '@/components/Discussions.vue'
 import DateRange from '@/components/Common/DateRange.vue'
-import BulkCertificates from '@/components/Modals/BulkCertificates.vue'
 
 const user = inject('$user')
 const showAnnouncementModal = ref(false)
-const openCertificateDialog = ref(false)
 
 const props = defineProps({
 	batchName: {
@@ -230,7 +214,7 @@ const batch = createResource({
 })
 
 const breadcrumbs = computed(() => {
-	let crumbs = [{ label: 'Batches', route: { name: 'Batches' } }]
+	let crumbs = [{ label: 'All Batches', route: { name: 'Batches' } }]
 	if (!isStudent.value) {
 		crumbs.push({
 			label: 'Details',
@@ -252,7 +236,7 @@ const breadcrumbs = computed(() => {
 const isStudent = computed(() => {
 	return (
 		user?.data &&
-		batch.data?.students?.length &&
+		batch.data?.students.length &&
 		batch.data?.students.includes(user.data.name)
 	)
 })
@@ -260,33 +244,34 @@ const isStudent = computed(() => {
 const tabIndex = ref(0)
 const tabs = computed(() => {
 	let batchTabs = []
-	batchTabs.push({
+	if (isStudent.value) {
-		label: 'Dashboard',
+		batchTabs.push({
-		icon: LayoutDashboard,
+			label: 'Dashboard',
-	})
+			icon: LayoutDashboard,
-
+		})
-	batchTabs.push({
+	}
-		label: 'Courses',
-		icon: BookOpen,
-	})
-
-	batchTabs.push({
-		label: 'Live Class',
-		icon: Laptop,
-	})
-
 	if (user.data?.is_moderator) {
+		batchTabs.push({
+			label: 'Students',
+			icon: Contact2,
+		})
 		batchTabs.push({
 			label: 'Assessments',
 			icon: BookOpenCheck,
 		})
 	}
-
+	batchTabs.push({
+		label: 'Live Class',
+		icon: Laptop,
+	})
+	batchTabs.push({
+		label: 'Courses',
+		icon: BookOpen,
+	})
 	batchTabs.push({
 		label: 'Announcements',
 		icon: Mail,
 	})
-
 	batchTabs.push({
 		label: 'Discussions',
 		icon: MessageCircle,

frontend/src/pages/BatchDetail.vue

@@ -137,7 +137,7 @@ const courses = createResource({
 })
 
 const breadcrumbs = computed(() => {
-	let items = [{ label: 'Batches', route: { name: 'Batches' } }]
+	let items = [{ label: 'All Batches', route: { name: 'Batches' } }]
 	items.push({
 		label: batch?.data?.title,
 		route: { name: 'BatchDetail', params: { batchName: batch?.data?.name } },

frontend/src/pages/BatchForm.vue

@@ -13,12 +13,12 @@
 				<div class="text-lg font-semibold mb-4">
 					{{ __('Details') }}
 				</div>
-				<div class="grid grid-cols-2 gap-10 mb-4 space-y-2">
+				<div class="grid grid-cols-2 gap-10 mb-4">
 					<div>
 						<FormControl
 							v-model="batch.title"
 							:label="__('Title')"
-							:required="true"
+							class="mb-4"
 						/>
 					</div>
 					<div class="flex flex-col space-y-2">
@@ -36,73 +36,61 @@
 				</div>
 			</div>
 			<div class="mb-4">
-				<div class="text-xs text-gray-600 mb-2">
+				<div>
-					{{ __('Meta Image') }}
+					<FileUploader
-				</div>
+						v-if="!batch.image"
-				<FileUploader
+						class="mt-4"
-					v-if="!batch.image"
+						:fileTypes="['image/*']"
-					:fileTypes="['image/*']"
+						:validateFile="validateFile"
-					:validateFile="validateFile"
+						@success="(file) => saveImage(file)"
-					@success="(file) => saveImage(file)"
+					>
-				>
+						<template v-slot="{ file, progress, uploading, openFileSelector }">
-					<template v-slot="{ file, progress, uploading, openFileSelector }">
+							<div class="mb-4">
-						<div class="flex items-center">
+								<Button @click="openFileSelector" :loading="uploading">
-							<div class="border rounded-md w-fit py-5 px-20">
+									{{ uploading ? `Uploading ${progress}%` : 'Upload an image' }}
-								<Image class="size-5 stroke-1 text-gray-700" />
-							</div>
-							<div class="ml-4">
-								<Button @click="openFileSelector">
-									{{ __('Upload') }}
 								</Button>
-								<div class="mt-2 text-gray-600 text-sm">
-									{{
-										__(
-											'Appears when the batch URL is shared on any online platform'
-										)
-									}}
-								</div>
 							</div>
+						</template>
+					</FileUploader>
+					<div v-else class="mb-4">
+						<div class="text-xs text-gray-600 mb-1">
+							{{ __('Meta Image') }}
 						</div>
-					</template>
+						<div class="flex items-center">
-				</FileUploader>
+							<div class="border rounded-md p-2 mr-2">
-				<div v-else class="mb-4">
+								<FileText class="h-5 w-5 stroke-1.5 text-gray-700" />
-					<div class="flex items-center">
-						<img :src="batch.image.file_url" class="border rounded-md w-40" />
-						<div class="ml-4">
-							<Button @click="removeImage()">
-								{{ __('Remove') }}
-							</Button>
-							<div class="mt-2 text-gray-600 text-sm">
-								{{
-									__(
-										'Appears when the batch URL is shared on any online platform'
-									)
-								}}
 							</div>
+							<div class="flex flex-col">
+								<span>
+									{{ batch.image.file_name }}
+								</span>
+								<span class="text-sm text-gray-500 mt-1">
+									{{ getFileSize(batch.image.file_size) }}
+								</span>
+							</div>
+							<X
+								@click="removeImage()"
+								class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
+							/>
 						</div>
 					</div>
 				</div>
+				<MultiSelect
+					v-model="instructors"
+					doctype="User"
+					:label="__('Instructors')"
+				/>
 			</div>
-			<MultiSelect
-				v-model="instructors"
-				doctype="User"
-				:label="__('Instructors')"
-				:required="true"
-				:filters="{ ignore_user_type: 1 }"
-			/>
 			<div class="mb-4">
 				<FormControl
 					v-model="batch.description"
 					:label="__('Description')"
 					type="textarea"
 					class="my-4"
-					:placeholder="__('Short description of the batch')"
-					:required="true"
 				/>
 				<div>
 					<label class="block text-sm text-gray-600 mb-1">
 						{{ __('Batch Details') }}
-						<span class="text-red-500">*</span>
 					</label>
 					<TextEditor
 						:content="batch.batch_details"
@@ -124,14 +112,12 @@
 							:label="__('Start Date')"
 							type="date"
 							class="mb-4"
-							:required="true"
 						/>
 						<FormControl
 							v-model="batch.end_date"
 							:label="__('End Date')"
 							type="date"
 							class="mb-4"
-							:required="true"
 						/>
 					</div>
 					<div>
@@ -140,22 +126,18 @@
 							:label="__('Start Time')"
 							type="time"
 							class="mb-4"
-							:required="true"
 						/>
 						<FormControl
 							v-model="batch.end_time"
 							:label="__('End Time')"
 							type="time"
 							class="mb-4"
-							:required="true"
 						/>
 						<FormControl
 							v-model="batch.timezone"
 							:label="__('Timezone')"
 							type="text"
-							:placeholder="__('Example: IST (+5:30)')"
 							class="mb-4"
-							:required="true"
 						/>
 					</div>
 				</div>
@@ -171,7 +153,6 @@
 							:label="__('Seat Count')"
 							type="number"
 							class="mb-4"
-							:placeholder="__('Number of seats available')"
 						/>
 						<FormControl
 							v-model="batch.evaluation_end_date"
@@ -251,11 +232,11 @@ import {
 	createResource,
 } from 'frappe-ui'
 import Link from '@/components/Controls/Link.vue'
-import { useRouter } from 'vue-router'
-import { showToast } from '@/utils'
-import { Image } from 'lucide-vue-next'
-import { capture } from '@/telemetry'
 import 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')
@@ -345,10 +326,6 @@ const batchDetail = createResource({
 				data.instructors.forEach((instructor) => {
 					instructors.value.push(instructor.instructor)
 				})
-			} else if (['start_time', 'end_time'].includes(key)) {
-				let [hours, minutes, seconds] = data[key].split(':')
-				hours = hours.length == 1 ? '0' + hours : hours
-				batch[key] = `${hours}:${minutes}`
 			} else if (Object.hasOwn(batch, key)) batch[key] = data[key]
 		})
 		let checkboxes = ['published', 'paid_batch', 'allow_self_enrollment']

frontend/src/pages/Batches.vue

@@ -8,12 +8,12 @@
 				:items="[{ label: __('Batches'), route: { name: 'Batches' } }]"
 			/>
 			<div class="flex space-x-2">
-				<div class="w-44">
+				<div class="w-40">
 					<Select
 						v-if="categories.data?.length"
 						v-model="currentCategory"
 						:options="categories.data"
-						:placeholder="__('Category')"
+						:placeholder="__('Filter')"
 					/>
 				</div>
 				<router-link
@@ -27,7 +27,7 @@
 						<template #prefix>
 							<Plus class="h-4 w-4 stroke-1.5" />
 						</template>
-						{{ __('New') }}
+						{{ __('New Batch') }}
 					</Button>
 				</router-link>
 			</div>
@@ -40,7 +40,6 @@
 				{{ __('Loading Batches...') }}
 			</div>
 			<Tabs
-				v-if="hasBatches"
 				v-model="tabIndex"
 				:tabs="makeTabs"
 				tablistClass="overflow-x-visible flex-wrap !gap-3 md:flex-nowrap"
@@ -80,63 +79,24 @@
 							<BatchCard :batch="batch" />
 						</router-link>
 					</div>
-					<div v-else class="p-5 italic text-gray-500">
+					<div
-						{{ __('No {0} batches').format(tab.label.toLowerCase()) }}
+						v-else
+						class="grid flex-1 place-items-center text-xl font-medium text-gray-500"
+					>
+						<div class="flex flex-col items-center justify-center mt-4">
+							<div>
+								{{ __('No {0} batches found').format(tab.label.toLowerCase()) }}
+							</div>
+						</div>
 					</div>
 				</template>
 			</Tabs>
-			<div
-				v-else-if="
-					!batches.loading &&
-					!hasBatches &&
-					(user.data?.is_instructor || user.data?.is_moderator)
-				"
-				class="grid grid-cols-3 p-5"
-			>
-				<router-link
-					:to="{
-						name: 'BatchForm',
-						params: {
-							batchName: 'new',
-						},
-					}"
-				>
-					<div class="bg-gray-50 py-32 px-5 rounded-md">
-						<div class="flex flex-col items-center text-center space-y-2">
-							<Plus
-								class="size-10 stroke-1 text-gray-800 p-1 rounded-full border bg-white"
-							/>
-							<div class="font-medium">
-								{{ __('Create a Batch') }}
-							</div>
-							<span class="text-gray-700 text-sm leading-4">
-								{{ __('You can link courses and assessments to it.') }}
-							</span>
-						</div>
-					</div>
-				</router-link>
-			</div>
-			<div
-				v-else-if="!batches.loading && !hasBatches"
-				class="text-center p-5 text-gray-600 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-			>
-				<BookOpen class="size-10 mx-auto stroke-1 text-gray-500" />
-				<div class="text-xl font-medium">
-					{{ __('No batches found') }}
-				</div>
-				<div>
-					{{
-						__(
-							'There are no batches available at the moment. Keep an eye out, fresh learning experiences are on the way soon!'
-						)
-					}}
-				</div>
-			</div>
 		</div>
 	</div>
 </template>
 <script setup>
 import {
+	createListResource,
 	createResource,
 	Breadcrumbs,
 	Button,
@@ -144,14 +104,13 @@ import {
 	Badge,
 	Select,
 } from 'frappe-ui'
-import { BookOpen, Plus } from 'lucide-vue-next'
+import { Plus } from 'lucide-vue-next'
 import BatchCard from '@/components/BatchCard.vue'
 import { inject, ref, computed, onMounted, watch } from 'vue'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
 const currentCategory = ref(null)
-const hasBatches = ref(false)
 
 onMounted(() => {
 	let queries = new URLSearchParams(location.search)
@@ -160,10 +119,10 @@ onMounted(() => {
 	}
 })
 
-const batches = createResource({
+const batches = createListResource({
 	doctype: 'LMS Batch',
 	url: 'lms.lms.utils.get_batches',
-	cache: ['batches', user.data?.email],
+	cache: ['batches', user?.data?.email],
 	auto: true,
 })
 
@@ -224,14 +183,6 @@ const addToTabs = (label) => {
 	})
 }
 
-watch(batches, () => {
-	Object.keys(batches.data).forEach((key) => {
-		if (batches.data[key].length) {
-			hasBatches.value = true
-		}
-	})
-})
-
 watch(
 	() => currentCategory.value,
 	() => {

frontend/src/pages/Billing.vue

@@ -1,50 +1,44 @@
 <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="pt-5 pb-10 mx-5"
+			class="mt-10 w-1/2 mx-auto"
 		>
-			<!-- <div class="mb-5">
+			<div class="text-3xl font-bold">
-				<div class="text-lg font-semibold">
+				{{ __('Billing Details') }}
-					{{ __('Address') }}
+			</div>
+			<div class="text-gray-600 mt-1">
+				{{ __('Enter the billing information to complete the payment.') }}
+			</div>
+			<div class="border rounded-md p-5 mt-5">
+				<div class="text-xl font-semibold">
+					{{ __('Summary') }}
 				</div>
-			</div> -->
+				<div class="text-gray-600 mt-1">
-			<div class="flex flex-col lg:flex-row justify-between">
+					{{ __('Review the details of your purchase.') }}
-				<div
+				</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="mt-5">
-				>
+					<div class="flex items-center justify-between">
-					<div class="flex items-center justify-between space-x-2">
+						<div>
-						<div class="text-gray-600">
-							{{ __('Ordered Item') }}
-						</div>
-						<div class="">
 							{{ orderSummary.data.title }}
 						</div>
-					</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">
+							{{
-							{{ __('Original Amount') }}
+								orderSummary.data.gst_applied
-						</div>
+									? orderSummary.data.original_amount_formatted
-						<div class="">
+									: orderSummary.data.total_amount_formatted
-							{{ orderSummary.data.original_amount_formatted }}
+							}}
 						</div>
 					</div>
 					<div
 						v-if="orderSummary.data.gst_applied"
 						class="flex items-center justify-between mt-2"
 					>
-						<div class="text-gray-600">
+						<div>
 							{{ __('GST Amount') }}
 						</div>
 						<div>
@@ -52,89 +46,107 @@
 						</div>
 					</div>
 					<div
-						class="flex items-center justify-between border-t border-gray-400 pt-4 mt-2"
+						v-if="orderSummary.data.gst_applied"
+						class="flex items-center justify-between mt-2"
 					>
-						<div class="text-lg font-semibold">
+						<div>
-							{{ __('Total') }}
+							{{ __('Total Amount') }}
 						</div>
-						<div class="text-lg font-semibold">
+						<div class="font-semibold text-2xl">
 							{{ orderSummary.data.total_amount_formatted }}
 						</div>
 					</div>
 				</div>
 
-				<div class="flex-1 lg:mr-10">
+				<div class="text-xl font-semibold mt-10">
-					<div class="mb-5">
+					{{ __('Address') }}
-						<div class="text-lg font-semibold">
+				</div>
-							{{ __('Address') }}
+				<div class="text-gray-600 mt-1">
+					{{ __('Specify your billing address correctly.') }}
+				</div>
+				<div class="grid grid-cols-2 gap-5 mt-4">
+					<div>
+						<div class="mt-4">
+							<div class="mb-1.5 text-sm text-gray-700">
+								{{ __('Billing Name') }}
+							</div>
+							<Input type="text" v-model="billingDetails.billing_name" />
+						</div>
+						<div class="mt-4">
+							<div class="mb-1.5 text-sm text-gray-700">
+								{{ __('Address Line 1') }}
+							</div>
+							<Input type="text" v-model="billingDetails.address_line1" />
+						</div>
+						<div class="mt-4">
+							<div class="mb-1.5 text-sm text-gray-700">
+								{{ __('Address Line 2') }}
+							</div>
+							<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 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')"
+								{{ __('Country') }}
-								v-model="billingDetails.billing_name"
+							</div>
-							/>
-							<FormControl
-								:label="__('Address Line 1')"
-								v-model="billingDetails.address_line1"
-							/>
-							<FormControl
-								:label="__('Address Line 2')"
-								v-model="billingDetails.address_line2"
-							/>
-							<FormControl :label="__('City')" v-model="billingDetails.city" />
-							<FormControl
-								:label="__('State')"
-								v-model="billingDetails.state"
-							/>
-						</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>
+						<div v-if="billingDetails.country == 'India'" class="mt-4">
-					<div class="flex items-center justify-between border-t pt-4 mt-8">
+							<div class="mb-1.5 text-sm text-gray-700">
-						<p class="text-gray-600">
+								{{ __('GST Number') }}
-							{{
+							</div>
-								__(
+							<Input type="text" v-model="billingDetails.gstin" />
-									'Make sure to enter the right billing name as the same will be used in your invoice.'
+						</div>
-								)
+						<div v-if="billingDetails.country == 'India'" class="mt-4">
-							}}
+							<div class="mb-1.5 text-sm text-gray-700">
-						</p>
+								{{ __('Pan Number') }}
-						<Button variant="solid" size="md" @click="generatePaymentLink()">
+							</div>
-							{{ __('Proceed to Payment') }}
+							<Input type="text" v-model="billingDetails.pan" />
-						</Button>
+						</div>
 					</div>
 				</div>
+				<Button variant="solid" class="mt-8" @click="generatePaymentLink()">
+					{{ __('Proceed to Payment') }}
+				</Button>
 			</div>
 		</div>
 		<div v-else-if="access.data?.message">
@@ -155,18 +167,11 @@
 	</div>
 </template>
 <script setup>
-import {
+import { Input, Button, createResource } from 'frappe-ui'
-	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 { showToast } from '@/utils/'
+import { createToast } from '@/utils/'
 
 const user = inject('$user')
 
@@ -197,8 +202,8 @@ const access = createResource({
 		name: props.name,
 	},
 	onSuccess(data) {
-		setBillingDetails(data.address)
 		orderSummary.submit()
+		setBillingDetails(data.address)
 	},
 })
 
@@ -219,49 +224,84 @@ 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 paymentLink = createResource({
+const paymentOptions = createResource({
-	url: 'lms.lms.payments.get_payment_link',
+	url: 'lms.lms.utils.get_payment_options',
 	makeParams(values) {
 		return {
 			doctype: props.type == 'course' ? 'LMS Course' : 'LMS Batch',
 			docname: props.name,
-			title: orderSummary.data.title,
+			phone: billingDetails.phone,
-			amount: orderSummary.data.original_amount,
+			country: billingDetails.country,
-			total_amount: orderSummary.data.amount,
-			currency: orderSummary.data.currency,
-			address: billingDetails,
 		}
 	},
 })
 
 const generatePaymentLink = () => {
-	paymentLink.submit(
+	paymentOptions.submit(
 		{},
 		{
-			validate() {
+			validate(params) {
-				if (!billingDetails.source) {
-					return __('Please let us know where you heard about us from.')
-				}
 				return validateAddress()
 			},
 			onSuccess(data) {
-				window.location.href = data
+				data.handler = (response) => {
+					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) {
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
+				showError(err)
+			},
+		}
+	)
+}
+
+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/CourseDetail.vue

@@ -16,18 +16,16 @@
 					</div>
 					<div class="flex items-center">
 						<Tooltip
-							v-if="parseInt(course.data.rating) > 0"
+							v-if="course.data.avg_rating"
 							:text="__('Average Rating')"
 							class="flex items-center"
 						>
 							<Star class="h-5 w-5 text-gray-100 fill-orange-500" />
 							<span class="ml-1">
-								{{ course.data.rating }}
+								{{ course.data.avg_rating }}
 							</span>
 						</Tooltip>
-						<span v-if="parseInt(course.data.rating) > 0" class="mx-3"
+						<span v-if="course.data.avg_rating" class="mx-3">&middot;</span>
-							>&middot;</span
-						>
 						<Tooltip
 							v-if="course.data.enrollment_count"
 							:text="__('Enrolled Students')"
@@ -69,18 +67,14 @@
 					<CourseCardOverlay :course="course" class="md:hidden mb-4" />
 					<div
 						v-html="course.data.description"
-						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-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"
+						class="course-description"
 					></div>
 					<div class="mt-10">
-						<CourseOutline
+						<CourseOutline :courseName="course.data.name" :showOutline="true" />
-							:title="__('Course Outline')"
-							:courseName="course.data.name"
-							:showOutline="true"
-						/>
 					</div>
 					<CourseReviews
 						:courseName="course.data.name"
-						:avg_rating="course.data.rating"
+						:avg_rating="course.data.avg_rating"
 						:membership="course.data.membership"
 					/>
 				</div>
@@ -119,10 +113,10 @@ const course = createResource({
 })
 
 const breadcrumbs = computed(() => {
-	let items = [{ label: 'Courses', route: { name: 'Courses' } }]
+	let items = [{ label: 'All Courses', route: { name: 'Courses' } }]
 	items.push({
 		label: course?.data?.title,
-		route: { name: 'CourseDetail', params: { courseName: course?.data?.name } },
+		route: { name: 'CourseDetail', params: { course: course?.data?.name } },
 	})
 	return items
 })
@@ -137,6 +131,26 @@ const pageMeta = computed(() => {
 updateDocumentTitle(pageMeta)
 </script>
 <style>
+.course-description p {
+	margin-bottom: 1rem;
+	line-height: 1.7;
+}
+.course-description li {
+	line-height: 1.7;
+}
+
+.course-description ol {
+	list-style: auto;
+	margin: revert;
+	padding: revert;
+}
+
+.course-description ul {
+	list-style: disc;
+	margin: revert;
+	padding: revert;
+}
+
 .avatar-group {
 	display: inline-flex;
 	align-items: center;

frontend/src/pages/CourseForm.vue

@@ -7,14 +7,6 @@
 				>
 					<Breadcrumbs class="h-7" :items="breadcrumbs" />
 					<div class="flex items-center mt-3 md:mt-0">
-						<Button v-if="courseResource.data?.name" @click="trashCourse()">
-							<template #prefix>
-								<Trash2 class="w-4 h-4 stroke-1.5" />
-							</template>
-							<span>
-								{{ __('Delete') }}
-							</span>
-						</Button>
 						<Button variant="solid" @click="submitCourse()" class="ml-2">
 							<span>
 								{{ __('Save') }}
@@ -31,23 +23,15 @@
 							v-model="course.title"
 							:label="__('Title')"
 							class="mb-4"
-							:required="true"
 						/>
 						<FormControl
 							v-model="course.short_introduction"
 							:label="__('Short Introduction')"
-							:placeholder="
-								__(
-									'A one line introduction to the course that appears on the course card'
-								)
-							"
 							class="mb-4"
-							:required="true"
 						/>
 						<div class="mb-4">
-							<div class="mb-1.5 text-sm text-gray-600">
+							<div class="mb-1.5 text-sm text-gray-700">
 								{{ __('Course Description') }}
-								<span class="text-red-500">*</span>
 							</div>
 							<TextEditor
 								:content="course.description"
@@ -57,62 +41,49 @@
 								editorClass="prose-sm max-w-none border-b border-x bg-gray-100 rounded-b-md py-1 px-2 min-h-[7rem]"
 							/>
 						</div>
-						<div class="mb-4">
+						<FileUploader
-							<div class="text-xs text-gray-600 mb-2">
+							v-if="!course.course_image"
-								{{ __('Course Image') }}
+							:fileTypes="['image/*']"
-								<span class="text-red-500">*</span>
+							:validateFile="validateFile"
-							</div>
+							@success="(file) => saveImage(file)"
-							<FileUploader
+						>
-								v-if="!course.course_image"
+							<template
-								:fileTypes="['image/*']"
+								v-slot="{ file, progress, uploading, openFileSelector }"
-								:validateFile="validateFile"
-								@success="(file) => saveImage(file)"
 							>
-								<template
+								<div class="mb-4">
-									v-slot="{ file, progress, uploading, openFileSelector }"
+									<Button @click="openFileSelector" :loading="uploading">
-								>
+										{{
-									<div class="flex items-center">
+											uploading ? `Uploading ${progress}%` : 'Upload an image'
-										<div class="border rounded-md w-fit py-5 px-20">
+										}}
-											<Image class="size-5 stroke-1 text-gray-700" />
+									</Button>
-										</div>
-										<div class="ml-4">
-											<Button @click="openFileSelector">
-												{{ __('Upload') }}
-											</Button>
-											<div class="mt-2 text-gray-600 text-sm">
-												{{
-													__('Appears on the course card in the course list')
-												}}
-											</div>
-										</div>
-									</div>
-								</template>
-							</FileUploader>
-							<div v-else class="mb-4">
-								<div class="flex items-center">
-									<img
-										:src="course.course_image.file_url"
-										class="border rounded-md w-40"
-									/>
-									<div class="ml-4">
-										<Button @click="removeImage()">
-											{{ __('Remove') }}
-										</Button>
-										<div class="mt-2 text-gray-600 text-sm">
-											{{ __('Appears on the course card in the course list') }}
-										</div>
-									</div>
 								</div>
+							</template>
+						</FileUploader>
+						<div v-else class="mb-4">
+							<div class="text-xs text-gray-600 mb-1">
+								{{ __('Course Image') }}
+							</div>
+							<div class="flex items-center">
+								<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">
+									<span>
+										{{ course.course_image.file_name }}
+									</span>
+									<span class="text-sm text-gray-500 mt-1">
+										{{ getFileSize(course.course_image.file_size) }}
+									</span>
+								</div>
+								<X
+									@click="removeImage()"
+									class="bg-gray-200 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
+								/>
 							</div>
 						</div>
 						<FormControl
 							v-model="course.video_link"
 							:label="__('Preview Video')"
-							:placeholder="
-								__(
-									'Paste the youtube link of a short video introducing the course'
-								)
-							"
 							class="mb-4"
 						/>
 						<div class="mb-4">
@@ -133,27 +104,15 @@
 								</div>
 								<FormControl
 									v-model="newTag"
-									:placeholder="__('Add a keyword and then press enter')"
-									class="w-72"
 									@keyup.enter="updateTags()"
 									id="tags"
 								/>
 							</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"
 							:label="__('Instructors')"
-							:filters="{ ignore_user_type: 1 }"
-							:required="true"
 						/>
 					</div>
 					<div class="container border-t">
@@ -163,7 +122,7 @@
 						<div class="grid grid-cols-3 gap-10 mb-4">
 							<div
 								v-if="user.data?.is_moderator"
-								class="flex flex-col space-y-4"
+								class="flex flex-col space-y-3"
 							>
 								<FormControl
 									type="checkbox"
@@ -256,24 +215,24 @@ import {
 	ref,
 	reactive,
 	watch,
-	getCurrentInstance,
 } from 'vue'
-import { showToast, updateDocumentTitle } from '@/utils'
+import {
+	convertToTitleCase,
+	showToast,
+	getFileSize,
+	updateDocumentTitle,
+} from '../utils'
 import Link from '@/components/Controls/Link.vue'
-import { Image, Trash2, X } from 'lucide-vue-next'
+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 app = getCurrentInstance()
-const { $dialog } = app.appContext.config.globalProperties
 
 const props = defineProps({
 	courseName: {
@@ -288,7 +247,6 @@ const course = reactive({
 	video_link: '',
 	course_image: null,
 	tags: '',
-	category: '',
 	published: false,
 	published_on: '',
 	featured: false,
@@ -435,9 +393,6 @@ const submitCourse = () => {
 			onSuccess(data) {
 				capture('course_created')
 				showToast('Success', 'Course created successfully', 'check')
-				if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-					settingsStore.onboardingDetails.reload()
-				}
 				router.push({
 					name: 'CourseForm',
 					params: { courseName: data.name },
@@ -450,37 +405,23 @@ const submitCourse = () => {
 	}
 }
 
-const deleteCourse = createResource({
+const validateMandatoryFields = () => {
-	url: 'lms.lms.api.delete_course',
+	const mandatory_fields = [
-	makeParams(values) {
+		'title',
-		return {
+		'short_introduction',
-			course: props.courseName,
+		'description',
+		'video_link',
+		'course_image',
+	]
+	for (const field of mandatory_fields) {
+		if (!course[field]) {
+			let fieldLabel = convertToTitleCase(field.split('_').join(' '))
+			return `${fieldLabel} is mandatory`
 		}
-	},
+	}
-	onSuccess() {
+	if (course.paid_course && (!course.course_price || !course.currency)) {
-		showToast(__('Success'), __('Course deleted successfully'), 'check')
+		return 'Course price and currency are mandatory for paid courses'
-		router.push({ name: 'Courses' })
+	}
-	},
-})
-
-const trashCourse = () => {
-	$dialog({
-		title: __('Delete Course'),
-		message: __(
-			'Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?'
-		),
-		actions: [
-			{
-				label: __('Delete'),
-				theme: 'red',
-				variant: 'solid',
-				onClick(close) {
-					deleteCourse.submit()
-					close()
-				},
-			},
-		],
-	})
 }
 
 watch(
@@ -495,7 +436,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.'
 	}
 }
 
@@ -522,12 +463,6 @@ 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

frontend/src/pages/Courses.vue

@@ -8,16 +8,7 @@
 				:items="[{ label: __('Courses'), route: { name: 'Courses' } }]"
 			/>
 			<div class="flex space-x-2 justify-end">
-				<div class="w-40 md:w-44">
+				<div class="w-36">
-					<FormControl
-						v-if="categories.data?.length"
-						type="select"
-						v-model="currentCategory"
-						:options="categories.data"
-						:placeholder="__('Category')"
-					/>
-				</div>
-				<div class="w-28 md:w-36">
 					<FormControl
 						type="text"
 						placeholder="Search"
@@ -30,7 +21,6 @@
 					</FormControl>
 				</div>
 				<router-link
-					v-if="user.data?.is_moderator || user.data?.is_instructor"
 					:to="{
 						name: 'CourseForm',
 						params: {
@@ -38,18 +28,17 @@
 						},
 					}"
 				>
-					<Button variant="solid">
+					<Button v-if="user.data?.is_moderator" variant="solid">
 						<template #prefix>
 							<Plus class="h-4 w-4" />
 						</template>
-						{{ __('New') }}
+						{{ __('New Course') }}
 					</Button>
 				</router-link>
 			</div>
 		</header>
 		<div class="">
 			<Tabs
-				v-if="hasCourses"
 				v-model="tabIndex"
 				tablistClass="overflow-x-visible flex-wrap !gap-3 md:flex-nowrap"
 				:tabs="makeTabs"
@@ -103,101 +92,38 @@
 							<CourseCard :course="course" />
 						</router-link>
 					</div>
-					<div v-else class="p-5 italic text-gray-500">
+					<div
-						{{ __('No {0} courses').format(tab.label.toLowerCase()) }}
+						v-else
+						class="grid flex-1 place-items-center text-xl font-medium text-gray-500"
+					>
+						<div class="flex flex-col items-center justify-center mt-4">
+							<div>
+								{{ __('No {0} courses found').format(tab.label.toLowerCase()) }}
+							</div>
+						</div>
 					</div>
 				</template>
 			</Tabs>
-			<div
-				v-else-if="
-					!courses.loading &&
-					(user.data?.is_moderator || user.data?.is_instructor)
-				"
-				class="grid grid-cols-3 p-5"
-			>
-				<router-link
-					:to="{
-						name: 'CourseForm',
-						params: {
-							courseName: 'new',
-						},
-					}"
-				>
-					<div class="bg-gray-50 py-32 px-5 rounded-md">
-						<div class="flex flex-col items-center text-center space-y-2">
-							<Plus
-								class="size-10 stroke-1 text-gray-800 p-1 rounded-full border bg-white"
-							/>
-							<div class="font-medium">
-								{{ __('Create a Course') }}
-							</div>
-							<span class="text-gray-700 text-sm leading-4">
-								{{ __('You can add chapters and lessons to it.') }}
-							</span>
-						</div>
-					</div>
-				</router-link>
-			</div>
-			<div
-				v-else-if="!courses.loading && !hasCourses"
-				class="text-center p-5 text-gray-600 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-			>
-				<BookOpen class="size-10 mx-auto stroke-1 text-gray-500" />
-				<div class="text-xl font-medium">
-					{{ __('No courses found') }}
-				</div>
-				<div class="leading-5">
-					{{
-						__(
-							'There are no courses available at the moment. Keep an eye out, fresh learning experiences are on the way soon!'
-						)
-					}}
-				</div>
-			</div>
 		</div>
 	</div>
 </template>
 
 <script setup>
 import {
-	Badge,
 	Breadcrumbs,
-	Button,
-	call,
-	createResource,
-	FormControl,
 	Tabs,
+	Badge,
+	Button,
+	FormControl,
+	createResource,
 } from 'frappe-ui'
 import CourseCard from '@/components/CourseCard.vue'
-import { BookOpen, Plus, Search } from 'lucide-vue-next'
+import { Plus, Search } from 'lucide-vue-next'
-import { ref, computed, inject, onMounted, watch } from 'vue'
+import { ref, computed, inject } from 'vue'
 import { updateDocumentTitle } from '@/utils'
-import { useRouter } from 'vue-router'
-import { useSettings } from '@/stores/settings'
 
 const user = inject('$user')
 const searchQuery = ref('')
-const currentCategory = ref(null)
-const hasCourses = ref(false)
-const router = useRouter()
-const settings = useSettings()
-
-onMounted(() => {
-	checkLearningPath()
-	let queries = new URLSearchParams(location.search)
-	if (queries.has('category')) {
-		currentCategory.value = queries.get('category')
-	}
-})
-
-const checkLearningPath = () => {
-	if (
-		settings.learningPaths.data &&
-		(!user.data?.is_moderator || !user.data?.is_instructor)
-	) {
-		router.push({ name: 'Programs' })
-	}
-}
 
 const courses = createResource({
 	url: 'lms.lms.utils.get_courses',
@@ -242,67 +168,18 @@ const addToTabs = (label) => {
 }
 
 const getCourses = (type) => {
-	let courseList = courses.data[type]
 	if (searchQuery.value) {
 		let query = searchQuery.value.toLowerCase()
-		courseList = courseList.filter(
+		return courses.data[type].filter(
 			(course) =>
 				course.title.toLowerCase().includes(query) ||
 				course.short_introduction.toLowerCase().includes(query) ||
 				course.tags.filter((tag) => tag.toLowerCase().includes(query)).length
 		)
 	}
-	if (currentCategory.value && currentCategory.value != '') {
+	return courses.data[type]
-		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(courses, () => {
-	if (courses.data) {
-		Object.keys(courses.data).forEach((section) => {
-			if (courses.data[section].length) {
-				hasCourses.value = true
-			}
-		})
-	}
-})
-
-watch(
-	() => currentCategory.value,
-	() => {
-		let queries = new URLSearchParams(location.search)
-		if (currentCategory.value) {
-			queries.set('category', currentCategory.value)
-		} else {
-			queries.delete('category')
-		}
-		history.pushState(null, '', `${location.pathname}?${queries.toString()}`)
-	}
-)
-
 const pageMeta = computed(() => {
 	return {
 		title: 'Courses',

frontend/src/pages/JobCreation.vue

@@ -19,13 +19,8 @@
 							v-model="job.job_title"
 							:label="__('Title')"
 							class="mb-4"
-							:required="true"
-						/>
-						<FormControl
-							v-model="job.location"
-							:label="__('Location')"
-							:required="true"
 						/>
+						<FormControl v-model="job.location" :label="__('Location')" />
 					</div>
 					<div>
 						<FormControl
@@ -34,21 +29,18 @@
 							type="select"
 							:options="jobTypes"
 							class="mb-4"
-							:required="true"
 						/>
 						<FormControl
 							v-model="job.status"
 							:label="__('Status')"
 							type="select"
 							:options="jobStatuses"
-							:required="true"
 						/>
 					</div>
 				</div>
 				<div class="mt-4">
 					<label class="block text-gray-600 text-xs mb-1">
 						{{ __('Description') }}
-						<span class="text-red-500">*</span>
 					</label>
 					<TextEditor
 						:content="job.description"
@@ -69,12 +61,10 @@
 							v-model="job.company_name"
 							:label="__('Company Name')"
 							class="mb-4"
-							:required="true"
 						/>
 						<FormControl
 							v-model="job.company_website"
 							:label="__('Company Website')"
-							:required="true"
 						/>
 					</div>
 					<div>
@@ -82,11 +72,9 @@
 							v-model="job.company_email_address"
 							:label="__('Company Email Address')"
 							class="mb-4"
-							:required="true"
 						/>
 						<label class="block text-gray-600 text-xs mb-1 mt-4">
 							{{ __('Company Logo') }}
-							<span class="text-red-500">*</span>
 						</label>
 						<FileUploader
 							v-if="!job.image"
@@ -161,7 +149,7 @@ const newJob = createResource({
 		return {
 			doc: {
 				doctype: 'Job Opportunity',
-				company_logo: job.image?.file_url,
+				company_logo: job.image.file_url,
 				...job,
 			},
 		}

frontend/src/pages/JobDetail.vue

@@ -52,88 +52,46 @@
 		</header>
 		<div v-if="job.data" class="max-w-3xl mx-auto">
 			<div class="p-4">
-				<div class="space-y-5 mb-10">
+				<div class="flex mb-10">
-					<div class="flex items-center">
+					<img
-						<img
+						:src="job.data.company_logo"
-							:src="job.data.company_logo"
+						class="w-16 h-16 rounded-lg object-contain mr-4"
-							class="w-16 h-16 rounded-lg object-contain mr-4"
+						:alt="job.data.company_name"
-							:alt="job.data.company_name"
+					/>
-						/>
+					<div>
 						<div class="text-2xl font-semibold mb-4">
 							{{ job.data.job_title }}
 						</div>
-					</div>
-					<div>
 						<div
-							class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-5 md:gap-y-5"
+							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">
-								<span class="p-4 bg-green-50 rounded-full">
+								<Building2 class="h-4 w-4 stroke-1.5" />
-									<Building2 class="h-4 w-4 text-green-500" />
+								<span>{{ job.data.company_name }}</span>
-								</span>
-								<div class="flex flex-col space-y-2">
-									<span class="text-xs text-gray-600 font-medium uppercase">
-										{{ __('Organisation') }}
-									</span>
-									<span class="text-sm font-semibold">
-										{{ job.data.company_name }}
-									</span>
-								</div>
 							</div>
 							<div class="flex items-center space-x-2">
-								<span class="p-4 bg-red-50 rounded-full">
+								<MapPin class="h-4 w-4 stroke-1.5" />
-									<MapPin class="h-4 w-4 text-red-500" />
+								<span>{{ job.data.location }}</span>
-								</span>
-								<div class="flex flex-col space-y-2">
-									<span class="text-xs text-gray-600 font-medium uppercase">
-										{{ __('Location') }}
-									</span>
-									<span class="text-sm font-semibold">
-										{{ job.data.location }}
-									</span>
-								</div>
 							</div>
 							<div class="flex items-center space-x-2">
-								<span class="p-4 bg-yellow-50 rounded-full">
+								<ClipboardType class="h-4 w-4 stroke-1.5" />
-									<ClipboardType class="h-4 w-4 text-yellow-500" />
+								<span>{{ job.data.type }}</span>
-								</span>
-								<div class="flex flex-col space-y-2">
-									<span class="text-xs font-medium text-gray-600 uppercase">
-										{{ __('Category') }}
-									</span>
-									<span class="text-sm font-semibold">
-										{{ job.data.type }}
-									</span>
-								</div>
 							</div>
 							<div class="flex items-center space-x-2">
-								<span class="p-4 bg-blue-50 rounded-full">
+								<CalendarDays class="h-4 w-4 stroke-1.5" />
-									<CalendarDays class="h-4 w-4 text-blue-500" />
+								<span>
+									{{ dayjs(job.data.creation).format('DD MMM YYYY') }}
 								</span>
-								<div class="flex flex-col space-y-2">
-									<span class="text-xs text-gray-600 font-medium uppercase">
-										{{ __('Posted on') }}
-									</span>
-									<span class="text-sm font-semibold">
-										{{ dayjs(job.data.creation).format('DD MMM YYYY') }}
-									</span>
-								</div>
 							</div>
 							<div
 								v-if="applicationCount.data"
 								class="flex items-center space-x-2"
 							>
-								<span class="p-4 bg-purple-50 rounded-full">
+								<SquareUserRound class="h-4 w-4 stroke-1.5" />
-									<SquareUserRound class="h-4 w-4 text-purple-500" />
+								<span
-								</span>
+									>{{ applicationCount.data }}
-								<div class="flex flex-col space-y-2">
+									{{ __('applications received') }}</span
-									<span class="text-xs text-gray-600 font-medium uppercase">
+								>
-										{{ __('Applications Received') }}
-									</span>
-									<span class="text-sm font-semibold">
-										{{ applicationCount.data }}
-									</span>
-								</div>
 							</div>
 						</div>
 					</div>

frontend/src/pages/Jobs.vue

@@ -7,22 +7,7 @@
 				class="h-7"
 				:items="[{ label: __('Jobs'), route: { name: 'Jobs' } }]"
 			/>
-			<div class="flex space-x-2">
+			<div class="flex">
-				<div class="w-40 md:w-44">
-					<FormControl
-						v-model="jobType"
-						type="select"
-						:options="jobTypes"
-						:placeholder="__('Type')"
-					/>
-				</div>
-				<div class="w-28 md:w-36">
-					<FormControl type="text" placeholder="Search" v-model="searchQuery">
-						<template #prefix>
-							<Search class="w-4 h-4 stroke-1.5 text-gray-600" name="search" />
-						</template>
-					</FormControl>
-				</div>
 				<router-link
 					v-if="user.data?.name"
 					:to="{
@@ -41,12 +26,9 @@
 				</router-link>
 			</div>
 		</header>
-		<div v-if="jobsList?.length">
+		<div v-if="jobs.data?.length">
-			<div class="lg:w-3/4 mx-auto p-5">
+			<div class="divide-y lg:w-3/4 mx-auto p-5">
-				<div class="text-xl font-semibold mb-5">
+				<div v-for="job in jobs.data">
-					{{ __('Find the perfect job for you') }}
-				</div>
-				<div v-for="job in jobsList" class="divide-y">
 					<router-link
 						:to="{
 							name: 'JobDetail',
@@ -65,22 +47,13 @@
 	</div>
 </template>
 <script setup>
-import { Button, Breadcrumbs, createResource, FormControl } from 'frappe-ui'
+import { Button, Breadcrumbs, createResource } from 'frappe-ui'
-import { Plus, Search } from 'lucide-vue-next'
+import { Plus } from 'lucide-vue-next'
-import { inject, computed, ref, onMounted } from 'vue'
+import { inject, computed } from 'vue'
 import JobCard from '@/components/JobCard.vue'
 import { updateDocumentTitle } from '@/utils'
 
 const user = inject('$user')
-const jobType = ref(null)
-const searchQuery = ref('')
-
-onMounted(() => {
-	let queries = new URLSearchParams(location.search)
-	if (queries.has('type')) {
-		jobType.value = queries.get('type')
-	}
-})
 
 const jobs = createResource({
 	url: 'lms.lms.api.get_job_opportunities',
@@ -95,32 +68,5 @@ const pageMeta = computed(() => {
 	}
 })
 
-const jobsList = computed(() => {
-	let jobData = jobs.data
-	if (jobType.value && jobType.value != '') {
-		jobData = jobData.filter((job) => job.type == jobType.value)
-	}
-	if (searchQuery.value) {
-		let query = searchQuery.value.toLowerCase()
-		jobData = jobData.filter(
-			(job) =>
-				job.job_title.toLowerCase().includes(query) ||
-				job.company_name.toLowerCase().includes(query) ||
-				job.location.toLowerCase().includes(query)
-		)
-	}
-	return jobData
-})
-
-const jobTypes = computed(() => {
-	return [
-		'',
-		{ label: __('Full Time'), value: 'Full Time' },
-		{ label: __('Part Time'), value: 'Part Time' },
-		{ label: __('Contract'), value: 'Contract' },
-		{ label: __('Freelance'), value: 'Freelance' },
-	]
-})
-
 updateDocumentTitle(pageMeta)
 </script>

frontend/src/pages/Lesson.vue

@@ -17,9 +17,14 @@
 						)
 					}}
 				</p>
-				<Button v-if="user.data" @click="enrollStudent()" variant="solid">
+				<router-link
-					{{ __('Start Learning') }}
+					v-if="user.data"
-				</Button>
+					:to="{ name: 'CourseDetail', params: { courseName: courseName } }"
+				>
+					<Button variant="solid">
+						{{ __('Start Learning') }}
+					</Button>
+				</router-link>
 				<Button v-else @click="redirectToLogin()">
 					{{ __('Login') }}
 				</Button>
@@ -103,7 +108,7 @@
 					<span
 						class="h-6 mr-1"
 						:class="{
-							'avatar-group overlap': lesson.data.instructors?.length > 1,
+							'avatar-group overlap': lesson.data.instructors.length > 1,
 						}"
 					>
 						<UserAvatar
@@ -111,15 +116,11 @@
 							:user="instructor"
 						/>
 					</span>
-					<CourseInstructors
+					<CourseInstructors :instructors="lesson.data.instructors" />
-						v-if="lesson.data?.instructors"
-						:instructors="lesson.data.instructors"
-					/>
 				</div>
 				<div
 					v-if="
-						lesson.data.instructor_content &&
+						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"
@@ -149,7 +150,6 @@
 					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-5"
 				>
 					<LessonContent
-						v-if="lesson.data?.body"
 						:content="lesson.data.body"
 						:youtube="lesson.data.youtube"
 						:quizId="lesson.data.quiz_id"
@@ -193,7 +193,7 @@ import { createResource, Breadcrumbs, Button } from 'frappe-ui'
 import { computed, watch, inject, ref, onMounted, onBeforeUnmount } from 'vue'
 import CourseOutline from '@/components/CourseOutline.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
-import { useRouter, useRoute } from 'vue-router'
+import { useRoute } from 'vue-router'
 import { ChevronLeft, ChevronRight } from 'lucide-vue-next'
 import Discussions from '@/components/Discussions.vue'
 import { getEditorTools, updateDocumentTitle } from '../utils'
@@ -203,7 +203,6 @@ import CourseInstructors from '@/components/CourseInstructors.vue'
 import ProgressBar from '@/components/ProgressBar.vue'
 
 const user = inject('$user')
-const router = useRouter()
 const route = useRoute()
 const allowDiscussions = ref(false)
 const editor = ref(null)
@@ -243,19 +242,9 @@ const lesson = createResource({
 	},
 	auto: true,
 	onSuccess(data) {
-		if (Object.keys(data).length === 0) {
-			router.push({
-				name: 'CourseDetail',
-				params: { courseName: props.courseName },
-			})
-			return
-		}
 		lessonProgress.value = data.membership?.progress
 		if (data.content) editor.value = renderEditor('editor', data.content)
-		if (
+		if (data.instructor_content?.blocks?.length)
-			data.instructor_content &&
-			JSON.parse(data.instructor_content)?.blocks?.length > 1
-		)
 			instructorEditor.value = renderEditor(
 				'instructor-content',
 				data.instructor_content
@@ -286,7 +275,7 @@ const renderEditor = (holder, content) => {
 }
 
 const markProgress = () => {
-	if (user.data && lesson.data && !lesson.data.progress) {
+	if (user.data && !lesson.data?.progress) {
 		progress.submit()
 	}
 }
@@ -305,17 +294,17 @@ const progress = createResource({
 })
 
 const breadcrumbs = computed(() => {
-	let items = [{ label: 'Courses', route: { name: 'Courses' } }]
+	let items = [{ label: 'All Courses', route: { name: 'Courses' } }]
 	items.push({
 		label: lesson?.data?.course_title,
-		route: { name: 'CourseDetail', params: { courseName: props.courseName } },
+		route: { name: 'CourseDetail', params: { course: props.courseName } },
 	})
 	items.push({
 		label: lesson?.data?.title,
 		route: {
 			name: 'Lesson',
 			params: {
-				courseName: props.courseName,
+				course: props.courseName,
 				chapterNumber: props.chapterNumber,
 				lessonNumber: props.lessonNumber,
 			},
@@ -376,40 +365,16 @@ const checkIfDiscussionsAllowed = () => {
 
 const allowEdit = () => {
 	if (user.data?.is_moderator) return true
-	if (lesson.data?.instructors?.includes(user.data?.name)) return true
+	if (lesson.data?.instructors.includes(user.data?.name)) return true
 	return false
 }
 
 const allowInstructorContent = () => {
 	if (user.data?.is_moderator) return true
-	if (lesson.data?.instructors?.includes(user.data?.name)) return true
+	if (lesson.data?.instructors.includes(user.data?.name)) return true
 	return false
 }
 
-const enrollment = createResource({
-	url: 'frappe.client.insert',
-	makeParams() {
-		return {
-			doc: {
-				doctype: 'LMS Enrollment',
-				course: props.courseName,
-				member: user.data?.name,
-			},
-		}
-	},
-})
-
-const enrollStudent = () => {
-	enrollment.submit(
-		{},
-		{
-			onSuccess() {
-				window.location.reload()
-			},
-		}
-	)
-}
-
 const redirectToLogin = () => {
 	window.location.href = `/login?redirect-to=/lms/courses/${props.courseName}`
 }
@@ -483,10 +448,6 @@ updateDocumentTitle(pageMeta)
 	max-width: unset;
 }
 
-.codex-editor__redactor {
-	padding-bottom: 0px !important;
-}
-
 .codeBoxHolder {
 	display: flex;
 	flex-direction: column;
@@ -576,13 +537,4 @@ 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

@@ -6,22 +6,13 @@
 					class="sticky top-0 z-10 flex flex-col md:flex-row md:items-center justify-between border-b overflow-hidden bg-white px-3 py-2.5 sm:px-5"
 				>
 					<Breadcrumbs class="text-ellipsis" :items="breadcrumbs" />
-					<Button
+					<Button variant="solid" @click="saveLesson()" class="mt-3 md:mt-0">
-						variant="solid"
-						@click="saveLesson({ showSuccessMessage: true })"
-						class="mt-3 md:mt-0"
-					>
 						{{ __('Save') }}
 					</Button>
 				</header>
 				<div class="py-5">
 					<div class="w-5/6 mx-auto">
-						<FormControl
+						<FormControl v-model="lesson.title" label="Title" class="mb-4" />
-							v-model="lesson.title"
-							label="Title"
-							class="mb-4"
-							:required="true"
-						/>
 						<FormControl
 							v-model="lesson.include_in_preview"
 							type="checkbox"
@@ -71,14 +62,14 @@
 			</div>
 			<div class="">
 				<div class="sticky top-0 p-5">
-					<LessonHelp />
+					<LessonPlugins :editor="editor" :notesEditor="instructorEditor" />
 				</div>
 			</div>
 		</div>
 	</div>
 </template>
 <script setup>
-import { Breadcrumbs, Button, createResource, FormControl } from 'frappe-ui'
+import { Breadcrumbs, FormControl, createResource, Button } from 'frappe-ui'
 import {
 	computed,
 	reactive,
@@ -88,19 +79,16 @@ import {
 	onBeforeUnmount,
 } from 'vue'
 import EditorJS from '@editorjs/editorjs'
-import LessonHelp from '@/components/LessonHelp.vue'
+import LessonPlugins from '@/components/LessonPlugins.vue'
 import { ChevronRight } from 'lucide-vue-next'
 import { updateDocumentTitle, createToast, getEditorTools } from '@/utils'
 import { capture } from '@/telemetry'
-import { useSettings } from '@/stores/settings'
 
 const editor = ref(null)
 const instructorEditor = ref(null)
 const user = inject('$user')
 const openInstructorEditor = ref(false)
-const settingsStore = useSettings()
 let autoSaveInterval
-let showSuccessMessage = false
 
 const props = defineProps({
 	courseName: {
@@ -124,15 +112,13 @@ onMounted(() => {
 	capture('lesson_form_opened')
 	editor.value = renderEditor('content')
 	instructorEditor.value = renderEditor('instructor-notes')
-	window.addEventListener('keydown', keyboardShortcut)
 })
 
 const renderEditor = (holder) => {
 	return new EditorJS({
 		holder: holder,
-		tools: getEditorTools(true),
+		tools: getEditorTools(),
 		autofocus: true,
-		defaultBlock: 'markdown',
 	})
 }
 
@@ -157,9 +143,7 @@ const lessonDetails = createResource({
 			Object.keys(data.lesson).forEach((key) => {
 				lesson[key] = data.lesson[key]
 			})
-			lesson.include_in_preview = data?.lesson?.include_in_preview
+			lesson.include_in_preview = data.include_in_preview ? true : false
-				? true
-				: false
 			addLessonContent(data)
 			addInstructorNotes(data)
 			enableAutoSave()
@@ -195,24 +179,12 @@ const addInstructorNotes = (data) => {
 
 const enableAutoSave = () => {
 	autoSaveInterval = setInterval(() => {
-		saveLesson({ showSuccessMessage: false })
+		saveLesson()
-	}, 10000)
+	}, 5000)
-}
-
-const keyboardShortcut = (e) => {
-	if (
-		e.key === 's' &&
-		(e.ctrlKey || e.metaKey) &&
-		!e.target.classList.contains('ProseMirror')
-	) {
-		saveLesson({ showSuccessMessage: true })
-		e.preventDefault()
-	}
 }
 
 onBeforeUnmount(() => {
 	clearInterval(autoSaveInterval)
-	window.removeEventListener('keydown', keyboardShortcut)
 })
 
 const newLessonResource = createResource({
@@ -364,11 +336,7 @@ const convertToJSON = (lessonData) => {
 	return blocks
 }
 
-const saveLesson = (e) => {
+const saveLesson = () => {
-	showSuccessMessage = false
-	if (typeof e != 'undefined' && e.showSuccessMessage) {
-		showSuccessMessage = true
-	}
 	editor.value.save().then((outputData) => {
 		lesson.content = JSON.stringify(outputData)
 		instructorEditor.value.save().then((outputData) => {
@@ -396,9 +364,6 @@ const createNewLesson = () => {
 						onSuccess() {
 							capture('lesson_created')
 							showToast('Success', 'Lesson created successfully', 'check')
-							if (!settingsStore.onboardingDetails.data?.is_onboarded) {
-								settingsStore.onboardingDetails.reload()
-							}
 							lessonDetails.reload()
 						},
 					}
@@ -420,11 +385,6 @@ const editCurrentLesson = () => {
 			validate() {
 				return validateLesson()
 			},
-			onSuccess() {
-				showSuccessMessage
-					? showToast('Success', 'Lesson updated successfully', 'check')
-					: ''
-			},
 			onError(err) {
 				showToast('Error', err.message, 'x')
 			},
@@ -463,7 +423,7 @@ const breadcrumbs = computed(() => {
 		},
 		{
 			label: lessonDetails.data?.course_title,
-			route: { name: 'CourseForm', params: { courseName: props.courseName } },
+			route: { name: 'CourseDetail', params: { courseName: props.courseName } },
 		},
 	]
 
@@ -513,10 +473,6 @@ updateDocumentTitle(pageMeta)
 	max-width: none;
 }
 
-.codex-editor--narrow .ce-toolbar__actions {
-	right: 100%;
-}
-
 .ce-toolbar__content {
 	max-width: none;
 }
@@ -589,6 +545,10 @@ updateDocumentTitle(pageMeta)
 	cursor: pointer;
 }
 
+.codeBoxSelectItem:hover {
+	opacity: 0.7;
+}
+
 .codeBoxSelectedItem {
 	background-color: lightblue !important;
 }
@@ -606,17 +566,4 @@ 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', 'slots', 'schedule']
+	let sections = ['certificates', 'roles', 'evaluations']
 	sections.forEach((section) => {
 		if (fragments.includes(section)) {
 			activeTab.value = convertToTitleCase(section)
@@ -161,8 +161,7 @@ watchEffect(() => {
 			About: { name: 'ProfileAbout' },
 			Certificates: { name: 'ProfileCertificates' },
 			Roles: { name: 'ProfileRoles' },
-			Slots: { name: 'ProfileEvaluator' },
+			Evaluations: { name: 'ProfileEvaluator' },
-			Schedule: { name: 'ProfileEvaluationSchedule' },
 		}[activeTab.value]
 		router.push(route)
 	}
@@ -186,13 +185,8 @@ const isSessionUser = () => {
 const getTabButtons = () => {
 	let buttons = [{ label: 'About' }, { label: 'Certificates' }]
 	if ($user.data?.is_moderator) buttons.push({ label: 'Roles' })
-	if (
+	if (isSessionUser() && $user.data?.is_evaluator)
-		isSessionUser() &&
+		buttons.push({ label: 'Evaluations' })
-		($user.data?.is_evaluator || $user.data?.is_moderator)
-	) {
-		buttons.push({ label: 'Slots' })
-		buttons.push({ label: 'Schedule' })
-	}
 
 	return buttons
 }

frontend/src/pages/ProfileAbout.vue

@@ -42,7 +42,7 @@
 							<img
 								:src="badge.badge_image"
 								:alt="badge.badge"
-								class="bg-gray-100 rounded-t-md h-[200px] mx-auto"
+								class="bg-gray-100 rounded-t-md"
 							/>
 							<div class="p-5">
 								<div class="text-2xl font-semibold mb-2">
@@ -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?.app_name
+		branding.data?.brand_name
 	}.`
 
 	if (medium == 'LinkedIn')

frontend/src/pages/ProfileEvaluationSchedule.vue

@@ -1,102 +0,0 @@
-<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/ProgramForm.vue

@@ -1,367 +0,0 @@
-<template>
-	<header
-		class="sticky top-0 z-10 flex flex-col md:flex-row md:items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
-	>
-		<Breadcrumbs :items="breadbrumbs" />
-		<Button variant="solid" @click="saveProgram()">
-			{{ __('Save') }}
-		</Button>
-	</header>
-	<div v-if="program.doc" class="pt-5 px-5 w-3/4 mx-auto space-y-10">
-		<FormControl v-model="program.doc.title" :label="__('Title')" />
-
-		<!-- Courses -->
-		<div>
-			<div class="flex items-center justify-between mb-2">
-				<div class="text-lg font-semibold">
-					{{ __('Program Courses') }}
-				</div>
-				<Button
-					@click="
-						() => {
-							currentForm = 'course'
-							showDialog = true
-						}
-					"
-				>
-					<template #prefix>
-						<Plus class="w-4 h-4" />
-					</template>
-					{{ __('Add') }}
-				</Button>
-			</div>
-
-			<ListView
-				:columns="courseColumns"
-				:rows="program.doc.program_courses"
-				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 courseColumns" />
-				</ListHeader>
-				<ListRows>
-					<Draggable
-						:list="program.doc.program_courses"
-						item-key="name"
-						group="items"
-						@end="updateOrder"
-						class="cursor-move"
-					>
-						<template #item="{ element: row }">
-							<ListRow :row="row" />
-						</template>
-					</Draggable>
-				</ListRows>
-				<ListSelectBanner>
-					<template #actions="{ unselectAll, selections }">
-						<div class="flex gap-2">
-							<Button
-								variant="ghost"
-								@click="remove(selections, unselectAll, 'program_courses')"
-							>
-								<Trash2 class="h-4 w-4 stroke-1.5" />
-							</Button>
-						</div>
-					</template>
-				</ListSelectBanner>
-			</ListView>
-		</div>
-
-		<!-- Members -->
-		<div>
-			<div class="flex items-center justify-between mb-2">
-				<div class="text-lg font-semibold">
-					{{ __('Program Members') }}
-				</div>
-				<Button
-					@click="
-						() => {
-							currentForm = 'member'
-							showDialog = true
-						}
-					"
-				>
-					<template #prefix>
-						<Plus class="w-4 h-4" />
-					</template>
-					{{ __('Add') }}
-				</Button>
-			</div>
-
-			<ListView
-				:columns="memberColumns"
-				:rows="program.doc.program_members"
-				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 memberColumns" />
-				</ListHeader>
-				<ListRows>
-					<ListRow :row="row" v-for="row in program.doc.program_members" />
-				</ListRows>
-				<ListSelectBanner>
-					<template #actions="{ unselectAll, selections }">
-						<div class="flex gap-2">
-							<Button
-								variant="ghost"
-								@click="remove(selections, unselectAll, 'program_members')"
-							>
-								<Trash2 class="h-4 w-4 stroke-1.5" />
-							</Button>
-						</div>
-					</template>
-				</ListSelectBanner>
-			</ListView>
-		</div>
-	</div>
-
-	<Dialog
-		v-model="showDialog"
-		:options="{
-			title:
-				currentForm == 'course'
-					? __('New Program Course')
-					: __('New Program Member'),
-			actions: [
-				{
-					label: __('Add'),
-					variant: 'solid',
-					onClick: () =>
-						currentForm == 'course'
-							? addProgramCourse(close)
-							: addProgramMember(close),
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<Link
-				v-if="currentForm == 'course'"
-				v-model="course"
-				doctype="LMS Course"
-				:filters="{
-					disable_self_learning: 1,
-				}"
-				:label="__('Program Course')"
-				:description="
-					__(
-						'Only courses for which self learning is disabled can be added to program.'
-					)
-				"
-			/>
-
-			<Link
-				v-if="currentForm == 'member'"
-				v-model="member"
-				doctype="User"
-				:filters="{
-					ignore_user_type: 1,
-				}"
-				:label="__('Program Member')"
-			/>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import {
-	Breadcrumbs,
-	Button,
-	call,
-	createDocumentResource,
-	Dialog,
-	FormControl,
-	ListView,
-	ListRows,
-	ListRow,
-	ListHeader,
-	ListHeaderItem,
-	ListSelectBanner,
-} from 'frappe-ui'
-import { computed, ref } from 'vue'
-import { Plus, Trash2 } from 'lucide-vue-next'
-import Link from '@/components/Controls/Link.vue'
-import { showToast } from '@/utils/'
-import Draggable from 'vuedraggable'
-import { useRouter } from 'vue-router'
-
-const showDialog = ref(false)
-const currentForm = ref(null)
-const course = ref(null)
-const member = ref(null)
-const router = useRouter()
-
-const props = defineProps({
-	programName: {
-		type: String,
-		required: true,
-	},
-})
-
-const program = createDocumentResource({
-	doctype: 'LMS Program',
-	name: props.programName,
-	auto: true,
-	cache: ['program', props.programName],
-})
-
-const addProgramCourse = () => {
-	program.setValue.submit(
-		{
-			program_courses: [
-				...program.doc.program_courses,
-				{ course: course.value },
-			],
-		},
-		{
-			onSuccess(data) {
-				showDialog.value = false
-				course.value = null
-				showToast(__('Success'), __('Course added to program'), 'check')
-				program.reload()
-			},
-			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
-			},
-		}
-	)
-}
-
-const addProgramMember = () => {
-	program.setValue.submit(
-		{
-			program_members: [
-				...program.doc.program_members,
-				{ member: member.value },
-			],
-		},
-		{
-			onSuccess(data) {
-				showDialog.value = false
-				member.value = null
-				showToast(__('Success'), __('Member added to program'), 'check')
-				program.reload()
-			},
-			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
-			},
-		}
-	)
-}
-
-const remove = (selections, unselectAll, doctype) => {
-	selections = Array.from(selections)
-	program.setValue.submit(
-		{
-			[doctype]: program.doc[doctype].filter(
-				(row) => !selections.includes(row.name)
-			),
-		},
-		{
-			onSuccess(data) {
-				unselectAll()
-				showToast(__('Success'), __('Items removed successfully'), 'check')
-				program.reload()
-			},
-			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
-			},
-		}
-	)
-}
-
-const updateOrder = (e) => {
-	let sourceIdx = e.from.dataset.idx
-	let targetIdx = e.to.dataset.idx
-	let courses = program.doc.program_courses
-	courses.splice(targetIdx, 0, courses.splice(sourceIdx, 1)[0])
-
-	courses.forEach((course, index) => {
-		course.idx = index + 1
-	})
-
-	program.setValue.submit(
-		{
-			program_courses: courses,
-		},
-		{
-			onSuccess(data) {
-				showToast(__('Success'), __('Course moved successfully'), 'check')
-				program.reload()
-			},
-			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
-			},
-		}
-	)
-}
-
-const saveProgram = () => {
-	call('frappe.model.rename_doc.update_document_title', {
-		doctype: 'LMS Program',
-		docname: program.doc.name,
-		name: program.doc.title,
-	}).then((data) => {
-		router.push({ name: 'ProgramForm', params: { programName: data } })
-	})
-}
-
-const courseColumns = computed(() => {
-	return [
-		{
-			label: 'Title',
-			key: 'course_title',
-			width: 3,
-		},
-		{
-			label: 'ID',
-			key: 'course',
-			width: 3,
-		},
-	]
-})
-
-const memberColumns = computed(() => {
-	return [
-		{
-			label: 'Member',
-			key: 'member',
-			width: 3,
-			align: 'left',
-		},
-		{
-			label: 'Full Name',
-			key: 'full_name',
-			width: 3,
-			align: 'left',
-		},
-		{
-			label: 'Progress (%)',
-			key: 'progress',
-			width: 3,
-			align: 'right',
-		},
-	]
-})
-
-const breadbrumbs = computed(() => {
-	return [
-		{
-			label: 'Programs',
-			route: { name: 'Programs' },
-		},
-		{
-			label: props.programName === 'new' ? 'New Program' : props.programName,
-		},
-	]
-})
-</script>

frontend/src/pages/Programs.vue

@@ -1,215 +0,0 @@
-<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="breadbrumbs" />
-		<Button
-			v-if="user.data?.is_moderator || user.data?.is_instructor"
-			@click="showDialog = true"
-			variant="solid"
-		>
-			<template #prefix>
-				<Plus class="h-4 w-4 stroke-1.5" />
-			</template>
-			{{ __('New') }}
-		</Button>
-	</header>
-	<div v-if="programs.data?.length" class="pt-5 px-5">
-		<div v-for="program in programs.data" class="mb-10">
-			<div class="flex items-center justify-between">
-				<div class="text-xl font-semibold">
-					{{ program.name }}
-				</div>
-				<div class="flex items-center space-x-2">
-					<Badge
-						v-if="program.members"
-						variant="subtle"
-						theme="green"
-						size="lg"
-					>
-						{{ program.members }}
-						{{
-							program.members == 1 ? __(singularize('members')) : __('members')
-						}}
-					</Badge>
-					<Badge
-						v-if="program.progress"
-						variant="subtle"
-						theme="blue"
-						size="lg"
-					>
-						{{ program.progress }}{{ __('% completed') }}
-					</Badge>
-
-					<router-link
-						v-if="user.data?.is_moderator || user.data?.is_instructor"
-						:to="{
-							name: 'ProgramForm',
-							params: { programName: program.name },
-						}"
-					>
-						<Button>
-							<template #prefix>
-								<Edit class="h-4 w-4 stroke-1.5" />
-							</template>
-							{{ __('Edit') }}
-						</Button>
-					</router-link>
-				</div>
-			</div>
-			<div
-				v-if="program.courses?.length"
-				class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-5 mt-5"
-			>
-				<div v-for="course in program.courses" class="relative group">
-					<CourseCard
-						:course="course"
-						@click="enrollMember(program.name, course.name)"
-						class="cursor-pointer"
-					/>
-					<div
-						v-if="lockCourse(course)"
-						class="absolute inset-0 bg-black-overlay-500 opacity-60 rounded-md"
-					></div>
-					<div
-						v-if="lockCourse(course)"
-						class="absolute inset-0 flex items-center justify-center"
-					>
-						<LockKeyhole class="size-10 text-white" />
-					</div>
-				</div>
-			</div>
-			<div v-else class="text-sm italic text-gray-600 mt-4">
-				{{ __('No courses in this program') }}
-			</div>
-		</div>
-	</div>
-	<div
-		v-else
-		class="text-center p-5 text-gray-600 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-	>
-		<BookOpen class="size-10 mx-auto stroke-1 text-gray-500" />
-		<div class="text-xl font-medium">
-			{{ __('No programs found') }}
-		</div>
-		<div class="leading-5">
-			{{
-				__(
-					'There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!'
-				)
-			}}
-		</div>
-	</div>
-
-	<Dialog
-		v-model="showDialog"
-		:options="{
-			title: __('New Program'),
-			actions: [
-				{
-					label: __('Create'),
-					variant: 'solid',
-					onClick: () => createProgram(close),
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<FormControl :label="__('Title')" v-model="title" />
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import {
-	Badge,
-	Breadcrumbs,
-	Button,
-	call,
-	createResource,
-	Dialog,
-	FormControl,
-} from 'frappe-ui'
-import { computed, inject, onMounted, ref } from 'vue'
-import { BookOpen, Edit, Plus, LockKeyhole } from 'lucide-vue-next'
-import CourseCard from '@/components/CourseCard.vue'
-import { useRouter } from 'vue-router'
-import { showToast, singularize } from '@/utils'
-import { useSettings } from '@/stores/settings'
-
-const user = inject('$user')
-const showDialog = ref(false)
-const router = useRouter()
-const title = ref('')
-const settings = useSettings()
-
-onMounted(() => {
-	if (
-		!settings.learningPaths.data &&
-		!user.data?.is_moderator &&
-		!user.data?.is_instructor
-	) {
-		router.push({ name: 'Courses' })
-	}
-})
-
-const programs = createResource({
-	url: 'lms.lms.utils.get_programs',
-	auto: true,
-	cache: 'programs',
-})
-
-const createProgram = (close) => {
-	call('frappe.client.insert', {
-		doc: {
-			doctype: 'LMS Program',
-			title: title.value,
-		},
-	}).then((res) => {
-		router.push({ name: 'ProgramForm', params: { programName: res.name } })
-	})
-}
-
-const enrollMember = (program, course) => {
-	call('lms.lms.utils.enroll_in_program_course', {
-		program: program,
-		course: course,
-	})
-		.then((data) => {
-			if (data.current_lesson) {
-				router.push({
-					name: 'Lesson',
-					params: {
-						courseName: course,
-						chapterNumber: data.current_lesson.split('-')[0],
-						lessonNumber: data.current_lesson.split('-')[1],
-					},
-				})
-			} else if (data) {
-				router.push({
-					name: 'Lesson',
-					params: {
-						courseName: course,
-						chapterNumber: 1,
-						lessonNumber: 1,
-					},
-				})
-			}
-		})
-		.catch((err) => {
-			showToast('Error', err.messages?.[0] || err, 'x')
-		})
-}
-
-const lockCourse = (course) => {
-	if (user.data?.is_moderator || user.data?.is_instructor) return false
-	if (course.membership) return false
-	if (course.eligible) return false
-	return true
-}
-
-const breadbrumbs = computed(() => [
-	{
-		label: 'Programs',
-	},
-])
-</script>

frontend/src/pages/QuizCreation.vue

@@ -3,42 +3,14 @@
 		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" />
-		<div class="space-x-2">
+		<Button variant="solid" @click="submitQuiz()">
-			<router-link
+			{{ __('Save') }}
-				v-if="quizDetails.data?.name"
+		</Button>
-				:to="{
-					name: 'QuizPage',
-					params: {
-						quizID: quizDetails.data.name,
-					},
-				}"
-			>
-				<Button>
-					{{ __('Open') }}
-				</Button>
-			</router-link>
-			<router-link
-				v-if="quizDetails.data?.name"
-				:to="{
-					name: 'QuizSubmissionList',
-					params: {
-						quizID: quizDetails.data.name,
-					},
-				}"
-			>
-				<Button>
-					{{ __('Submission List') }}
-				</Button>
-			</router-link>
-			<Button variant="solid" @click="submitQuiz()">
-				{{ __('Save') }}
-			</Button>
-		</div>
 	</header>
 	<div class="w-3/4 mx-auto py-5">
 		<!-- Details -->
 		<div class="mb-8">
-			<div class="font-semibold mb-4">
+			<div class="text-sm font-semibold mb-4">
 				{{ __('Details') }}
 			</div>
 			<FormControl
@@ -48,20 +20,13 @@
 						? __('Title')
 						: __('Enter a title and save the quiz to proceed')
 				"
-				:required="true"
 			/>
 			<div v-if="quizDetails.data?.name">
-				<div class="grid grid-cols-2 gap-5 mt-4 mb-8">
+				<div class="grid grid-cols-3 gap-5 mt-2 mb-8">
 					<FormControl
-						type="number"
 						v-model="quiz.max_attempts"
 						:label="__('Maximun Attempts')"
 					/>
-					<FormControl
-						type="number"
-						v-model="quiz.duration"
-						:label="__('Duration (in minutes)')"
-					/>
 					<FormControl
 						v-model="quiz.total_marks"
 						:label="__('Total Marks')"
@@ -75,7 +40,7 @@
 
 				<!-- Settings -->
 				<div class="mb-8">
-					<div class="font-semibold mb-4">
+					<div class="text-sm font-semibold mb-4">
 						{{ __('Settings') }}
 					</div>
 					<div class="grid grid-cols-3 gap-5 my-4">
@@ -93,7 +58,7 @@
 				</div>
 
 				<div class="mb-8">
-					<div class="font-semibold mb-4">
+					<div class="text-sm font-semibold mb-4">
 						{{ __('Shuffle Settings') }}
 					</div>
 					<div class="grid grid-cols-3">
@@ -113,7 +78,7 @@
 				<!-- Questions -->
 				<div>
 					<div class="flex items-center justify-between mb-4">
-						<div class="font-semibold">
+						<div class="text-sm font-semibold">
 							{{ __('Questions') }}
 						</div>
 						<Button @click="openQuestionModal()">
@@ -142,7 +107,6 @@
 								v-slot="{ idx, column, item }"
 								v-for="row in quiz.questions"
 								@click="openQuestionModal(row)"
-								class="cursor-pointer"
 							>
 								<ListRowItem :item="item">
 									<div
@@ -161,7 +125,7 @@
 								<div class="flex gap-2">
 									<Button
 										variant="ghost"
-										@click="deleteQuestions(selections, unselectAll)"
+										@click="deleteQuizzes(selections, unselectAll)"
 									>
 										<Trash2 class="h-4 w-4 stroke-1.5" />
 									</Button>
@@ -206,10 +170,11 @@ import {
 	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 { showToast } from '../utils'
 import { useRouter } from 'vue-router'
 
 const showQuestionModal = ref(false)
@@ -233,7 +198,6 @@ const quiz = reactive({
 	total_marks: 0,
 	passing_percentage: 0,
 	max_attempts: 0,
-	duration: 0,
 	limit_questions_to: 0,
 	show_answers: true,
 	show_submission_history: false,
@@ -256,7 +220,11 @@ onMounted(() => {
 })
 
 const keyboardShortcut = (e) => {
-	if (e.key === 's' && (e.ctrlKey || e.metaKey)) {
+	if (
+		e.key === 's' &&
+		(e.ctrlKey || e.metaKey) &&
+		!e.target.classList.contains('ProseMirror')
+	) {
 		submitQuiz()
 		e.preventDefault()
 	}
@@ -338,7 +306,7 @@ const createQuiz = () => {
 			onSuccess(data) {
 				showToast(__('Success'), __('Quiz created successfully'), 'check')
 				router.push({
-					name: 'QuizForm',
+					name: 'QuizCreation',
 					params: { quizID: data.name },
 				})
 			},
@@ -379,17 +347,17 @@ const questionColumns = computed(() => {
 		{
 			label: __('ID'),
 			key: 'question',
-			width: '10rem',
+			width: '25%',
 		},
 		{
 			label: __('Question'),
 			key: __('question_detail'),
-			width: '40rem',
+			width: '60%',
 		},
 		{
 			label: __('Marks'),
 			key: 'marks',
-			width: '5rem',
+			width: '10%',
 		},
 	]
 })
@@ -407,29 +375,24 @@ const openQuestionModal = (question = null) => {
 	showQuestionModal.value = true
 }
 
-const deleteQuestionResource = createResource({
+const deleteQuiz = createResource({
-	url: 'lms.lms.api.delete_documents',
+	url: 'frappe.client.delete',
 	makeParams(values) {
 		return {
 			doctype: 'LMS Quiz Question',
-			documents: values.questions,
+			name: values.quiz,
 		}
 	},
 })
 
-const deleteQuestions = (selections, unselectAll) => {
+const deleteQuizzes = (selections, unselectAll) => {
-	deleteQuestionResource.submit(
+	selections.forEach(async (quiz) => {
-		{
+		deleteQuiz.submit({ quiz })
-			questions: Array.from(selections),
+	})
-		},
+	setTimeout(() => {
-		{
+		quizDetails.reload()
-			onSuccess() {
+		unselectAll()
-				showToast(__('Success'), __('Questions deleted successfully'), 'check')
+	}, 500)
-				quizDetails.reload()
-				unselectAll()
-			},
-		}
-	)
 }
 
 const breadcrumbs = computed(() => {
@@ -447,18 +410,9 @@ const breadcrumbs = computed(() => {
 		})
 	} */
 	crumbs.push({
-		label: props.quizID == 'new' ? __('New Quiz') : quizDetails.data?.title,
+		label: props.quizID == 'new' ? 'New Quiz' : quizDetails.data?.title,
-		route: { name: 'QuizForm', params: { quizID: props.quizID } },
+		route: { name: 'QuizCreation', 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/QuizPage.vue

@@ -1,58 +0,0 @@
-<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="md:w-7/12 md:mx-auto mx-4 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'
-import { updateDocumentTitle } from '@/utils'
-
-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 }]
-})
-
-const pageMeta = computed(() => {
-	return {
-		title: title.data?.title,
-		description: __('Quiz Submission'),
-	}
-})
-
-updateDocumentTitle(pageMeta)
-</script>

frontend/src/pages/QuizSubmission.vue

@@ -1,146 +0,0 @@
-<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 v-if="submisisonDetails.doc" :items="breadcrumbs" />
-		<div class="space-x-2">
-			<Badge
-				v-if="submisisonDetails.isDirty"
-				:label="__('Not Saved')"
-				variant="subtle"
-				theme="orange"
-			/>
-			<Button variant="solid" @click="saveSubmission()">
-				{{ __('Save') }}
-			</Button>
-		</div>
-	</header>
-	<div v-if="submisisonDetails.doc" class="w-1/2 mx-auto py-5 space-y-5">
-		<div class="text-xl font-semibold">
-			{{ submisisonDetails.doc.member_name }}
-		</div>
-		<div class="space-y-4 border p-5 rounded-md">
-			<div class="grid grid-cols-2 gap-5">
-				<FormControl
-					v-model="submisisonDetails.doc.quiz_title"
-					:label="__('Quiz')"
-					:disabled="true"
-				/>
-				<FormControl
-					v-model="submisisonDetails.doc.member_name"
-					:label="__('Member')"
-					:disabled="true"
-				/>
-			</div>
-
-			<div class="grid grid-cols-2 gap-5">
-				<FormControl
-					v-model="submisisonDetails.doc.score"
-					:label="__('Score')"
-					:disabled="true"
-				/>
-				<FormControl
-					v-model="submisisonDetails.doc.percentage"
-					:label="__('Percentage')"
-					:disabled="true"
-				/>
-			</div>
-		</div>
-
-		<div
-			v-for="row in submisisonDetails.doc.result"
-			class="border p-5 rounded-md space-y-4"
-		>
-			<div class="flex space-x-1 font-semibold">
-				<span class="leading-5" v-html="row.question"> </span>
-			</div>
-			<div v-html="row.answer" class="leading-5"></div>
-			<div class="grid grid-cols-2 gap-5">
-				<FormControl v-model="row.marks" :label="__('Marks')" />
-				<FormControl
-					v-model="row.marks_out_of"
-					:label="__('Marks out of')"
-					:disabled="true"
-				/>
-			</div>
-		</div>
-	</div>
-</template>
-<script setup>
-import {
-	createDocumentResource,
-	Breadcrumbs,
-	FormControl,
-	Button,
-	Badge,
-} from 'frappe-ui'
-import { computed, onBeforeUnmount, onMounted, inject } from 'vue'
-import { useRouter } from 'vue-router'
-import { showToast } from '@/utils'
-
-const router = useRouter()
-const user = inject('$user')
-
-onMounted(() => {
-	if (!user.data?.is_instructor && !user.data?.is_moderator)
-		router.push({ name: 'Courses' })
-
-	window.addEventListener('keydown', keyboardShortcut)
-})
-
-onBeforeUnmount(() => {
-	window.removeEventListener('keydown', keyboardShortcut)
-})
-
-const keyboardShortcut = (e) => {
-	if (
-		e.key === 's' &&
-		(e.ctrlKey || e.metaKey) &&
-		!e.target.classList.contains('ProseMirror')
-	) {
-		saveSubmission()
-		e.preventDefault()
-	}
-}
-
-const props = defineProps({
-	submission: {
-		type: String,
-		required: true,
-	},
-})
-
-const submisisonDetails = createDocumentResource({
-	doctype: 'LMS Quiz Submission',
-	name: props.submission,
-	auto: true,
-})
-
-const breadcrumbs = computed(() => {
-	return [
-		{
-			label: __('Quiz Submissions'),
-			route: {
-				name: 'QuizSubmissionList',
-				params: {
-					quizID: submisisonDetails.doc.quiz,
-				},
-			},
-		},
-		{
-			label: submisisonDetails.doc.quiz_title,
-		},
-	]
-})
-
-const saveSubmission = () => {
-	submisisonDetails.save.submit(
-		{},
-		{
-			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
-			},
-		}
-	)
-}
-</script>