chore: merge 'develop' into 'main'

.github/workflows/ci.yml

@@ -7,6 +7,8 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
     services:
       redis-cache:
         image: redis:alpine
@@ -77,4 +79,27 @@ jobs:
       run: bench --site frappe.local build
     - name: run tests
       working-directory: /home/runner/frappe-bench
-      run: bench --site frappe.local run-tests --app lms
+      run: bench --site frappe.local run-tests --app lms --coverage
+    - name: Upload coverage data
+      uses: actions/upload-artifact@v4
+      with:
+        path: /home/runner/frappe-bench/sites/coverage.xml
+
+  coverage:
+    name: Coverage Wrap Up
+    needs: tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Upload coverage data
+        uses: codecov/codecov-action@v5
+        with:
+          name: Server
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          verbose: true

cypress/e2e/course_creation.cy.js

@@ -56,6 +56,7 @@ describe("Course Creation", () => {
 			.parent()
 			.within(() => {
 				cy.get("input").click().type("frappe");
+				cy.wait(500);
 				cy.get("input")
 					.invoke("attr", "aria-controls")
 					.as("instructor_list_id");

frontend/package.json

@@ -6,8 +6,9 @@
   "scripts": {
     "dev": "vite",
     "serve": "vite preview",
-    "build": "vite build --base=/assets/lms/frontend/ && yarn copy-html-entry",
-    "copy-html-entry": "cp ../lms/public/frontend/index.html ../lms/www/lms.html"
+    "build": "vite build --base=/assets/lms/frontend/ && yarn copy-html-entry && yarn copy-colors-json",
+    "copy-html-entry": "cp ../lms/public/frontend/index.html ../lms/www/lms.html",
+    "copy-colors-json": "cp node_modules/frappe-ui/src/tailwind/colors.json src/utils/frappe-ui-colors.json"
   },
   "dependencies": {
     "@codemirror/lang-html": "6.4.9",
@@ -40,7 +41,6 @@
     "pinia": "2.0.33",
     "plyr": "3.7.8",
     "socket.io-client": "4.7.2",
-    "tailwindcss": "3.4.15",
     "thememirror": "2.0.1",
     "typescript": "5.7.2",
     "vue": "^3.5.0",
@@ -56,6 +56,7 @@
     "autoprefixer": "10.4.2",
     "postcss": "8.4.5",
     "vite": "5.0.11",
+    "tailwindcss": "^3.4.15",
     "vite-plugin-pwa": "0.15.0"
   },
   "resolutions": {

frontend/src/components/Controls/ColorSwatches.vue

@@ -21,8 +21,10 @@
 								:style="
 									modelValue
 										? {
-												backgroundColor:
-													theme.backgroundColor[modelValue.toLowerCase()][400],
+												backgroundColor: getColor(
+													modelValue.toLowerCase(),
+													400
+												),
 										  }
 										: {}
 								"
@@ -55,8 +57,7 @@
 							:key="color"
 							class="size-5 rounded-full cursor-pointer"
 							:style="{
-								backgroundColor:
-									theme.backgroundColor[color.toLowerCase()][400],
+								backgroundColor: getColor(color.toLowerCase(), 400),
 							}"
 							@click="
 								(e) => {
@@ -79,7 +80,7 @@
 import { Button, FormControl, Popover } from 'frappe-ui'
 import { computed } from 'vue'
 import { Palette, X } from 'lucide-vue-next'
-import { theme } from '@/utils/theme'
+import { getColor } from '@/utils'
 
 const emit = defineEmits(['update:modelValue', 'change'])
 

frontend/src/components/CourseCard.vue

@@ -136,11 +136,11 @@
 import { Award, BookOpen, GraduationCap, Star, Users } from 'lucide-vue-next'
 import { sessionStore } from '@/stores/session'
 import { Tooltip } from 'frappe-ui'
-import { theme } from '@/utils/theme'
 import { formatAmount } from '@/utils'
 import CourseInstructors from '@/components/CourseInstructors.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
 import ProgressBar from '@/components/ProgressBar.vue'
+import colors from '@/utils/frappe-ui-colors.json'
 
 const { user } = sessionStore()
 
@@ -152,8 +152,10 @@ const props = defineProps({
 })
 
 const getGradientColor = () => {
+	let theme =
+		localStorage.getItem('theme') == 'light' ? 'lightMode' : 'darkMode'
 	let color = props.course.card_gradient?.toLowerCase() || 'blue'
-	let colorMap = theme.backgroundColor[color]
+	let colorMap = colors[theme][color]
 	return `linear-gradient(to top right, black, ${colorMap[400]})`
 	/* return `bg-gradient-to-br from-${color}-100 via-${color}-200 to-${color}-400` */
 	/* return `linear-gradient(to bottom right, ${colorMap[100]}, ${colorMap[400]})` */

frontend/src/components/Modals/CourseProgressSummary.vue

@@ -114,11 +114,11 @@
 							categoryColumn: 'category',
 							valueColumn: 'count',
 							colors: [
-								theme.colors.red['400'],
-								theme.colors.amber['400'],
-								theme.colors.pink['400'],
-								theme.colors.blue['400'],
-								theme.colors.green['400'],
+								getColor('red', 400),
+								getColor('amber', 400),
+								getColor('pink', 400),
+								getColor('blue', 400),
+								getColor('green', 400),
 							],
 						}"
 					/>
@@ -146,7 +146,7 @@ import {
 	NumberChart,
 } from 'frappe-ui'
 import { computed, ref, watch } from 'vue'
-import { theme } from '@/utils/theme'
+import { getColor } from '@/utils'
 
 const show = defineModel<boolean>({ default: false })
 const searchFilter = ref<string | null>(null)

frontend/src/components/Notes/InlineLessonMenu.vue

@@ -20,7 +20,7 @@
 					<span
 						class="size-3 rounded-full"
 						:style="{
-							backgroundColor: theme.backgroundColor[color.toLowerCase()][400],
+							backgroundColor: getColor(color.toLowerCase(), 400),
 						}"
 					></span>
 					<span>
@@ -55,9 +55,8 @@
 <script setup lang="ts">
 import { computed, inject, ref, watch } from 'vue'
 import { NotepadText, Trash2 } from 'lucide-vue-next'
-import { theme } from '@/utils/theme'
 import type { Note, Notes } from '@/components/Notes/types'
-import { blockQuotesClick, highlightText } from '@/utils'
+import { blockQuotesClick, getColor, highlightText } from '@/utils'
 
 const user = inject<any>('$user')
 const show = defineModel()

frontend/src/components/StudentHeatmap.vue

@@ -17,7 +17,7 @@
 import { createResource } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
 import ApexChart from 'vue3-apexcharts'
-import { theme } from '@/utils/theme'
+import { getColor } from '@/utils'
 
 const user = inject('$user')
 const labels = ref([])
@@ -81,11 +81,11 @@ const chartOptions = computed(() => {
 				enableShades: true,
 				colorScale: {
 					ranges: [
-						{ from: 0, to: 0, color: theme.colors.gray[400] },
-						{ from: 1, to: 5, color: theme.colors.green[200] },
-						{ from: 6, to: 15, color: theme.colors.green[500] },
-						{ from: 16, to: 30, color: theme.colors.green[700] },
-						{ from: 31, to: 100, color: theme.colors.green[800] },
+						{ from: 0, to: 0, color: getColor('green', 400) },
+						{ from: 1, to: 5, color: getColor('green', 200) },
+						{ from: 6, to: 15, color: getColor('green', 500) },
+						{ from: 16, to: 30, color: getColor('green', 700) },
+						{ from: 31, to: 100, color: getColor('green', 800) },
 					],
 				},
 			},

frontend/src/pages/Programs/ProgramForm.vue

@@ -58,7 +58,7 @@
 						</Button>
 					</div>
 					<ListView
-						v-if="program.program_courses.length > 0"
+						v-if="program.program_courses?.length > 0"
 						:columns="courseColumns"
 						:rows="program.program_courses"
 						:options="{
@@ -133,7 +133,7 @@
 						</div>
 					</div>
 					<ListView
-						v-if="program.program_members.length > 0"
+						v-if="program.program_members?.length > 0"
 						:columns="memberColumns"
 						:rows="program.program_members"
 						:options="{
@@ -430,7 +430,7 @@ const addCourse = (close: () => void) => {
 	}
 
 	const existingCourse = program.value.program_courses.find(
-		(c) => c.course === course.value
+		(c: any) => c.course === course.value
 	)
 	if (!existingCourse) {
 		program.value.program_courses.push({
@@ -544,11 +544,11 @@ const remove = (
 	const selectionsArray = Array.from(selections)
 	if (type === 'courses') {
 		program.value.program_courses = program.value.program_courses.filter(
-			(c) => !selectionsArray.includes(c.name || c.course)
+			(c: any) => !selectionsArray.includes(c.name || c.course)
 		)
 	} else {
 		program.value.program_members = program.value.program_members.filter(
-			(m) => !selectionsArray.includes(m.name || m.member)
+			(m: any) => !selectionsArray.includes(m.name || m.member)
 		)
 	}
 	dirty.value = true

frontend/src/pages/Programs/ProgramProgressSummary.vue

@@ -31,11 +31,11 @@
 						categoryColumn: 'category',
 						valueColumn: 'count',
 						colors: [
-							theme.colors.red['400'],
-							theme.colors.amber['400'],
-							theme.colors.pink['400'],
-							theme.colors.blue['400'],
-							theme.colors.green['400'],
+							getColor('red', 400),
+							getColor('amber', 400),
+							getColor('pink', 400),
+							getColor('blue', 400),
+							getColor('green', 400),
 						],
 					}"
 				/>
@@ -74,7 +74,7 @@ import {
 } from 'frappe-ui'
 import type { ProgramMember } from '@/types'
 import { computed, ref, watch } from 'vue'
-import { theme } from '@/utils/theme'
+import { getColor } from '@/utils'
 
 const show = defineModel<boolean>({ default: false })
 const searchFilter = ref<string | null>(null)