chore: resolved conflicts

.github/workflows/ui-tests.yml

@@ -100,6 +100,11 @@ jobs:
           bench --site lms.test execute frappe.utils.install.complete_setup_wizard
           bench --site lms.test execute frappe.tests.ui_test_helpers.create_test_user
 
+      - name: cypress pre-requisites
+        run: |
+          cd ~/frappe-bench/apps/lms
+          yarn add cypress@^10 --no-lockfile
+
       - name: UI Tests
         run: cd ~/frappe-bench/ && bench --site lms.test run-ui-tests lms --headless
         env:

lms/public/css/style.css

@@ -819,7 +819,7 @@ input[type=checkbox] {
 }
 
 .lesson-pagination {
-	margin: 2rem 0;
+	margin: 2rem 0 5rem;
 }
 
 .lesson-video {

lms/public/js/common_functions.js

@@ -1,7 +1,6 @@
 frappe.ready(() => {
 	setup_file_size();
 	pin_header();
-	setup_router();
 
 	$(".join-batch").click((e) => {
 		join_course(e);
@@ -43,14 +42,6 @@ frappe.ready(() => {
 	});
 });
 
-const setup_router = () => {
-	frappe.router = {
-		slug(name) {
-			return name.toLowerCase().replace(/ /g, "-");
-		},
-	};
-};
-
 const pin_header = () => {
 	const el = document.querySelector(".sticky");
 	if (el) {

lms/public/js/website.bundle.js

@@ -2,3 +2,4 @@ import "./profile.js";
 import "./common_functions.js";
 import "../../../../frappe/frappe/public/js/frappe/ui/chart.js";
 import "../../../../frappe/frappe/public/js/frappe/ui/keyboard.js";
+import "../../../../frappe/frappe/public/js/frappe/event_emitter.js";

lms/templates/lms_base.html

@@ -18,5 +18,14 @@
 			Object.assign(frappe.boot, telemetry_boot_info)
 	</script>
 	{% endif %}
-    {{ include_script("telemetry.bundle.js") }}
+	<script>
+		frappe.router = {
+			slug(name) {
+				return name.toLowerCase().replace(/ /g, "-");
+			},
+		};
+		frappe.utils.make_event_emitter(frappe.router)
+	</script>
+	{{ include_script("telemetry.bundle.js") }}
+
 {%- endblock -%}

lms/www/batch/edit.html

@@ -115,12 +115,6 @@
 			"can_select": ["LMS Quiz"],
 			"can_read": ["LMS Quiz"]
 		};
-
-		frappe.router = {
-			slug (name) {
-				return name.toLowerCase().replace(/ /g, "-");
-			}
-		}
 	</script>
 	{% endif %}
     {{ include_script('controls.bundle.js') }}

lms/www/classes/class.html

@@ -486,11 +486,6 @@
 
 		frappe.boot.single_types = []
 
-		frappe.router = {
-			slug (name) {
-				return name.toLowerCase().replace(/ /g, "-");
-			}
-		}
 		let class_info = {{ class_info | json }};
 	</script>
 	{% endif %}

lms/www/classes/index.html

@@ -157,12 +157,6 @@
 			"can_select": ["LMS Category"],
 			"can_read": ["LMS Category"]
 		};
-
-		frappe.router = {
-			slug (name) {
-				return name.toLowerCase().replace(/ /g, "-");
-			}
-		}
 		let class_info = null;
 	</script>
 	{% endif %}

lms/www/classes/progress.py

@@ -36,7 +36,7 @@ def get_context(context):
 	context.assessments = get_assessments(class_name, context.student.name)
 
 	upcoming_evals = frappe.get_all(
-		"LMS certificate Request",
+		"LMS Certificate Request",
 		{
 			"member": context.student.name,
 			"course": ["in", context.courses],

package.json

@@ -14,17 +14,5 @@
   "bugs": {
     "url": "https://github.com/frappe/lms/issues"
   },
-  "homepage": "https://github.com/frappe/lms#readme",
-  "devDependencies": {
-    "cypress": "^10"
-  },
-  "dependencies": {
-    "@4tw/cypress-drag-drop": "^2",
-    "@cypress/code-coverage": "^3",
-    "@editorjs/header": "^2.7.0",
-    "@editorjs/list": "^1.8.0",
-    "@testing-library/cypress": "^8",
-    "@testing-library/dom": "8.17.1",
-    "cypress-real-events": "^1.7.6"
-  }
+  "homepage": "https://github.com/frappe/lms#readme"
 }