fix: removed unused import

fix: Username validations

community/community/widgets/Avatar.html

@@ -1,5 +1,5 @@
 {% set color = member.get_palette() %}
-<a href="/{{member.username}}">
+<a class="button-links" href="/{{member.username}}">
   <span class="avatar {{ avatar_class }}" title="{{ member.full_name }}">
     {% if member.user_image %}
     <img class="avatar-frame standard-image" style="object-fit: cover;" src="{{ member.user_image }}" title="{{ member.full_name }}">

community/hooks.py

@@ -136,7 +136,6 @@ primary_rules = [
     {"from_route": "/courses/<course>/<topic>", "to_route": "courses/topic"},
     {"from_route": "/hackathons/<hackathon>", "to_route": "hackathons/hackathon"},
     {"from_route": "/hackathons/<hackathon>/<project>", "to_route": "hackathons/project"},
-    {"from_route": "/dashboard", "to_route": ""},
     {"from_route": "/add-a-new-batch", "to_route": "add-a-new-batch"},
     {"from_route": "/courses/<course>/home", "to_route": "batch/home"},
     {"from_route": "/courses/<course>/learn", "to_route": "batch/learn"},

community/lms/doctype/lms_batch_membership/lms_batch_membership.json

@@ -37,6 +37,7 @@
    "fieldname": "member_type",
    "fieldtype": "Select",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Member Type",
    "options": "\nStudent\nMentor\nStaff"
   },
@@ -44,7 +45,6 @@
    "default": "Member",
    "fieldname": "role",
    "fieldtype": "Select",
-   "in_standard_filter": 1,
    "label": "Role",
    "options": "\nMember\nAdmin"
   },
@@ -63,9 +63,10 @@
   {
    "fetch_from": "batch.course",
    "fieldname": "course",
-   "fieldtype": "Data",
+   "fieldtype": "Link",
    "in_list_view": 1,
-   "label": "Course"
+   "label": "Course",
+   "options": "LMS Course"
   },
   {
    "fieldname": "current_lesson",
@@ -83,7 +84,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-07-06 20:50:46.885325",
+ "modified": "2021-08-04 17:10:42.708479",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Membership",

community/lms/doctype/lms_course/lms_course.py

@@ -13,6 +13,38 @@ from ...utils import slugify
 
 class LMSCourse(Document):
 
+    def on_update(self):
+        if not self.upcoming and self.has_value_changed("upcoming"):
+            self.send_email_to_interested_users()
+
+    def send_email_to_interested_users(self):
+        interested_users = frappe.get_all("LMS Course Interest",
+                                            {
+                                                "course": self.name
+                                            },
+                                            ["name", "user"])
+        subject = self.title + " is available!"
+        args = {
+            "title": self.title,
+            "course_link": "/courses/{0}".format(self.name),
+            "app_name": frappe.db.get_single_value("System Settings", "app_name"),
+            "site_url": frappe.utils.get_url()
+        }
+
+        for user in interested_users:
+            args["first_name"] = frappe.db.get_value("User", user.user, "first_name")
+            email_args = frappe._dict(
+                            recipients = user.user,
+                            sender = frappe.db.get_single_value("LMS Settings", "email_sender"),
+                            subject = subject,
+                            header = [subject, "green"],
+                            template = "lms_course_interest",
+                            args = args,
+                            now = True
+                        )
+            frappe.enqueue(method=frappe.sendmail, queue='short', timeout=300, is_async=True, **email_args)
+            frappe.db.set_value("LMS Course Interest", user.name, "email_sent", True)
+
     @staticmethod
     def find(name):
         """Returns the course with specified name.
@@ -74,8 +106,11 @@ class LMSCourse(Document):
         mentors = frappe.get_all("LMS Course Mentor Mapping", {"course": self.name}, ["mentor"])
         for mentor in mentors:
             member = frappe.get_doc("User", mentor.mentor)
-            # TODO: change this to count query
+            member.batch_count = frappe.db.count("LMS Batch Membership",
-            member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member.name, "member_type": "Mentor"}))
+                                    {
+                                        "member": member.name,
+                                        "member_type": "Mentor"
+                                    })
             course_mentors.append(member)
         return course_mentors
 
@@ -191,7 +226,13 @@ class LMSCourse(Document):
         """Returns the {chapter_index}.{lesson_index} for the lesson.
         """
         lesson = frappe.db.get_value("Lessons", {"lesson": lesson_name}, ["idx", "parent"], as_dict=True)
+        if not lesson:
+            return None
+
         chapter = frappe.db.get_value("Chapters", {"chapter": lesson.parent}, ["idx"], as_dict=True)
+        if not chapter:
+            return None
+
         return f"{chapter.idx}.{lesson.idx}"
 
     def reindex_exercises(self):
@@ -238,21 +279,6 @@ class LMSCourse(Document):
             membership.batch_title = frappe.db.get_value("LMS Batch", membership.batch, "title")
         return all_memberships
 
-    def get_mentors(self, batch=None):
-        filters = {
-            "course": self.name,
-            "member_type": "Mentor"
-        }
-        if batch:
-            filters["batch"] = batch
-
-        memberships = frappe.get_all(
-                    "LMS Batch Membership",
-                    filters,
-                    ["member"])
-        member_names = [m['member'] for m in memberships]
-        return find_all("User", name=["IN", member_names])
-
     def get_students(self, batch=None):
         """Returns (email, full_name, username) of all the students of this batch as a list of dict.
         """

community/lms/doctype/lms_course_interest/lms_course_interest.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2021, FOSS United and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('LMS Course Interest', {
+	// refresh: function(frm) {
+
+	// }
+});

community/lms/doctype/lms_course_interest/lms_course_interest.json

@@ -0,0 +1,61 @@
+{
+ "actions": [],
+ "creation": "2021-08-06 17:37:20.184849",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "course",
+  "user",
+  "email_sent"
+ ],
+ "fields": [
+  {
+   "fieldname": "course",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Course",
+   "options": "LMS Course"
+  },
+  {
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "User",
+   "options": "User"
+  },
+  {
+   "default": "0",
+   "fieldname": "email_sent",
+   "fieldtype": "Check",
+   "label": "Email Sent",
+   "options": "email_sent"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-08-06 18:06:21.370741",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "LMS Course Interest",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

community/lms/doctype/lms_course_interest/lms_course_interest.py

@@ -0,0 +1,17 @@
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.model.document import Document
+
+class LMSCourseInterest(Document):
+	pass
+
+@frappe.whitelist()
+def capture_interest(course):
+    frappe.get_doc({
+        "doctype": "LMS Course Interest",
+        "course": course,
+        "user": frappe.session.user
+    }).save(ignore_permissions=True)
+    return "OK"

community/lms/doctype/lms_course_interest/test_lms_course_interest.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2021, FOSS United and Contributors
+# See license.txt
+
+# import frappe
+import unittest
+
+class TestLMSCourseInterest(unittest.TestCase):
+	pass

community/lms/doctype/lms_quiz/lms_quiz.py

@@ -46,34 +46,30 @@ class LMSQuiz(Document):
             return result[0]
 
 @frappe.whitelist()
-def submit(quiz, result):
+def quiz_summary(quiz, results):
     score = 0
-    answer_map = {
+    results = json.loads(results)
-        "is_correct_1": "option_1",
-        "is_correct_2": "option_2",
-        "is_correct_3": "option_3",
-        "is_correct_4": "option_4"
-    }
-    result = json.loads(result)
-    quiz_details = frappe.get_doc("LMS Quiz", quiz)
 
-    for response in result:
+    for result in results:
-        match = list(filter(lambda x: x.question == response.get("question"), quiz_details.questions))[0]
+        correct = result["is_correct"][0]
-        correct_options = quiz_details.get_correct_options(match)
+        result["question"] = frappe.db.get_value("LMS Quiz Question",
-        correct_answers = [ match.get(answer_map[option]) for option in correct_options ]
+                            {"parent": quiz, "idx": result["question_index"]},
+                            ["question"])
 
-        if response.get("answer") == correct_answers:
+        for point in result["is_correct"]:
-            response["result"] = "Right"
+            correct = correct and point
-            score += 1
+
-        else:
+        result["result"] = "Right" if correct else "Wrong"
-            response["result"] = "Wrong"
+        score += correct
-        response["answer"] = ("").join([ ans if idx == len(response.get("answer")) -1 else ans + ", "  for idx, ans in enumerate(response.get("answer")) ])
+
+        del result["is_correct"]
+        del result["question_index"]
 
     frappe.get_doc({
         "doctype": "LMS Quiz Submission",
         "quiz": quiz,
-        "result": result,
+        "result": results,
         "score": score
     }).save(ignore_permissions=True)
-    update_progress(quiz_details.lesson)
+
     return score

community/lms/doctype/lms_quiz/test_lms_quiz.py

@@ -3,6 +3,39 @@
 
 # import frappe
 import unittest
+import frappe
 
 class TestLMSQuiz(unittest.TestCase):
-	pass
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        frappe.get_doc({
+            "doctype": "LMS Quiz",
+            "title": "Test Quiz"
+        }).save()
+
+    def test_with_multiple_options(self):
+        quiz = frappe.get_doc("LMS Quiz", "Test Quiz")
+        quiz.append("questions", {
+            "question": "Question multiple",
+            "option_1": "Option 1",
+            "is_correct_1": 1,
+            "option_2": "Option 2",
+            "is_correct_2": 1
+        })
+        quiz.save()
+        self.assertTrue(quiz.questions[0].multiple)
+
+    def test_with_no_correct_option(self):
+        quiz = frappe.get_doc("LMS Quiz", "Test Quiz")
+        quiz.append("questions", {
+            "question": "Question no correct option",
+            "option_1": "Option 1",
+            "option_2": "Option 2",
+        })
+        self.assertRaises(frappe.ValidationError, quiz.save)
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        frappe.db.delete("LMS Quiz", "Test Quiz")
+        frappe.db.delete("LMS Quiz Question", {"parent": "Test Quiz"})

community/lms/doctype/lms_quiz_question/lms_quiz_question.json

@@ -9,15 +9,23 @@
   "options_section",
   "option_1",
   "is_correct_1",
+  "column_break_5",
+  "explanation_1",
   "section_break_5",
   "option_2",
   "is_correct_2",
+  "column_break_10",
+  "explanation_2",
   "column_break_4",
   "option_3",
   "is_correct_3",
+  "column_break_15",
+  "explanation_3",
   "section_break_11",
   "option_4",
   "is_correct_4",
+  "column_break_20",
+  "explanation_4",
   "multiple"
  ],
  "fields": [
@@ -101,12 +109,52 @@
   {
    "fieldname": "section_break_11",
    "fieldtype": "Section Break"
+  },
+  {
+   "depends_on": "option_1",
+   "fieldname": "explanation_1",
+   "fieldtype": "Data",
+   "label": "Explanation"
+  },
+  {
+   "depends_on": "option_2",
+   "fieldname": "explanation_2",
+   "fieldtype": "Data",
+   "label": "Explanation"
+  },
+  {
+   "depends_on": "option_3",
+   "fieldname": "explanation_3",
+   "fieldtype": "Data",
+   "label": "Explanation"
+  },
+  {
+   "depends_on": "option_4",
+   "fieldname": "explanation_4",
+   "fieldtype": "Data",
+   "label": "Explanation"
+  },
+  {
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_10",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_15",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_20",
+   "fieldtype": "Column Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-06-22 16:54:13.133859",
+ "modified": "2021-07-19 19:35:28.446236",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz Question",

community/lms/web_form/profile/profile.js

@@ -1,7 +1,14 @@
 frappe.ready(function () {
+
   frappe.web_form.after_load = () => {
     if (!frappe.utils.get_url_arg("name")) {
       window.location.href = `/edit-profile?name=${frappe.session.user}`;
     }
   }
+
+  frappe.web_form.after_save = () => {
+    setTimeout(() => {
+      window.location.href = `/${frappe.web_form.get_value(["username"])}`;
+    })
+  }
 })

community/lms/web_form/profile/profile.json

@@ -11,6 +11,7 @@
  "apply_document_permissions": 0,
  "breadcrumbs": "",
  "button_label": "Save",
+ "client_script": "",
  "creation": "2021-06-30 13:48:13.682851",
  "custom_css": "[data-doctype=\"Web Form\"] {\n    max-width: 720px;\n    margin: 6rem auto;\n}",
  "doc_type": "User",
@@ -20,7 +21,7 @@
  "is_standard": 1,
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2021-07-14 17:15:15.424855",
+ "modified": "2021-08-06 14:40:39.013776",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "profile",
@@ -72,6 +73,18 @@
    "reqd": 0,
    "show_in_filter": 0
   },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "username",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "Username",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
   {
    "allow_read_on_all_link_options": 0,
    "description": "Get your globally recognized avatar from Gravatar.com",

community/lms/widgets/ChapterTeaser.html

@@ -27,7 +27,7 @@
           {{ lesson.title }}
 
           {% if membership %}
-          <img class="lesson-progress-tick {{ course.get_progress(lesson.name) != 'Complete' and 'hide' }}"
+          <img class="ml-1 lesson-progress-tick {{ course.get_progress(lesson.name) != 'Complete' and 'hide' }}"
             src="/assets/community/icons/check.svg">
           {% endif %}
 

community/lms/widgets/CourseCard.html

@@ -1,10 +1,14 @@
 <div class="common-card-style course-card">
-  <div class="course-image" style="background-image: url({{ course.image }});">
+  <div class="course-image {% if not course.image %}default-image{% endif %}"
+    {% if course.image %} style="background-image: url( {{ course.image }} );" {% endif %}>
     <div class="course-tags">
       {% for tag in course.get_tags() %}
       <div class="course-card-pills">{{ tag }}</div>
       {% endfor %}
     </div>
+    {% if not course.image %}
+    <div class="default-image-text">{{ course.title[0] }}</div>
+    {% endif %}
   </div>
   <div class="course-card-content">
     <div class="course-card-meta muted-text">
@@ -54,7 +58,7 @@
     {% set query_parameter = "?batch=" + membership.batch if membership and membership.batch else "" %}
 
     {% if course.upcoming %}
-    <div class="view-course-link is-default">
+    <div class="view-course-link is-secondary border">
       Upcoming Course <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
     </div>
     <a class="stretched-link" href="/courses/{{ course.name }}"></a>

community/lms/widgets/RenderBatch.html

@@ -1,30 +0,0 @@
-<div class="batch">
-  <div class="batch-details">
-    <div class="">Session every {{batch.sessions_on}}</div>
-    <div>{{frappe.utils.format_time(batch.start_time, "short")}} -
-      {{frappe.utils.format_time(batch.end_time, "short")}}
-    </div>
-    <div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
-    <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
-
-    {% for m in course.get_mentors(batch.name) %}
-    <div>
-      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
-      <span class="instructor-title">{{m.full_name}}</span>
-    </div>
-    {% endfor %}
-  </div>
-  {% if can_manage or can_join %}
-  <div class="cta">
-    <div class="">
-      {% if can_manage %}
-      <a href="/courses/{{ course.name }}/home?batch={{ batch.name }}" class="btn btn-primary manage-batch" data-batch="{{ batch.name | urlencode }}"
-        data-course="{{ course.name | urlencode }}">Manage</a>
-      {% elif can_join %}
-      <button class="join-batch btn btn-secondary" data-batch="{{ batch.name | urlencode }}"
-        data-course="{{ course.name | urlencode }}">Join this Batch</button>
-      {% endif %}
-    </div>
-  </div>
-  {% endif %}
-</div>

community/lms/widgets/Reviews.html

@@ -1,23 +1,28 @@
-{% if course.get_reviews() | length %}
 <div class="reviews-parent">
-  <div class="reviews-heading">
+  {% set reviews = course.get_reviews() %}
-    <div class="course-home-headings">Student Review</div>
+  {% if reviews | length or course.is_eligible_to_review(membership) %}
+  <div class="mb-5">
+    <span class="course-home-headings">Reviews</span>
     {% if course.is_eligible_to_review(membership) %}
-    <a class="review-link" href="">
+    <span class="review-link button is-secondary pull-right">
-      Provide your Feedback
+      Write a review
-    </a>
+    </span>
     {% endif %}
   </div>
+  {% endif %}
+  {% if reviews | length %}
   <div class="reviews-section">
-    {% for review in course.get_reviews() %}
+    {% for review in reviews %}
     <div class="review-card">
       <div class="common-card-style review-content small-title"> {{ review.review }} </div>
       <div class="review-card-footer">
         <div>
           {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }}
-          <span class="course-instructor">
+          <a class="button-links" href="/{{review.owner_details.username}}">
-            {{ review.owner_details.full_name }}
+            <span class="course-instructor">
-          </span>
+              {{ review.owner_details.full_name }}
+            </span>
+          </a>
         </div>
         <div class="rating">
           {% for i in [1, 2, 3, 4, 5] %}
@@ -30,6 +35,7 @@
     </div>
     {% endfor %}
   </div>
+  {% endif %}
 </div>
 
 <div class="modal fade review-modal" id="review-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
@@ -67,8 +73,8 @@
             </div>
             <div class="control-input-wrapper">
               <div class="control-input">
-                <textarea type="text" autocomplete="off" class="input-with-feedback form-control review-field" data-fieldtype="Text"
+                <textarea type="text" autocomplete="off" class="input-with-feedback form-control review-field"
-                  data-fieldname="feedback_comments" placeholder="" style="height: 300px;"
+                  data-fieldtype="Text" data-fieldname="feedback_comments" placeholder="" style="height: 300px;"
                   spellcheck="false"></textarea>
               </div>
             </div>
@@ -77,9 +83,9 @@
         </form>
       </div>
       <div class="modal-footer">
-        <div class="button submit-review is-primary" data-course="{{ course.name | urlencode}}" id="submit-review">Submit</div>
+        <div class="button submit-review is-primary" data-course="{{ course.name | urlencode}}" id="submit-review">
+          Submit</div>
       </div>
     </div>
   </div>
 </div>
-{% endif %}

community/overrides/test_user.py

@@ -0,0 +1,54 @@
+# Copyright (c) 2021, FOSS United and Contributors
+# See license.txt
+
+# import frappe
+import unittest
+import frappe
+
+class TestCustomUser(unittest.TestCase):
+
+    def test_with_basic_username(self):
+        new_user = frappe.get_doc({
+                        "doctype": "User",
+                        "email": "test_with_basic_username@example.com",
+                        "first_name": "Username"
+                    }).insert()
+        self.assertEqual(new_user.username, "username")
+
+    def test_without_username(self):
+        """ The user in this test has the same first name as the user of the test test_with_basic_username.
+        In such cases frappe makes the username of the second user empty.
+        The condition in community app should override this and save a username. """
+        new_user = frappe.get_doc({
+                        "doctype": "User",
+                        "email": "test-without-username@example.com",
+                        "first_name": "Username"
+                    }).insert()
+        self.assertTrue(new_user.username)
+
+    def test_with_illegal_characters(self):
+        new_user = frappe.get_doc({
+                        "doctype": "User",
+                        "email": "test_with_illegal_characters@example.com",
+                        "first_name": "Username$$"
+                    }).insert()
+        self.assertEqual(new_user.username[:8], "username")
+
+    def test_with_hyphen_at_end(self):
+        new_user = frappe.get_doc({
+                        "doctype": "User",
+                        "email": "test_with_hyphen_at_end@example.com",
+                        "first_name": "Username---"
+                    }).insert()
+        length = len(new_user.username)
+        self.assertNotEqual(new_user.username[length-1], "-")
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        users = [
+                    "test_with_basic_username@example.com",
+                    "test-without-username@example.com",
+                    "test_with_illegal_characters@example.com",
+                    "test_with_hyphen_at_end@example.com"
+                ]
+        frappe.db.delete("User", {"name": ["in", users]})

community/overrides/user.py

@@ -2,9 +2,50 @@ import frappe
 from frappe.core.doctype.user.user import User
 from frappe.utils import cint
 import hashlib
+import random
+import re
+from frappe import _
 
 class CustomUser(User):
 
+    def validate(self):
+        super(CustomUser, self).validate()
+        self.validate_username_characters()
+
+    def validate_username_characters(self):
+        if self.is_new():
+
+            if self.username.find(" "):
+                self.username.replace(" ", "")
+
+            if not re.match("^[A-Za-z0-9_]*$", self.username):
+                self.username = self.remove_illegal_characters()
+
+            if not self.username:
+                self.username = self.get_username_from_first_name()
+
+            if self.username_exists():
+                self.username = self.remove_illegal_characters() + str(random.randint(0, 99))
+
+        else:
+            if not re.match("^[A-Za-z0-9_-]*$", self.username):
+                frappe.throw(_("Username can only contain alphabets, numbers, hyphen and underscore."))
+
+            if self.username[0] == "-" or self.username[len(self.username) - 1] == "-":
+                frappe.throw(_("First and Last character of username cannot be Hyphen(-)."))
+
+    def get_username_from_first_name(self):
+        return frappe.scrub(self.first_name) + str(random.randint(0, 99))
+
+    def remove_illegal_characters(self):
+        username = ''.join([c for c in self.username if c.isalnum() or c in ['-', '_']])
+        while username[0] == "-" or username[len(username) - 1] == "-":
+            if username[0] == "-":
+                username = username[1:]
+            if username[len(username) - 1]:
+                username = username[:1]
+        return username
+
     def get_authored_courses(self) -> int:
         """Returns the number of courses authored by this user.
         """

community/public/css/style.css

@@ -234,6 +234,22 @@ input[type=checkbox] {
   background-repeat: no-repeat;
 }
 
+.default-image {
+  background-color: var(--avatar-frame-bg);
+  color: var(--avatar-frame-color);
+  display: flex;
+  flex-direction: column;
+}
+
+.default-image-text {
+  display: flex;
+  flex: 1;
+  align-self: center;
+  justify-content: normal;
+  font-size: 7rem;
+  font-weight: bold;
+}
+
 .course-tags {
   display: flex;
   position: relative;
@@ -317,7 +333,7 @@ input[type=checkbox] {
 
 .card-divider {
   border: 1px solid #F4F5F6;
-  margin-bottom: 16px;
+  margin-bottom: 1rem;
 }
 
 .card-divider-dark {
@@ -471,23 +487,30 @@ input[type=checkbox] {
   --star-fill: #74808B;
 }
 
-div.custom-checkbox>label>input {
+.custom-checkbox {
+  display: flex;
+  align-items: center;
+}
+
+.custom-checkbox>label>input {
   visibility: hidden;
 }
 
-div.custom-checkbox>label>img {
+.custom-checkbox>label>.empty-checkbox {
-  height: 20px;
+  height: 1.5rem;
-  width: 20px;
+  width: 1.5rem;
   border: 1px solid black;
   border-radius: 5px;
 }
 
-div.custom-checkbox>label>input:checked+img {
+.custom-checkbox>label>input:checked+.empty-checkbox {
-  background: url(/assets/community/images/Vector.png);
+  background: url(/assets/community/icons/tick.svg);
   background-repeat: no-repeat;
   background-position: center center;
-  background-size: 15px 15px;
+}
-  object-fit: contain;
+
+.quiz-label {
+  margin-bottom: 0;
 }
 
 .course-card-wide {
@@ -601,7 +624,7 @@ div.custom-checkbox>label>input:checked+img {
 }
 
 .button {
-  box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.13), 0px 0px 0.5px rgba(0, 0, 0, 0.5);
+  box-shadow: var(--btn-shadow);
   border-radius: 6px;
   cursor: pointer;
   display: flex;
@@ -612,6 +635,11 @@ div.custom-checkbox>label>input:checked+img {
   font-size: 12px;
   line-height: 135%;
   letter-spacing: -0.011em;
+  border: none;
+}
+
+.button:disabled {
+  cursor: not-allowed;
 }
 
 .wide-button {
@@ -637,6 +665,11 @@ div.custom-checkbox>label>input:checked+img {
   color: inherit;
 }
 
+.is-default {
+  background: #98A1A9;
+  color: #ffffff;
+}
+
 @media (max-width: 600px) {
   .video-preview {
     margin-top: 16px;
@@ -653,12 +686,6 @@ div.custom-checkbox>label>input:checked+img {
   color: #FFFFFF;
 }
 
-.is-default {
-  background-color: white;
-  border: 1px solid #C8CFD5;
-  box-sizing: border-box;
-}
-
 .course-home-outline {
   margin-top: 3rem;
 }
@@ -757,7 +784,7 @@ div.custom-checkbox>label>input:checked+img {
 }
 
 .lesson-links {
-  display: flex;
+  display: block;
   padding: 0 1rem;
   margin-bottom: .25rem;
   color: inherit;
@@ -771,6 +798,13 @@ div.custom-checkbox>label>input:checked+img {
   border-radius: .25rem;
 }
 
+.course-content-parent .lesson-links {
+  padding: 0 0 0 1rem;
+  margin-bottom: 0.75rem;
+  font-size: 0.85rem;
+  line-height: 200%;
+}
+
 .chapter-content {
   margin: 0;
   margin-left: .875rem;
@@ -997,8 +1031,24 @@ div.custom-checkbox>label>input:checked+img {
   color: red;
 }
 
+.quiz-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
 .question {
   flex-direction: column;
+  width: 688px;
+  margin: auto;
+}
+
+.question p {
+  margin-bottom: 0;
+}
+
+.active-question .card-divider {
+  margin-top: 1rem;
 }
 
 .dark-links {
@@ -1041,7 +1091,7 @@ div.custom-checkbox>label>input:checked+img {
 }
 
 .course-content-parent .course-home-headings {
-  margin: 0px 0px 16px;
+  margin: 0px 0px 1rem;
 }
 
 .lesson-pagination {
@@ -1175,7 +1225,19 @@ div.custom-checkbox>label>input:checked+img {
   left: 174px;
   font-size: 12px;
   line-height: 165%;
-  width: fit-content;
+  width: 85%;
+}
+
+@media (max-width: 1200px) {
+  .profile-profession {
+    width: 75%;
+  }
+}
+
+@media (max-width: 767px) {
+  .profile-profession {
+    width: 60%;
+  }
 }
 
 @media (max-width: 500px) {
@@ -1189,6 +1251,7 @@ div.custom-checkbox>label>input:checked+img {
   .profile-profession {
     top: 5px;
     left: 70px;
+    width: 75%;
   }
 }
 
@@ -1271,3 +1334,19 @@ pre {
   width: 100%;
   overflow-x: auto;
 }
+
+.markdown-source h1 {
+  font-size: 1.3rem;
+}
+
+.markdown-source h2 {
+  font-size: 1.2rem;
+}
+
+.markdown-source h3 {
+  font-size: 1.1rem;
+}
+
+.markdown-source h4 {
+  font-size: 1rem;
+}

community/public/icons/minus-circle-green.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" fill="#68D391" stroke="#68D391" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 12H16" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

community/public/icons/minus-circle.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-minus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="8" y1="12" x2="16" y2="12"></line></svg>

community/public/icons/tick.svg

@@ -1,3 +1 @@
-<svg class="icon">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check"><polyline points="20 6 9 17 4 12"></polyline></svg>
-  <use href="#icon-tick"></use>
-</svg>

community/public/icons/wrong.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 20C15.5228 20 20 15.5228 20 10C20 4.47715 15.5228 0 10 0C4.47715 0 0 4.47715 0 10C0 15.5228 4.47715 20 10 20ZM6.0429 6.04289C6.43342 5.65237 7.06659 5.65237 7.45711 6.04289L10.0011 8.58692L12.5451 6.04294C12.9356 5.65242 13.5688 5.65242 13.9593 6.04294C14.3499 6.43347 14.3499 7.06663 13.9593 7.45716L11.4154 10.0011L13.9593 12.5451C14.3499 12.9356 14.3499 13.5688 13.9593 13.9593C13.5688 14.3499 12.9357 14.3499 12.5451 13.9593L10.0011 11.4154L7.45711 13.9594C7.06659 14.3499 6.43342 14.3499 6.0429 13.9594C5.65237 13.5689 5.65237 12.9357 6.0429 12.5452L8.58693 10.0011L6.0429 7.45711C5.65237 7.06658 5.65237 6.43342 6.0429 6.04289Z" fill="#F56B6B"/>
+</svg>

community/templates/emails/lms_course_interest.html

@@ -0,0 +1,19 @@
+<div>
+	{% set site_link = "<a href='" + site_url + "'>" + app_name + "</a>" %}
+	<p>{{ _("Hi {0},").format(first_name) }}</p>
+  <br>
+	<p>{{ _("The course {0} is now available on {1}.").format(frappe.bold(title), app_name) }}</p>
+  <br>
+	<p>Click on the link below to start learning.</p>
+	<p style="margin: 15px 0px;">
+		<a href="{{ course_link }}" rel="nofollow" class="btn btn-primary">{{ _("Start Learning") }}</a>
+	</p>
+	<br>
+	<p>
+		{{ _("You can also copy-paste following link in your browser") }}<br>
+		<a href="{{ course_link }}">{{ site_url }}{{ course_link }}</a>
+	</p>
+	<br>
+	<p>Thanks and Regards,</p>
+	<p>{{ app_name }}</p>
+</div>

community/templates/quiz.html

@@ -1,33 +1,59 @@
-{% set last_submission = quiz.get_last_submission_details() %}
+<div id="quiz-title" class="course-home-headings">{{ quiz.title }}</div>
-{% if last_submission %}
+
-<div class="mb-5 pull-right">
+<div class="card-divider"></div>
-  <div class="text-muted">Last Submitted On: {{ frappe.utils.pretty_date(last_submission.creation) }}</div>
+
-  <div class="text-muted">Last Submission Score: {{ last_submission.score }}</div>
+<div class="mt-5">
-</div>
+  <form id="quiz-form">
-{% endif %}
+    <div class="questions">
-<h3 id="title" class="mb-5">{{ quiz.title }}</h3>
+      {% for question in quiz.questions %}
-<form id="quiz-form">
+      <div class="question {% if loop.index == 1 %} active-question {% else %} hide {% endif %}"
-  {% for question in quiz.questions %}
+        data-question="{{ question.question }}" data-multi="{{ question.multiple}}" data-qt-index="{{ loop.index }}">
-  <div class="question mb-5" data-question="{{ question.question }}"
+        <p>{{ frappe.utils.md_to_html(question.question) }}</p>
-    data-multi="{{ question.multiple_correct_answers}}">
+
-    <p> {{ loop.index }}. {{ question.question }}</p>
+        {% if question.multiple %}
-    {% set options = [question.option_1, question.option_2, question.option_3, question.option_4] %}
+        <small class="font-weight-bold">Choose all answers that apply:</small>
-    {% for option in options %}
+        {% else %}
-    {% if option %}
+        <small class="font-weight-bold">Choose 1 answer:</small>
-    <div class="custom-checkbox mb-2">
+        {% endif %}
-      <label>
+
-        <input {% if question.multiple %} type="checkbox" {% else %} type="radio"
+        <div class="card-divider"></div>
-          name="{{ question.question | urlencode }}" {% endif %} class="option" value="{{ option | urlencode }}">
+
-          <img />
+        {% set options = [question.option_1, question.option_2, question.option_3, question.option_4] %}
-      </label>
+
-      <span class="label-area">{{ option }}</span>
+        {% for option in options %}
+        {% if option %}
+
+        <div class="custom-checkbox">
+          <label class="quiz-label">
+            <input class="option" value="{{ option | urlencode }}"
+            data-correct="{{ question['is_correct_' + loop.index | string] }}"
+            {% if question.multiple %} type="checkbox"
+            {% else %} type="radio" name="{{ question.question | urlencode }}" {% endif %}>
+            <img class="empty-checkbox mr-3"/>
+          </label>
+          <span class="label-area">{{ frappe.utils.md_to_html(option) }}</span>
+        </div>
+
+        {% set explanation = question['explanation_' + loop.index | string] %}
+        {% if explanation %}
+        <small class="explanation muted-text hide">{{ explanation }}</small>
+        {% endif %}
+
+        <div class="card-divider"></div>
+        {% endif %}
+        {% endfor %}
+
+      </div>
+      {% endfor %}
     </div>
-    {% endif %}
+    <div class="quiz-footer">
-    {% endfor %}
+      <span class="font-weight-bold"> <span class="current-question">1</span> of {{ quiz.questions | length }}</span>
-  </div>
+      <button class="btn btn-primary pull-right" id="check" disabled>Check</button>
-  {% endfor %}
+      <button class="btn btn-primary hide" id="next">Next</button>
-  <button class="btn btn-secondary hide mb-5" id="try-again">Try Again</button>
+      <button class="btn btn-primary hide" id="summary">Summary</button>
-  <button class="btn btn-primary" id="submit-quiz">Submit</button>
+    </div>
-  <h4 class="success-message"></h4>
+    <div class="button is-secondary pull-right hide" id="try-again">Try Again</div>
-  <h5 class="score text-muted"></h5>
+    <h4 class="success-message"></h4>
-</form>
+    <h5 class="score text-muted"></h5>
+  </form>
+</div>

community/www/batch/learn.html

@@ -1,13 +1,8 @@
 {% extends "templates/base.html" %}
 {% from "www/macros/livecode.html" import LiveCodeEditorJS, LiveCodeEditor with context %}
-{% block title %}{{ lesson.title }}{% endblock %}
+{% block title %} {{ lesson.title }} - {{ course.title }} {% endblock %}
 
 {% block head_include %}
-<meta name="description" content="{{lesson.title}} - {{course.title}}" />
-<meta name="keywords" content="{{lesson.title}} - {{course.title}}" />
-<style>
-</style>
-
 <link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 <link rel="stylesheet" href="/assets/css/lms.css">
 <link rel="stylesheet" href="/assets/frappe/css/hljs-night-owl.css">
@@ -47,7 +42,7 @@
   </div>
 
   {% if membership or lesson.include_in_preview %}
-  <div class="common-card-style lesson-content-card from-markdown">{{ lesson.render_html() }}</div>
+  <div class="common-card-style lesson-content-card markdown-source">{{ lesson.render_html() }}</div>
   {% else %}
   <div class="common-card-style lesson-content-card">
     <span>This lesson is not available for Preview. Please join the course to access this lesson. <a href="/courses/{{ course.name }}">Checkout Course Details.</a></span>

community/www/batch/learn.js

@@ -1,13 +1,27 @@
 frappe.ready(() => {
 
+  localStorage.removeItem($("#quiz-title").text());
+
   save_current_lesson();
 
+  $(".option").click((e) => {
+    enable_check(e);
+  })
+
   $("#progress").click((e) => {
     mark_progress(e);
   });
 
-  $("#submit-quiz").click((e) => {
+  $("#summary").click((e) => {
-    submit_quiz(e);
+    quiz_summary(e);
+  });
+
+  $("#check").click((e) => {
+    check_answer(e);
+  });
+
+  $("#next").click((e) => {
+    mark_active_question(e);
   });
 
   $("#try-again").click((e) => {
@@ -25,6 +39,28 @@ var save_current_lesson = () => {
   }
 }
 
+var enable_check = (e) => {
+  if ($(".option:checked").length && $("#check").attr("disabled")) {
+    $("#check").removeAttr("disabled");
+  }
+}
+
+var mark_active_question = (e = undefined) => {
+  var current_index;
+  var next_index = 1;
+  if (e) {
+    e.preventDefault();
+    current_index = $(".active-question").attr("data-qt-index");
+    next_index = parseInt(current_index) + 1;
+  }
+  $(".question").addClass("hide").removeClass("active-question");
+  $(`.question[data-qt-index='${next_index}']`).removeClass("hide").addClass("active-question");
+  $(".current-question").text(`${next_index}`);
+  $("#check").removeClass("hide").attr("disabled", true);
+  $("#next").addClass("hide");
+  $(".explanation").addClass("hide");
+}
+
 var mark_progress = (e) => {
   var status = $(e.currentTarget).attr("data-progress");
   frappe.call({
@@ -56,47 +92,77 @@ var change_progress_indicators = (status, e) => {
   $(e.currentTarget).text(label).attr("data-progress", data_progress);
 }
 
-var submit_quiz = (e) => {
+var quiz_summary = (e) => {
   e.preventDefault();
-  var result = [];
+  var quiz_name = $("#quiz-title").text();
-  $('.question').each((i, element) => {
+  var total_questions = $(".question").length;
-    var options = $(element).find(".option");
+
-    var answers = [];
-    options.filter((i, op) => $(op).prop("checked")).each((i, elem) => answers.push(decodeURIComponent(elem.value)));
-    result.push({
-      "question": element.dataset.question,
-      "answer": answers
-    });
-  });
   frappe.call({
-    method: "community.lms.doctype.lms_quiz.lms_quiz.submit",
+    method: "community.lms.doctype.lms_quiz.lms_quiz.quiz_summary",
     args: {
-      quiz: $("#title").text(),
+      "quiz": quiz_name,
-      result: result
+      "results": localStorage.getItem(quiz_name)
     },
     callback: (data) => {
-      $("#submit-quiz").addClass("hide");
+      var message = data.message == total_questions ? "Excellent Work" : "You were almost there."
+      $(".question").addClass("hide");
+      $(".quiz-footer").addClass("hide");
+      $("#quiz-form").parent().prepend(
+        `<div class="text-center summary"><h2>${message} 👏 </h2>
+          <div class="font-weight-bold">${data.message}/${total_questions} correct.</div></div>`);
       $("#try-again").removeClass("hide");
-      $(":input[type='checkbox']").prop("disabled", true);
-      $(":input[type='radio']").prop("disabled", true);
-      if (data.message == result.length) {
-        $(".success-message").text("Congratulations, you cleared the quiz!");
-      }
-      else {
-        $(".success-message").text("Some of your answers weren't correct. You can give it another shot.");
-      }
-      $(".score").text(`Score: ${data.message}/${result.length}`);
     }
   })
 }
 
 var try_quiz_again = (e) => {
-  e.preventDefault();
+  window.location.reload();
-  $(":input[type='checkbox']").prop("disabled", false);
+}
-  $(":input[type='radio']").prop("disabled", false);
+
-  $("#quiz-form").trigger("reset");
+var check_answer = (e) => {
-  $(".success-message").text("");
+  e.preventDefault();
-  $(".score").text("");
+
-  $("#submit-quiz").removeClass("hide");
+  var quiz_name = $("#quiz-title").text();
-  $("#try-again").addClass("hide");
+  var total_questions = $(".question").length;
+  var current_index = $(".active-question").attr("data-qt-index");
+
+  $(".explanation").removeClass("hide");
+  $("#check").addClass("hide");
+  current_index == total_questions ? $("#summary").removeClass("hide") : $("#next").removeClass("hide");
+
+  var [answer, is_correct] = parse_options();
+  add_to_local_storage(quiz_name, current_index, answer, is_correct)
+}
+
+var parse_options = () => {
+  var answer = [];
+  var is_correct = [];
+  $(".active-question input").each((i, element) => {
+    var correct = parseInt($(element).attr("data-correct"));
+    if ($(element).prop("checked")) {
+      answer.push(decodeURIComponent($(element).val()));
+      correct && is_correct.push(1);
+      correct ? add_icon(element, "check") : add_icon(element, "wrong");
+    }
+    else {
+      correct && is_correct.push(0);
+      correct ? add_icon(element, "minus-circle-green") : add_icon(element, "minus-circle");
+    }
+  })
+  return [answer, is_correct];
+}
+
+var add_icon = (element, icon) => {
+  $(element).parent().empty().html(`<img class="mr-3" src="/assets/community/icons/${icon}.svg">`);
+}
+
+var add_to_local_storage = (quiz_name, current_index, answer, is_correct) => {
+  var quiz_stored = JSON.parse(localStorage.getItem(quiz_name));
+  var quiz_obj = {
+    "question_index": current_index,
+    "answer": answer.join(),
+    "is_correct": is_correct
+  }
+  quiz_stored ? quiz_stored.push(quiz_obj) : quiz_stored = [quiz_obj]
+  localStorage.setItem(quiz_name, JSON.stringify(quiz_stored))
 }

community/www/batch/learn.py

@@ -17,14 +17,20 @@ def get_context(context):
             index_ = get_lesson_index(context.course, context.batch, frappe.session.user) or "1.1"
         else:
             index_ = "1.1"
-        frappe.local.flags.redirect_location = context.course.get_learn_url(index_) + context.course.query_parameter
+        utils.redirect_to_lesson(context.course, index_)
-        raise frappe.Redirect
 
-    context.lesson = list(filter(lambda x: cstr(x.number) == lesson_number, context.lessons))[0]
+    context.lesson = get_current_lesson_details(lesson_number, context)
     neighbours = context.course.get_neighbours(lesson_number, context.lessons)
     context.next_url = get_learn_url(neighbours["next"], context.course)
     context.prev_url = get_learn_url(neighbours["prev"], context.course)
 
+    meta_info = context.lesson.title + " - " + context.course.title
+    context.metatags = {
+        "title": meta_info,
+        "keywords": meta_info,
+        "description": meta_info
+    }
+
     context.page_extensions = get_page_extensions()
     context.page_context = {
         "course": context.course.name,
@@ -33,6 +39,12 @@ def get_context(context):
         "is_member": context.membership is not None
     }
 
+def get_current_lesson_details(lesson_number, context):
+    details_list = list(filter(lambda x: cstr(x.number) == lesson_number, context.lessons))
+    if not len(details_list):
+        utils.redirect_to_lesson(context.course)
+    return details_list[0]
+
 def get_learn_url(lesson_number, course):
     return course.get_learn_url(lesson_number) and course.get_learn_url(lesson_number) + course.query_parameter
 

community/www/batch/utils.py

@@ -24,9 +24,6 @@ def get_common_context(context):
         if batch:
             context.batch = batch
 
-        context.members = course.get_mentors(membership.batch) + course.get_students(membership.batch)
-        context.member_count = len(context.members)
-
     context.course.query_parameter = "?batch=" + membership.batch if membership and membership.batch else ""
     context.livecode_url = get_livecode_url()
 

community/www/courses/course.html

@@ -3,8 +3,6 @@
 {% block title %}{{ course.title }}
 {% endblock %}
 {% block head_include %}
-<meta name="description" content="Courses" />
-<meta name="keywords" content="Courses {{course.title}}" />
 <link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 {% block content %}
@@ -24,12 +22,16 @@
 
 {% macro CourseCardWide(course) %}
 <div class="common-card-style course-card-wide">
-  <div class="course-image-wide" style="background-image: url({{ course.image }});">
+  <div class="course-image-wide {% if not course.image %} default-image {% endif %}"
+    {% if course.image %}style="background-image: url({{ course.image }});"{% endif %}>
     <div class="course-tags">
       {% for tag in course.get_tags() %}
       <div class="course-card-pills">{{ tag }}</div>
       {% endfor %}
     </div>
+    {% if not course.image %}
+    <div class="default-image-text">{{ course.title[0] }}</div>
+    {% endif %}
   </div>
   <div class="course-card-wide-content">
     <div class="course-info">
@@ -56,6 +58,12 @@
         Continue Learning <img class="ml-2" src="/assets/community/icons/white-arrow.svg" />
       </a>
       {% endif %}
+      {% if course.upcoming %}
+      <button class="button wide-button is-default" id="notify-me" data-course="{{course.name | urlencode}}"
+      {% if is_user_interested %} disabled="disabled" title="Your interest has already been noted." {% endif %} >
+        Notify me when available
+      </button>
+      {% endif %}
       {% if course.video_link %}
       <div class="button wide-button is-secondary video-preview">
         Watch Video Preview
@@ -100,24 +108,33 @@
       </div>
       {{ widgets.MemberCard(member=course.get_instructor(), show_course_count=True, dimension_class="member-card-large") }}
     </div>
-    {% if course.get_course_progress() %}
+    {% set progress = course.get_course_progress() %}
+    {% if progress %}
     <div class="course-progress-section">
       <div class="course-home-headings">
         Your Progress
       </div>
       <div class="common-card-style progress-card">
         <p class="small-title">
+          {% if progress != 100 %}
           Great work so far!
+          {% else %}
+          Excellent Work on completing this course 👏
+          {% endif %}
         </p>
         <p class="progress-text">
+          {% if progress != 100 %}
           Challenge yourself to complete the lessons and grow professionally.
+          {% else %}
+          You have reached a new level in your journey to success!
+          {% endif %}
         </p>
         <div class="progress-percentage">
-          {{ frappe.utils.rounded(course.get_course_progress()) }}%
+          {{ frappe.utils.rounded(progress) }}%
         </div>
         <div class="progress">
-          <div class="progress-bar" role="progressbar" style="width: {{ course.get_course_progress() }}%"
+          <div class="progress-bar" role="progressbar" style="width: {{ progress }}%"
-            aria-valuenow="{{ course.get_course_progress() }}" aria-valuemin="0" aria-valuemax="100"></div>
+            aria-valuenow="{{ progress }}" aria-valuemin="0" aria-valuemax="100"></div>
         </div>
       </div>
     </div>
@@ -185,55 +202,3 @@
   {% endif %}
 </div>
 {% endmacro %}
-
-{% macro BatchSection(course) %}
-<div class="row">
-  <div class="col-lg-8 col-md-12">
-    {% if course.is_mentor(frappe.session.user) %}
-    {{ BatchSectionForMentors(course, course.get_batches(mentor=frappe.session.user)) }}
-    {% else %}
-    {{ BatchSectionForStudents(course, course.get_upcoming_batches()) }}
-    {% endif %}
-  </div>
-</div>
-{% endmacro %}
-{% macro BatchSectionForMentors(course, mentor_batches) %}
-<h2>Your Batches</h2>
-
-{% if mentor_batches %}
-
-<div class="row">
-  {% for batch in mentor_batches %}
-  <div class="col-lg-4 col-md-6">
-    {{ widgets.RenderBatch(course=course, batch=batch, can_manage=True) }}
-  </div>
-  {% endfor %}
-</div>
-
-<a class="add-batch margin-bottom" href="/add-a-new-batch?new=1&course={{course.name}}">Add a new batch</a>
-{% else %}
-<div class="mentor_message">
-  <p>
-    You are a mentor for this course.
-  </p>
-  <a class="" href="/add-a-new-batch?new=1&course={{course.name}}">Create your first batch</a>
-</div>
-{% endif %}
-{% endmacro %}
-
-{% macro BatchSectionForStudents(course, upcoming_batches) %}
-{% if upcoming_batches %}
-<div class="mt-5">
-  <h3 class="upcoming">Upcoming Batches</h3>
-  <div class="row">
-    {% for batch in upcoming_batches %}
-    <div class="col-lg-4 col-md-6">
-      {{ widgets.RenderBatch(course=course, batch=batch, can_join=True) }}
-    </div>
-    {% endfor %}
-  </div>
-  {% else %}
-  <div class="mt-5 upcoming">There are no Upcoming Batches for this course currently.</div>
-  {% endif %}
-</div>
-{% endmacro %}

community/www/courses/course.js

@@ -41,6 +41,10 @@ frappe.ready(() => {
     submit_review(e);
   })
 
+  $("#notify-me").click((e) => {
+    notify_user(e);
+  })
+
 })
 
 var check_mentor_request = () => {
@@ -209,3 +213,23 @@ var submit_review = (e) => {
     }
   })
 }
+
+var notify_user = (e) => {
+  e.preventDefault();
+  var course = decodeURIComponent($(e.currentTarget).attr("data-course"));
+  if (frappe.session.user == "Guest") {
+    window.location.href = `/login?redirect-to=/courses/${course}`;
+    return;
+  }
+
+  frappe.call({
+    method: "community.lms.doctype.lms_course_interest.lms_course_interest.capture_interest",
+    args: {
+      "course": course
+    },
+    callback: (data) => {
+      frappe.msgprint(__("Your interest has been noted. We'll notify you via email when this course becomes available."));
+      $("#notify-me").attr("disabled", true).attr("title", "Your interest has already been noted");
+    }
+  })
+}

community/www/courses/course.py

@@ -18,3 +18,18 @@ def get_context(context):
     membership = course.get_membership(frappe.session.user)
     context.course.query_parameter = "?batch=" + membership.batch if membership and membership.batch else ""
     context.membership = membership
+    if context.course.upcoming:
+        context.is_user_interested = get_user_interest(context.course.name)
+    context.metatags = {
+        "title": course.title,
+        "image": course.image,
+        "description": course.short_introduction,
+        "keywords": course.title
+    }
+
+def get_user_interest(course):
+    return frappe.db.count("LMS Course Interest",
+            {
+                "course": course,
+                "user": frappe.session.user
+            })

community/www/courses/index.html

@@ -2,8 +2,6 @@
 {% from "www/hackathons/macros/card.html" import null_card %}
 {% block title %}{{ 'Courses' }}{% endblock %}
 {% block head_include %}
-<meta name="description" content="{{ 'Courses' }}" />
-<meta name="keywords" content="Courses" />
 <style>
 </style>
 {% endblock %}

community/www/courses/index.py

@@ -3,6 +3,12 @@ import frappe
 def get_context(context):
     context.no_cache = 1
     context.courses = get_courses()
+    context.metatags = {
+        "title": "All Courses",
+        "image": frappe.db.get_single_value("Website Settings", "banner_image"),
+        "description": "This page lists all the courses published on our website",
+        "keywords": "All Courses, Courses, Learn"
+    }
 
 def get_courses():
     course_names = frappe.get_all("LMS Course", filters={"is_published": True}, pluck="name")

community/www/profiles/profile.html

@@ -35,21 +35,24 @@
       {% endif %}
       <span class="social-icons">
         {% if member.linkedin %}
-        <a class="linkedin" href="{{ member.linkedin }}">
+        <a class="linkedin button-links" href="{{ member.linkedin }}">
           <img src="/assets/community/images/linkedin.png">
         </a>
         {% endif %}
         {% if member.medium %}
-        <a class="medium" href="{{ member.medium}}">
+        <a class="medium button-links" href="{{ member.medium}}">
           <img src="/assets/community/icons/medium.svg">
         </a>
         {% endif %}
         {% if member.github %}
-        <a class="github" href="{{ member.github }}">
+        <a class="github button-links" href="{{ member.github }}">
           <img src="/assets/community/icons/github.svg">
         </a>
         {% endif %}
       </span>
+      {% if frappe.session.user == member.email %}
+      <a class="dark-links pull-right" href="edit-profile?name={{ member.email }}">Edit Profile</a>
+      {% endif %}
     </div>
   </div>
 </div>