From 10ed37ec670066857852776e9f51572d3fb90d24 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 10 May 2024 18:41:39 +0530
Subject: [PATCH 1/6] fix: mobile and lesson issues

---
 frontend/src/components/BatchOverlay.vue    |  2 +-
 frontend/src/components/MobileLayout.vue    | 42 +++++++++++++++++++--
 frontend/src/pages/BatchDetail.vue          | 20 ++++++----
 frontend/src/pages/CreateLesson.vue         |  7 +++-
 frontend/src/pages/Profile.vue              | 10 +++--
 frontend/src/pages/ProfileAbout.vue         |  2 +-
 frontend/src/pages/ProfileCertificates.vue  |  4 +-
 frontend/src/pages/ProfileEvaluator.vue     | 13 +++++--
 frontend/src/pages/ProfileRoles.vue         |  4 +-
 frontend/src/pages/Statistics.vue           |  2 +-
 frontend/src/stores/session.js              |  2 +
 lms/patches.txt                             |  3 +-
 lms/patches/v2_0/fix_progress_percentage.py | 10 +++++
 13 files changed, 94 insertions(+), 27 deletions(-)
 create mode 100644 lms/patches/v2_0/fix_progress_percentage.py

diff --git a/frontend/src/components/BatchOverlay.vue b/frontend/src/components/BatchOverlay.vue
index a1c7cc094..9917bc3a6 100644
--- a/frontend/src/components/BatchOverlay.vue
+++ b/frontend/src/components/BatchOverlay.vue
@@ -1,5 +1,5 @@
 <template>
-	<div v-if="batch.data" class="shadow rounded-md p-5" style="width: 300px">
+	<div v-if="batch.data" class="shadow rounded-md p-5 lg:w-72">
 		<Badge
 			v-if="batch.data.seat_count && seats_left > 0"
 			theme="green"
diff --git a/frontend/src/components/MobileLayout.vue b/frontend/src/components/MobileLayout.vue
index b90d67599..65bf22e05 100644
--- a/frontend/src/components/MobileLayout.vue
+++ b/frontend/src/components/MobileLayout.vue
@@ -29,15 +29,42 @@
 <script setup>
 import { getSidebarLinks } from '../utils'
 import { useRouter } from 'vue-router'
-import { computed, inject } from 'vue'
+import { computed } from 'vue'
 import { sessionStore } from '@/stores/session'
+import { usersStore } from '@/stores/user'
+import { LogOut, LogIn, UserRound } from 'lucide-vue-next'
 
-const { logout, user } = sessionStore()
+const { logout, user, username } = sessionStore()
 let { isLoggedIn } = sessionStore()
-
 const router = useRouter()
+let { userResource } = usersStore()
+
 const tabs = computed(() => {
-	return getSidebarLinks()
+	let links = getSidebarLinks()
+
+	if (user) {
+		links.push({
+			label: 'Profile',
+			icon: UserRound,
+			activeFor: [
+				'Profile',
+				'ProfileAbout',
+				'ProfileCertification',
+				'ProfileEvaluator',
+				'ProfileRoles',
+			],
+		})
+		links.push({
+			label: 'Log out',
+			icon: LogOut,
+		})
+	} else {
+		links.push({
+			label: 'Log in',
+			icon: LogIn,
+		})
+	}
+	return links
 })
 
 let isActive = (tab) => {
@@ -50,6 +77,13 @@ const handleClick = (tab) => {
 		logout.submit().then(() => {
 			isLoggedIn = false
 		})
+	else if (tab.label == 'Profile')
+		router.push({
+			name: 'Profile',
+			params: {
+				username: userResource.data?.username,
+			},
+		})
 	else router.push({ name: tab.to })
 }
 
diff --git a/frontend/src/pages/BatchDetail.vue b/frontend/src/pages/BatchDetail.vue
index 78cde922c..2214e9052 100644
--- a/frontend/src/pages/BatchDetail.vue
+++ b/frontend/src/pages/BatchDetail.vue
@@ -11,17 +11,23 @@
 				<div class="my-3">
 					{{ batch.data.description }}
 				</div>
-				<div class="flex items-center justify-between w-1/2">
+				<div
+					class="flex flex-col gap-2 lg:gap-0 lg:flex-row lg:items-center justify-between lg:w-1/2"
+				>
 					<div class="flex items-center">
 						<BookOpen class="h-4 w-4 text-gray-700 mr-2" />
 						<span> {{ batch.data?.courses?.length }} {{ __('Courses') }} </span>
 					</div>
-					<span v-if="batch.data.courses">&middot;</span>
+					<span class="hidden lg:block" v-if="batch.data.courses"
+						>&middot;</span
+					>
 					<DateRange
 						:startDate="batch.data.start_date"
 						:endDate="batch.data.end_date"
 					/>
-					<span v-if="batch.data.start_date">&middot;</span>
+					<span class="hidden lg:block" v-if="batch.data.start_date"
+						>&middot;</span
+					>
 					<div class="flex items-center">
 						<Clock class="h-4 w-4 text-gray-700 mr-2" />
 						<span>
@@ -31,14 +37,14 @@
 					</div>
 				</div>
 			</div>
-			<div class="grid grid-cols-[60%,20%] gap-20 mt-10">
-				<div class="">
+			<div class="grid lg:grid-cols-[60%,20%] gap-4 lg:gap-20 mt-10">
+				<div class="order-2 lg:order-none">
 					<div
 						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal mt-6"
 						v-html="batch.data.batch_details"
 					></div>
 				</div>
-				<div>
+				<div class="order-1 lg:order-none">
 					<BatchOverlay :batch="batch" />
 				</div>
 			</div>
@@ -48,7 +54,7 @@
 						{{ __('Courses') }}
 					</div>
 				</div>
-				<div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-8 mt-5">
+				<div class="grid grid-cols-1 lg:grid-cols-3 gap-8 mt-5">
 					<div
 						v-if="batch.data.courses"
 						v-for="course in courses.data"
diff --git a/frontend/src/pages/CreateLesson.vue b/frontend/src/pages/CreateLesson.vue
index 6107ea79b..da5059ae2 100644
--- a/frontend/src/pages/CreateLesson.vue
+++ b/frontend/src/pages/CreateLesson.vue
@@ -43,7 +43,7 @@
 							<div
 								v-show="openInstructorEditor"
 								id="instructor-notes"
-								class="py-3"
+								class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal mt-6 py-3"
 							></div>
 						</div>
 					</div>
@@ -52,7 +52,10 @@
 							<label class="block font-medium text-gray-600 mb-1">
 								{{ __('Content') }}
 							</label>
-							<div id="content" class="py-3"></div>
+							<div
+								id="content"
+								class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-gray-300 prose-th:border-gray-300 prose-td:relative prose-th:relative prose-th:bg-gray-100 prose-sm max-w-none !whitespace-normal mt-6 py-3"
+							></div>
 						</div>
 					</div>
 				</div>
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index 44ba89fca..f2ef2588d 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -35,8 +35,8 @@
 				</EditCoverImage>
 			</div>
 		</div>
-		<div class="mx-auto -mt-4 max-w-4xl translate-x-0 sm:px-5">
-			<div class="flex items-center">
+		<div class="mx-auto -mt-10 md:-mt-4 max-w-4xl translate-x-0 px-5">
+			<div class="flex flex-col md:flex-row items-center">
 				<div>
 					<img
 						v-if="profile.data.user_image"
@@ -57,7 +57,11 @@
 						{{ profile.data.headline }}
 					</div>
 				</div>
-				<Button v-if="isSessionUser()" class="ml-auto" @click="editProfile()">
+				<Button
+					v-if="isSessionUser()"
+					class="mt-3 sm:mt-0 md:ml-auto"
+					@click="editProfile()"
+				>
 					<template #prefix>
 						<Edit class="w-4 h-4 stroke-1.5 text-gray-700" />
 					</template>
diff --git a/frontend/src/pages/ProfileAbout.vue b/frontend/src/pages/ProfileAbout.vue
index 995d8b572..c153404e1 100644
--- a/frontend/src/pages/ProfileAbout.vue
+++ b/frontend/src/pages/ProfileAbout.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="mt-7">
+	<div class="mt-7 mb-10">
 		<h2 class="mb-3 text-lg font-semibold text-gray-900">
 			{{ __('About') }}
 		</h2>
diff --git a/frontend/src/pages/ProfileCertificates.vue b/frontend/src/pages/ProfileCertificates.vue
index 519d5f53e..8ec33749b 100644
--- a/frontend/src/pages/ProfileCertificates.vue
+++ b/frontend/src/pages/ProfileCertificates.vue
@@ -1,9 +1,9 @@
 <template>
-	<div class="mt-7">
+	<div class="mt-7 mb-10">
 		<h2 class="mb-3 text-lg font-semibold text-gray-900">
 			{{ __('Certificates') }}
 		</h2>
-		<div class="grid grid-cols-3 gap-4">
+		<div class="grid grod-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
 			<div
 				v-for="certificate in certificates.data"
 				:key="certificate.name"
diff --git a/frontend/src/pages/ProfileEvaluator.vue b/frontend/src/pages/ProfileEvaluator.vue
index b8d24844d..2456835b7 100644
--- a/frontend/src/pages/ProfileEvaluator.vue
+++ b/frontend/src/pages/ProfileEvaluator.vue
@@ -5,7 +5,9 @@
 		</h2>
 
 		<div class="">
-			<div class="grid grid-cols-4 gap-4 text-sm text-gray-700 mb-4">
+			<div
+				class="grid grid-cols-3 md:grid-cols-4 gap-4 text-sm text-gray-700 mb-4"
+			>
 				<div>
 					{{ __('Day') }}
 				</div>
@@ -20,7 +22,7 @@
 			<div
 				v-if="evaluator.data"
 				v-for="slot in evaluator.data.slots.schedule"
-				class="grid grid-cols-4 gap-4 mb-4 group"
+				class="grid grid-cols-3 md:grid-cols-4 gap-4 mb-4 group"
 			>
 				<FormControl
 					type="select"
@@ -44,7 +46,10 @@
 				/>
 			</div>
 
-			<div class="grid grid-cols-4 gap-4 mb-4" v-show="showSlotsTemplate">
+			<div
+				class="grid grid-cols-3 md:grod-cols-4 gap-4 mb-4"
+				v-show="showSlotsTemplate"
+			>
 				<FormControl
 					type="select"
 					:options="days"
@@ -74,7 +79,7 @@
 			<h2 class="mb-4 text-lg font-semibold text-gray-900">
 				{{ __('I am unavailable') }}
 			</h2>
-			<div class="grid grid-cols-4 gap-4">
+			<div class="grid grid-cols-2 md:grid-cols-4 gap-4">
 				<FormControl
 					type="date"
 					:label="__('From')"
diff --git a/frontend/src/pages/ProfileRoles.vue b/frontend/src/pages/ProfileRoles.vue
index 46a177832..45619b06b 100644
--- a/frontend/src/pages/ProfileRoles.vue
+++ b/frontend/src/pages/ProfileRoles.vue
@@ -3,7 +3,9 @@
 		<h2 class="mb-3 text-lg font-semibold text-gray-900">
 			{{ __('Settings') }}
 		</h2>
-		<div class="flex justify-between w-3/4 mt-5">
+		<div
+			class="flex flex-col md:flex-row gap-4 md:gap-0 justify-between w-3/4 mt-5"
+		>
 			<FormControl
 				:label="__('Moderator')"
 				v-model="moderator"
diff --git a/frontend/src/pages/Statistics.vue b/frontend/src/pages/Statistics.vue
index 163af66d0..89269ba80 100644
--- a/frontend/src/pages/Statistics.vue
+++ b/frontend/src/pages/Statistics.vue
@@ -6,7 +6,7 @@
 			<Breadcrumbs class="h-7" :items="breadcrumbs" />
 		</header>
 		<div v-if="chartDetails.data" class="p-5">
-			<div class="grid grid-cols-2 lg:grid-cols-5 gap-4">
+			<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-5 gap-4">
 				<div class="flex items-center shadow py-2 px-3 rounded-md">
 					<div class="p-2 rounded-md bg-gray-100 mr-3">
 						<BookOpen class="w-18 h-18 stroke-1.5 text-gray-700" />
diff --git a/frontend/src/stores/session.js b/frontend/src/stores/session.js
index 564db2d89..13e1e85af 100644
--- a/frontend/src/stores/session.js
+++ b/frontend/src/stores/session.js
@@ -17,6 +17,7 @@ export const sessionStore = defineStore('lms-session', () => {
 	}
 
 	let user = ref(sessionUser())
+	let username = ref(null)
 	const isLoggedIn = computed(() => !!user.value)
 
 	const login = createResource({
@@ -43,6 +44,7 @@ export const sessionStore = defineStore('lms-session', () => {
 
 	return {
 		user,
+		username,
 		isLoggedIn,
 		login,
 		logout,
diff --git a/lms/patches.txt b/lms/patches.txt
index 6029128c1..bc62d4cd4 100644
--- a/lms/patches.txt
+++ b/lms/patches.txt
@@ -86,4 +86,5 @@ lms.patches.v1_0.change_jobs_url #19-01-2024
 lms.patches.v1_0.custom_perm_for_discussions #14-01-2024
 lms.patches.v1_0.rename_evaluator_role
 lms.patches.v1_0.change_navbar_urls
-lms.patches.v1_0.set_published_on
\ No newline at end of file
+lms.patches.v1_0.set_published_on
+lms.patches.v2_0.fix_progress_percentage
\ No newline at end of file
diff --git a/lms/patches/v2_0/fix_progress_percentage.py b/lms/patches/v2_0/fix_progress_percentage.py
new file mode 100644
index 000000000..0fbf8f1d4
--- /dev/null
+++ b/lms/patches/v2_0/fix_progress_percentage.py
@@ -0,0 +1,10 @@
+import frappe
+from lms.lms.utils import get_course_progress
+
+
+def execute():
+	enrollments = frappe.get_all("LMS Enrollment", fields=["name", "course", "member"])
+
+	for enrollment in enrollments:
+		progress = get_course_progress(enrollment.course, enrollment.member)
+		frappe.db.set_value("LMS Enrollment", enrollment.name, "progress", progress)

From 9d0b120cde9a9a4c59a6baa2b0dbe2c0b61eee62 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 10 May 2024 19:04:13 +0530
Subject: [PATCH 2/6] fix: removed unnecessary commits

---
 frontend/src/stores/session.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/stores/session.js b/frontend/src/stores/session.js
index 13e1e85af..564db2d89 100644
--- a/frontend/src/stores/session.js
+++ b/frontend/src/stores/session.js
@@ -17,7 +17,6 @@ export const sessionStore = defineStore('lms-session', () => {
 	}
 
 	let user = ref(sessionUser())
-	let username = ref(null)
 	const isLoggedIn = computed(() => !!user.value)
 
 	const login = createResource({
@@ -44,7 +43,6 @@ export const sessionStore = defineStore('lms-session', () => {
 
 	return {
 		user,
-		username,
 		isLoggedIn,
 		login,
 		logout,

From 65e9d164f5888fa78d0311d923555a5abb9bf392 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 13 May 2024 10:22:11 +0530
Subject: [PATCH 3/6] fix: linter action

---
 .github/workflows/linters.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index e6d7584cc..3de6a5dfc 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -3,8 +3,9 @@ name: Linters
 on:
   pull_request:
   workflow_dispatch:
-  push:
-    branches: [ main ]
+
+permissions:
+  contents: read
 
 jobs:
   linters:
@@ -26,8 +27,7 @@ jobs:
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
 
-      - name: Download semgrep
-        run: pip install semgrep
-
       - name: Run Semgrep rules
-        run: semgrep ci --config ./frappe-semgrep-rules/rules
+      run: |
+          pip install semgrep
+          semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness

From 3c5918d485564fd618dcdcbe23b89aaff81e6999 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 13 May 2024 10:23:33 +0530
Subject: [PATCH 4/6] fix: added branches to linters github action

---
 .github/workflows/linters.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index 3de6a5dfc..003a98532 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -3,6 +3,8 @@ name: Linters
 on:
   pull_request:
   workflow_dispatch:
+  push:
+    branches: [ main, develop ]
 
 permissions:
   contents: read

From e98d7d29f71b309cf37eef8a9becaf8004bbe4e9 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 13 May 2024 10:31:09 +0530
Subject: [PATCH 5/6] fix: removed permission check for linters

---
 .github/workflows/linters.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index 003a98532..f53126d13 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -6,9 +6,6 @@ on:
   push:
     branches: [ main, develop ]
 
-permissions:
-  contents: read
-
 jobs:
   linters:
     name: Semantic Commits

From 2a19fbc3d2743126b78878f4c580fed4cc38af42 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 13 May 2024 10:39:03 +0530
Subject: [PATCH 6/6] fix: linter github action

---
 .github/workflows/linters.yml | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index f53126d13..0730ff24a 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -7,21 +7,37 @@ on:
     branches: [ main, develop ]
 
 jobs:
-  linters:
-    name: Semantic Commits
+
+  commit-lint:
+    name: 'Semantic Commits'
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 200
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          check-latest: true
+
+      - name: Check commit titles
+        run: |
+          npm install @commitlint/cli @commitlint/config-conventional
+          npx commitlint --verbose --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }}
 
-      - name: Set up Python
-        uses: actions/setup-python@v4
+  linters:
+    name: Semgrep Rules
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
-
-      - name: Install and Run Pre-commit
-        uses: pre-commit/action@v2.0.3
+          cache: pip
 
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules