chore(release): Bumped to Version 2.26.0

fix: scorm files getting wrong path

.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 install libcups2-dev redis-server mariadb-client-10.6
+sudo apt-get install libcups2-dev redis-server mariadb-client
 
 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

@@ -0,0 +1,64 @@
+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/ci.yml

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

.github/workflows/ui-tests.yml

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

README.md

@@ -1,115 +1,174 @@
-<p align="center">
+<div align="center" markdown="1">
-  <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>
 
-&nbsp;
+**Easy to use, open source, Learning Management System**
 
-<p align="center">
+![Tests](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/vandxn/main&style=flat&logo=cypress)
-    <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;
 
-<p align="center">
+<div align="center">
-	<a href="https://dashboard.cypress.io/projects/vandxn/runs">
+	<img src=".github/hero.png?v=5" alt="Hero Image" width="72%" />
-    <img alt="cypress" src="https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/vandxn/main&style=flat&logo=cypress">
+</div>
-  </a>
+<br />
-  <a href="https://github.com/frappe/lms/blob/main/LICENSE">
+<div align="center">
-    <img alt="license" src="https://img.shields.io/badge/license-AGPLv3-blue">
+	<a href="https://frappe.io/learning">Website</a>
-  </a>
+	-
-</p>
+	<a href="https://docs.frappe.io/learning">Documentation</a>
+</div>
 
-<img width="1402" alt="Lesson" src="https://frappelms.com/files/banner.png">
+## Frappe Learning
+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>Show more screenshots</summary>
+<summary>View 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">
+
-	<img width="941" alt="ss3" src="https://user-images.githubusercontent.com/31363128/210056134-01a7c429-1ef4-434e-9d43-128dda35d7e5.png">
+![Batch](.github/batch.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.
 
-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.
+### Under the Hood
 
-## Features
+- [**Frappe Framework**](https://github.com/frappe/frappe): A full-stack web application framework.
-- 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 ✨
 
-## Tech Stack
+- [**Frappe UI**](https://github.com/frappe/frappe-ui): A Vue-based UI library, to provide a modern user interface.
 
-Frappe LMS is built on [Frappe Framework](https://frappeframework.com) which is a batteries-included python web framework.
+## Production Setup
-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/)
-
-## Local 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
-```
-
-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.
-
-```
-Username: Administrator
-password: admin
-```
-
-### Frappe Bench
-
-Currently, this app depends on the `develop` branch of [frappe](https://github.com/frappe/frappe).
-
-1. Setup frappe-bench by following [this guide](https://frappeframework.com/docs/v14/user/en/installation)
-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
-
- 1. Now, you can access the site at `http://lms.test:8000`
-
-
-## Deployment
-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.
 
 ### Managed Hosting
-Frappe LMS can be deployed in a few clicks on [Frappe Cloud](https://frappecloud.com/marketplace/apps/lms).
 
-### Self-hosting
+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.
-If you want to self-host, you can follow official [Frappe Bench Installation](https://github.com/frappe/bench#installation) instructions.
 
-## Bugs and Feature Requests
+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.
-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.
 
-## License
+<div>
-Distributed under [GNU AFFERO GENERAL PUBLIC LICENSE](license.txt)
+	<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 [Docker documentation](https://docs.docker.com/). After that, follow below steps:
+
+**Step 1**: Setup folder and download the required files
+
+    mkdir frappe-learning
+    cd frappe-learning
+
+    # Download the docker-compose file
+    wget -O docker-compose.yml https://raw.githubusercontent.com/frappe/lms/develop/docker/docker-compose.yml
+
+    # Download the setup script
+    wget -O init.sh https://raw.githubusercontent.com/frappe/lms/develop/docker/init.sh
+
+**Step 2**: Run the container and daemonize it
+
+    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:
+- Username: Administrator
+- Password: admin
+
+### Local
+
+To setup the repository locally follow the steps mentioned below:
+
+1. Install bench and setup a `frappe-bench` directory by following the [Installation Steps](https://frappeframework.com/docs/user/en/installation)
+1. Start the server by running `bench start`
+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
+
+- [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://test_site_ui:8000",
+		baseUrl: "http://testui:8000",
 	},
 });

cypress/e2e/course_creation.cy.js

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

cypress/support/commands.js

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

docker/docker-compose.yml

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

frontend/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="UTF-8" />
-		<link rel="icon" href="/favicon.png" />
+		<link rel="icon" href="{{ favicon or '/assets/lms/frontend/favicon.png' }}" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<title>Frappe Learning</title>
 		<meta name="title" content="{{ meta.title }}" />
@@ -42,6 +42,7 @@
 
 		<script>
 			window.csrf_token = '{{ csrf_token }}'
+			window.setup_complete = '{{ setup_complete }}'
 			document.getElementById('seo-content').style.display = 'none';
 		</script>
 		<script type="module" src="/src/main.js"></script>

frontend/package.json

@@ -18,21 +18,26 @@
     "@editorjs/nested-list": "^1.4.2",
     "@editorjs/paragraph": "^2.11.3",
     "@editorjs/simple-image": "^1.6.0",
+    "@editorjs/table": "^2.4.2",
+    "@vueuse/router": "^12.7.0",
     "ace-builds": "^1.36.2",
+    "apexcharts": "^4.3.0",
     "chart.js": "^4.4.1",
     "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.69",
+    "frappe-ui": "^0.1.112",
     "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/components/Annoucements.vue

@@ -5,7 +5,7 @@
 				<div class="flex items-center justify-between mb-2">
 					<div class="flex items-center">
 						<Avatar :label="comm.sender_full_name" size="lg" />
-						<div class="ml-2">
+						<div class="ml-2 text-ink-gray-7">
 							{{ comm.sender_full_name }}
 						</div>
 					</div>
@@ -14,18 +14,18 @@
 					</div>
 				</div>
 				<div
-					class="prose prose-sm bg-gray-50 !min-w-full px-4 py-2 rounded-md"
+					class="prose prose-sm bg-surface-menu-bar !min-w-full px-4 py-2 rounded-md"
 					v-html="comm.content"
 				></div>
 			</div>
 		</div>
 	</div>
-	<div v-else class="text-sm italic text-gray-600">
+	<div v-else class="text-sm italic text-ink-gray-5">
 		{{ __('No announcements') }}
 	</div>
 </template>
 <script setup>
-import { createListResource, Avatar } from 'frappe-ui'
+import { createResource, Avatar } from 'frappe-ui'
 import { timeAgo } from '@/utils'
 
 const props = defineProps({
@@ -35,24 +35,15 @@ const props = defineProps({
 	},
 })
 
-const communications = createListResource({
+const communications = createResource({
-	doctype: 'Communication',
+	url: 'lms.lms.api.get_announcements',
-	fields: [
+	makeParams(value) {
-		'subject',
+		return {
-		'content',
+			batch: props.batch,
-		'recipients',
+		}
-		'cc',
-		'communication_date',
-		'sender',
-		'sender_full_name',
-	],
-	filters: {
-		reference_doctype: 'LMS Batch',
-		reference_name: props.batch,
 	},
-	orderBy: 'communication_date desc',
 	auto: true,
-	cache: ['batch', props.batch],
+	cache: ['announcement', 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="flex h-full flex-col justify-between transition-all duration-300 ease-in-out border-r bg-surface-menu-bar"
-		:class="isSidebarCollapsed ? 'w-14' : 'w-56'"
+		:class="sidebarStore.isSidebarCollapsed ? 'w-14' : 'w-56'"
 	>
 		<div
 			class="flex flex-col overflow-hidden"
-			:class="isSidebarCollapsed ? 'items-center' : ''"
+			:class="sidebarStore.isSidebarCollapsed ? 'items-center' : ''"
 		>
-			<UserDropdown :isCollapsed="isSidebarCollapsed" />
+			<UserDropdown :isCollapsed="sidebarStore.isSidebarCollapsed" />
 			<div class="flex flex-col" v-if="sidebarSettings.data">
 				<SidebarLink
 					v-for="link in sidebarLinks"
 					:link="link"
-					:isCollapsed="isSidebarCollapsed"
+					:isCollapsed="sidebarStore.isSidebarCollapsed"
 					class="mx-2 my-0.5"
 				/>
 			</div>
@@ -22,17 +22,17 @@
 			>
 				<div
 					class="flex items-center justify-between pr-2 cursor-pointer"
-					:class="isSidebarCollapsed ? 'pl-3' : 'pl-4'"
+					:class="sidebarStore.isSidebarCollapsed ? 'pl-3' : 'pl-4'"
-					@click="showWebPages = !showWebPages"
+					@click="toggleWebPages"
 				>
 					<div
-						v-if="!isSidebarCollapsed"
+						v-if="!sidebarStore.isSidebarCollapsed"
-						class="flex items-center text-sm text-gray-600 my-1"
+						class="flex items-center text-sm text-ink-gray-5 my-1"
 					>
 						<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
 							<ChevronRight
-								class="h-4 w-4 stroke-1.5 text-gray-900 transition-all duration-300 ease-in-out"
+								class="h-4 w-4 stroke-1.5 text-ink-gray-9 transition-all duration-300 ease-in-out"
-								:class="{ 'rotate-90': showWebPages }"
+								:class="{ 'rotate-90': !sidebarStore.isWebpagesCollapsed }"
 							/>
 						</span>
 						<span class="ml-2">
@@ -41,19 +41,19 @@
 					</div>
 					<Button v-if="isModerator" variant="ghost" @click="openPageModal()">
 						<template #icon>
-							<Plus class="h-4 w-4 text-gray-700 stroke-1.5" />
+							<Plus class="h-4 w-4 text-ink-gray-7 stroke-1.5" />
 						</template>
 					</Button>
 				</div>
 				<div
 					v-if="sidebarSettings.data?.web_pages?.length"
 					class="flex flex-col transition-all duration-300 ease-in-out"
-					:class="showWebPages ? 'block' : 'hidden'"
+					:class="!sidebarStore.isWebpagesCollapsed ? 'block' : 'hidden'"
 				>
 					<SidebarLink
 						v-for="link in sidebarSettings.data.web_pages"
 						:link="link"
-						:isCollapsed="isSidebarCollapsed"
+						:isCollapsed="sidebarStore.isSidebarCollapsed"
 						class="mx-2 my-0.5"
 						:showControls="isModerator ? true : false"
 						@openModal="openPageModal"
@@ -62,23 +62,33 @@
 				</div>
 			</div>
 		</div>
-		<SidebarLink
+		<div>
-			:link="{
+			<TrialBanner
-				label: isSidebarCollapsed ? 'Expand' : 'Collapse',
+				v-if="
-			}"
+					userResource.data?.is_system_manager && userResource.data?.is_fc_site
-			:isCollapsed="isSidebarCollapsed"
+				"
-			@click="isSidebarCollapsed = !isSidebarCollapsed"
+				:isSidebarCollapsed="sidebarStore.isSidebarCollapsed"
-			class="m-2"
+			/>
-		>
+			<SidebarLink
-			<template #icon>
+				:link="{
-				<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
+					label: sidebarStore.isSidebarCollapsed ? 'Expand' : 'Collapse',
-					<CollapseSidebar
+				}"
-						class="h-4.5 w-4.5 text-gray-700 duration-300 ease-in-out"
+				:isCollapsed="sidebarStore.isSidebarCollapsed"
-						:class="{ '[transform:rotateY(180deg)]': isSidebarCollapsed }"
+				@click="toggleSidebar()"
-					/>
+				class="m-2"
-				</span>
+			>
-			</template>
+				<template #icon>
-		</SidebarLink>
+					<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
+						<CollapseSidebar
+							class="h-4.5 w-4.5 text-ink-gray-7 duration-300 ease-in-out"
+							:class="{
+								'[transform:rotateY(180deg)]': sidebarStore.isSidebarCollapsed,
+							}"
+						/>
+					</span>
+				</template>
+			</SidebarLink>
+		</div>
 	</div>
 	<PageModal
 		v-model="showPageModal"
@@ -96,12 +106,15 @@ 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 { Button, createResource, TrialBanner } 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())
@@ -109,7 +122,7 @@ 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) => {
@@ -179,6 +192,48 @@ const addQuizzes = () => {
 	}
 }
 
+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
@@ -210,9 +265,25 @@ watch(userResource, () => {
 	if (userResource.data) {
 		isModerator.value = userResource.data.is_moderator
 		isInstructor.value = userResource.data.is_instructor
+		addPrograms()
 		addQuizzes()
+		addAssignments()
 	}
 })
 
-let isSidebarCollapsed = ref(getSidebarFromStorage())
+const toggleSidebar = () => {
+	sidebarStore.isSidebarCollapsed = !sidebarStore.isSidebarCollapsed
+	localStorage.setItem(
+		'isSidebarCollapsed',
+		JSON.stringify(sidebarStore.isSidebarCollapsed)
+	)
+}
+
+const toggleWebPages = () => {
+	sidebarStore.isWebpagesCollapsed = !sidebarStore.isWebpagesCollapsed
+	localStorage.setItem(
+		'isWebpagesCollapsed',
+		JSON.stringify(sidebarStore.isWebpagesCollapsed)
+	)
+}
 </script>

frontend/src/components/Apps.vue

@@ -3,7 +3,7 @@
 		<template #target="{ togglePopover }">
 			<button
 				:class="[
-					'group w-full flex h-7 items-center justify-between rounded px-2 text-base text-gray-800 hover:bg-gray-100',
+					'group w-full flex h-7 items-center justify-between rounded px-2 text-base text-ink-gray-8 hover:bg-surface-gray-2',
 				]"
 				@click.prevent="togglePopover()"
 			>
@@ -18,15 +18,15 @@
 		</template>
 		<template #body>
 			<div
-				class="grid grid-cols-3 justify-between mx-3 p-2 rounded-lg border border-gray-100 bg-white shadow-xl"
+				class="grid grid-cols-3 justify-between mx-3 p-2 rounded-lg border border-gray-100 bg-surface-white shadow-xl"
 			>
 				<div v-for="app in apps.data" key="name">
 					<a
 						:href="app.route"
-						class="flex flex-col gap-1.5 rounded justify-center items-center py-2 px-3 hover:bg-gray-100"
+						class="flex flex-col gap-1.5 rounded justify-center items-center py-2 px-3 hover:bg-surface-gray-2"
 					>
 						<img class="size-8" :src="app.logo" />
-						<div class="text-sm" @click="app.onClick">
+						<div class="text-sm text-ink-gray-7" @click="app.onClick">
 							{{ app.title }}
 						</div>
 					</a>

frontend/src/components/AssessmentPlugin.vue

@@ -0,0 +1,75 @@
+<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,7 +1,7 @@
 <template>
 	<div>
-		<div class="flex items-center justify-between">
+		<div class="flex items-center justify-between mb-4">
-			<div class="text-lg font-semibold mb-4">
+			<div class="text-lg font-semibold text-ink-gray-9">
 				{{ __('Assessments') }}
 			</div>
 			<Button v-if="canSeeAddButton()" @click="showModal = true">
@@ -11,7 +11,7 @@
 				{{ __('Add') }}
 			</Button>
 		</div>
-		<div v-if="assessments.data?.length">
+		<div v-if="assessments.data?.length" class="text-sm">
 			<ListView
 				:columns="getAssessmentColumns()"
 				:rows="assessments.data"
@@ -19,10 +19,11 @@
 				:options="{
 					showTooltip: false,
 					getRowRoute: (row) => getRowRoute(row),
+					selectable: user.data?.is_student ? false : true,
 				}"
 			>
 				<ListHeader
-					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+					class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
 				>
 					<ListHeaderItem :item="item" v-for="item in getAssessmentColumns()">
 						<template #prefix="{ item }">
@@ -38,7 +39,18 @@
 					<ListRow :row="row" v-for="row in assessments.data">
 						<template #default="{ column, item }">
 							<ListRowItem :item="row[column.key]" :align="column.align">
-								<div>
+								<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>
@@ -59,7 +71,7 @@
 				</ListSelectBanner>
 			</ListView>
 		</div>
-		<div v-else class="text-sm italic text-gray-600">
+		<div v-else class="text-sm italic text-ink-gray-5">
 			{{ __('No Assessments') }}
 		</div>
 	</div>
@@ -80,6 +92,7 @@ import {
 	ListSelectBanner,
 	createResource,
 	Button,
+	Badge,
 } from 'frappe-ui'
 import { inject, ref } from 'vue'
 import AssessmentModal from '@/components/Modals/AssessmentModal.vue'
@@ -145,7 +158,7 @@ const getRowRoute = (row) => {
 			return {
 				name: 'AssignmentSubmission',
 				params: {
-					assignmentName: row.assessment_name,
+					assignmentID: row.assessment_name,
 					submissionName: row.submission.name,
 				},
 			}
@@ -153,7 +166,7 @@ const getRowRoute = (row) => {
 			return {
 				name: 'AssignmentSubmission',
 				params: {
-					assignmentName: row.assessment_name,
+					assignmentID: row.assessment_name,
 					submissionName: 'new',
 				},
 			}
@@ -177,20 +190,33 @@ const getAssessmentColumns = () => {
 		{
 			label: 'Assessment',
 			key: 'title',
+			width: '25rem',
 		},
 		{
 			label: 'Type',
 			key: 'assessment_type',
+			width: '15rem',
 		},
 	]
 
 	if (!user.data?.is_moderator) {
 		columns.push({
-			label: 'Status/Score',
+			label: 'Status/Percentage',
 			key: 'status',
-			align: 'center',
+			align: 'left',
+			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

@@ -0,0 +1,468 @@
+<template>
+	<div
+		v-if="assignment.data"
+		class="grid grid-cols-[65%,35%] 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 text-ink-gray-9">
+				<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-ink-gray-7 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-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal"
+			></div>
+		</div>
+
+		<div class="flex flex-col">
+			<div class="p-5">
+				<div class="flex items-center justify-between mb-4">
+					<div class="font-semibold text-ink-gray-9">
+						{{ __('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-surface-blue-2 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-ink-gray-5 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 text-ink-gray-7">
+							<div class="border self-start rounded-md p-2 mr-2">
+								<FileText class="h-5 w-5 stroke-1.5" />
+							</div>
+							<a
+								:href="submissionFile.file_url"
+								target="_blank"
+								class="flex flex-col cursor-pointer !no-underline"
+							>
+								<span class="text-sm leading-5">
+									{{ submissionFile.file_name }}
+								</span>
+								<span class="text-sm text-ink-gray-5 mt-1">
+									{{ getFileSize(submissionFile.file_size) }}
+								</span>
+							</a>
+							<X
+								v-if="canModifyAssignment"
+								@click="removeSubmission()"
+								class="bg-surface-gray-3 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-ink-gray-5 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-surface-gray-2 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-surface-blue-2 rounded-md"
+				>
+					<div class="text-sm text-ink-gray-5 font-medium mb-2">
+						{{ __('Comments by Evaluator') }}:
+					</div>
+					<div class="leading-5">
+						{{ submissionResource.doc.comments }}
+					</div>
+				</div>
+
+				<!-- Grading -->
+				<div v-if="canGradeSubmission" class="mt-8 space-y-4">
+					<div class="font-semibold mb-2 text-ink-gray-9">
+						{{ __('Grading') }}
+					</div>
+					<FormControl
+						v-if="submissionResource.doc"
+						v-model="submissionResource.doc.status"
+						:label="__('Grade')"
+						type="select"
+						:options="submissionStatusOptions"
+					/>
+					<div>
+						<div class="text-sm text-ink-gray-5 mb-1">
+							{{ __('Comments') }}
+						</div>
+						<TextEditor
+							:content="comments"
+							@change="
+								(val) => {
+									comments = val
+									isDirty = true
+								}
+							"
+							:editable="true"
+							:fixedMenu="true"
+							editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
+						/>
+					</div>
+				</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 comments = 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.doc.comments) {
+			comments.value = submissionResource.doc.comments
+		}
+		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,
+				assignment_attachment: submissionFile.value?.file_url,
+				evaluator: evaluator,
+				comments: comments.value,
+				answer: answer.value,
+			},
+			{
+				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) => {
+	isDirty.value = true
+	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 = () => {
+	isDirty.value = true
+	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

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

@@ -9,8 +9,8 @@
 		<div class="flex items-center space-x-2 shadow rounded-lg p-1 w-1/2">
 			<Button variant="ghost" @click="togglePlay">
 				<template #icon>
-					<Play v-if="!isPlaying" class="w-4 h-4 text-gray-900" />
+					<Play v-if="!isPlaying" class="w-4 h-4 text-ink-gray-9" />
-					<Pause v-else class="w-4 h-4 text-gray-900" />
+					<Pause v-else class="w-4 h-4 text-ink-gray-9" />
 				</template>
 			</Button>
 			<input
@@ -22,13 +22,13 @@
 				@input="changeCurrentTime"
 				class="duration-slider w-full h-1"
 			/>
-			<span class="text-xs text-gray-900 font-medium">
+			<span class="text-xs text-ink-gray-9 font-medium">
 				{{ formatTime(currentTime) }} / {{ formatTime(duration) }}
 			</span>
 			<Button variant="ghost" @click="toggleMute">
 				<template #icon>
-					<Volume2 v-if="!isMuted" class="w-4 h-4 text-gray-900" />
+					<Volume2 v-if="!isMuted" class="w-4 h-4 text-ink-gray-9" />
-					<VolumeX v-else class="w-4 h-4 text-gray-900" />
+					<VolumeX v-else class="w-4 h-4 text-ink-gray-9" />
 				</template>
 			</Button>
 		</div>

frontend/src/components/BatchCard.vue

@@ -1,50 +1,52 @@
 <template>
 	<div
-		class="flex flex-col shadow hover:bg-gray-100 rounded-md p-4 h-full"
+		class="flex flex-col border-2 hover:bg-surface-gray-2 rounded-md p-4 h-full"
 		style="min-height: 150px"
 	>
-		<div class="text-lg leading-5 font-semibold mb-2">
+		<div class="text-lg leading-5 font-semibold mb-2 text-ink-gray-9">
 			{{ batch.title }}
 		</div>
-		<Badge
+		<div
 			v-if="batch.seat_count && batch.seats_left > 0"
-			theme="green"
+			class="text-xs bg-green-100 text-green-700 self-start px-2 py-0.5 rounded-md"
-			class="self-start mb-2"
 		>
 			{{ batch.seats_left }}
-			<span v-if="batch.seats_left > 1">{{ __('Seats Left') }}</span
+			<span v-if="batch.seats_left > 1">
-			><span v-else-if="batch.seats_left == 1">{{ __('Seat Left') }}</span>
+				{{ __('Seats Left') }}
-		</Badge>
+			</span>
-		<Badge
+			<span v-else-if="batch.seats_left == 1">
+				{{ __('Seat Left') }}
+			</span>
+		</div>
+		<div
 			v-else-if="batch.seat_count && batch.seats_left <= 0"
-			theme="red"
+			class="text-xs bg-red-100 text-red-700 self-start px-2 py-0.5 rounded-md"
-			class="self-start mb-2"
 		>
 			{{ __('Sold Out') }}
-		</Badge>
+		</div>
-		<div class="short-introduction text-sm text-gray-700">
+		<div class="short-introduction text-sm text-ink-gray-7">
 			{{ batch.description }}
 		</div>
-		<div v-if="batch.amount" class="font-semibold mb-4">
+		<div v-if="batch.amount" class="font-semibold text-ink-gray-9 mb-4">
 			{{ batch.price }}
 		</div>
 		<div class="flex flex-col space-y-2 mt-auto">
 			<DateRange
 				:startDate="batch.start_date"
 				:endDate="batch.end_date"
-				class="text-sm text-gray-700"
+				class="text-sm text-ink-gray-7"
 			/>
-			<div class="flex items-center text-sm text-gray-700">
+			<div class="flex items-center text-sm text-ink-gray-7">
-				<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
+				<Clock class="h-4 w-4 stroke-1.5 mr-2 text-ink-gray-7" />
 				<span>
 					{{ formatTime(batch.start_time) }} - {{ formatTime(batch.end_time) }}
 				</span>
 			</div>
 			<div
 				v-if="batch.timezone"
-				class="flex items-center text-sm text-gray-700"
+				class="flex items-center text-sm text-ink-gray-7"
 			>
-				<Globe class="h-4 w-4 stroke-1.5 mr-2 text-gray-600" />
+				<Globe class="h-4 w-4 stroke-1.5 mr-2 text-ink-gray-5" />
 				<span>
 					{{ batch.timezone }}
 				</span>

frontend/src/components/BatchCourses.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<div class="flex items-center justify-between mb-4">
-			<div class="text-xl font-semibold">
+			<div class="text-lg font-semibold text-ink-gray-9">
 				{{ __('Courses') }}
 			</div>
 			<Button v-if="canSeeAddButton()" @click="openCourseModal()">
@@ -18,6 +18,7 @@
 				row-key="batch_course"
 				:options="{
 					showTooltip: false,
+					selectable: user.data?.is_student ? false : true,
 					getRowRoute: (row) => ({
 						name: 'CourseDetail',
 						params: { courseName: row.name },
@@ -25,7 +26,7 @@
 				}"
 			>
 				<ListHeader
-					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+					class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
 				>
 					<ListHeaderItem :item="item" v-for="item in getCoursesColumns()">
 						<template #prefix="{ item }">
@@ -118,13 +119,13 @@ const getCoursesColumns = () => {
 		},
 		{
 			label: 'Lessons',
-			key: 'lesson_count',
+			key: 'lessons',
 			align: 'right',
 		},
 		{
 			label: 'Enrollments',
 			align: 'right',
-			key: 'enrollment_count',
+			key: 'enrollments',
 		},
 	]
 }

frontend/src/components/BatchDashboard.vue

@@ -1,17 +1,18 @@
 <template>
-	<div>
+	<div class="space-y-10">
 		<UpcomingEvaluations
 			:batch="batch.data.name"
 			:endDate="batch.data.evaluation_end_date"
 			:courses="batch.data.courses"
-			:isStudent="isStudent"
 		/>
 		<Assessments :batch="batch.data.name" />
+		<StudentHeatmap />
 	</div>
 </template>
 <script setup>
 import UpcomingEvaluations from '@/components/UpcomingEvaluations.vue'
 import Assessments from '@/components/Assessments.vue'
+import StudentHeatmap from '@/components/StudentHeatmap.vue'
 
 const props = defineProps({
 	batch: {

frontend/src/components/BatchFeedback.vue

@@ -0,0 +1,245 @@
+<template>
+	<div v-if="user.data?.is_student">
+		<div
+			v-if="feedbackList.data?.length"
+			class="bg-surface-blue-2 text-blue-700 p-2 rounded-md mb-5"
+		>
+			{{ __('Thank you for providing your feedback!') }}
+		</div>
+		<div v-else class="flex justify-between items-center mb-5">
+			<div class="text-lg font-semibold">
+				{{ __('Help Us Improve') }}
+			</div>
+			<Button @click="submitFeedback()">
+				{{ __('Submit') }}
+			</Button>
+		</div>
+		<div class="space-y-8">
+			<div class="flex items-center justify-between">
+				<Rating
+					v-for="key in ratingKeys"
+					v-model="feedback[key]"
+					:label="__(convertToTitleCase(key))"
+					:readonly="readOnly"
+				/>
+			</div>
+			<FormControl
+				v-model="feedback.feedback"
+				type="textarea"
+				:label="__('Feedback')"
+				:rows="7"
+				:readonly="readOnly"
+			/>
+		</div>
+	</div>
+
+	<div v-else-if="feedbackList.data?.length">
+		<div class="text-lg font-semibold mb-5">
+			{{ __('Average of Feedback Received') }}
+		</div>
+
+		<div class="flex items-center justify-between mb-10">
+			<Rating
+				v-for="key in ratingKeys"
+				v-model="average[key]"
+				:label="__(convertToTitleCase(key))"
+				:readonly="true"
+			/>
+		</div>
+
+		<div class="text-lg font-semibold mb-5">
+			{{ __('All Feedback') }}
+		</div>
+		<ListView
+			:columns="feedbackColumns"
+			:rows="feedbackList.data"
+			row-key="name"
+			:options="{
+				showTooltip: false,
+				rowHeight: 'h-16',
+				selectable: false,
+			}"
+		>
+			<ListHeader
+				class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
+			></ListHeader>
+			<ListRows>
+				<ListRow
+					:row="row"
+					v-for="row in feedbackList.data"
+					class="group cursor-pointer feedback-list"
+				>
+					<template #default="{ column, item }">
+						<ListRowItem
+							:item="row[column.key]"
+							:align="column.align"
+							class="text-sm"
+						>
+							<template #prefix>
+								<div v-if="column.key == 'member_name'">
+									<Avatar
+										class="flex"
+										:image="row['member_image']"
+										:label="item"
+										size="sm"
+									/>
+								</div>
+							</template>
+							<div v-if="ratingKeys.includes(column.key)">
+								<Rating v-model="row[column.key]" :readonly="true" />
+							</div>
+							<div v-else class="leading-5">
+								{{ row[column.key] }}
+							</div>
+						</ListRowItem>
+					</template>
+				</ListRow>
+			</ListRows>
+		</ListView>
+	</div>
+	<div v-else class="text-sm italic text-center text-ink-gray-7 mt-5">
+		{{ __('No feedback received yet.') }}
+	</div>
+</template>
+<script setup>
+import { computed, inject, onMounted, reactive, ref, watch } from 'vue'
+import { convertToTitleCase } from '@/utils'
+import {
+	Avatar,
+	Button,
+	createListResource,
+	FormControl,
+	ListView,
+	ListHeader,
+	ListHeaderItem,
+	ListRows,
+	ListRow,
+	ListRowItem,
+	Rating,
+} from 'frappe-ui'
+
+const user = inject('$user')
+const ratingKeys = ['content', 'instructors', 'value']
+const readOnly = ref(false)
+const average = reactive({})
+const feedback = reactive({})
+
+const props = defineProps({
+	batch: {
+		type: String,
+		required: true,
+	},
+})
+
+onMounted(() => {
+	let filters = {
+		batch: props.batch,
+	}
+	if (user.data?.is_student) {
+		filters['member'] = user.data?.name
+	}
+	feedbackList.update({
+		filters: filters,
+	})
+	feedbackList.reload()
+})
+
+const feedbackList = createListResource({
+	doctype: 'LMS Batch Feedback',
+	filters: {
+		batch: props.batch,
+	},
+	fields: [
+		'content',
+		'instructors',
+		'value',
+		'feedback',
+		'name',
+		'member',
+		'member_name',
+		'member_image',
+	],
+	cache: ['feedbackList', props.batch, user.data?.name],
+})
+
+watch(
+	() => feedbackList.data,
+	() => {
+		if (feedbackList.data.length) {
+			let data = feedbackList.data
+			readOnly.value = true
+
+			ratingKeys.forEach((key) => {
+				average[key] = 0
+			})
+
+			data.forEach((row) => {
+				Object.keys(row).forEach((key) => {
+					if (ratingKeys.includes(key)) row[key] = row[key] * 5
+					feedback[key] = row[key]
+				})
+				ratingKeys.forEach((key) => {
+					average[key] += row[key]
+				})
+			})
+			Object.keys(average).forEach((key) => {
+				average[key] = average[key] / data.length
+			})
+		}
+	}
+)
+
+const submitFeedback = () => {
+	ratingKeys.forEach((key) => {
+		feedback[key] = feedback[key] / 5
+	})
+	feedbackList.insert.submit(
+		{
+			member: user.data?.name,
+			batch: props.batch,
+			...feedback,
+		},
+		{
+			onSuccess: () => {
+				feedbackList.reload()
+			},
+		}
+	)
+}
+
+const feedbackColumns = computed(() => {
+	return [
+		{
+			label: 'Member',
+			key: 'member_name',
+			width: '10rem',
+		},
+		{
+			label: 'Feedback',
+			key: 'feedback',
+			width: '15rem',
+		},
+		{
+			label: 'Content',
+			key: 'content',
+			width: '9rem',
+		},
+		{
+			label: 'Instructors',
+			key: 'instructors',
+			width: '9rem',
+		},
+		{
+			label: 'Value',
+			key: 'value',
+			width: '9rem',
+		},
+	]
+})
+</script>
+<style>
+.feedback-list > button > div {
+	align-items: start;
+	padding: 0.15rem 0;
+}
+</style>

frontend/src/components/BatchOverlay.vue

@@ -1,25 +1,31 @@
 <template>
-	<div v-if="batch.data" class="shadow rounded-md p-5 lg:w-72">
+	<div v-if="batch.data" class="border-2 rounded-md p-5 lg:w-72">
-		<Badge
+		<div
 			v-if="batch.data.seat_count && seats_left > 0"
-			theme="green"
+			class="text-xs bg-green-100 text-green-700 float-right px-2 py-0.5 rounded-md"
-			class="self-start mb-2 float-right"
 		>
-			{{ seats_left }} <span v-if="seats_left > 1">{{ __('Seats Left') }}</span
+			{{ seats_left }}
-			><span v-else-if="seats_left == 1">{{ __('Seat Left') }}</span>
+			<span v-if="seats_left > 1">
-		</Badge>
+				{{ __('Seats Left') }}
-		<Badge
+			</span>
+			<span v-else-if="seats_left == 1">
+				{{ __('Seat Left') }}
+			</span>
+		</div>
+		<div
 			v-else-if="batch.data.seat_count && seats_left <= 0"
-			theme="red"
+			class="text-xs bg-red-100 text-red-700 float-right px-2 py-0.5 rounded-md"
-			class="self-start mb-2 float-right"
 		>
 			{{ __('Sold Out') }}
-		</Badge>
+		</div>
-		<div v-if="batch.data.amount" class="text-lg font-semibold mb-3">
+		<div
+			v-if="batch.data.amount"
+			class="text-lg font-semibold mb-3 text-ink-gray-9"
+		>
 			{{ formatNumberIntoCurrency(batch.data.amount, batch.data.currency) }}
 		</div>
-		<div class="flex items-center mb-3">
+		<div class="flex items-center mb-3 text-ink-gray-7">
-			<BookOpen class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
+			<BookOpen class="h-4 w-4 stroke-1.5 mr-2" />
 			<span> {{ batch.data.courses.length }} {{ __('Courses') }} </span>
 		</div>
 		<DateRange
@@ -27,15 +33,15 @@
 			:endDate="batch.data.end_date"
 			class="mb-3"
 		/>
-		<div class="flex items-center mb-3">
+		<div class="flex items-center mb-3 text-ink-gray-7">
-			<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
+			<Clock class="h-4 w-4 stroke-1.5 mr-2" />
 			<span>
 				{{ formatTime(batch.data.start_time) }} -
 				{{ formatTime(batch.data.end_time) }}
 			</span>
 		</div>
-		<div v-if="batch.data.timezone" class="flex items-center">
+		<div v-if="batch.data.timezone" class="flex items-center text-ink-gray-7">
-			<Globe class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
+			<Globe class="h-4 w-4 stroke-1.5 mr-2" />
 			<span>
 				{{ batch.data.timezone }}
 			</span>
@@ -63,7 +69,11 @@
 					name: batch.data.name,
 				},
 			}"
-			v-else-if="batch.data.paid_batch && batch.data.seats_left"
+			v-else-if="
+				batch.data.paid_batch &&
+				batch.data.seats_left > 0 &&
+				batch.data.accept_enrollments
+			"
 		>
 			<Button v-if="!isStudent" class="w-full mt-4" variant="solid">
 				<span>
@@ -74,7 +84,11 @@
 		<Button
 			variant="solid"
 			class="w-full mt-2"
-			v-else-if="batch.data.allow_self_enrollment && batch.data.seats_left"
+			v-else-if="
+				batch.data.allow_self_enrollment &&
+				batch.data.seats_left &&
+				batch.data.accept_enrollments
+			"
 			@click="enrollInBatch()"
 		>
 			{{ __('Enroll Now') }}
@@ -106,6 +120,7 @@ import { useRouter } from 'vue-router'
 
 const router = useRouter()
 const user = inject('$user')
+const dayjs = inject('$dayjs')
 
 const props = defineProps({
 	batch: {

frontend/src/components/BatchStudents.vue

@@ -1,80 +1,221 @@
 <template>
-	<Button class="float-right mb-3" @click="openStudentModal()">
+	<div class="">
-		<template #prefix>
+		<div class="w-full flex items-center justify-between pb-4">
-			<Plus class="h-4 w-4" />
+			<div class="font-medium text-ink-gray-7">
-		</template>
+				{{ __('Statistics') }}
-		{{ __('Add') }}
+			</div>
-	</Button>
+		</div>
-	<div class="text-lg font-semibold mb-4">
+		<div class="grid grid-cols-4 gap-5 mb-8">
-		{{ __('Students') }}
+			<div
-	</div>
+				class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
-	<div v-if="students.data?.length">
-		<ListView
-			:columns="getStudentColumns()"
-			:rows="students.data"
-			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 getStudentColumns()">
+				<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
-					<template #prefix="{ item }">
+					<User class="w-5 h-5 stroke-1.5" />
-						<component
+				</div>
-							v-if="item.icon"
+				<div class="flex items-center space-x-2">
-							:is="item.icon"
+					<span class="font-semibold">
-							class="h-4 w-4 stroke-1.5 ml-4"
+						{{ students.data?.length }}
-						/>
+					</span>
-					</template>
+					<span class="">
-				</ListHeaderItem>
+						{{ __('Students') }}
-			</ListHeader>
+					</span>
-			<ListRows>
+				</div>
-				<ListRow :row="row" v-for="row in students.data">
+			</div>
-					<template #default="{ column, item }">
+
-						<ListRowItem :item="row[column.key]" :align="column.align">
+			<div
-							<template #prefix>
+				class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
-								<div v-if="column.key == 'full_name'">
+			>
-									<Avatar
+				<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
-										class="flex items-center"
+					<GraduationCap class="w-5 h-5 stroke-1.5" />
-										:image="row['user_image']"
+				</div>
-										:label="item"
+				<div class="flex items-center space-x-2">
-										size="sm"
+					<span class="font-semibold">
-									/>
+						{{ certificationCount.data }}
-								</div>
+					</span>
-							</template>
+					<span class="">
-							<div>
+						{{ __('Certified') }}
-								{{ row[column.key] }}
+					</span>
-							</div>
+				</div>
-						</ListRowItem>
+			</div>
-					</template>
+
-				</ListRow>
+			<div
-			</ListRows>
+				class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
-			<ListSelectBanner>
+			>
-				<template #actions="{ unselectAll, selections }">
+				<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
-					<div class="flex gap-2">
+					<BookOpen class="w-5 h-5 stroke-1.5" />
-						<Button
+				</div>
-							variant="ghost"
+				<div class="flex items-center space-x-2">
-							@click="removeStudents(selections, unselectAll)"
+					<span class="font-semibold">
-						>
+						{{ batch.courses?.length }}
-							<Trash2 class="h-4 w-4 stroke-1.5" />
+					</span>
-						</Button>
+					<span>
+						{{ __('Courses') }}
+					</span>
+				</div>
+			</div>
+
+			<div
+				class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
+			>
+				<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
+					<ShieldCheck class="w-5 h-5 stroke-1.5" />
+				</div>
+				<div class="flex items-center space-x-2">
+					<span class="font-semibold">
+						{{ assessmentCount }}
+					</span>
+					<span>
+						{{ __('Assessments') }}
+					</span>
+				</div>
+			</div>
+		</div>
+		<div v-if="showProgressChart" class="mb-8">
+			<div class="text-ink-gray-7 font-medium">
+				{{ __('Progress') }}
+			</div>
+			<ApexChart
+				:options="chartOptions"
+				:series="chartData"
+				type="bar"
+				:height="chartData[0].data.length * 30 + 100"
+			/>
+			<div
+				class="flex items-center justify-center text-sm text-ink-gray-7 space-x-4"
+			>
+				<div class="flex items-center space-x-2">
+					<div
+						class="w-3 h-3 rounded-sm"
+						:style="{ 'background-color': theme.colors.green[600] }"
+					></div>
+					<div>
+						{{ __('Courses') }}
 					</div>
+				</div>
+				<div class="flex items-center space-x-2">
+					<div
+						class="w-3 h-3 rounded-sm"
+						:style="{ 'background-color': theme.colors.blue[600] }"
+					></div>
+					<div>
+						{{ __('Assessments') }}
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div>
+		<div class="flex items-center justify-between mb-4">
+			<div class="text-ink-gray-7 font-medium">
+				{{ __('Students') }}
+			</div>
+			<Button @click="openStudentModal()">
+				<template #prefix>
+					<Plus class="h-4 w-4" />
 				</template>
-			</ListSelectBanner>
+				{{ __('Add') }}
-		</ListView>
+			</Button>
-	</div>
+		</div>
-	<div v-else class="text-sm italic text-gray-600">
+
-		{{ __('There are no students in this batch.') }}
+		<div v-if="students.data?.length">
+			<ListView
+				:columns="getStudentColumns()"
+				:rows="students.data"
+				row-key="name"
+				:options="{
+					showTooltip: false,
+				}"
+			>
+				<ListHeader
+					class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
+				>
+					<ListHeaderItem
+						:item="item"
+						v-for="item in getStudentColumns()"
+						: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"
+								class="text-sm"
+							>
+								<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 class="text-xs">{{ row[column.key] }}%</div>
+								</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>
+			</ListView>
+		</div>
+		<div v-else class="text-sm italic text-ink-gray-5">
+			{{ __('There are no students in this batch.') }}
+		</div>
 	</div>
+
 	<StudentModal
-		:batch="props.batch"
+		:batch="props.batch.name"
 		v-model="showStudentModal"
 		v-model:reloadStudents="students"
 	/>
+	<BatchStudentProgress
+		:student="selectedStudent"
+		v-model="showStudentProgressModal"
+	/>
 </template>
 <script setup>
 import {
+	Avatar,
+	Button,
 	createResource,
+	FeatherIcon,
 	ListHeader,
 	ListHeaderItem,
 	ListSelectBanner,
@@ -82,65 +223,91 @@ import {
 	ListRows,
 	ListView,
 	ListRowItem,
-	Avatar,
-	Button,
 } from 'frappe-ui'
-import { Trash2, Plus } from 'lucide-vue-next'
+import {
-import { ref } from 'vue'
+	BookOpen,
+	GraduationCap,
+	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'
+import { theme } from '@/utils/theme'
 
 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: String,
+		type: Object,
 		default: null,
 	},
 })
 
 const students = createResource({
 	url: 'lms.lms.utils.get_batch_students',
-	cache: ['students', props.batch],
+	cache: ['students', props.batch.name],
 	params: {
-		batch: props.batch,
+		batch: props.batch?.name,
 	},
 	auto: true,
+	onSuccess(data) {
+		chartData.value = getChartData()
+		showProgressChart.value = data.length && true
+	},
 })
 
 const getStudentColumns = () => {
-	return [
+	let columns = [
 		{
 			label: 'Full Name',
 			key: 'full_name',
-			width: 2,
+			width: '20rem',
+			icon: 'user',
 		},
 		{
-			label: 'Courses Done',
+			label: 'Progress',
-			key: 'courses_completed',
+			key: 'progress',
-			align: 'center',
+			width: '15rem',
-		},
+			icon: 'activity',
-		{
-			label: 'Assessments Done',
-			key: 'assessments_completed',
-			align: 'center',
 		},
 		{
 			label: 'Last Active',
 			key: 'last_active',
+			width: '10rem',
+			align: 'center',
+			icon: 'clock',
 		},
 	]
+
+	return columns
 }
 
 const openStudentModal = () => {
 	showStudentModal.value = true
 }
 
+const openStudentProgressModal = (row) => {
+	showStudentProgressModal.value = true
+	selectedStudent.value = row
+}
+
 const deleteStudents = createResource({
 	url: 'lms.lms.api.delete_documents',
 	makeParams(values) {
 		return {
-			doctype: 'Batch Student',
+			doctype: 'LMS Batch Enrollment',
 			documents: values.students,
 		}
 	},
@@ -160,4 +327,119 @@ const removeStudents = (selections, unselectAll) => {
 		}
 	)
 }
+
+const getChartData = () => {
+	let categories = {}
+
+	if (!students.data?.length) return []
+
+	Object.keys(students.data[0].courses).forEach((course) => {
+		categories[course] = {
+			value: 0,
+			type: 'course',
+			label: course,
+		}
+	})
+
+	Object.keys(students.data?.[0].assessments).forEach((assessment) => {
+		categories[assessment] = {
+			value: 0,
+			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].result === 'Pass') {
+				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 = theme.colors.green[700]
+	const assessmentColor = theme.colors.blue[700]
+	const maxY =
+		students.data?.length % 5
+			? students.data?.length + (5 - (students.data?.length % 5))
+			: students.data?.length
+
+	return {
+		chart: {
+			type: 'bar',
+			toolbar: {
+				show: false,
+			},
+		},
+		plotOptions: {
+			bar: {
+				distributed: true,
+				borderRadius: 3,
+				borderRadiusApplication: 'end',
+				horizontal: true,
+				barHeight: '40%',
+			},
+		},
+		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 > 30 ? `${value.substring(0, 30)}...` : value
+				},
+			},
+		},
+		yaxis: {
+			max: maxY,
+			min: 0,
+			stepSize: 10,
+			tickAmount: maxY / 5,
+			/* reversed: true */
+		},
+	}
+}
+
+watch(students, () => {
+	if (students.data?.length) {
+		assessmentCount.value = Object.keys(students.data?.[0].assessments).length
+	}
+})
+
+const certificationCount = createResource({
+	url: 'frappe.client.get_count',
+	params: {
+		doctype: 'LMS Certificate',
+		filters: {
+			batch_name: props.batch.name,
+		},
+	},
+	auto: true,
+})
 </script>
+<style>
+.apexcharts-legend {
+	display: none !important;
+}
+</style>

frontend/src/components/BrandSettings.vue

@@ -2,7 +2,7 @@
 	<div class="flex flex-col justify-between min-h-0">
 		<div>
 			<div class="flex items-center justify-between">
-				<div class="font-semibold mb-1">
+				<div class="font-semibold mb-1 text-ink-gray-9">
 					{{ __(label) }}
 				</div>
 				<Badge
@@ -12,7 +12,7 @@
 					theme="orange"
 				/>
 			</div>
-			<div class="text-xs text-gray-600">
+			<div class="text-xs text-ink-gray-5">
 				{{ __(description) }}
 			</div>
 		</div>

frontend/src/components/Categories.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="flex flex-col min-h-0">
 		<div class="flex items-center justify-between">
-			<div class="text-xl font-semibold mb-1">
+			<div class="text-xl font-semibold mb-5 text-ink-gray-9">
 				{{ label }}
 			</div>
 			<Button @click="() => showCategoryForm()">
@@ -28,12 +28,12 @@
 		</div>
 
 		<div class="overflow-y-scroll">
-			<div class="text-base divide-y">
+			<div class="text-base divide-y space-y-2">
 				<FormControl
 					:value="cat.category"
 					type="text"
 					v-for="cat in categories.data"
-					class="form-control"
+					class=""
 					@change.stop="(e) => update(cat.name, e.target.value)"
 				/>
 			</div>
@@ -128,24 +128,3 @@ const update = (name, value) => {
 	)
 }
 </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/CertificationLinks.vue

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

frontend/src/components/Common/DateRange.vue

@@ -1,6 +1,6 @@
 <template>
-	<div class="flex items-center">
+	<div class="flex items-center text-ink-gray-7">
-		<Calendar class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
+		<Calendar class="h-4 w-4 stroke-1.5 mr-2" />
 		<span>
 			{{ getFormattedDateRange(props.startDate, props.endDate) }}
 		</span>

frontend/src/components/Controls/Autocomplete.vue

@@ -17,7 +17,7 @@
 								>
 									{{ displayValue(selectedValue) }}
 								</span>
-								<span class="text-base leading-5 text-gray-500" v-else>
+								<span class="text-base leading-5 text-ink-gray-4" v-else>
 									{{ placeholder || '' }}
 								</span>
 							</div>
@@ -28,7 +28,9 @@
 			</template>
 			<template #body="{ isOpen }">
 				<div v-show="isOpen">
-					<div class="mt-1 rounded-lg bg-white py-1 text-base shadow-2xl">
+					<div
+						class="mt-1 rounded-lg bg-surface-white py-1 text-base shadow-2xl"
+					>
 						<div class="relative px-1.5 pt-0.5">
 							<ComboboxInput
 								ref="search"
@@ -62,7 +64,7 @@
 							>
 								<div
 									v-if="group.group && !group.hideLabel"
-									class="px-2.5 py-1.5 text-sm font-medium text-gray-500"
+									class="px-2.5 py-1.5 text-sm font-medium text-ink-gray-4"
 								>
 									{{ group.group }}
 								</div>
@@ -76,7 +78,7 @@
 									<li
 										:class="[
 											'flex items-center rounded px-2.5 py-2 text-base',
-											{ 'bg-gray-100': active },
+											{ 'bg-surface-gray-2': active },
 										]"
 									>
 										<slot
@@ -92,8 +94,8 @@
 													{{ option.label }}
 												</div>
 												<div
-													v-if="option.label != option.description"
+													v-if="option.description"
-													class="text-xs text-gray-700"
+													class="text-xs text-ink-gray-7"
 													v-html="option.description"
 												></div>
 											</div>
@@ -103,7 +105,7 @@
 							</div>
 							<li
 								v-if="groups.length == 0"
-								class="mt-1.5 rounded-md px-2.5 py-1.5 text-base text-gray-600"
+								class="mt-1.5 rounded-md px-2.5 py-1.5 text-base text-ink-gray-5"
 							>
 								No results found
 							</li>
@@ -128,7 +130,7 @@ import {
 	ComboboxOptions,
 	ComboboxOption,
 } from '@headlessui/vue'
-import { Popover, Button } from 'frappe-ui'
+import { Popover } from 'frappe-ui'
 import { ChevronDown, X } from 'lucide-vue-next'
 import { ref, computed, useAttrs, useSlots, watch, nextTick } from 'vue'
 
@@ -243,7 +245,7 @@ watch(showOptions, (val) => {
 })
 
 const textColor = computed(() => {
-	return props.disabled ? 'text-gray-600' : 'text-gray-800'
+	return props.disabled ? 'text-ink-gray-5' : 'text-ink-gray-8'
 })
 
 const inputClasses = computed(() => {
@@ -264,12 +266,14 @@ const inputClasses = computed(() => {
 	let variant = props.disabled ? 'disabled' : props.variant
 	let variantClasses = {
 		subtle:
-			'border border-gray-100 bg-gray-100 placeholder-gray-500 hover:border-gray-200 hover:bg-gray-200 focus:bg-white focus:border-gray-500 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-gray-400',
+			'border border-gray-100 bg-surface-gray-2 placeholder-ink-gray-4 hover:border-outline-gray-modals hover:bg-surface-gray-3 focus:bg-surface-white focus:border-outline-gray-4 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-outline-gray-3',
 		outline:
-			'border border-gray-300 bg-white placeholder-gray-500 hover:border-gray-400 hover:shadow-sm focus:bg-white focus:border-gray-500 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-gray-400',
+			'border border-outline-gray-2 bg-surface-white placeholder-ink-gray-4 hover:border-outline-gray-3 hover:shadow-sm focus:bg-surface-white focus:border-outline-gray-4 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-outline-gray-3',
 		disabled: [
-			'border bg-gray-50 placeholder-gray-400',
+			'border bg-surface-menu-bar placeholder-ink-gray-3',
-			props.variant === 'outline' ? 'border-gray-300' : 'border-transparent',
+			props.variant === 'outline'
+				? 'border-outline-gray-2'
+				: 'border-transparent',
 		],
 	}[variant]
 

frontend/src/components/Controls/CodeEditor.vue

@@ -5,7 +5,7 @@
 			height: height,
 		}"
 	>
-		<span class="text-xs" v-if="label">
+		<span class="text-xs text-ink-gray-7" v-if="label">
 			{{ label }}
 		</span>
 		<div
@@ -13,7 +13,7 @@
 			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"
+			class="mt-1 text-xs text-ink-gray-5"
 			v-show="description"
 			v-html="description"
 		></span>
@@ -27,7 +27,6 @@
 	</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'
@@ -35,9 +34,7 @@ import 'ace-builds/src-min-noconflict/theme-twilight'
 import { PropType, onMounted, ref, watch } from 'vue'
 import { Button } from 'frappe-ui'
 
-const isDark = useDark({
+const isDark = ref(false)
-	attribute: 'data-theme',
-})
 
 const props = defineProps({
 	modelValue: {
@@ -82,6 +79,7 @@ const editor = ref<HTMLElement | null>(null)
 let aceEditor = null as ace.Ace.Editor | null
 
 onMounted(() => {
+	isDark.value = localStorage.getItem('theme') === 'dark'
 	setupEditor()
 })
 
@@ -148,6 +146,7 @@ function resetEditor(value: string, resetHistory = false) {
 	value = getModelValue()
 	aceEditor?.setValue(value)
 	aceEditor?.clearSelection()
+	console.log(isDark.value)
 	aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
 	props.autofocus && aceEditor?.focus()
 	if (resetHistory) {
@@ -156,6 +155,7 @@ function resetEditor(value: string, resetHistory = false) {
 }
 
 watch(isDark, () => {
+	console.log(isDark.value)
 	aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
 })
 
@@ -175,30 +175,3 @@ watch(
 
 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/IconPicker.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="space-y-1.5">
-		<label class="block text-xs text-gray-600">
+		<label class="block text-xs text-ink-gray-5">
 			{{ label }}
 		</label>
 		<div class="w-full">
@@ -8,22 +8,22 @@
 				<template #target="{ togglePopover }">
 					<button
 						@click="openPopover(togglePopover)"
-						class="flex w-full items-center space-x-2 focus:outline-none bg-gray-100 rounded h-7 py-1.5 px-2 hover:bg-gray-200 focus:bg-white border border-gray-100 hover:border-gray-200 focus:border-gray-500"
+						class="flex w-full items-center space-x-2 focus:outline-none bg-surface-gray-2 rounded h-7 py-1.5 px-2 hover:bg-surface-gray-3 focus:bg-surface-white border border-gray-100 hover:border-outline-gray-modals focus:border-outline-gray-4"
 					>
 						<component
 							v-if="selectedIcon"
-							class="w-4 h-4 text-gray-700 stroke-1.5"
+							class="w-4 h-4 text-ink-gray-7 stroke-1.5"
 							:is="icons[selectedIcon]"
 						/>
 						<component
 							v-else
-							class="w-4 h-4 text-gray-700 stroke-1.5"
+							class="w-4 h-4 text-ink-gray-7 stroke-1.5"
 							:is="icons.Folder"
 						/>
 						<span v-if="selectedIcon">
 							{{ selectedIcon }}
 						</span>
-						<span v-else class="text-gray-600">
+						<span v-else class="text-ink-gray-5">
 							{{ __('Choose an icon') }}
 						</span>
 					</button>
@@ -40,7 +40,7 @@
 							<div v-for="(iconComponent, iconName) in filteredIcons">
 								<component
 									:is="iconComponent"
-									class="h-4 w-4 stroke-1.5 text-gray-700 cursor-pointer"
+									class="h-4 w-4 stroke-1.5 text-ink-gray-7 cursor-pointer"
 									@click="setIcon(iconName, close)"
 								/>
 							</div>

frontend/src/components/Controls/Link.vue

@@ -2,6 +2,7 @@
 	<div class="space-y-1.5">
 		<label class="block" :class="labelClasses" v-if="attrs.label">
 			{{ attrs.label }}
+			<span class="text-ink-red-3" v-if="attrs.required">*</span>
 		</label>
 		<Autocomplete
 			ref="autocomplete"
@@ -28,8 +29,8 @@
 				<slot name="item-label" v-bind="{ active, selected, option }" />
 			</template>
 
-			<template v-if="attrs.onCreate" #footer="{ value, close }">
+			<template #footer="{ value, close }">
-				<div>
+				<div v-if="attrs.onCreate">
 					<Button
 						variant="ghost"
 						class="w-full !justify-start"
@@ -41,8 +42,21 @@
 						</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-ink-gray-5">{{ description }}</p>
 	</div>
 </template>
 
@@ -50,7 +64,7 @@
 import Autocomplete from '@/components/Controls/Autocomplete.vue'
 import { watchDebounced } from '@vueuse/core'
 import { createResource, Button } from 'frappe-ui'
-import { Plus } from 'lucide-vue-next'
+import { Plus, X } from 'lucide-vue-next'
 import { useAttrs, computed, ref } from 'vue'
 
 const props = defineProps({
@@ -66,12 +80,14 @@ 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({
@@ -117,7 +133,7 @@ const options = createResource({
 	transform: (data) => {
 		return data.map((option) => {
 			return {
-				label: option.value,
+				label: option.label || option.value,
 				value: option.value,
 				description: option.description,
 			}
@@ -125,7 +141,7 @@ const options = createResource({
 	},
 })
 
-function reload(val) {
+const reload = (val) => {
 	options.update({
 		params: {
 			txt: val,
@@ -136,13 +152,18 @@ function reload(val) {
 	options.reload()
 }
 
+const clearValue = (close) => {
+	emit(valuePropPassed.value ? 'change' : 'update:modelValue', '')
+	close()
+}
+
 const labelClasses = computed(() => {
 	return [
 		{
 			sm: 'text-xs',
 			md: 'text-base',
 		}[attrs.size || 'sm'],
-		'text-gray-600',
+		'text-ink-gray-5',
 	]
 })
 </script>

frontend/src/components/Controls/MultiSelect.vue

@@ -2,6 +2,7 @@
 	<div>
 		<label class="block mb-1" :class="labelClasses" v-if="label">
 			{{ label }}
+			<span class="text-ink-red-3" v-if="required">*</span>
 		</label>
 		<div class="grid grid-cols-3 gap-1">
 			<Button
@@ -40,7 +41,9 @@
 						</template>
 						<template #body="{ isOpen }">
 							<div v-show="isOpen">
-								<div class="mt-1 rounded-lg bg-white py-1 text-base shadow-2xl">
+								<div
+									class="mt-1 rounded-lg bg-surface-white py-1 text-base shadow-2xl"
+								>
 									<ComboboxOptions
 										class="my-1 max-h-[12rem] overflow-y-auto px-1.5"
 										static
@@ -54,14 +57,14 @@
 											<li
 												:class="[
 													'flex cursor-pointer items-center rounded px-2 py-1 text-base',
-													{ 'bg-gray-100': active },
+													{ 'bg-surface-gray-2': active },
 												]"
 											>
 												<div class="flex flex-col gap-1 p-1">
 													<div class="text-base font-medium">
 														{{ option.description }}
 													</div>
-													<div class="text-sm text-gray-600">
+													<div class="text-sm text-ink-gray-5">
 														{{ option.value }}
 													</div>
 												</div>
@@ -115,6 +118,9 @@ const props = defineProps({
 		type: Function,
 		default: (value) => `${value} is an Invalid value`,
 	},
+	required: {
+		type: Boolean,
+	},
 })
 
 const values = defineModel()
@@ -152,24 +158,11 @@ 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(() => {
@@ -249,7 +242,7 @@ const labelClasses = computed(() => {
 			sm: 'text-xs',
 			md: 'text-base',
 		}[props.size || 'sm'],
-		'text-gray-600',
+		'text-ink-gray-5',
 	]
 })
 </script>

frontend/src/components/Controls/Rating.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="space-y-1">
-		<label class="block text-xs text-gray-600" v-if="props.label">
+		<label class="block text-xs text-ink-gray-5" v-if="props.label">
 			{{ props.label }}
 		</label>
 		<div class="flex text-center">

frontend/src/components/CourseCard.vue

@@ -1,7 +1,7 @@
 <template>
 	<div
 		v-if="course.title"
-		class="flex flex-col h-full rounded-md shadow-md text-base overflow-auto"
+		class="flex flex-col h-full rounded-md border-2 overflow-auto"
 		style="min-height: 350px"
 	>
 		<div
@@ -10,19 +10,18 @@
 			:style="{ backgroundImage: 'url(\'' + encodeURI(course.image) + '\')' }"
 		>
 			<div
-				class="flex items-center flex-wrap space-y-1 space-x-1 relative top-4 px-2 w-fit"
+				class="flex items-center flex-wrap space-x-1 relative top-4 px-2 w-fit"
 			>
 				<Badge v-if="course.featured" variant="subtle" theme="green" size="md">
 					{{ __('Featured') }}
 				</Badge>
-				<Badge
+				<div
-					variant="outline"
+					v-if="course.tags"
-					theme="gray"
+					v-for="tag in course.tags?.split(', ')"
-					size="md"
+					class="text-xs bg-white text-gray-800 px-2 py-0.5 rounded-md"
-					v-for="tag in course.tags"
 				>
 					{{ tag }}
-				</Badge>
+				</div>
 			</div>
 			<div v-if="!course.image" class="image-placeholder">
 				{{ course.title[0] }}
@@ -30,36 +29,36 @@
 		</div>
 		<div class="flex flex-col flex-auto p-4">
 			<div class="flex items-center justify-between mb-2">
-				<div v-if="course.lesson_count">
+				<div v-if="course.lessons">
 					<Tooltip :text="__('Lessons')">
-						<span class="flex items-center">
+						<span class="flex items-center text-ink-gray-7">
-							<BookOpen class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
+							<BookOpen class="h-4 w-4 stroke-1.5 mr-1" />
-							{{ course.lesson_count }}
+							{{ course.lessons }}
 						</span>
 					</Tooltip>
 				</div>
 
-				<div v-if="course.enrollment_count">
+				<div v-if="course.enrollments">
 					<Tooltip :text="__('Enrolled Students')">
-						<span class="flex items-center">
+						<span class="flex items-center text-ink-gray-7">
-							<Users class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
+							<Users class="h-4 w-4 stroke-1. mr-1" />
-							{{ course.enrollment_count }}
+							{{ course.enrollments }}
 						</span>
 					</Tooltip>
 				</div>
 
-				<div v-if="course.avg_rating">
+				<div v-if="course.rating">
 					<Tooltip :text="__('Average Rating')">
-						<span class="flex items-center">
+						<span class="flex items-center text-ink-gray-7">
-							<Star class="h-4 w-4 stroke-1.5 text-gray-700 mr-1" />
+							<Star class="h-4 w-4 stroke-1.5 mr-1" />
-							{{ course.avg_rating }}
+							{{ course.rating }}
 						</span>
 					</Tooltip>
 				</div>
 
 				<div v-if="course.status != 'Approved'">
 					<Badge
-						variant="solid"
+						variant="subtle"
 						:theme="course.status === 'Under Review' ? 'orange' : 'blue'"
 						size="sm"
 					>
@@ -68,11 +67,11 @@
 				</div>
 			</div>
 
-			<div class="text-xl font-semibold leading-6">
+			<div class="text-xl font-semibold leading-6 text-ink-gray-9">
 				{{ course.title }}
 			</div>
 
-			<div class="short-introduction text-gray-700 text-sm">
+			<div class="short-introduction text-ink-gray-7 text-sm">
 				{{ course.short_introduction }}
 			</div>
 
@@ -81,7 +80,10 @@
 				:progress="course.membership.progress"
 			/>
 
-			<div v-if="user && course.membership" class="text-sm mb-4">
+			<div
+				v-if="user && course.membership"
+				class="text-sm text-ink-gray-7 mt-2 mb-4"
+			>
 				{{ Math.ceil(course.membership.progress) }}% completed
 			</div>
 
@@ -99,9 +101,15 @@
 					<CourseInstructors :instructors="course.instructors" />
 				</div>
 
-				<div class="font-semibold">
+				<div v-if="course.paid_course" class="font-semibold">
 					{{ course.price }}
 				</div>
+				<div
+					v-if="course.paid_certificate || course.enable_certification"
+					class="text-xs text-ink-blue-3 bg-surface-blue-1 py-0.5 px-1 rounded-md"
+				>
+					{{ __('Certification') }}
+				</div>
 			</div>
 		</div>
 	</div>

frontend/src/components/CourseCardOverlay.vue

@@ -1,35 +1,37 @@
 <template>
-	<div class="shadow rounded-md min-w-80">
+	<div class="border-2 rounded-md min-w-80">
 		<iframe
 			v-if="course.data.video_link"
 			:src="video_link"
 			class="rounded-t-md min-h-56 w-full"
 		/>
 		<div class="p-5">
-			<div v-if="course.data.price" class="text-2xl font-semibold mb-3">
+			<div v-if="course.data.paid_course" class="text-2xl font-semibold mb-3">
 				{{ course.data.price }}
 			</div>
-			<router-link
+			<div v-if="course.data.membership" class="space-y-2">
-				v-if="course.data.membership"
+				<router-link
-				:to="{
+					:to="{
-					name: 'Lesson',
+						name: 'Lesson',
-					params: {
+						params: {
-						courseName: course.name,
+							courseName: course.name,
-						chapterNumber: course.data.current_lesson
+							chapterNumber: course.data.current_lesson
-							? course.data.current_lesson.split('-')[0]
+								? course.data.current_lesson.split('-')[0]
-							: 1,
+								: 1,
-						lessonNumber: course.data.current_lesson
+							lessonNumber: course.data.current_lesson
-							? course.data.current_lesson.split('-')[1]
+								? course.data.current_lesson.split('-')[1]
-							: 1,
+								: 1,
-					},
+						},
-				}"
+					}"
-			>
+				>
-				<Button variant="solid" size="md" class="w-full">
+					<Button variant="solid" size="md" class="w-full">
-					<span>
+						<span>
-						{{ __('Continue Learning') }}
+							{{ __('Continue Learning') }}
-					</span>
+						</span>
-				</Button>
+					</Button>
-			</router-link>
+				</router-link>
+				<CertificationLinks :courseName="course.data.name" />
+			</div>
 			<router-link
 				v-else-if="course.data.paid_course"
 				:to="{
@@ -48,7 +50,7 @@
 			</router-link>
 			<div
 				v-else-if="course.data.disable_self_learning"
-				class="bg-blue-100 text-blue-900 text-sm rounded-md py-1 px-3"
+				class="bg-surface-blue-2 text-blue-900 text-sm rounded-md py-1 px-3"
 			>
 				{{ __('Contact the Administrator to enroll for this course.') }}
 			</div>
@@ -87,38 +89,62 @@
 					</span>
 				</Button>
 			</router-link>
-			<div class="mt-8 mb-4 font-medium">
+			<div class="space-y-4">
-				{{ __('This course has:') }}
+				<div class="mt-8 font-medium text-ink-gray-9">
-			</div>
+					{{ __('This course has:') }}
-			<div class="flex items-center mb-3">
+				</div>
-				<BookOpen class="h-5 w-5 stroke-1.5 text-gray-600" />
+				<div class="flex items-center text-ink-gray-9">
-				<span class="ml-2">
+					<BookOpen class="h-4 w-4 stroke-1.5" />
-					{{ course.data.lesson_count }} {{ __('Lessons') }}
+					<span class="ml-2">
-				</span>
+						{{ course.data.lessons }} {{ __('Lessons') }}
-			</div>
+					</span>
-			<div class="flex items-center mb-3">
+				</div>
-				<Users class="h-5 w-5 stroke-1.5 text-gray-600" />
+				<div class="flex items-center text-ink-gray-9">
-				<span class="ml-2">
+					<Users class="h-4 w-4 stroke-1.5" />
-					{{ course.data.enrollment_count_formatted }}
+					<span class="ml-2">
-					{{ __('Enrolled Students') }}
+						{{ formatAmount(course.data.enrollments) }}
-				</span>
+						{{ __('Enrolled Students') }}
-			</div>
+					</span>
-			<div class="flex items-center">
+				</div>
-				<Star class="h-5 w-5 stroke-1.5 fill-orange-500 text-gray-50" />
+				<div
-				<span class="ml-2">
+					v-if="parseInt(course.data.rating) > 0"
-					{{ course.data.avg_rating }} {{ __('Rating') }}
+					class="flex items-center text-ink-gray-9"
-				</span>
+				>
+					<Star class="h-4 w-4 stroke-1.5 fill-orange-500 text-gray-50" />
+					<span class="ml-2">
+						{{ course.data.rating }} {{ __('Rating') }}
+					</span>
+				</div>
+				<div
+					v-if="course.data.enable_certification"
+					class="flex items-center font-semibold text-ink-gray-9"
+				>
+					<GraduationCap class="h-4 w-4 stroke-2" />
+					<span class="ml-2">
+						{{ __('Certificate of Completion') }}
+					</span>
+				</div>
+				<div
+					v-if="course.data.paid_certificate"
+					class="flex items-center font-semibold text-ink-gray-9"
+				>
+					<GraduationCap class="h-4 w-4 stroke-2" />
+					<span class="ml-2">
+						{{ __('Paid Certificate after Evaluation') }}
+					</span>
+				</div>
 			</div>
 		</div>
 	</div>
 </template>
 <script setup>
-import { BookOpen, Users, Star } from 'lucide-vue-next'
+import { BookOpen, Users, Star, GraduationCap } from 'lucide-vue-next'
 import { computed, inject } from 'vue'
-import { Button, createResource } from 'frappe-ui'
+import { Button, createResource, Tooltip } from 'frappe-ui'
-import { showToast } from '@/utils/'
+import { showToast, formatAmount } from '@/utils/'
 import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
+import CertificationLinks from '@/components/CertificationLinks.vue'
 
 const router = useRouter()
 const user = inject('$user')
@@ -142,7 +168,7 @@ function enrollStudent() {
 		showToast(
 			__('Please Login'),
 			__('You need to login first to enroll for this course'),
-			'circle-warn'
+			'alert-circle'
 		)
 		setTimeout(() => {
 			window.location.href = `/login?redirect-to=${window.location.pathname}`

frontend/src/components/CourseInstructors.vue

@@ -1,44 +1,46 @@
 <template>
-	<span v-if="instructors.length == 1">
+	<div class="text-ink-gray-7">
-		<router-link
+		<span v-if="instructors?.length == 1">
-			:to="{
+			<router-link
-				name: 'Profile',
+				:to="{
-				params: { username: instructors[0].username },
+					name: 'Profile',
-			}"
+					params: { username: instructors[0].username },
-		>
+				}"
-			{{ instructors[0].full_name }}
+			>
-		</router-link>
+				{{ instructors[0].full_name }}
-	</span>
+			</router-link>
-	<span v-if="instructors.length == 2">
+		</span>
-		<router-link
+		<span v-if="instructors?.length == 2">
-			:to="{
+			<router-link
-				name: 'Profile',
+				:to="{
-				params: { username: instructors[0].username },
+					name: 'Profile',
-			}"
+					params: { username: instructors[0].username },
-		>
+				}"
-			{{ instructors[0].first_name }}
+			>
-		</router-link>
+				{{ instructors[0].first_name }}
-		and
+			</router-link>
-		<router-link
+			and
-			:to="{
+			<router-link
-				name: 'Profile',
+				:to="{
-				params: { username: instructors[1].username },
+					name: 'Profile',
-			}"
+					params: { username: instructors[1].username },
-		>
+				}"
-			{{ instructors[1].first_name }}
+			>
-		</router-link>
+				{{ instructors[1].first_name }}
-	</span>
+			</router-link>
-	<span v-if="instructors.length > 2">
+		</span>
-		<router-link
+		<span v-if="instructors?.length > 2">
-			:to="{
+			<router-link
-				name: 'Profile',
+				:to="{
-				params: { username: instructors[0].username },
+					name: 'Profile',
-			}"
+					params: { username: instructors[0].username },
-		>
+				}"
-			{{ instructors[0].first_name }}
+			>
-		</router-link>
+				{{ instructors[0].first_name }}
-		and {{ instructors.length - 1 }} others
+			</router-link>
-	</span>
+			and {{ instructors?.length - 1 }} others
+		</span>
+	</div>
 </template>
 <script setup>
 const props = defineProps({

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 leading-5 text-ink-gray-9">
 				{{ __(title) }}
 			</div>
 			<Button size="sm" v-if="allowEdit" @click="openChapterModal()">
@@ -16,7 +16,7 @@
 		</div>
 		<div
 			:class="{
-				'shadow rounded-md pt-2 px-2': showOutline && outline.data?.length,
+				'border-2 rounded-md py-2 px-2': showOutline && outline.data?.length,
 			}"
 		>
 			<Disclosure
@@ -25,21 +25,42 @@
 				:key="chapter.name"
 				:defaultOpen="openChapterDetail(chapter.idx)"
 			>
-				<DisclosureButton ref="" class="flex w-full p-2">
+				<DisclosureButton ref="" class="flex items-center w-full p-2 group">
 					<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 mr-2"
+						class="h-4 w-4 text-ink-gray-9 stroke-1"
 					/>
-					<div class="text-base text-left font-medium leading-5">
+					<div
+						class="text-base text-left text-ink-gray-9 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-ink-gray-9 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-ink-red-3 invisible group-hover:visible"
+							/>
+						</Tooltip>
+					</div>
 				</DisclosureButton>
-				<DisclosurePanel>
+				<DisclosurePanel v-if="!chapter.is_scorm_package">
 					<Draggable
+						v-if="!chapter.is_scorm_package"
 						:list="chapter.lessons"
 						:disabled="!allowEdit"
 						item-key="name"
@@ -48,7 +69,12 @@
 						:data-chapter="chapter.name"
 					>
 						<template #item="{ element: lesson }">
-							<div class="outline-lesson pl-8 py-2 pr-4">
+							<div
+								class="outline-lesson pl-8 py-2 pr-4 text-ink-gray-9"
+								:class="
+									isActiveLesson(lesson.number) ? 'bg-surface-selected' : ''
+								"
+							>
 								<router-link
 									:to="{
 										name: allowEdit ? 'LessonForm' : 'Lesson',
@@ -62,21 +88,21 @@
 									<div class="flex items-center text-sm leading-5 group">
 										<MonitorPlay
 											v-if="lesson.icon === 'icon-youtube'"
-											class="h-4 w-4 text-gray-900 stroke-1 mr-2"
+											class="h-4 w-4 stroke-1 mr-2"
 										/>
 										<HelpCircle
 											v-else-if="lesson.icon === 'icon-quiz'"
-											class="h-4 w-4 text-gray-900 stroke-1 mr-2"
+											class="h-4 w-4 stroke-1 mr-2"
 										/>
 										<FileText
 											v-else-if="lesson.icon === 'icon-list'"
-											class="h-4 w-4 text-gray-900 stroke-1 mr-2"
+											class="h-4 w-4 text-ink-gray-9 stroke-1 mr-2"
 										/>
 										{{ lesson.title }}
 										<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 text-ink-red-3 ml-auto invisible group-hover:visible"
 										/>
 										<Check
 											v-if="lesson.is_complete"
@@ -89,6 +115,7 @@
 					</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: {
@@ -102,9 +129,6 @@
 								{{ __('Add Lesson') }}
 							</Button>
 						</router-link>
-						<Button class="ml-2" @click="openChapterModal(chapter)">
-							{{ __('Edit Chapter') }}
-						</Button>
 					</div>
 				</DisclosurePanel>
 			</Disclosure>
@@ -118,24 +142,26 @@
 	/>
 </template>
 <script setup>
-import { Button, createResource } from 'frappe-ui'
+import { Button, createResource, Tooltip } from 'frappe-ui'
-import { ref, getCurrentInstance } from 'vue'
+import { getCurrentInstance, inject, ref } from 'vue'
 import Draggable from 'vuedraggable'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue'
 import {
-	ChevronRight,
-	MonitorPlay,
-	HelpCircle,
-	FileText,
 	Check,
+	ChevronRight,
+	FileText,
+	FilePenLine,
+	HelpCircle,
+	MonitorPlay,
 	Trash2,
 } from 'lucide-vue-next'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import ChapterModal from '@/components/Modals/ChapterModal.vue'
 import { showToast } from '@/utils'
 
 const route = useRoute()
-const expandAll = ref(true)
+const router = useRouter()
+const user = inject('$user')
 const showChapterModal = ref(false)
 const currentChapter = ref(null)
 const app = getCurrentInstance()
@@ -205,8 +231,10 @@ const updateLessonIndex = createResource({
 
 const trashLesson = (lessonName, chapterName) => {
 	$dialog({
-		title: __('Delete Lesson'),
+		title: __('Delete this lesson?'),
-		message: __('Are you sure you want to delete this lesson?'),
+		message: __(
+			'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'),
@@ -245,9 +273,66 @@ const updateOutline = (e) => {
 		idx: e.newIndex,
 	})
 }
-</script>
+
-<style>
+const deleteChapter = createResource({
-.outline-lesson:has(.router-link-active) {
+	url: 'lms.lms.api.delete_chapter',
-	background-color: theme('colors.gray.100');
+	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()
+				},
+			},
+		],
+	})
 }
-</style>
+
+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,
+		},
+	})
+}
+
+const isActiveLesson = (lessonNumber) => {
+	return (
+		route.params.chapterNumber == lessonNumber.split('.')[0] &&
+		route.params.lessonNumber == lessonNumber.split('.')[1]
+	)
+}
+</script>

frontend/src/components/CourseReviews.vue

@@ -7,7 +7,7 @@
 		>
 			{{ __('Write a Review') }}
 		</Button>
-		<div class="flex items-center font-semibold text-2xl">
+		<div class="flex items-center font-semibold text-2xl text-ink-gray-9">
 			{{ __('Student Reviews') }}
 		</div>
 		<div class="grid gap-8 mt-10">
@@ -28,17 +28,17 @@
 								params: { username: review.owner_details.username },
 							}"
 						>
-							<span class="text-lg font-medium mr-4">
+							<span class="text-lg font-medium mr-4 text-ink-gray-7">
 								{{ review.owner_details.full_name }}
 							</span>
 						</router-link>
-						<span>
+						<span class="text-ink-gray-7">
 							{{ review.creation }}
 						</span>
 						<div class="flex mt-2">
 							<Star
 								v-for="index in 5"
-								class="h-5 w-5 text-gray-100 bg-gray-200 rounded-sm mr-2"
+								class="h-5 w-5 text-ink-gray-1 rounded-sm mr-2"
 								:class="
 									index <= Math.ceil(review.rating)
 										? 'fill-orange-500'
@@ -48,7 +48,7 @@
 						</div>
 					</div>
 				</div>
-				<div v-if="review.review" class="mt-4 leading-5">
+				<div v-if="review.review" class="mt-4 leading-5 text-ink-gray-7">
 					{{ review.review }}
 				</div>
 			</div>
@@ -76,7 +76,7 @@ const props = defineProps({
 		required: true,
 	},
 	avg_rating: {
-		type: Number,
+		type: String,
 		required: true,
 	},
 	membership: {

frontend/src/components/CreateOutline.vue

@@ -6,7 +6,7 @@
 		<div v-if="course.chapters.length">
 			{{ course.chapters }}
 		</div>
-		<div v-else class="border bg-white rounded-md p-5 text-center mt-4">
+		<div v-else class="border bg-surface-white rounded-md p-5 text-center mt-4">
 			<div>
 				{{
 					__(

frontend/src/components/DesktopLayout.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="relative flex h-full flex-col">
 		<div class="h-full flex-1">
-			<div class="flex h-screen text-base">
+			<div class="flex h-screen text-base bg-surface-white">
 				<div
 					class="relative block min-h-0 flex-shrink-0 overflow-hidden hover:overflow-auto"
 				>

frontend/src/components/DiscussionReplies.vue

@@ -3,10 +3,10 @@
 		<div v-if="!singleThread" class="flex items-center mb-5">
 			<Button variant="outline" @click="showTopics = true">
 				<template #icon>
-					<ChevronLeft class="w-5 h-5 stroke-1.5 text-gray-700" />
+					<ChevronLeft class="w-5 h-5 stroke-1.5 text-ink-gray-7" />
 				</template>
 			</Button>
-			<span class="text-lg font-semibold ml-2">
+			<span class="text-lg font-semibold ml-2 text-ink-gray-9">
 				{{ topic.title }}
 			</span>
 		</div>
@@ -17,7 +17,7 @@
 				:class="{ 'border-b': index + 1 != replies.data.length }"
 			>
 				<div class="flex items-center justify-between mb-2">
-					<div class="flex items-center">
+					<div class="flex items-center text-ink-gray-5">
 						<UserAvatar :user="reply.user" class="mr-2" />
 						<span>
 							{{ reply.user.full_name }}
@@ -63,7 +63,7 @@
 					:fixedMenu="reply.editable || false"
 					:editorClass="
 						reply.editable
-							? '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'
+							? 'ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none'
 							: 'prose-sm'
 					"
 				/>
@@ -71,13 +71,14 @@
 		</div>
 
 		<TextEditor
+			v-if="renderEditor"
 			class="mt-5"
 			:content="newReply"
 			:mentions="mentionUsers"
 			@change="(val) => (newReply = val)"
 			placeholder="Type your reply here..."
 			:fixedMenu="true"
-			editorClass="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 border border-gray-300 rounded-b-md min-h-[7rem] py-1 px-2"
+			editorClass="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none border border-outline-gray-2 rounded-b-md min-h-[7rem] py-1 px-2"
 		/>
 		<div class="flex justify-between mt-2">
 			<span> </span>
@@ -94,7 +95,7 @@ import { createResource, TextEditor, Button, Dropdown } from 'frappe-ui'
 import { timeAgo } from '../utils'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { ChevronLeft, MoreHorizontal } from 'lucide-vue-next'
-import { ref, inject, onMounted, computed } from 'vue'
+import { ref, inject, onMounted } from 'vue'
 import { createToast } from '../utils'
 
 const showTopics = defineModel('showTopics')
@@ -102,6 +103,8 @@ const newReply = ref('')
 const socket = inject('$socket')
 const user = inject('$user')
 const allUsers = inject('$allUsers')
+const mentionUsers = ref([])
+const renderEditor = ref(false)
 
 const props = defineProps({
 	topic: {
@@ -124,6 +127,7 @@ onMounted(() => {
 	socket.on('delete_message', (data) => {
 		replies.reload()
 	})
+	fetchMentionUsers()
 })
 
 const replies = createResource({
@@ -150,15 +154,26 @@ const newReplyResource = createResource({
 	},
 })
 
-const mentionUsers = computed(() => {
+const fetchMentionUsers = () => {
-	let users = Object.values(allUsers.data).map((user) => {
+	if (user.data?.is_student) {
-		return {
+		renderEditor.value = true
-			value: user.name,
+	} else {
-			label: user.full_name,
+		allUsers.reload(
-		}
+			{},
-	})
+			{
-	return users
+				onSuccess(data) {
-})
+					mentionUsers.value = Object.values(data).map((user) => {
+						return {
+							value: user.name,
+							label: user.full_name,
+						}
+					})
+					renderEditor.value = true
+				},
+			}
+		)
+	}
+}
 
 const postReply = () => {
 	newReplyResource.submit(
@@ -178,7 +193,7 @@ const postReply = () => {
 					title: 'Error',
 					text: err.messages?.[0] || err,
 					icon: 'x',
-					iconClasses: 'bg-red-600 text-white rounded-md p-px',
+					iconClasses: 'bg-surface-red-5 text-ink-white rounded-md p-px',
 					position: 'top-center',
 					timeout: 10,
 				})

frontend/src/components/Discussions.vue

@@ -3,7 +3,7 @@
 		<Button v-if="!singleThread" class="float-right" @click="openTopicModal()">
 			{{ __('New {0}').format(singularize(title)) }}
 		</Button>
-		<div class="text-xl font-semibold">
+		<div class="text-xl font-semibold text-ink-gray-9">
 			{{ __(title) }}
 		</div>
 	</div>
@@ -16,10 +16,10 @@
 			>
 				<UserAvatar :user="topic.user" size="2xl" class="mr-4" />
 				<div>
-					<div class="text-lg font-semibold mb-1">
+					<div class="text-lg font-semibold mb-1 text-ink-gray-7">
 						{{ topic.title }}
 					</div>
-					<div class="flex items-center">
+					<div class="flex items-center text-ink-gray-5">
 						<span>
 							{{ topic.user.full_name }}
 						</span>
@@ -44,12 +44,12 @@
 		v-else
 		class="flex flex-col items-center justify-center border-2 border-dashed mt-5 py-8 rounded-md"
 	>
-		<MessageSquareText class="w-7 h-7 text-gray-500 stroke-1.5 mr-2" />
+		<MessageSquareText class="w-7 h-7 text-ink-gray-4 stroke-1.5 mr-2" />
 		<div class="">
 			<div v-if="emptyStateTitle" class="font-medium mb-2">
 				{{ __(emptyStateTitle) }}
 			</div>
-			<div class="text-gray-600">
+			<div class="text-ink-gray-5">
 				{{ __(emptyStateText) }}
 			</div>
 		</div>

frontend/src/components/Icons/FrappeCloudIcon.vue

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

frontend/src/components/JobCard.vue

@@ -1,71 +1,41 @@
 <template>
-	<div class="flex rounded p-1 lg:px-2 lg:py-2.5 hover:bg-gray-100">
+	<div class="flex space-x-4 border rounded-md p-2">
-		<div class="flex w-3/5 md:w-2/5">
+		<img :src="job.company_logo" class="size-10 rounded-full object-contain" />
-			<img
+		<div class="flex flex-col space-y-2 flex-1">
-				:src="job.company_logo"
+			<div class="flex items-center justify-between">
-				class="w-12 h-12 rounded-lg object-contain mr-4"
+				<span class="font-semibold text-ink-gray-9">
-				:alt="job.company_name"
-			/>
-			<div>
-				<div class="font-medium mb-1">
 					{{ job.job_title }}
-				</div>
-				<div class="text-gray-700">
-					{{ job.company_name }}
-				</div>
-			</div>
-		</div>
-		<div class="flex justify-end w-1/5 text-gray-700">
-			{{ job.location.replace(',', '').split(' ')[0] }}
-		</div>
-		<div
-			class="flex justify-end w-1/5 text-gray-700 text-right hidden md:block"
-		>
-			{{ job.type }}
-		</div>
-		<div class="flex justify-end w-1/5 text-sm text-gray-700 text-right">
-			{{ dayjs(job.creation).format('DD MMM YYYY') }}
-		</div>
-	</div>
-	<!-- <div class="flex flex-col shadow rounded-md p-4 h-full">
-		<div class="flex justify-between">
-			<div>
-				<div class="text-xl font-semibold mb-2">
-					{{ job.job_title }}
-				</div>
-				<div>
-					{{ __("posted by") }}
-					<span class="font-medium">
-						{{ job.company_name }}
-					</span>
-				</div>
-			</div>
-			<img
-				:src="job.company_logo"
-				class="w-12 h-12 rounded-lg object-contain"
-			/>
-		</div>
-		<div class="flex justify-between mt-8">
-			<div class="flex items-center">
-				<Badge :label="job.type" theme="green" size="lg" class="mr-4"/>
-				<Badge :label="job.location" theme="gray" size="lg">
-					<template #prefix>
-						<MapPin class="h-4 w-4 stroke-1.5" />
-					</template>
-				</Badge>
-			</div>
-			<div>
-				<span class="font-medium">
-					{{ dayjs(job.creation).format('DD MMM YYYY') }}
 				</span>
 			</div>
+			<div class="flex items-center space-x-2 text-ink-gray-5">
+				<Building2 class="w-4 h-4 stroke-1.5" />
+				<span>
+					{{ job.company_name }}
+				</span>
+			</div>
+			<div class="flex items-center space-x-2 text-ink-gray-5">
+				<MapPin class="w-4 h-4 stroke-1.5" />
+				<span>
+					{{ job.location }}
+				</span>
+			</div>
+			<div class="flex items-center space-x-2 text-ink-gray-5">
+				<Shapes class="w-4 h-4 stroke-1.5" />
+				<span>
+					{{ job.type }}
+				</span>
+			</div>
+			<div class="flex items-center space-x-2 text-ink-gray-5">
+				<Calendar class="w-4 h-4 stroke-1.5" />
+				<span> {{ __('posted') }} {{ dayjs(job.creation).fromNow() }} </span>
+			</div>
 		</div>
-	</div> -->
+	</div>
 </template>
 <script setup>
-import { MapPin } from 'lucide-vue-next'
+import { Building2, Calendar, MapPin, Shapes } from 'lucide-vue-next'
-import { Badge } from 'frappe-ui'
 import { inject } from 'vue'
+import { Avatar } from 'frappe-ui'
 
 const dayjs = inject('$dayjs')
 const props = defineProps({

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"

frontend/src/components/LessonHelp.vue

@@ -1,5 +1,20 @@
 <template>
-	<div class="space-y-5">
+	<div class="space-y-5 text-ink-gray-9">
+		<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-ink-gray-5 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"
@@ -8,9 +23,9 @@
 				<span>
 					{{ __('How to add a Quiz?') }}
 				</span>
-				<Info class="w-3 h-3 text-gray-700" />
+				<Info class="w-3 h-3 text-ink-gray-7" />
 			</div>
-			<div class="text-xs text-gray-600 mb-1 leading-5">
+			<div class="text-xs text-ink-gray-5 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.'
@@ -21,15 +36,15 @@
 
 		<div class="space-y-2">
 			<div
-				class="flex items-center text-sm font-medium space-x-2 cursor-pointer"
+				class="flex text-sm font-medium space-x-2 cursor-pointer"
 				@click="openHelpDialog('upload')"
 			>
 				<span class="leading-5">
-					{{ __('How to upload content from your system?') }}
+					{{ __(contentMap['upload']) }}
 				</span>
-				<Info class="w-3 h-3 text-gray-700" />
+				<Info class="w-3 h-3 text-ink-gray-7" />
 			</div>
-			<div class="text-xs text-gray-600 mb-1 leading-5">
+			<div class="text-xs text-ink-gray-5 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.'
@@ -44,11 +59,11 @@
 				@click="openHelpDialog('youtube')"
 			>
 				<span>
-					{{ __('How to add a YouTube Video?') }}
+					{{ __(contentMap['youtube']) }}
 				</span>
-				<Info class="w-3 h-3 text-gray-700" />
+				<Info class="w-3 h-3 text-ink-gray-7" />
 			</div>
-			<div class="text-xs text-gray-600 mb-1 leading-5">
+			<div class="text-xs text-ink-gray-5 mb-1 leading-5">
 				{{
 					__(
 						'Copy the URL of the video from YouTube and paste it in the editor.'
@@ -57,7 +72,7 @@
 			</div>
 		</div>
 	</div>
-	<ExplanationVideos v-model="showExplanation" :type="type" />
+	<ExplanationVideos v-model="showExplanation" :title="title" :type="type" />
 </template>
 <script setup>
 import { Info } from 'lucide-vue-next'
@@ -66,9 +81,16 @@ 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/LiveClass.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="flex items-center justify-between mb-5">
-		<div class="text-lg font-semibold">
+		<div class="text-lg font-semibold text-ink-gray-9">
 			{{ __('Live Class') }}
 		</div>
 		<Button v-if="user.data.is_moderator" @click="openLiveClassModal">
@@ -15,47 +15,59 @@
 	<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 text-ink-gray-7 p-3"
 		>
-			<div class="font-semibold text-gray-900 text-lg mb-4">
+			<div class="font-semibold text-ink-gray-9 text-lg mb-1">
 				{{ cls.title }}
 			</div>
-			<div class="leading-5 text-gray-700 text-sm mb-4">
+			<div class="short-introduction">
 				{{ cls.description }}
 			</div>
-			<div class="flex items-center mb-2">
+			<div class="space-y-3">
-				<Calendar class="w-4 h-4 stroke-1.5 text-gray-700" />
+				<div class="flex items-center space-x-2">
-				<span class="ml-2">
+					<Calendar class="w-4 h-4 stroke-1.5" />
-					{{ dayjs(cls.date).format('DD MMMM YYYY') }}
+					<span>
-				</span>
+						{{ dayjs(cls.date).format('DD MMMM YYYY') }}
-			</div>
+					</span>
-			<div class="flex items-center mb-5">
+				</div>
-				<Clock class="w-4 h-4 stroke-1.5" />
+				<div class="flex items-center space-x-2">
-				<span class="ml-2">
+					<Clock class="w-4 h-4 stroke-1.5" />
-					{{ formatTime(cls.time) }}
+					<span>
-				</span>
+						{{ formatTime(cls.time) }}
-			</div>
+					</span>
-			<div class="flex items-center space-x-2 text-gray-900 mt-auto">
+				</div>
-				<a
+				<div
-					:href="cls.start_url"
+					v-if="cls.date >= dayjs().format('YYYY-MM-DD')"
-					target="_blank"
+					class="flex items-center space-x-2 text-ink-gray-9 mt-auto"
-					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"
 				>
-					<Monitor class="h-4 w-4 stroke-1.5" />
+					<a
-					{{ __('Start') }}
+						v-if="user.data?.is_moderator || user.data?.is_evaluator"
-				</a>
+						:href="cls.start_url"
-				<a
+						target="_blank"
-					:href="cls.join_url"
+						class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-ink-gray-8 bg-surface-gray-2 hover:bg-surface-gray-3 active:bg-surface-gray-4 focus-visible:ring focus-visible:ring-outline-gray-3 h-7 text-base px-2 rounded"
-					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"
+						<Monitor class="h-4 w-4 stroke-1.5" />
-				>
+						{{ __('Start') }}
-					<Video class="h-4 w-4 stroke-1.5" />
+					</a>
-					{{ __('Join') }}
+					<a
-				</a>
+						: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-ink-gray-8 bg-surface-gray-2 hover:bg-surface-gray-3 active:bg-surface-gray-4 focus-visible:ring focus-visible:ring-outline-gray-3 h-7 text-base px-2 rounded"
+					>
+						<Video class="h-4 w-4 stroke-1.5" />
+						{{ __('Join') }}
+					</a>
+				</div>
+				<div v-else class="flex items-center space-x-2 text-yellow-700">
+					<Info class="w-4 h-4 stroke-1.5" />
+					<span>
+						{{ __('This class has ended') }}
+					</span>
+				</div>
 			</div>
 		</div>
 	</div>
-	<div v-else class="text-sm italic text-gray-600">
+	<div v-else class="text-sm italic text-ink-gray-5">
 		{{ __('No live classes scheduled') }}
 	</div>
 	<LiveClassModal
@@ -66,7 +78,7 @@
 </template>
 <script setup>
 import { createListResource, Button } from 'frappe-ui'
-import { Plus, Clock, Calendar, Video, Monitor } from 'lucide-vue-next'
+import { Plus, Clock, Calendar, Video, Monitor, Info } from 'lucide-vue-next'
 import { inject } from 'vue'
 import LiveClassModal from '@/components/Modals/LiveClassModal.vue'
 import { ref } from 'vue'
@@ -105,3 +117,15 @@ const openLiveClassModal = () => {
 	showLiveClassModal.value = true
 }
 </script>
+<style>
+.short-introduction {
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	text-overflow: ellipsis;
+	width: 100%;
+	overflow: hidden;
+	margin: 0.25rem 0 1.5rem;
+	line-height: 1.5;
+}
+</style>

frontend/src/components/Members.vue

@@ -2,10 +2,10 @@
 	<div class="flex min-h-0 flex-col text-base">
 		<div class="flex items-center justify-between">
 			<div>
-				<div class="text-xl font-semibold mb-1">
+				<div class="text-xl font-semibold mb-1 text-ink-gray-9">
 					{{ __(label) }}
 				</div>
-				<!-- <div class="text-xs text-gray-600">
+				<!-- <div class="text-xs text-ink-gray-5">
 					{{ __(description) }}
 				</div> -->
 			</div>
@@ -36,7 +36,7 @@
 			<FormControl
 				v-model="member.first_name"
 				:placeholder="__('First Name')"
-				type="test"
+				type="text"
 				class="w-full"
 			/>
 			<Button @click="addMember()" variant="subtle">
@@ -63,19 +63,32 @@
 							/>
 							<div class="space-y-1">
 								<div class="flex">
-									<div class="text-gray-900">
+									<div class="text-ink-gray-9">
 										{{ member.full_name }}
 									</div>
-									<div v-if="getRole(member)">
+									<div
-										{{ getRole(member) }}
+										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">
+								<div class="text-sm text-ink-gray-7">
 									{{ member.name }}
 								</div>
 							</div>
 						</div>
-						<div class="flex items-center justify-center text-gray-700 text-sm">
+						<div
+							class="flex items-center justify-center text-ink-gray-7 text-sm"
+						>
 							<div v-if="member.last_active">
 								{{ dayjs(member.last_active).format('DD MMM, YYYY HH:mm a') }}
 							</div>
@@ -99,7 +112,7 @@
 	</div>
 </template>
 <script setup lang="ts">
-import { createResource, Avatar, Button, FormControl } from 'frappe-ui'
+import { createResource, Avatar, Button, FormControl, Badge } from 'frappe-ui'
 import { useRouter } from 'vue-router'
 import { ref, watch, reactive, inject } from 'vue'
 import { RefreshCw, Plus, X } from 'lucide-vue-next'

frontend/src/components/MobileLayout.vue

@@ -5,7 +5,7 @@
 		</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 items-center justify-around border-t border-outline-gray-2 bottom-0 z-10 w-full bg-surface-white standalone:pb-4"
 			:style="{
 				gridTemplateColumns: `repeat(${
 					sidebarLinks.length + 1
@@ -22,7 +22,7 @@
 				<component
 					:is="icons[tab.icon]"
 					class="h-6 w-6 stroke-1.5"
-					:class="[isActive(tab) ? 'text-gray-900' : 'text-gray-600']"
+					:class="[isActive(tab) ? 'text-ink-gray-9' : 'text-ink-gray-5']"
 				/>
 			</button>
 			<Popover
@@ -33,7 +33,7 @@
 				<template #target>
 					<component
 						:is="icons['List']"
-						class="h-6 w-6 stroke-1.5 text-gray-600"
+						class="h-6 w-6 stroke-1.5 text-ink-gray-5"
 					/>
 				</template>
 				<template #body-main>
@@ -46,7 +46,7 @@
 						>
 							<component
 								:is="icons[link.icon]"
-								class="h-4 w-4 stroke-1.5 text-gray-600"
+								class="h-4 w-4 stroke-1.5 text-ink-gray-5"
 							/>
 							<div>
 								{{ link.label }}

frontend/src/components/Modals/AnnouncementModal.vue

@@ -16,25 +16,26 @@
 		<template #body-content>
 			<div class="flex flex-col gap-4">
 				<div class="">
-					<div class="mb-1.5 text-sm text-gray-600">
+					<div class="mb-1.5 text-sm text-ink-gray-5">
 						{{ __('Subject') }}
+						<span class="text-ink-red-3">*</span>
 					</div>
 					<Input type="text" v-model="announcement.subject" />
 				</div>
 				<div class="">
-					<div class="mb-1.5 text-sm text-gray-600">
+					<div class="mb-1.5 text-sm text-ink-gray-5">
 						{{ __('Reply To') }}
 					</div>
 					<Input type="text" v-model="announcement.replyTo" />
 				</div>
 				<div class="mb-4">
-					<div class="mb-1.5 text-sm text-gray-600">
+					<div class="mb-1.5 text-sm text-ink-gray-5">
 						{{ __('Announcement') }}
 					</div>
 					<TextEditor
-						:bubbleMenu="true"
+						:fixedMenu="true"
 						@change="(val) => (announcement.announcement = val)"
-						editorClass="prose-sm py-2 px-2 min-h-[200px] border-gray-300 hover:border-gray-400 rounded-md bg-gray-200"
+						editorClass="prose-sm py-2 px-2 min-h-[200px] border-outline-gray-2 hover:border-outline-gray-3 rounded-b-md bg-surface-gray-3"
 					/>
 				</div>
 			</div>
@@ -44,7 +45,7 @@
 <script setup>
 import { Dialog, Input, TextEditor, createResource } from 'frappe-ui'
 import { reactive } from 'vue'
-import { createToast } from '@/utils/'
+import { showToast } from '@/utils/'
 
 const show = defineModel()
 
@@ -94,22 +95,14 @@ const makeAnnouncement = (close) => {
 			},
 			onSuccess() {
 				close()
-				createToast({
+				showToast(
-					title: 'Success',
+					__('Success'),
-					text: 'Announcement has been sent successfully',
+					__('Announcement has been sent successfully'),
-					icon: 'Check',
+					'check'
-					iconClasses: 'bg-green-600 text-white rounded-md p-px',
+				)
-				})
 			},
 			onError(err) {
-				createToast({
+				showToast(__('Error'), __(err.messages?.[0] || err), 'alert-circle')
-					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/BatchCourseModal.vue

@@ -14,7 +14,12 @@
 		}"
 	>
 		<template #body-content>
-			<Link doctype="LMS Course" v-model="course" :label="__('Course')" />
+			<Link
+				doctype="LMS Course"
+				v-model="course"
+				:label="__('Course')"
+				:required="true"
+			/>
 			<Link
 				doctype="Course Evaluator"
 				v-model="evaluator"
@@ -26,7 +31,7 @@
 </template>
 <script setup>
 import { Dialog, createResource } from 'frappe-ui'
-import { ref, defineModel } from 'vue'
+import { ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
 import { showToast } from '@/utils'
 

frontend/src/components/Modals/BatchStudentProgress.vue

@@ -0,0 +1,130 @@
+<template>
+	<Dialog
+		v-model="show"
+		:options="{
+			size: 'xl',
+		}"
+	>
+		<template #body>
+			<div class="p-5 space-y-10 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-ink-gray-7">
+							{{ student.email }}
+						</div>
+					</div>
+				</div>
+
+				<div class="space-y-8">
+					<!-- Assessments -->
+					<div class="space-y-2 text-sm">
+						<div class="flex items-center border-b pb-1 font-medium">
+							<span class="flex-1">
+								{{ __('Assessment') }}
+							</span>
+							<span>
+								{{ __('Percentage/Status') }}
+							</span>
+						</div>
+						<router-link
+							v-for="assessment in Object.keys(student.assessments)"
+							class="flex items-center text-ink-gray-7 font-medium"
+							:to="{
+								name:
+									student.assessments[assessment].type == 'LMS Assignment'
+										? 'AssignmentSubmission'
+										: '',
+								params:
+									student.assessments[assessment].type == 'LMS Assignment'
+										? {
+												assignmentID:
+													student.assessments[assessment].assessment,
+												submissionName:
+													student.assessments[assessment].submission,
+										  }
+										: {},
+							}"
+						>
+							<span class="flex-1">
+								{{ assessment }}
+							</span>
+							<span v-if="isAssignment(student.assessments[assessment].status)">
+								<Badge
+									:theme="
+										getStatusTheme(student.assessments[assessment].status)
+									"
+								>
+									{{ student.assessments[assessment].status }}
+								</Badge>
+							</span>
+							<span v-else>
+								{{ student.assessments[assessment].status }}
+							</span>
+						</router-link>
+					</div>
+
+					<!-- Courses -->
+					<div class="space-y-2 text-sm">
+						<div class="flex items-center border-b pb-1 font-medium">
+							<span class="flex-1">
+								{{ __('Courses') }}
+							</span>
+							<span>
+								{{ __('Progress') }}
+							</span>
+						</div>
+						<div
+							v-for="course in Object.keys(student.courses)"
+							class="flex items-center text-ink-gray-7 font-medium"
+						>
+							<span class="flex-1">
+								{{ course }}
+							</span>
+							<span>
+								{{ Math.floor(student.courses[course]) }}
+							</span>
+						</div>
+					</div>
+				</div>
+
+				<!-- Heatmap -->
+				<StudentHeatmap :member="student.email" :days="120" />
+			</div>
+		</template>
+	</Dialog>
+</template>
+<script setup>
+import { Avatar, Badge, Dialog } from 'frappe-ui'
+import StudentHeatmap from '@/components/StudentHeatmap.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

@@ -0,0 +1,132 @@
+<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">
+				<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')"
+				/>
+				<FormControl
+					type="select"
+					v-model="details.course"
+					:label="__('Course')"
+					:options="getCourses()"
+				/>
+				<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_name: 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>