fix: conflicts

school/lms/web_template/courses_enrolled/courses_enrolled.html

@@ -0,0 +1,28 @@
+{% set member = frappe.get_doc("User", frappe.session.user) %}
+<div class="mt-10">
+  {% set enrolled = member.get_enrolled_courses().in_progress + member.get_enrolled_courses().completed %}
+  {% if enrolled | length %}
+  <div class="mt-8">
+    <div class="course-home-headings">
+      {{ _("Courses Enrolled") }}
+    </div>
+    <div class="cards-parent">
+      {% for course in enrolled %}
+      {{ widgets.CourseCard(course=course) }}
+      {% endfor %}
+    </div>
+  </div>
+  {% else %}
+  <div class="common-card-style thread-card">
+    <div class="w-25 text-center" style="margin: 0 auto;">
+      <span class="font-weight-bold"> No Enrolled Courses </span>
+      <div class="small">
+        You have not enrolled in any course yet.
+      </div>
+      <a class="button is-primary ml-auto mr-auto mt-3" href="/courses">
+        Explore Courses
+      </a>
+    </div>
+  </div>
+  {% endif %}
+</div>

school/lms/web_template/courses_enrolled/courses_enrolled.json

@@ -0,0 +1,16 @@
+{
+ "__unsaved": 1,
+ "creation": "2021-10-21 11:29:50.424865",
+ "docstatus": 0,
+ "doctype": "Web Template",
+ "fields": [],
+ "idx": 0,
+ "modified": "2021-10-21 12:02:23.837501",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "Courses Enrolled",
+ "owner": "Administrator",
+ "standard": 1,
+ "template": "",
+ "type": "Section"
+}

school/lms/web_template/courses_mentored/courses_mentored.html

@@ -0,0 +1,11 @@
+{% set member = frappe.get_doc("User", frappe.session.user) %}
+<div class="mt-10">
+  {% if member.get_mentored_courses() | length %}
+  <div class="course-home-headings"> {{ _("Courses Mentored") }} </div>
+  <div class="cards-parent">
+    {% for course in member.get_mentored_courses() %}
+    {{ widgets.CourseCard(course=course) }}
+    {% endfor %}
+  </div>
+  {% endif %}
+</div>

school/lms/web_template/courses_mentored/courses_mentored.json

@@ -0,0 +1,16 @@
+{
+ "__unsaved": 1,
+ "creation": "2021-10-21 11:32:57.411626",
+ "docstatus": 0,
+ "doctype": "Web Template",
+ "fields": [],
+ "idx": 0,
+ "modified": "2021-10-21 12:01:56.270656",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "Courses Mentored",
+ "owner": "Administrator",
+ "standard": 1,
+ "template": "",
+ "type": "Section"
+}