refactor: switched to less for css

- Added build setup to include styles.less in building community.css
- The old styles are still in style.css. Those styles will be slowly moved to style.less.
- Move all the new styles to style.less

.github/workflows/ci.yml

@@ -36,27 +36,12 @@ jobs:
     - name: setup node
       uses: actions/setup-node@v2
       with:
-        node-version: '14'
+        node-version: '12'
         check-latest: true
-    - name: setup cache for bench
-      uses: actions/cache@v2
-      with:
-        path: ~/bench-cache
-        key: ${{ runner.os }}
     - name: install bench
-      run: |
-        pip3 install frappe-bench
-        which bench
+      run: pip3 install frappe-bench
     - name: bench init
-      run: |
-        if [ -d ~/bench-cache/bench.tgz ]
-        then
-           (cd && tar xzf ~/bench-cache/bench.tgz)
-        else
-          bench init ~/frappe-bench --skip-redis-config-generation
-          mkdir -p ~/bench-cache
-          (cd && tar czf ~/bench-cache/bench.tgz frappe-bench)
-        fi
+      run: bench init ~/frappe-bench --skip-redis-config-generation
     - name: add community app to bench
       working-directory: /home/runner/frappe-bench
       run: bench get-app community $GITHUB_WORKSPACE
@@ -65,13 +50,10 @@ jobs:
       run: bench new-site --mariadb-root-password root --admin-password admin frappe.local
     - name: install community app
       working-directory: /home/runner/frappe-bench
-      run: bench --verbose --site frappe.local install-app community
+      run: bench --site frappe.local install-app community
     - name: allow tests
       working-directory: /home/runner/frappe-bench
       run: bench --site frappe.local set-config allow_tests true
-    - name: bench build
-      working-directory: /home/runner/frappe-bench
-      run: bench --site frappe.local build
     - name: run tests
       working-directory: /home/runner/frappe-bench
       run: bench --site frappe.local run-tests --app community

.gitignore

@@ -3,5 +3,4 @@
 *.egg-info
 *.swp
 tags
-community/docs/current
-community/public/dist
+community/docs/current

community/community/doctype/community_course_member/community_course_member.py

@@ -50,3 +50,18 @@ class CommunityCourseMember(WebsiteGenerator):
 			send_priority=0, 
 			queue_separately=True, 
 			args=args)
+
+	def create_user(self):
+		user = 	frappe.get_doc({
+					"doctype": "User",
+					"email": self.email,
+					"first_name": self.full_name.split(" ")[0],
+					"full_name": self.full_name,
+					"username": self.user_name,
+					"send_welcome_email": 0,
+					"user_type": 'Website User',
+					"redirect_url": self.name
+				})
+		user.save(ignore_permissions=True)
+		update_password_link = user.reset_password()
+		return user, update_password_link

community/community/doctype/community_member/community_member.py

@@ -8,97 +8,57 @@ import re
 from frappe import _
 from frappe.model.document import Document
 import random
-from frappe.utils import cint
-import hashlib
 
 class CommunityMember(Document):
 
-    def validate(self):
-        self.validate_username()
-        self.abbr = ("").join([ s[0] for s in self.full_name.split() ])
-        if self.route != self.username:
-            self.route = self.username
+	def validate(self):
+		self.validate_username()
+		self.abbr = ("").join([ s[0] for s in self.full_name.split() ])
+		if self.route != self.username:
+			self.route = self.username	
+	
+	def validate_username(self):
+		if not self.username:
+			self.username = create_username_from_email(self.email)
 
-    def validate_username(self):
-        if not self.username:
-            self.username = create_username_from_email(self.email)
+		if self.username:
+			if len(self.username) < 4:
+				frappe.throw(_("Username must be atleast 4 characters long."))
+			if not re.match("^[A-Za-z0-9_]*$", self.username):
+				frappe.throw(_("Username can only contain alphabets, numbers and underscore."))
+			self.username = self.username.lower()
 
-        if self.username:
-            if len(self.username) < 4:
-                frappe.throw(_("Username must be atleast 4 characters long."))
-            if not re.match("^[A-Za-z0-9_]*$", self.username):
-                frappe.throw(_("Username can only contain alphabets, numbers and underscore."))
-            self.username = self.username.lower()
-
-    def get_course_count(self) -> int:
-        """Returns the number of courses authored by this user.
-        """
-        return frappe.db.count(
-            'LMS Course', {
-                'owner': self.email
-        })
-
-    def get_batch_count(self) -> int:
-        """Returns the number of batches authored by this user.
-        """
-        return frappe.db.count(
-            'LMS Batch Membership', {
-                'member': self.name,
-                'member_type': 'Mentor'
-            })
-
-    def get_photo_url(self):
-        return frappe.db.get_value("User", self.email, ["user_image"])
-
-    def get_palette(self):
-        palette = [
-            ['--orange-avatar-bg', '--orange-avatar-color'],
-            ['--pink-avatar-bg', '--pink-avatar-color'],
-            ['--blue-avatar-bg', '--blue-avatar-color'],
-            ['--green-avatar-bg', '--green-avatar-color'],
-            ['--dark-green-avatar-bg', '--dark-green-avatar-color'],
-            ['--red-avatar-bg', '--red-avatar-color'],
-            ['--yellow-avatar-bg', '--yellow-avatar-color'],
-            ['--purple-avatar-bg', '--purple-avatar-color'],
-            ['--gray-avatar-bg', '--gray-avatar-color0']
-        ]
-
-        encoded_name = str(self.full_name).encode("utf-8")
-        hash_name = hashlib.md5(encoded_name).hexdigest()
-        idx = cint((int(hash_name[4:6], 16) + 1) / 5.33)
-        return palette[idx % 8]
-
-    def __repr__(self):
-        return f"<CommunityMember: {self.email}>"
+	def __repr__(self):
+		return f"<CommunityMember: {self.email}>"
 
 def create_member_from_user(doc, method):
-    username = doc.username
+	username = doc.username
 
-    if ( doc.username and  username_exists(doc.username)) or not doc.username:
-        username = create_username_from_email(doc.email)
+	if ( doc.username and  username_exists(doc.username)) or not doc.username:
+		username = create_username_from_email(doc.email)
 
-    elif len(doc.username) < 4 and doc.send_welcome_email == 1:
-        username = adjust_username(doc.username)
+	elif len(doc.username) < 4:
+		username = adjust_username(doc.username)
 
-    if username_exists(username):
-        username = username + str(random.randint(0,9))
+	if username_exists(username):
+		username = username + str(random.randint(0,9))
 
-    member = frappe.get_doc({
-        "doctype": "Community Member",
-        "full_name": doc.full_name,
-        "username": username,
-        "email": doc.email,
-        "route": doc.username,
-        "owner": doc.email
-    })
-    member.save(ignore_permissions=True)
+	member = frappe.get_doc({
+		"doctype": "Community Member",
+		"full_name": doc.full_name,
+		"username": username,
+		"email": doc.email,
+		"route": doc.username,
+		"owner": doc.email
+	})
+	member.save(ignore_permissions=True)
 
 def username_exists(username):
-    return frappe.db.exists("Community Member", dict(username=username))
+	return frappe.db.exists("Community Member", dict(username=username))
 
 def create_username_from_email(email):
-    string = email.split("@")[0]
-    return ''.join(e for e in string if e.isalnum())
+	string = email.split("@")[0]
+	return ''.join(e for e in string if e.isalnum())
 
 def adjust_username(username):
-    return username.ljust(4, str(random.randint(0,9)))
+	return username.ljust(4, str(random.randint(0,9)))

community/community/widgets/Avatar.html

@@ -1,14 +0,0 @@
-{% set color = member.get_palette() %}
-<a href="/{{member.username}}">
-<span class="avatar {{ avatar_class }}" title="{{ member.full_name }}">
-  {% if member.get_photo_url() %}
-  <img class="avatar-frame standard-image" src="{{ member.get_photo_url() }}" title="{{ member.full_name }}">
-  </img>
-  {% else %}
-  <span class="avatar-frame standard-image" title="{{ member.full_name }}"
-    style="background-color: var({{color[0]}}); color: var({{color[1]}});">
-    {{ member.abbr }}
-  </span>
-  {% endif %}
-  </a>
-</span>

community/hooks.py

@@ -10,16 +10,15 @@ app_icon = "octicon octicon-file-directory"
 app_color = "grey"
 app_email = "jannat@erpnext.com"
 app_license = "AGPL"
-
 # Includes in <head>
 # ------------------
 
 # include js, css files in header of desk.html
-# app_include_css = "/assets/community/css/community.css"
-# app_include_js = "/assets/community/js/community.js"
+app_include_css = "/assets/community/css/community.css"
+app_include_js = "/assets/community/js/community.js"
 
 # include js, css files in header of web template
-web_include_css = "community.bundle.css"
+web_include_css = "/assets/css/community.css"
 # web_include_css = "/assets/community/css/community.css"
 # web_include_js = "/assets/community/js/community.js"
 
@@ -137,17 +136,16 @@ primary_rules = [
     {"from_route": "/sketches/<sketch>", "to_route": "sketches/sketch"},
     {"from_route": "/courses/<course>", "to_route": "courses/course"},
     {"from_route": "/courses/<course>/<topic>", "to_route": "courses/topic"},
+    {"from_route": "/hackathons", "to_route": "hackathons"},
     {"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>/<batch>/learn", "to_route": "batch/learn"},
-    {"from_route": "/courses/<course>/<batch>/learn/<int:chapter>.<int:lesson>", "to_route": "batch/learn"},
-    {"from_route": "/courses/<course>/<batch>/schedule", "to_route": "batch/schedule"},
-    {"from_route": "/courses/<course>/<batch>/members", "to_route": "batch/members"},
-    {"from_route": "/courses/<course>/<batch>/discuss", "to_route": "batch/discuss"},
-    {"from_route": "/courses/<course>/<batch>/about", "to_route": "batch/about"},
-    {"from_route": "/courses/<course>/<batch>/progress", "to_route": "batch/progress"}
+    {"from_route": "/courses/<course>/<batch>/learn", "to_route": "courses/learn"},
+    {"from_route": "/courses/<course>/<batch>/schedule", "to_route": "courses/schedule"},
+    {"from_route": "/courses/<course>/<batch>/members", "to_route": "courses/members"},
+    {"from_route": "/courses/<course>/<batch>/discuss", "to_route": "courses/discuss"},
+    {"from_route": "/courses/<course>/<batch>/about", "to_route": "courses/about"}
 ]
 
 # Any frappe default URL is blocked by profile-rules, add it here to unblock it
@@ -165,9 +163,7 @@ whitelist = [
     "/hackathons",
     "/dashboard",
     "/join-request"
-    "/add-a-new-batch",
-    "/new-sign-up",
-    "/message"
+    "/add-a-new-batch"
 ]
 whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]
 

community/lms/api.py

@@ -21,16 +21,3 @@ def get_section(name):
     """
     doc = frappe.get_doc("LMS Section", name)
     return doc and doc.as_dict()
-
-@frappe.whitelist()
-def submit_solution(exercise, code):
-    """Submits a solution.
-
-    @exerecise: name of the exercise to submit
-    @code: solution to the exercise
-    """
-    ex = frappe.get_doc("Exercise", exercise)
-    if not ex:
-        return
-    doc = ex.submit(code)
-    return {"name": doc.name, "creation": doc.creation}

community/lms/doctype/chapter/chapter.js

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

community/lms/doctype/chapter/chapter.py

@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class Chapter(Document):
-    def get_lessons(self):
-        rows = frappe.db.get_all("Lesson",
-            filters={"chapter": self.name},
-            fields='*',
-            order_by="index_")
-        return [frappe.get_doc(dict(row, doctype='Lesson')) for row in rows]

community/lms/doctype/exercise/exercise.js

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

community/lms/doctype/exercise/exercise.json

@@ -1,106 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2021-05-19 17:43:39.923430",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "title",
-  "description",
-  "code",
-  "answer",
-  "column_break_4",
-  "course",
-  "hints",
-  "tests",
-  "image",
-  "lesson"
- ],
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title"
-  },
-  {
-   "fieldname": "course",
-   "fieldtype": "Link",
-   "label": "Course",
-   "options": "LMS Course"
-  },
-  {
-   "columns": 4,
-   "fieldname": "description",
-   "fieldtype": "Small Text",
-   "in_list_view": 1,
-   "label": "Description"
-  },
-  {
-   "columns": 4,
-   "fieldname": "answer",
-   "fieldtype": "Code",
-   "label": "Answer"
-  },
-  {
-   "fieldname": "tests",
-   "fieldtype": "Code",
-   "label": "Tests"
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "columns": 4,
-   "fieldname": "hints",
-   "fieldtype": "Small Text",
-   "label": "Hints"
-  },
-  {
-   "columns": 4,
-   "fieldname": "code",
-   "fieldtype": "Code",
-   "label": "Code"
-  },
-  {
-   "fieldname": "image",
-   "fieldtype": "Code",
-   "label": "Image",
-   "read_only": 1
-  },
-  {
-   "fieldname": "lesson",
-   "fieldtype": "Link",
-   "label": "Lesson",
-   "options": "Lesson"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-05-20 13:23:12.340928",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "Exercise",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "search_fields": "title",
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "title",
- "track_changes": 1
-}

community/lms/doctype/exercise/exercise.py

@@ -1,59 +0,0 @@
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe.model.document import Document
-from ..lms_sketch.livecode import livecode_to_svg
-
-class Exercise(Document):
-    def before_save(self):
-        self.image = livecode_to_svg(None, self.answer)
-
-    def get_user_submission(self):
-        """Returns the latest submission for this user.
-        """
-        user = frappe.session.user
-        if not user or user == "Guest":
-            return
-
-        result = frappe.get_all('Exercise Submission',
-            fields="*",
-            filters={
-                "owner": user,
-                "exercise": self.name
-            },
-            order_by="creation desc",
-            page_length=1)
-
-        print("get_user_submission", result)
-        if result:
-            return result[0]
-
-    def submit(self, code):
-        """Submits the given code as solution to exercise.
-        """
-        user = frappe.session.user
-        if not user or user == "Guest":
-            return
-
-        old_submission = self.get_user_submission()
-        if old_submission and old_submission.solution == code:
-            return old_submission
-
-        course = frappe.get_doc("LMS Course", self.course)
-        batch = course.get_student_batch(user)
-
-        image = livecode_to_svg(None, code)
-
-        doc = frappe.get_doc(
-            doctype="Exercise Submission",
-            exercise=self.name,
-            exercise_title=self.title,
-            course=self.course,
-            lesson=self.lesson,
-            batch=batch and batch.name,
-            image=image,
-            solution=code)
-        doc.insert(ignore_permissions=True)
-        return doc
-

community/lms/doctype/exercise/test_exercise.py

@@ -1,47 +0,0 @@
-# Copyright (c) 2021, FOSS United and Contributors
-# See license.txt
-
-import frappe
-import unittest
-
-class TestExercise(unittest.TestCase):
-    def setUp(self):
-        frappe.db.sql('delete from `tabExercise Submission`')
-        frappe.db.sql('delete from `tabExercise`')
-        frappe.db.sql('delete from `tabLMS Course`')
-
-    def new_exercise(self):
-        course = frappe.get_doc({
-            "doctype": "LMS Course",
-            "name": "test-course",
-            "title": "Test Course"
-        })
-        course.insert()
-        e = frappe.get_doc({
-            "doctype": "Exercise",
-            "name": "test-problem",
-            "course": course.name,
-            "title": "Test Problem",
-            "description": "draw a circle",
-            "code": "# draw a single cicle",
-            "answer": (
-                "# draw a single circle\n" +
-                "circle(100, 100, 50)")
-        })
-        e.insert()
-        return e
-
-    def test_exercise(self):
-        e = self.new_exercise()
-        assert e.get_user_submission() is None
-
-    def test_exercise_submission(self):
-        e = self.new_exercise()
-        submission = e.submit("circle(100, 100, 50)")
-        assert submission is not None
-        assert submission.exercise == e.name
-        assert submission.course == e.course
-
-        user_submission = e.get_user_submission()
-        assert user_submission is not None
-        assert user_submission.name == submission.name

community/lms/doctype/exercise_submission/exercise_submission.js

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

community/lms/doctype/exercise_submission/exercise_submission.json

@@ -1,90 +0,0 @@
-{
- "actions": [],
- "creation": "2021-05-19 11:41:18.108316",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "exercise",
-  "solution",
-  "exercise_title",
-  "course",
-  "batch",
-  "lesson",
-  "image"
- ],
- "fields": [
-  {
-   "fieldname": "exercise",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Exercise",
-   "options": "Exercise"
-  },
-  {
-   "fieldname": "solution",
-   "fieldtype": "Code",
-   "in_list_view": 1,
-   "label": "Solution"
-  },
-  {
-   "fetch_from": "exercise.title",
-   "fieldname": "exercise_title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Exercise Title",
-   "read_only": 1
-  },
-  {
-   "fetch_from": "exercise.course",
-   "fieldname": "course",
-   "fieldtype": "Link",
-   "label": "Course",
-   "options": "LMS Course",
-   "read_only": 1
-  },
-  {
-   "fieldname": "batch",
-   "fieldtype": "Link",
-   "label": "Batch",
-   "options": "LMS Batch"
-  },
-  {
-   "fetch_from": "exercise.lesson",
-   "fieldname": "lesson",
-   "fieldtype": "Link",
-   "label": "Lesson",
-   "options": "Lesson"
-  },
-  {
-   "fieldname": "image",
-   "fieldtype": "Code",
-   "label": "Image",
-   "read_only": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-05-21 11:28:45.833018",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "Exercise Submission",
- "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/exercise_submission/exercise_submission.py

@@ -1,8 +0,0 @@
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-class ExerciseSubmission(Document):
-	pass

community/lms/doctype/exercise_submission/test_exercise_submission.py

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

community/lms/doctype/invite_request/invite_request.js

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

community/lms/doctype/invite_request/invite_request.json

@@ -1,88 +0,0 @@
-{
- "actions": [],
- "creation": "2021-04-29 16:29:56.857914",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "invite_email",
-  "signup_email",
-  "column_break_4",
-  "status",
-  "full_name",
-  "username",
-  "invite_code"
- ],
- "fields": [
-  {
-   "allow_in_quick_entry": 1,
-   "fieldname": "invite_email",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Invite Email",
-   "options": "Email",
-   "unique": 1
-  },
-  {
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "label": "Full Name"
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "signup_email",
-   "fieldtype": "Data",
-   "label": "Signup Email",
-   "options": "Email"
-  },
-  {
-   "fieldname": "username",
-   "fieldtype": "Data",
-   "label": "Username"
-  },
-  {
-   "fieldname": "invite_code",
-   "fieldtype": "Data",
-   "label": "Invite Code"
-  },
-  {
-   "default": "Pending",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Status",
-   "options": "Pending\nApproved\nRejected\nRegistered"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-05-03 09:22:20.954921",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "Invite Request",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "search_fields": "invite_email, signup_email",
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "invite_email",
- "track_changes": 1
-}

community/lms/doctype/invite_request/invite_request.py

@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.model.document import Document
-import json
-from frappe.utils.password import get_decrypted_password
-
-class InviteRequest(Document):
-    def on_update(self):
-        if self.has_value_changed("status") and self.status == "Approved":
-            self.send_email()
-
-    def create_user(self, password):
-        full_name_split = self.full_name.split(" ")
-        user = 	frappe.get_doc({
-                    "doctype": "User",
-                    "email": self.signup_email,
-                    "first_name": full_name_split[0],
-                    "last_name": full_name_split[1] if len(full_name_split) > 1 else "",
-                    "username": self.username,
-                    "send_welcome_email": 0,
-                    "user_type": "Website User",
-                    "new_password": password
-                })
-        user.save(ignore_permissions=True)
-        return user
-
-    def send_email(self):
-        subject = _("Your request has been approved.")
-        args = {
-            "full_name": self.full_name,
-            "signup_form_link": "/new-sign-up?invite_code={0}".format(self.name),
-            "site_url": frappe.utils.get_url()
-        }
-        frappe.sendmail(
-            recipients=self.invite_email,
-            sender=frappe.db.get_single_value("LMS Settings", "email_sender"),
-            subject=subject,
-            header=[subject, "green"],
-            template = "lms_invite_request_approved",
-            args=args)
-
-@frappe.whitelist(allow_guest=True)
-def create_invite_request(invite_email):
-
-    if not frappe.utils.validate_email_address(invite_email):
-        return "invalid email"
-
-    if frappe.db.exists("User", invite_email):
-        return "user"
-
-    if frappe.db.exists("Invite Request", {"invite_email": invite_email}):
-        return "invite"
-
-    frappe.get_doc({
-            "doctype": "Invite Request",
-            "invite_email": invite_email
-        }).save(ignore_permissions=True)
-    return "OK"
-
-
-@frappe.whitelist(allow_guest=True)
-def update_invite(data):
-    data = frappe._dict(json.loads(data)) if type(data) == str else frappe._dict(data)
-
-    try:
-        doc = frappe.get_doc("Invite Request", data.invite_code)
-    except frappe.DoesNotExistError:
-        frappe.throw(_("Invalid Invite Code."))
-
-    doc.signup_email = data.signup_email
-    doc.username = data.username
-    doc.full_name = data.full_name
-    doc.invite_code = data.invite_code
-    doc.save(ignore_permissions=True)
-
-    user = doc.create_user(data.password)
-    if user:
-        doc.status = "Registered"
-        doc.save(ignore_permissions=True)
-
-    return "OK"

community/lms/doctype/invite_request/test_invite_request.py

@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, FOSS United and Contributors
-# See license.txt
-from __future__ import unicode_literals
-from community.lms.doctype.invite_request.invite_request import create_invite_request, update_invite
-import frappe
-import unittest
-
-class TestInviteRequest(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(self):
-        create_invite_request("test_invite@example.com")
-
-    def test_create_invite_request(self):
-        if frappe.db.exists("Invite Request", {"invite_email": "test_invite@example.com"}):
-            invite = frappe.db.get_value("Invite Request",
-                        filters={"invite_email": "test_invite@example.com"},
-                        fieldname=["invite_email", "status", "signup_email"],
-                        as_dict=True)
-            self.assertEqual(invite.status, "Pending")
-            self.assertEqual(invite.signup_email, None)
-
-    def test_create_invite_request_update(self):
-        if frappe.db.exists("Invite Request", {"invite_email": "test_invite@example.com"}):
-
-            data = {
-                "signup_email": "test_invite@example.com",
-                "username": "test_invite",
-                "full_name": "Test Invite",
-                "password": "Test@invite",
-                "invite_code": frappe.db.get_value("Invite Request", {"invite_email": "test_invite@example.com"}, "name")
-            }
-
-            update_invite(data)
-            invite = frappe.db.get_value("Invite Request",
-                        filters={"invite_email": "test_invite@example.com"},
-                        fieldname=["invite_email", "status", "signup_email", "full_name", "username", "invite_code", "name"],
-                        as_dict=True)
-            self.assertEqual(invite.signup_email, "test_invite@example.com")
-            self.assertEqual(invite.full_name, "Test Invite")
-            self.assertEqual(invite.username, "test_invite")
-            self.assertEqual(invite.invite_code, invite.name)
-            self.assertEqual(invite.status, "Registered")
-
-            user = frappe.db.get_value("User", "test_invite@example.com",
-                        fieldname=["first_name", "username", "send_welcome_email", "user_type"],
-                        as_dict=True)
-            self.assertTrue(user)
-            self.assertEqual(user.first_name, invite.full_name.split(" ")[0])
-            self.assertEqual(user.username, invite.username)
-            self.assertEqual(user.send_welcome_email, 0)
-            self.assertEqual(user.user_type, "Website User")
-
-            member = frappe.db.get_value("Community Member", {"email": "test_invite@example.com"})
-            self.assertTrue(member)
-
-    @classmethod
-    def tearDownClass(self):
-
-        if frappe.db.exists("Community Member", {"email": "test_invite@example.com"}):
-            frappe.delete_doc("Community Member", {"email": "test_invite@example.com"})
-
-        if frappe.db.exists("User", "test_invite@example.com"):
-            frappe.delete_doc("User", "test_invite@example.com")
-
-        invite_request = frappe.db.exists("Invite Request", {"invite_email": "test_invite@example.com"})
-        if invite_request:
-            frappe.delete_doc("Invite Request", invite_request)

community/lms/doctype/lesson/lesson.json

@@ -1,80 +0,0 @@
-{
- "actions": [],
- "autoname": "format:{####} {title}",
- "creation": "2021-05-03 06:21:12.995987",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "chapter",
-  "lesson_type",
-  "title",
-  "index_",
-  "body",
-  "sections"
- ],
- "fields": [
-  {
-   "fieldname": "chapter",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Chapter",
-   "options": "Chapter"
-  },
-  {
-   "default": "Video",
-   "fieldname": "lesson_type",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Lesson Type",
-   "options": "Video\nText\nQuiz"
-  },
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title"
-  },
-  {
-   "default": "1",
-   "fieldname": "index_",
-   "fieldtype": "Int",
-   "label": "Index"
-  },
-  {
-   "fieldname": "body",
-   "fieldtype": "Markdown Editor",
-   "label": "Body"
-  },
-  {
-   "fieldname": "sections",
-   "fieldtype": "Table",
-   "label": "Sections",
-   "options": "LMS Section"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-05-13 20:03:51.510605",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "Lesson",
- "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/lesson/lesson.py

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from ...section_parser import SectionParser
-
-class Lesson(Document):
-    def before_save(self):
-        sections = SectionParser().parse(self.body or "")
-        self.sections = [self.make_lms_section(i, s) for i, s in enumerate(sections)]
-        for s in self.sections:
-            if s.type == "exercise":
-                e = s.get_exercise()
-                e.lesson = self.name
-                e.save()
-
-    def get_sections(self):
-        return sorted(self.get('sections'), key=lambda s: s.index)
-
-    def make_lms_section(self, index, section):
-            s = frappe.new_doc('LMS Section', parent_doc=self, parentfield='sections')
-            s.type = section.type
-            s.id = section.id
-            s.label = section.label
-            s.contents = section.contents
-            s.index = index
-            return s
-
-    def get_next(self):
-        """Returns the number for the next lesson.
-
-        The return value would be like 1.2, 2.1 etc.
-        It will be None if there is no next lesson.
-        """
-
-
-    def get_prev(self):
-        """Returns the number for the prev lesson.
-
-        The return value would be like 1.2, 2.1 etc.
-        It will be None if there is no next lesson.
-        """

community/lms/doctype/lesson/test_lesson.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, FOSS United and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestLesson(unittest.TestCase):
-	pass

community/lms/doctype/lms_batch/lms_batch.json

@@ -1,5 +1,6 @@
 {
  "actions": [],
+ "autoname": "field:title",
  "creation": "2021-03-18 19:37:34.614796",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -26,8 +27,6 @@
   {
    "fieldname": "course",
    "fieldtype": "Link",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
    "label": "Course",
    "options": "LMS Course"
   },
@@ -50,12 +49,10 @@
    "label": "Description"
   },
   {
-   "default": "Public",
    "fieldname": "visibility",
    "fieldtype": "Select",
-   "in_list_view": 1,
    "label": "Visibility",
-   "options": "Public\nUnlisted\nPrivate"
+   "options": "\nPublic\nUnlisted\nPrivate"
   },
   {
    "fieldname": "membership",
@@ -64,19 +61,16 @@
    "options": "\nOpen\nRestricted\nInvite Only\nClosed"
   },
   {
-   "default": "Active",
    "fieldname": "status",
    "fieldtype": "Select",
-   "in_list_view": 1,
    "label": "Status",
-   "options": "Active\nInactive"
+   "options": "\nActive\nInactive"
   },
   {
-   "default": "Ready",
    "fieldname": "stage",
    "fieldtype": "Select",
    "label": "Stage",
-   "options": "Ready\nIn Progress\nCompleted\nCancelled"
+   "options": "\nReady\nIn Progress\nCompleted\nCancelled"
   },
   {
    "fieldname": "column_break_3",
@@ -97,13 +91,11 @@
   {
    "fieldname": "start_date",
    "fieldtype": "Date",
-   "in_list_view": 1,
    "label": "Start Date"
   },
   {
    "fieldname": "start_time",
    "fieldtype": "Time",
-   "in_list_view": 1,
    "label": "Start Time"
   },
   {
@@ -114,7 +106,6 @@
   {
    "fieldname": "end_time",
    "fieldtype": "Time",
-   "in_list_view": 1,
    "label": "End Time"
   }
  ],
@@ -126,7 +117,7 @@
    "link_fieldname": "batch"
   }
  ],
- "modified": "2021-05-06 05:46:38.469120",
+ "modified": "2021-04-21 12:45:21.144972",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch",

community/lms/doctype/lms_batch/lms_batch.py

@@ -6,68 +6,16 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 from community.www.courses.utils import get_member_with_email
-from frappe import _
-from community.lms.doctype.lms_batch_membership.lms_batch_membership import create_membership
-from community.query import find, find_all
 
 class LMSBatch(Document):
-    def validate(self):
-        self.validate_if_mentor()
-        if not self.code:
-            self.generate_code()
-
-    def validate_if_mentor(self):
-        course = frappe.get_doc("LMS Course", self.course)
-        if not course.is_mentor(frappe.session.user):
-           frappe.throw(_("You are not a mentor of the course {0}").format(course.title))
-
-    def after_insert(self):
-        create_membership(batch=self.name, member_type="Mentor")
-
-    def generate_code(self):
-        short_code = frappe.db.get_value("LMS Course", self.course, "short_code")
-        course_batches = frappe.get_all("LMS Batch",{"course":self.course})
-        self.code = short_code + str(len(course_batches) + 1)
-
-    def get_mentors(self):
-        memberships = frappe.get_all(
-                    "LMS Batch Membership",
-                    {"batch": self.name, "member_type": "Mentor"},
-                    ["member"])
-        member_names = [m['member'] for m in memberships]
-        return find_all("Community Member", name=["IN", member_names])
-
-    def is_member(self, email, member_type=None):
-        """Checks if a person is part of a batch.
-
-        If member_type is specified, checks if the person is a Student/Mentor.
-        """
-        member = find("Community Member", email=email)
-        if not member:
-            return
-
-        filters = {
-            "batch": self.name,
-            "member": member.name
-        }
-        if member_type:
-            filters['member_type'] = member_type
-        return frappe.db.exists("LMS Batch Membership", filters)
-
-    def get_students(self):
-        """Returns (email, full_name, username) of all the students of this batch as a list of dict.
-        """
-        memberships = frappe.get_all(
-                    "LMS Batch Membership",
-                    {"batch": self.name, "member_type": "Student"},
-                    ["member"])
-        member_names = [m['member'] for m in memberships]
-        members = frappe.get_all(
-                    "Community Member",
-                    {"name": ["IN", member_names]},
-                    ["email", "full_name", "username"])
-        return members
+	def validate(self):
+		if not self.code:
+			self.generate_code()
 
+	def generate_code(self):
+		short_code = frappe.db.get_value("LMS Course", self.course, "short_code")
+		course_batches = frappe.get_all("LMS Batch",{"course":self.course})
+		self.code = short_code + str(len(course_batches) + 1)
 
 @frappe.whitelist()
 def get_messages(batch):
@@ -88,4 +36,4 @@ def save_message(message, batch):
         "author": get_member_with_email(),
         "message": message
     })
-    doc.save(ignore_permissions=True)
+    doc.save(ignore_permissions=True)

community/lms/doctype/lms_batch_membership/lms_batch_membership.json

@@ -6,13 +6,11 @@
  "engine": "InnoDB",
  "field_order": [
   "batch",
+  "role",
+  "column_break_3",
   "member",
   "member_name",
-  "member_email",
-  "column_break_3",
-  "course",
-  "member_type",
-  "role"
+  "member_type"
  ],
  "fields": [
   {
@@ -32,7 +30,6 @@
    "options": "Community Member"
   },
   {
-   "default": "Student",
    "fieldname": "member_type",
    "fieldtype": "Select",
    "in_list_view": 1,
@@ -40,7 +37,6 @@
    "options": "\nStudent\nMentor\nStaff"
   },
   {
-   "default": "Member",
    "fieldname": "role",
    "fieldtype": "Select",
    "in_standard_filter": 1,
@@ -58,28 +54,11 @@
   {
    "fieldname": "column_break_3",
    "fieldtype": "Column Break"
-  },
-  {
-   "fetch_from": "member.email",
-   "fieldname": "member_email",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Member Email",
-   "read_only": 1,
-   "read_only_depends_on": "member.email"
-  },
-  {
-   "fetch_from": "batch.course",
-   "fieldname": "course",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Course",
-   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-05-24 09:32:04.128620",
+ "modified": "2021-04-26 12:52:59.826509",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Membership",

community/lms/doctype/lms_batch_membership/lms_batch_membership.py

@@ -8,34 +8,35 @@ from frappe.model.document import Document
 from frappe import _
 
 class LMSBatchMembership(Document):
+	
+	def validate(self):
+		self.validate_membership_in_same_batch()
+		self.validate_membership_in_different_batch_same_course()
+	
+	def validate_membership_in_same_batch(self):
+		previous_membership = frappe.db.get_value("LMS Batch Membership", {"member": self.member, "batch": self.batch}, ["member_type","member"], as_dict=1)
+		if previous_membership:
+			member_name = frappe.db.get_value("Community Member", self.member, "full_name")
+			frappe.throw(_("{0} is already a {1} of {2}").format(member_name, previous_membership.member_type, self.batch))
 
-    def validate(self):
-        self.validate_membership_in_same_batch()
-        self.validate_membership_in_different_batch_same_course()
-
-    def validate_membership_in_same_batch(self):
-        previous_membership = frappe.db.get_value("LMS Batch Membership", {"member": self.member, "batch": self.batch, "name": ["!=", self.name]}, ["member_type","member"], as_dict=1)
-        if previous_membership:
-            member_name = frappe.db.get_value("Community Member", self.member, "full_name")
-            frappe.throw(_("{0} is already a {1} of {2}").format(member_name, previous_membership.member_type, self.batch))
-
-    def validate_membership_in_different_batch_same_course(self):
-        course = frappe.db.get_value("LMS Batch", self.batch, "course")
-        previous_membership = frappe.get_all("LMS Batch Membership", {"member": self.member}, ["batch", "member_type"])
-        for membership in previous_membership:
-            batch_course = frappe.db.get_value("LMS Batch", membership.batch, "course")
-            if batch_course == course and (membership.member_type == "Student" or self.member_type == "Student"):
-                member_name = frappe.db.get_value("Community Member", self.member, "full_name")
-                frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))
+	def validate_membership_in_different_batch_same_course(self):
+		course = frappe.db.get_value("LMS Batch", self.batch, "course")
+		previous_membership = frappe.get_all("LMS Batch Membership", {"member": self.member}, ["batch", "member_type"])
+		for membership in previous_membership:
+			batch_course = frappe.db.get_value("LMS Batch", membership.batch, "course")
+			if batch_course == course and (membership.member_type == "Student" or self.member_type == "Student"):
+				member_name = frappe.db.get_value("Community Member", self.member, "full_name")
+				frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))
 
+@frappe.whitelist()
 def create_membership(batch, member=None, member_type="Student", role="Member"):
-    if not member:
-        member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name")
-    frappe.get_doc({
-        "doctype": "LMS Batch Membership",
-        "batch": batch,
-        "role": role,
-        "member_type": member_type,
-        "member": member
-    }).save(ignore_permissions=True)
-    return "OK"
+	if not member:
+		member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name")
+	frappe.get_doc({
+		"doctype": "LMS Batch Membership",
+		"batch": batch,
+		"role": role,
+		"member_type": member_type,
+		"member": member
+	}).save(ignore_permissions=True)
+	return "OK"

community/lms/doctype/lms_course/lms_course.json

@@ -2,12 +2,14 @@
  "actions": [],
  "allow_guest_to_view": 1,
  "allow_rename": 1,
+ "autoname": "field:title",
  "creation": "2021-03-01 16:49:33.622422",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "title",
+  "slug",
   "is_published",
   "column_break_3",
   "short_code",
@@ -41,6 +43,14 @@
    "fieldtype": "Data",
    "label": "Short Code"
   },
+  {
+   "description": "The slug of the course. Autogenerated from the title if not specified.",
+   "fieldname": "slug",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Slug",
+   "unique": 1
+  },
   {
    "fieldname": "column_break_3",
    "fieldtype": "Column Break"
@@ -64,8 +74,8 @@
  "is_published_field": "is_published",
  "links": [
   {
-   "group": "Chapters",
-   "link_doctype": "Chapter",
+   "group": "Topics",
+   "link_doctype": "LMS Topic",
    "link_fieldname": "course"
   },
   {
@@ -77,14 +87,9 @@
    "group": "Mentors",
    "link_doctype": "LMS Course Mentor Mapping",
    "link_fieldname": "course"
-  },
-  {
-   "group": "Mentors",
-   "link_doctype": "LMS Mentor Request",
-   "link_fieldname": "course"
   }
  ],
- "modified": "2021-05-06 13:37:03.318829",
+ "modified": "2021-04-21 14:45:41.658056",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",
@@ -103,7 +108,7 @@
    "write": 1
   }
  ],
- "search_fields": "title",
+ "search_fields": "slug",
  "sort_field": "creation",
  "sort_order": "DESC",
  "title_field": "title",

community/lms/doctype/lms_course/lms_course.py

@@ -6,34 +6,32 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 from ...utils import slugify
-from community.query import find, find_all
 
 class LMSCourse(Document):
-    @staticmethod
-    def find(name):
-        """Returns the course with specified name.
-        """
-        return find("LMS Course", is_published=True, name=name)
-
-    def autoname(self):
-        if not self.name:
-            self.name = self.generate_slug(title=self.title)
-
-    @staticmethod
-    def find_all():
-        """Returns all published courses.
-        """
-        return find_all("LMS Course", is_published=True)
+    def before_save(self):
+        if not self.slug:
+            self.slug = self.generate_slug(title=self.title)
 
     def generate_slug(self, title):
         result = frappe.get_all(
             'LMS Course',
-            fields=['name'])
-        slugs = set([row['name'] for row in result])
+            fields=['slug'])
+        slugs = set([row['slug'] for row in result])
         return slugify(title, used_slugs=slugs)
 
     def __repr__(self):
-        return f"<Course#{self.name}>"
+        return f"<Course#{self.name} {self.slug}>"
+
+    def get_topic(self, slug):
+        """Returns the topic with given slug in this course as a Document.
+        """
+        result = frappe.get_all(
+            "LMS Topic",
+            filters={"course": self.name, "slug": slug})
+
+        if result:
+            row = result[0]
+            return frappe.get_doc('LMS Topic', row['name'])
 
     def has_mentor(self, email):
         """Checks if this course has a mentor with given email.
@@ -52,7 +50,7 @@ class LMSCourse(Document):
         """Returns the name of Community Member document for a give user.
         """
         try:
-            return frappe.db.get_value("Community Member", {"email": email}, "name")
+            return frappe.db.get_value("Community Member", {"email": email}, ["name"])
         except frappe.DoesNotExistError:
             return None
 
@@ -91,123 +89,14 @@ class LMSCourse(Document):
             course_mentors.append(member)
         return course_mentors
 
-    def is_mentor(self, email):
-        """Checks if given user is a mentor for this course.
-        """
-        if not email:
-            return False
-        member = self.get_community_member(email)
-        return frappe.db.exists({
-            "doctype": "LMS Course Mentor Mapping",
-            "course": self.name,
-            "mentor": member
-        })
-
-    def get_student_batch(self, email):
-        """Returns the batch the given student is part of.
-
-        Returns None if the student is not part of any batch.
-        """
-        if not email:
-            return
-
-        batch_name = frappe.get_value(
-            doctype="LMS Batch Membership",
-            filters={
-                "course": self.name,
-                "member_type": "Student",
-                "member_email": email
-            },
-            fieldname="batch")
-        return batch_name and frappe.get_doc("LMS Batch", batch_name)
-
     def get_instructor(self):
-        member_name = self.get_community_member(self.owner)
-        return frappe.get_doc("Community Member", member_name)
+        return frappe.get_doc("User", self.owner)
 
-    def get_chapters(self):
-        """Returns all chapters of this course.
+    @staticmethod
+    def find_all():
+        """Returns all published courses.
         """
-        # TODO: chapters should have a way to specify the order
-        return find_all("Chapter", course=self.name, order_by="creation")
-
-    def get_batch(self, batch_name):
-        return find("LMS Batch", name=batch_name, course=self.name)
-
-    def get_batches(self, mentor=None):
-        batches = find_all("LMS Batch", course=self.name)
-        if mentor:
-            # TODO: optimize this
-            member = self.get_community_member(email=mentor)
-            memberships = frappe.db.get_all(
-                "LMS Batch Membership",
-                {"member": member},
-                ["batch"])
-            batch_names = {m.batch for m in memberships}
-            return [b for b in batches if b.name in batch_names]
-
-    def get_upcoming_batches(self):
-        now = frappe.utils.nowdate()
-        batches =  find_all("LMS Batch",
-            course=self.name,
-            start_date=[">", now],
-            status="Active",
-            visibility="Public")
-        return batches
-
-    def get_chapter(self, index):
-        return find("Chapter", course=self.name, index_=index)
-
-    def get_lesson(self, chapter_index, lesson_index):
-        chapter_name = frappe.get_value(
-            "Chapter",
-            {"course": self.name, "index_": chapter_index},
-            "name")
-        lesson_name = chapter_name and frappe.get_value(
-            "Lesson",
-            {"chapter": chapter_name, "index_": lesson_index},
-            "name")
-        return lesson_name and frappe.get_doc("Lesson", lesson_name)
-
-    def get_outline(self):
-        return CourseOutline(self)
-
-class CourseOutline:
-    def __init__(self, course):
-        self.course = course
-        self.chapters = self.get_chapters()
-        self.lessons = self.get_lessons()
-
-    def get_next(self, current):
-        numbers = sorted(lesson['number'] for lesson in self.lessons)
-        try:
-            index = numbers.index(current)
-            return numbers[index+1]
-        except IndexError:
-            return None
-
-    def get_prev(self, current):
-        numbers = sorted(lesson['number'] for lesson in self.lessons)
-        try:
-            index = numbers.index(current)
-            if index == 0:
-                return None
-            return numbers[index-1]
-        except IndexError:
-            return None
-
-    def get_chapters(self):
-        return frappe.db.get_all("Chapter",
-            filters={"course": self.course.name},
-            fields=["name", "title", "index_"])
-
-    def get_lessons(self):
-        chapters = [c['name'] for c in self.chapters]
-        lessons = frappe.db.get_all("Lesson",
-            filters={"chapter": ["IN", chapters]},
-            fields=["name", "title", "chapter", "index_"])
-
-        chapter_numbers = {c['name']: c['index_'] for c in self.chapters}
-        for lesson in lessons:
-            lesson['number'] = "{}.{}".format(chapter_numbers[lesson['chapter']], lesson['index_'])
-        return lessons
+        rows = frappe.db.get_all("LMS Course",
+            filters={"is_published": True},
+            fields='*')
+        return [frappe.get_doc(dict(row, doctype='LMS Course')) for row in rows]

community/lms/doctype/lms_course/test_lms_course.py

@@ -24,7 +24,7 @@ class TestLMSCourse(unittest.TestCase):
     def test_new_course(self):
         course = self.new_course("Test Course")
         assert course.title == "Test Course"
-        assert course.name == "test-course"
+        assert course.slug == "test-course"
         assert course.get_mentors() == []
 
     def test_find_all(self):
@@ -41,7 +41,7 @@ class TestLMSCourse(unittest.TestCase):
 
         # now we should find one course
         courses = LMSCourse.find_all()
-        assert [c.name for c in courses] == [course.name]
+        assert [c.slug for c in courses] == [course.slug]
 
     # disabled this test as it is failing
     def _test_add_mentors(self):

community/lms/doctype/lms_mentor_request/lms_mentor_request.py

@@ -8,119 +8,84 @@ from frappe.model.document import Document
 from frappe import _
 
 class LMSMentorRequest(Document):
-    def on_update(self):
-        if self.has_value_changed('status'):
+	def on_update(self):
+		if self.has_value_changed('status'):
+			template = frappe.db.get_single_value('LMS Settings', 'mentor_request_status_update')
+			if not template:
+				return
 
-            if self.status == "Approved":
-                self.create_course_mentor_mapping()
-
-            if self.status != "Pending":
-                self.send_status_change_email()
-
-    def create_course_mentor_mapping(self):
-        mapping = frappe.get_doc({
-            "doctype": "LMS Course Mentor Mapping",
-            "mentor": self.member,
-            "course": self.course
-        })
-        mapping.save()
-
-    def send_creation_email(self, member):
-        email_template = self.get_email_template('mentor_request_creation')
-        if not email_template:
-            return
-
-        course_details = frappe.db.get_value("LMS Course", self.course, ["owner", "slug", "title"], as_dict=True)
-        message = frappe.render_template(email_template.response,
-                {
-                    'member_name': member.full_name,
-                    'course_url': '/courses/' + course_details.slug,
-                    'course': course_details.title
-                })
-
-        email_args = {
-            "recipients": [frappe.session.user, course_details.owner],
-            "subject": email_template.subject,
-            "header": email_template.subject,
-            "message": message
-        }
-        frappe.enqueue(method=frappe.sendmail, queue="short", timeout=300, is_async=True, **email_args)
-
-    def send_status_change_email(self):
-        email_template = self.get_email_template('mentor_request_status_update')
-        if not email_template:
-            return
-
-        course_details = frappe.db.get_value("LMS Course", self.course, ["owner", "title"], as_dict=True)
-        message = frappe.render_template(email_template.response,
-                {
-                    'member_name': self.member_name,
-                    'status': self.status,
-                    'course': course_details.title
-                })
-
-        member_email = frappe.db.get_value("Community Member", self.member, "email")
-        if self.status == 'Approved' or self.status == 'Rejected':
-            reviewed_by = frappe.db.get_value('Community Member', self.reviewed_by, 'email')
-            email_args = {
-                "recipients": member_email,
-                "cc": [course_details.owner, reviewed_by],
-                "subject": email_template.subject,
-                "header": email_template.subject,
-                "message": message
-            }
-            frappe.enqueue(method=frappe.sendmail, queue="short", timeout=300, is_async=True, **email_args)
-
-        elif self.status == 'Withdrawn':
-            email_args = {
-                "recipients": [member_email, course_details.owner],
-                "subject": email_template.subject,
-                "header": email_template.subject,
-                "message": message
-            }
-            frappe.enqueue(method=frappe.sendmail, queue="short", timeout=300, is_async=True, **email_args)
-
-    def get_email_template(self, template_name):
-        template = frappe.db.get_single_value('LMS Settings', template_name)
-        if template:
-            return frappe.get_doc('Email Template', template)
+			email_template = frappe.get_doc('Email Template', template)	
+			message = frappe.render_template(email_template.response, {'member_name': self.member_name, 'status': self.status})
+			subject = _('The status of your application has changed.')
+			member_email = frappe.db.get_value("Community Member", self.member, "email")
+			
+			if self.status == 'Approved' or self.status == 'Rejected':
+				reviewed_by = frappe.db.get_value('Community Member', self.reviewed_by, 'email')
+				send_email(member_email, [get_course_author(self.course), reviewed_by], subject, message)
+			
+			elif self.status == 'Withdrawn':
+				send_email([member_email, get_course_author(self.course)], None, subject, message)
 
 @frappe.whitelist()
 def has_requested(course):
-    return frappe.db.count('LMS Mentor Request',
-                filters = {
-                    'member': get_member().name,
-                    'course': course,
-                    'status': ['in', ('Pending', 'Approved')]
-                }
+	return len(frappe.get_all('LMS Mentor Request',
+					filters = {
+						'member': get_member().name,
+						'course': course,
+						'status': ['in', ('Pending', 'Approved')]
+					}
+				)
 			)
 
 @frappe.whitelist()
 def create_request(course):
-    if not has_requested(course):
-        member = get_member()
-        request = frappe.get_doc({
-                    'doctype': 'LMS Mentor Request',
-                    'member': member.name,
-                    'course': course,
-                    'status': 'Pending'
-                })
-        request.save(ignore_permissions=True)
-        request.send_creation_email(member)
-        return 'OK'
-
-    else:
-        return 'Already Applied'
+	if not has_requested(course):
+		member = get_member()
+		frappe.get_doc({
+			'doctype': 'LMS Mentor Request',
+			'member': member.name,
+			'course': course,
+			'status': 'Pending'
+		}).save(ignore_permissions=True)
+		send_creation_email(course, member)
+		return 'OK'
+	else:
+		return 'Already Applied'
 
 @frappe.whitelist()
 def cancel_request(course):
-    request = frappe.get_doc('LMS Mentor Request', {'member': get_member().name, 'course': course, 'status': ['in', ('Pending', 'Approved')]})
-    request.status = 'Withdrawn'
-    request.save(ignore_permissions=True)
-    return 'OK'
+	request = frappe.get_doc('LMS Mentor Request', {'member': get_member().name, 'course': course, 'status': ['in', ('Pending', 'Approved')]})
+	request.status = 'Withdrawn'
+	request.save(ignore_permissions=True)
+	return 'OK'
 
 def get_member():
-    try:
-        return frappe.get_doc('Community Member', {'email': frappe.session.user})
-    except frappe.DoesNotExistError:
-        return
+	try:
+		return frappe.get_doc('Community Member', {'email': frappe.session.user})
+	except frappe.DoesNotExistError:
+		return
+
+def get_course_author(course):
+	return frappe.db.get_value('LMS Course', course, 'owner')
+
+def send_creation_email(course, member):
+	template = frappe.db.get_single_value('LMS Settings', 'mentor_request_creation')
+	if not template:
+		return
+
+	email_template = frappe.get_doc('Email Template', template)
+	member_name = member.full_name
+	message = frappe.render_template(email_template.response, {'member_name': member_name})
+	subject = _('Request for Mentorship')
+	send_email([frappe.session.user, get_course_author(course)], None, subject, message)
+
+def send_email(recipients, cc, subject, message):
+	frappe.sendmail(
+		recipients = recipients,
+		cc = cc,
+		sender = frappe.db.get_single_value('LMS Settings', 'email_sender'),
+		subject = subject, 
+		send_priority = 0, 
+		queue_separately = True,
+		message = message
+	)

community/lms/doctype/lms_section/lms_section.json

@@ -9,8 +9,7 @@
   "contents",
   "code",
   "attrs",
-  "index",
-  "id"
+  "index"
  ],
  "fields": [
   {
@@ -44,17 +43,12 @@
    "fieldname": "index",
    "fieldtype": "Int",
    "label": "Index"
-  },
-  {
-   "fieldname": "id",
-   "fieldtype": "Data",
-   "label": "id"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-05-19 18:55:26.019625",
+ "modified": "2021-03-12 17:56:23.118854",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Section",

community/lms/doctype/lms_section/lms_section.py

@@ -10,10 +10,6 @@ class LMSSection(Document):
     def __repr__(self):
         return f"<LMSSection {self.label!r}>"
 
-    def get_exercise(self):
-        if self.type == "exercise":
-            return frappe.get_doc("Exercise", self.id)
-
     def get_latest_code_for_user(self):
         """Returns the latest code for the logged in user.
         """

community/lms/doctype/lms_settings/lms_settings.json

@@ -6,11 +6,10 @@
  "engine": "InnoDB",
  "field_order": [
   "livecode_url",
-  "column_break_2",
-  "email_sender",
   "mentor_request_section",
   "mentor_request_creation",
-  "mentor_request_status_update"
+  "mentor_request_status_update",
+  "email_sender"
  ],
  "fields": [
   {
@@ -41,16 +40,12 @@
    "fieldname": "mentor_request_section",
    "fieldtype": "Section Break",
    "label": "Mentor Request"
-  },
-  {
-   "fieldname": "column_break_2",
-   "fieldtype": "Column Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2021-04-29 17:14:43.589700",
+ "modified": "2021-04-21 13:28:35.783395",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Settings",

community/lms/doctype/lms_sketch/livecode.py

@@ -3,102 +3,26 @@
 import websocket
 import json
 from .svg import SVG
-import frappe
-from urllib.parse import urlparse
 
-# Files to pass to livecode server
-# The same code is part of livecode-canvas.js
-# TODO: generate livecode-canvas.js from this file
-START = '''
-import sketch
-code = open("main.py").read()
-env = dict(sketch.__dict__)
-exec(code, env)
-'''
-
-SKETCH = '''
-import json
-
-def sendmsg(msgtype, function, args):
-  """Sends a message to the frontend.
-
-  The frontend will receive the specified message whenever
-  this function is called. The frontend can decide to some
-  action on each of these messages.
-  """
-  msg = dict(msgtype=msgtype, function=function, args=args)
-  print("--MSG--", json.dumps(msg))
-
-def _draw(func, **kwargs):
-  sendmsg(msgtype="draw", function=func, args=kwargs)
-
-def circle(x, y, d):
-    """Draws a circle of diameter d with center (x, y).
-    """
-    _draw("circle", x=x, y=y, d=d)
-
-def line(x1, y1, x2, y2):
-    """Draws a line from point (x1, y1) to point (x2, y2).
-    """
-    _draw("line", x1=x1, y1=y1, x2=x2, y2=y2)
-
-def rect(x, y, w, h):
-    """Draws a rectangle on the canvas.
-
-    Parameters
-    ----------
-    x: x coordinate of the top-left corner of the rectangle
-    y: y coordinate of the top-left corner of the rectangle
-    w: width of the rectangle
-    h: height of the rectangle
-    """
-    _draw("rect", x=x, y=y, w=w, h=h)
-
-def clear():
-    _draw("clear")
-
-# clear the canvas on start
-clear()
-'''
-
-def get_livecode_url():
-    doc = frappe.get_cached_doc("LMS Settings")
-    return doc.livecode_url
-
-def get_livecode_ws_url():
-    url = urlparse(get_livecode_url())
-    protocol = "wss" if url.scheme == "https" else "ws"
-    return protocol + "://" + url.netloc + "/livecode"
-
-def livecode_to_svg(livecode_ws_url, code, *, timeout=3):
+def livecode_to_svg(livecode_ws_url, code, *, timeout=1):
     """Renders the code as svg.
     """
-    if livecode_ws_url is None:
-        livecode_ws_url = get_livecode_ws_url()
+    print("livecode_to_svg")
+    ws = websocket.WebSocket()
+    ws.settimeout(timeout)
+    ws.connect(livecode_ws_url)
 
-    try:
-        ws = websocket.WebSocket()
-        ws.settimeout(timeout)
-        ws.connect(livecode_ws_url)
+    msg = {
+        "msgtype": "exec",
+        "runtime": "python-canvas",
+        "code": code
+    }
+    ws.send(json.dumps(msg))
 
-        msg = {
-            "msgtype": "exec",
-            "runtime": "python",
-            "code": code,
-            "files": [
-                {"filename": "start.py", "contents": START},
-                {"filename": "sketch.py", "contents": SKETCH},
-            ],
-            "command": ["python", "start.py"]
-        }
-        ws.send(json.dumps(msg))
-
-        messages = _read_messages(ws)
-        commands = [m for m in messages if m['msgtype'] == 'draw']
-        img = draw_image(commands)
-        return img.tostring()
-    except websocket.WebSocketException as e:
-        frappe.log_error(frappe.get_traceback(), 'livecode_to_svg failed')
+    messages = _read_messages(ws)
+    commands = [m['cmd'] for m in messages if m['msgtype'] == 'draw']
+    img = draw_image(commands)
+    return img.tostring()
 
 def _read_messages(ws):
     messages = []
@@ -108,19 +32,17 @@ def _read_messages(ws):
             if not msg:
                 break
             messages.append(json.loads(msg))
-    except websocket.WebSocketTimeoutException as e:
-        print("Error:", e)
+    except websocket.WebSocketTimeoutException:
         pass
     return messages
 
 def draw_image(commands):
     img = SVG(width=300, height=300, viewBox="0 0 300 300", fill='none', stroke='black')
     for c in commands:
-        args = c['args']
         if c['function'] == 'circle':
-            img.circle(cx=args['x'], cy=args['y'], r=args['d']/2)
+            img.circle(cx=c['x'], cy=c['y'], r=c['d']/2)
         elif c['function'] == 'line':
-            img.line(x1=args['x1'], y1=args['y1'], x2=args['x2'], y2=args['y2'])
+            img.line(x1=c['x1'], y1=c['y1'], x2=c['x2'], y2=c['y2'])
         elif c['function'] == 'rect':
-            img.rect(x=args['x'], y=args['y'], width=args['w'], height=args['h'])
+            img.rect(x=c['x'], y=c['y'], width=c['w'], height=c['h'])
     return img

community/lms/doctype/lms_sketch/lms_sketch.py

@@ -9,11 +9,6 @@ import frappe
 from frappe.model.document import Document
 from . import livecode
 
-DEFAULT_IMAGE = """
-<svg viewBox="0 0 300 300" width="300" xmlns="http://www.w3.org/2000/svg">
-</svg>
-"""
-
 class LMSSketch(Document):
     @property
     def sketch_id(self):
@@ -53,20 +48,15 @@ class LMSSketch(Document):
         else:
             ws_url = self.get_livecode_ws_url()
             value = livecode.livecode_to_svg(ws_url, self.code)
-            if value:
-                cache.set(key, value)
-        return value or DEFAULT_IMAGE
+            cache.set(key, value)
+        return value
 
     @staticmethod
-    def get_recent_sketches(limit=100, owner=None):
+    def get_recent_sketches(limit=100):
         """Returns the recent sketches.
         """
-        filters = {}
-        if owner:
-            filters = {"owner": owner}
         sketches = frappe.get_all(
             "LMS Sketch",
-            filters=filters,
             fields='*',
             order_by='modified desc',
             page_length=limit
@@ -83,7 +73,7 @@ def save_sketch(name, title, code):
         doc.title = title
         doc.code = code
         doc.runtime = 'python-canvas'
-        doc.insert(ignore_permissions=True)
+        doc.insert()
         status = "created"
     else:
         doc = frappe.get_doc("LMS Sketch", name)

community/lms/doctype/lms_topic/lms_topic.js

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

community/lms/doctype/lms_topic/lms_topic.json

@@ -1,61 +1,69 @@
 {
  "actions": [],
- "autoname": "format:{####} {title}",
- "creation": "2021-05-03 05:49:08.383057",
+ "allow_guest_to_view": 1,
+ "creation": "2021-03-02 07:20:41.686573",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "course",
   "title",
+  "slug",
+  "preview",
   "description",
-  "locked",
-  "index_"
+  "order",
+  "sections"
  ],
  "fields": [
   {
    "fieldname": "title",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Title"
+   "label": "Title",
+   "reqd": 1
   },
   {
    "fieldname": "description",
    "fieldtype": "Markdown Editor",
    "label": "Description"
   },
-  {
-   "default": "0",
-   "fieldname": "locked",
-   "fieldtype": "Check",
-   "label": "Locked"
-  },
   {
    "fieldname": "course",
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Course",
-   "options": "LMS Course"
+   "options": "LMS Course",
+   "reqd": 1
   },
   {
-   "default": "1",
-   "fieldname": "index_",
+   "fieldname": "order",
    "fieldtype": "Int",
-   "label": "Index"
+   "label": "Order"
+  },
+  {
+   "fieldname": "preview",
+   "fieldtype": "Markdown Editor",
+   "label": "Preview"
+  },
+  {
+   "fieldname": "sections",
+   "fieldtype": "Table",
+   "label": "Sections",
+   "options": "LMS Section"
+  },
+  {
+   "description": "The slug of the topic. Autogenerated from the title if not specified.",
+   "fieldname": "slug",
+   "fieldtype": "Data",
+   "label": "Slug"
   }
  ],
  "index_web_pages_for_search": 1,
- "links": [
-  {
-   "group": "Lessons",
-   "link_doctype": "Lesson",
-   "link_fieldname": "chapter"
-  }
- ],
- "modified": "2021-05-13 21:05:20.531890",
+ "links": [],
+ "modified": "2021-04-06 14:12:48.514062",
  "modified_by": "Administrator",
  "module": "LMS",
- "name": "Chapter",
+ "name": "LMS Topic",
  "owner": "Administrator",
  "permissions": [
   {
@@ -72,8 +80,10 @@
   }
  ],
  "search_fields": "title",
- "sort_field": "modified",
- "sort_order": "DESC",
+ "sort_field": "creation",
+ "sort_order": "ASC",
  "title_field": "title",
- "track_changes": 1
+ "track_changes": 1,
+ "track_seen": 1,
+ "track_views": 1
 }

community/lms/doctype/lms_topic/lms_topic.py

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from .section_parser import SectionParser
+from ...utils import slugify
+
+class LMSTopic(Document):
+    def before_save(self):
+        course = self.get_course()
+        if not self.slug:
+            self.slug = self.generate_slug(title=self.title)
+
+        sections = SectionParser().parse(self.description or "")
+        self.sections = [self.make_lms_section(i, s) for i, s in enumerate(sections)]
+
+    def get_course(self):
+        return frappe.get_doc("LMS Course", self.course)
+
+    def generate_slug(self, title):
+        result = frappe.get_all(
+            'LMS Topic',
+            filters={'course': self.course},
+            fields=['slug'])
+        slugs = set([row['slug'] for row in result])
+        return slugify(title, used_slugs=slugs)
+
+    def get_sections(self):
+        return sorted(self.sections, key=lambda s: s.index)
+
+    def make_lms_section(self, index, section):
+            s = frappe.new_doc('LMS Section', parent_doc=self, parentfield='sections')
+            s.type = section.type
+            s.label = section.label
+            s.contents = section.contents
+            s.index = index
+            return s
+
+
+

community/lms/doctype/lms_topic/section_parser.py

@@ -1,9 +1,4 @@
 """Utility to split the text in the topic into multiple sections.
-
-{{ section(type="example", id="foo") }}
-circle(100, 100, 50)
-{{ end }}
-
 """
 from __future__ import annotations
 from dataclasses import dataclass

community/lms/doctype/lms_topic/test_lms_topic.py

@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 import unittest
 
-class TestChapter(unittest.TestCase):
+class TestLMSTopic(unittest.TestCase):
 	pass

community/lms/web_form/add_a_new_batch/add_a_new_batch.js

@@ -1,39 +1,35 @@
 frappe.ready(function () {
-  frappe.web_form.after_save = () => {
-    let data = frappe.web_form.get_values();
-    let slug = new URLSearchParams(window.location.search).get("slug")
-    frappe.msgprint({
-      message: __("Batch {0} has been successfully created!", [data.title]),
-      clear: true
-    });
-    setTimeout(function () {
-      window.location.href = `courses/${slug}`;
-    }, 2000);
-  }
+	frappe.web_form.after_save = () => {
+		let data = frappe.web_form.get_values();
+		frappe.call({
+			"method": "community.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
+			"args": {
+				"batch": data.title,
+				"member_type": "Mentor"
+			},
+			"callback": (data) => {
+				if (data.message == "OK") {
+					window.location.href = "/courses"
+				}
+			}
+		})
+	}
 
-  frappe.web_form.validate = () => {
-    let sysdefaults = frappe.boot.sysdefaults;
-    let time_format = sysdefaults && sysdefaults.time_format ? sysdefaults.time_format : 'HH:mm:ss';
-    let data = frappe.web_form.get_values();
-
-    data.start_time = moment(data.start_time, time_format).format(time_format)
-    data.end_time = moment(data.end_time, time_format).format(time_format)
-
-    if (data.start_date < frappe.datetime.nowdate()) {
-      frappe.msgprint(__('Start date cannot be a past date.'))
-      return false;
-    }
-
-    if (!frappe.datetime.validate(data.start_time) || !frappe.datetime.validate(data.end_time)) {
-      frappe.msgprint(__('Invalid Start or End Time.'));
-      return false;
-    }
-
-    if (data.start_time > data.end_time) {
-      frappe.msgprint(__('Start Time should be less than End Time.'));
-      return false;
-    }
-
-    return true;
-  };
-})
+	frappe.web_form.validate = () => {
+		let data = frappe.web_form.get_values();
+		if (!frappe.datetime.validate(data.start_time) || !frappe.datetime.validate(data.end_time)) {
+			frappe.msgprint(__('Invalid Start or End Time.'));
+			return false;
+		}
+		if (data.start_time > data.end_time) {
+			frappe.msgprint(__('Start Time should be less than End Time.'));
+			return false;
+		}
+		console.log(data.start_date, date.nowdate())
+		if (data.start_date < date.nowdate()) {
+			frappe.msgprint(__('Start date cannot be a past date.'))
+			return false;
+		}
+		return true;
+	};	
+})

community/lms/web_form/add_a_new_batch/add_a_new_batch.json

@@ -11,7 +11,6 @@
  "apply_document_permissions": 0,
  "button_label": "Save",
  "creation": "2021-04-20 11:37:49.135114",
- "custom_css": ".datepicker.active {\n    background-color: white;\n}",
  "doc_type": "LMS Batch",
  "docstatus": 0,
  "doctype": "Web Form",
@@ -19,7 +18,7 @@
  "is_standard": 1,
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2021-04-30 11:22:18.188712",
+ "modified": "2021-04-26 11:08:00.026388",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "add-a-new-batch",
@@ -38,13 +37,13 @@
   {
    "allow_read_on_all_link_options": 0,
    "fieldname": "course",
-   "fieldtype": "Data",
+   "fieldtype": "Link",
    "hidden": 0,
    "label": "Course",
    "max_length": 0,
    "max_value": 0,
-   "options": "",
-   "read_only": 1,
+   "options": "LMS Course",
+   "read_only": 0,
    "reqd": 0,
    "show_in_filter": 0
   },
@@ -91,7 +90,7 @@
    "fieldname": "start_time",
    "fieldtype": "Data",
    "hidden": 0,
-   "label": "Start Time",
+   "label": "Start Time (HH:MM:SS)",
    "max_length": 0,
    "max_value": 0,
    "read_only": 0,
@@ -103,7 +102,7 @@
    "fieldname": "end_time",
    "fieldtype": "Data",
    "hidden": 0,
-   "label": "End Time",
+   "label": "End Time (HH:MM:SS)",
    "max_length": 0,
    "max_value": 0,
    "read_only": 0,
@@ -111,4 +110,4 @@
    "show_in_filter": 0
   }
  ]
-}
+}

community/lms/web_form/add_a_new_batch/add_a_new_batch.py

@@ -3,5 +3,5 @@ from __future__ import unicode_literals
 import frappe
 
 def get_context(context):
-    # do your magic here
-    pass
+	# do your magic here
+	pass

community/lms/web_form/add_messages/add_messages.js

@@ -0,0 +1,12 @@
+frappe.ready(function() {
+	// bind events here
+	frappe.web_form.after_load = () => {
+		frappe.web_form.set_value(["batch"], [frappe.utils.get_url_arg('batch')]);
+		frappe.web_form.set_value(["author"], [frappe.utils.get_url_arg('author')]);
+	}
+	frappe.web_form.success_url = `courses/course?course=${frappe.utils.get_url_arg('course')}`;
+
+	$('.breadcrumb-container')
+		.html(`<a href="${frappe.web_form.success_url}">Back to my course</a>`)
+		.addClass('py-4');
+})

community/lms/web_form/add_messages/add_messages.json

@@ -0,0 +1,77 @@
+{
+ "accept_payment": 0,
+ "allow_comments": 0,
+ "allow_delete": 0,
+ "allow_edit": 0,
+ "allow_incomplete": 0,
+ "allow_multiple": 0,
+ "allow_print": 0,
+ "amount": 0.0,
+ "amount_based_on_field": 0,
+ "apply_document_permissions": 0,
+ "button_label": "Send",
+ "client_script": "",
+ "creation": "2021-03-23 13:10:16.814983",
+ "doc_type": "LMS Message",
+ "docstatus": 0,
+ "doctype": "Web Form",
+ "idx": 0,
+ "is_standard": 1,
+ "login_required": 1,
+ "max_attachment_size": 0,
+ "modified": "2021-03-23 19:25:54.984968",
+ "modified_by": "Administrator",
+ "module": "LMS",
+ "name": "add-messages",
+ "owner": "Administrator",
+ "payment_button_label": "Buy Now",
+ "published": 0,
+ "route": "add-messages",
+ "route_to_success_link": 0,
+ "show_attachments": 0,
+ "show_in_grid": 0,
+ "show_sidebar": 0,
+ "sidebar_items": [],
+ "success_url": "",
+ "title": "Add Messages",
+ "web_form_fields": [
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "batch",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "Batch",
+   "max_length": 0,
+   "max_value": 0,
+   "options": "LMS Batch",
+   "read_only": 1,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "message",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "Message",
+   "max_length": 0,
+   "max_value": 0,
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
+   "allow_read_on_all_link_options": 0,
+   "fieldname": "author",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "label": "Author",
+   "max_length": 0,
+   "max_value": 0,
+   "options": "Community Member",
+   "read_only": 1,
+   "reqd": 0,
+   "show_in_filter": 0
+  }
+ ]
+}

community/lms/web_form/add_messages/add_messages.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def get_context(context):
+	# do your magic here
+	pass

community/lms/widgets/ChapterTeaser.html

@@ -1,15 +0,0 @@
-<div class="chapter-teaser">
-  <div class="teaser-body">
-    <h3 class="chapter-title"><span class="chapter-number">{{index}}</span> {{ chapter.title }}</h3>
-    <div class="chapter-description">
-      {{ chapter.description or "" }}
-    </div>
-    <div class="chapter-lessons">
-      {% for lesson in chapter.get_lessons() %}
-        <div class="lesson-teaser">
-          {{lesson.title}}
-        </div>
-      {% endfor %}
-    </div>
-  </div>
-</div>

community/lms/widgets/CourseTeaser.html

@@ -1,19 +1,13 @@
 <div class="course-teaser">
   <div class="course-body">
-    <h3 class="course-title"><a href="/courses/{{ course.name }}">{{ course.title }}</a></h3>
+    <h3 class="course-title"><a href="/courses/{{ course.slug }}">{{ course.title }}</a></h3>
     <div class="course-intro">
       {{ course.short_introduction or "" }}
     </div>
   </div>
   <div class="course-footer">
-    {% set batch = course.get_student_batch(frappe.session.user) %}
-    {% if batch %}
-      <a class="btn btn-secondary pull-right" href="/courses/{{course.name}}/{{batch.name}}/learn">Resume Course</a>
-    {% endif %}
     <div class="course-author">
-      {% with author = course.get_instructor() %}
-        {{ widgets.Avatar(member=author, avatar_class="avatar-medium") }} <a href="/{{author.username}}">{{ author.full_name }}</a>
-      {% endwith %}
+      {{ course.get_instructor().full_name }}
     </div>
   </div>
 </div>

community/lms/widgets/Exercise.html

@@ -1,18 +0,0 @@
-{% from "www/macros/livecode.html" import LiveCodeEditorJS, LiveCodeEditor with context %}
-
-<div class="exercise">
-  <h2>{{ exercise.title }}</h2>
-  <div class="exercise-description">{{frappe.utils.md_to_html(exercise.description)}}</div>
-
-  {% if exercise.image %}
-  <div class="exercise-image">{{exercise.image}}</div>
-  {% endif %}
-
-  {% set submission = exercise.get_user_submission() %}
-
-  {{ LiveCodeEditor(exercise.name,
-        code=submission.solution if submission else exercise.code,
-        reset_code=exercise.code,
-        is_exercise=True,
-        last_submitted=submission and submission.creation) }}
-</div>

community/lms/widgets/RequestInvite.html

@@ -1,64 +0,0 @@
-<form id="invite-request-form">
-  <div class="row">
-    <div class="col-md">
-      <input class="form-control w-100 mr-5 mb-5 mt-2" id="invite_email" type="email" placeholder="Email Address">
-    </div>
-    <div class="col-md">
-      <a type="submit" id="submit-invite-request" class="btn btn-primary btn-lg" role="button">Request
-        Invite</a>
-    </div>
-  </div>
-</form>
-<script>
-  frappe.ready(() => {
-    $("#submit-invite-request").click(function () {
-      var invite_email = $("#invite_email").val()
-      frappe.call({
-        method: "community.lms.doctype.invite_request.invite_request.create_invite_request",
-        args: {
-          invite_email: invite_email
-        },
-        callback: (data) => {
-          if (data.message == "invalid email") {
-            $(".email-validation") && $(".email-validation").remove();
-            if (invite_email) {
-              var message = `<div>
-              <small class="email-validation" style="color: red;">${invite_email} is not a valid email address.</small>
-            </div>`;
-            }
-            else {
-              var message = `<div>
-              <small class="email-validation" style="color: red;">Please enter an email address.</small>
-            </div>`;
-            }
-
-            $("#invite-request-form").append(message);
-          }
-          else {
-            $("#invite-request-form").hide();
-
-            if (data.message == "OK") {
-              var message = `<div>
-              <p class="lead alert alert-secondary">Thanks for your interest in Mon School. We have recorded your interest and we will get back to you shortly.</p>
-            </div>`;
-            }
-
-            else if (data.message == "invite") {
-              var message = `<div>
-              <p class="lead alert alert-secondary">Email ${invite_email} has already been used to request an invitation.</p>
-            </div>`;
-            }
-
-            else if (data.message == "user") {
-              var message = `<div>
-              <p class="lead alert alert-secondary">Looks like there is already an account with email ${invite_email}. Would you like to <a href="/login">login</a>?</p>
-            </div>`;
-            }
-
-            $(".jumbotron").append(message);
-          }
-        }
-      })
-    })
-  })
-</script>

community/lms/widgets/SketchTeaser.html

@@ -9,8 +9,7 @@
       <a href="sketches/{{sketch.sketch_id}}">{{sketch.title}}</a>
     </div>
     <div class="sketch-author">
-      {% set owner = sketch.get_owner() %}
-      by <a href="/{{owner.username}}">{{owner.full_name}}</a>
+      by {{sketch.get_owner().full_name}}
     </div>
   </div>
 </div>

community/patches.txt

@@ -1,4 +1,3 @@
 community.patches.set_email_preferences
 community.patches.change_name_for_community_members
-community.patches.save_abbr_for_community_members
-community.patches.create_mentor_request_email_templates
+community.patches.save_abbr_for_community_members

community/patches/create_mentor_request_email_templates.py

@@ -1,31 +0,0 @@
-from __future__ import unicode_literals
-import frappe, os
-from frappe import _
-
-def execute():
-    frappe.reload_doc("email", "doctype", "email_template")
-    base_path = frappe.get_app_path("community", "templates", "emails")
-
-    if not frappe.db.exists("Email Template", _('Mentor Request Creation Template')):
-        response = frappe.read_file(os.path.join(base_path, "mentor_request_creation_email.html"))
-        frappe.get_doc({
-            'doctype': 'Email Template',
-            'name': _("Mentor Request Creation Template"),
-            'response': response,
-            'subject': _('Request for Mentorship'),
-            'owner': frappe.session.user
-        }).insert(ignore_permissions=True)
-
-        frappe.db.set_value("LMS Settings", None, "mentor_request_creation", _('Mentor Request Creation Template'))
-
-    if not frappe.db.exists("Email Template", _('Mentor Request Status Update Template')):
-        response = frappe.read_file(os.path.join(base_path, "mentor_request_status_update_email.html"))
-        frappe.get_doc({
-            'doctype': 'Email Template',
-            'name': _("Mentor Request Status Update Template"),
-            'response': response,
-            'subject': _('The status of your application has changed.'),
-            'owner': frappe.session.user
-        }).insert(ignore_permissions=True)
-
-        frappe.db.set_value("LMS Settings", None, "mentor_request_status_update", _('Mentor Request Status Update Template'))

community/public/build.json

@@ -0,0 +1,10 @@
+{
+  "css/lms.css": [
+    "public/css/lms.css"
+  ],
+  "css/community.css": [
+    "public/css/vars.css",
+    "public/css/style.css",
+    "public/css/style.less"
+  ]
+}

community/public/css/community.bundle.less

@@ -1,4 +0,0 @@
-
-@import "./style.css";
-@import "./vars.css";
-@import "./style.less";

community/public/css/lms.css

@@ -0,0 +1,136 @@
+
+.livecode-editor-large .canvas-wrapper {
+  position: relative;
+  padding: 10px;
+}
+
+.livecode-editor-large canvas {
+  position: relative;
+  z-index: 0;
+  border: 1px solid #ddd;
+  height: 300px;
+  width: 300px;
+}
+
+.livecode-editor-large .code {
+  width: 100%;
+  padding: 5px;
+  min-height: 330px;
+  resize: none;
+}
+.livecode-editor-large .output {
+  padding: 5px;
+}
+
+.livecode-editor-large .CodeMirror {
+  height: 320px;
+}
+
+.canvas-editor canvas {
+  position: relative;
+  z-index: 0;
+  border: 1px solid #ddd;
+}
+.canvas-wrapper .output {
+  position: absolute;
+  z-index: 1;
+  width: 100%;
+  left: 0px;
+  top: 0px;
+  background-color: rgba(255, 255, 255, 0);
+  margin: 15px;
+  max-height: 200px;
+}
+
+.canvas-editor .code {
+  width: 100%;
+  padding: 5px;
+  /* min-height: 330px; */
+  resize: none;
+}
+/* .canvas-editor .output {
+  padding: 5px;
+} */
+
+.heading {
+  background: #eee;
+  padding: 10px;
+  clear: both;
+  color: #212529;
+  border: 1px solid #ddd;
+}
+
+.livecode-editor-large h2 {
+  font-size: 1.2em;
+  text-transform: uppercase;
+  margin: 0px;
+  font-weight: normal;
+}
+
+.livecode-editor-large .run {
+  float: right;
+}
+
+.livecode-editor-large .col-sm {
+  border: 1px solid #ddd;
+}
+
+.sketch-header h1 {
+  font-size: 1.5em;
+  margin-bottom: 0px;
+}
+
+.sketch-header {
+  margin-bottom: 1em;
+}
+
+.sketch-card .sketch-title a {
+  font-weight: bold;
+  color: inherit;
+}
+
+
+.canvas-editor .CodeMirror {
+  background: #ffe;
+  border: 1px solid #eed;
+  margin-bottom: 10px;
+  border-radius: 10px;
+  height: 100%;
+}
+
+canvas {
+  border: 2px solid #eee;
+}
+
+@media (min-width: 768px) {
+  .canvas-wrapper {
+    margin-bottom: -200px;
+  }
+}
+
+@media (max-width: 768px) {
+  .canvas-wrapper {
+    padding-top: 20px;
+    margin-left: 2em;
+  }
+  .canvas-wrapper .output {
+    left: 2em;
+  }
+}
+
+.hidden {
+  display: none;
+}
+
+.livecode-controls {
+  margin-left: 2em;
+}
+
+.livecode-controls a {
+   margin-left: 10px;
+   color: #666;
+}
+
+.canvas-editor {
+  margin: 10px 0px;
+}

community/public/css/style.css

@@ -1,3 +1,5 @@
+@import url("https://cdn.jsdelivr.net/npm/bootstrap-icons@1.4.1/font/bootstrap-icons.css");
+@import url("https://use.fontawesome.com/releases/v5.13.0/css/all.css");
 
 :root {
   --c1: #fefae0;
@@ -23,15 +25,85 @@
   --cta-color: var(--c4);
   --send-message: var(--c7);
   --received-message: var(--c8);
+
+  --primary-color: #08B74F;
 }
 
 body {
   padding: 0px;
   margin: 0px;
+  background: white;
 }
 
+.course-header {
+  margin-top: 20px;
+  padding: 20px;
+  background: var(--header-bg);
+  color: var(--header-color);
+  border-radius: 10px;
+}
 
-/* .course-details {
+.course-header h1 {
+  color: inherit;
+}
+
+.course-type {
+  text-transform: uppercase;
+  font-size: 1.0em;
+  color: var(--tag-color);
+}
+
+.sidebar {
+  background: var(--sidebar-bg);
+  margin: 20px 0px;
+  border-radius: 10px;
+  padding: 1px 20px 20px 20px;
+  color: var(--text-color);
+}
+
+.sidebar h3 {
+  margin-top: 20px;
+  color: var(--c2);
+}
+
+.sidebar-batch {
+  background: var(--sidebar-bg);
+  color: var(--text-color);
+  position: fixed;
+  left: 0;
+  height: 100%;
+}
+
+.sidebar-batch a {
+  padding: 16px 8px 8px 16px;
+  display: block;
+}
+
+.instructor {
+  padding: 10px;
+}
+
+.instructor-title {
+  font-weight: bold;
+}
+
+.instructor-subtitle {
+  font-size: 0.8em;
+  color: var(--text-color);
+}
+
+.sidebar .notice {
+  padding: 10px;
+  border-radius: 10px;
+  border: 1px dashed var(--text-color);
+}
+
+.sidebar .notice a {
+  color: inherit;
+  text-decoration: underline;
+}
+
+.course-details {
   margin: 20px 0px;
 }
 
@@ -40,7 +112,7 @@ body {
   font-size: 1.4em;
   font-weight: bold;
   margin: 20px 0px 10px 0px;
-} */
+}
 
 .chapter-plan {
   border-radius: 10px;
@@ -55,7 +127,7 @@ body {
   font-weight: bold;
 }
 
-/* .chapter-number {
+.chapter-number {
   background: var(--text-color);
   color: white;
   border-radius: 50%;
@@ -68,12 +140,12 @@ body {
 
 .chapter-description {
   margin: 20px 0px;
-} */
+}
 
 .lessons {
   padding-left: 20px;
 }
-.lessons .lesson {
+.lesson {
   margin: 5px 0px;
   font-weight: bold;
 }
@@ -163,7 +235,7 @@ img.profile-photo {
 }
 
 .msger-inputarea {
-  position: absolute;
+  position: fixed;
   bottom: 0;
   width: 100%;
   display: flex;
@@ -215,13 +287,6 @@ img.profile-photo {
 }
 
 .message-section {
-  margin-left: 3%;
+  margin-left: 5%;
   display: inline-block;
-  width: 95%;
-}
-
-.display-4 {
-  color: #2D005A;
-  font-weight: 600;
-  line-height: 51px;
 }

community/public/css/style.less

@@ -1,26 +1,14 @@
-h2 {
-  margin: 20px 0px;
-  color: black;
-}
+@primary-color: #08B74F;
 
 .teaser {
   background: white;
-  border-radius: 9px;
-  border: 1px solid #C4C4C4;
-
-  .teaser-body {
-    padding: 20px;
-  }
-  .teaser-footer {
-    padding: 20px;
-  }
+  border-radius: 10px;
+  border: 1px solid #ddd;
 }
 
 .sketch-teaser {
   .teaser();
   width: 220px;
-  margin-bottom: 30px;
-  margin-top: 30px;
 
   svg {
     width: 200px;
@@ -30,9 +18,8 @@ h2 {
     padding: 10px;
   }
   .sketch-footer {
-    border-top: 1px solid#C4C4C4;
     padding: 10px;
-    background: #F6F6F6;
+    background: #eee;
     border-radius: 0px 0px 10px 10px;
   }
 }
@@ -40,8 +27,6 @@ h2 {
 .course-teaser {
   .teaser();
   color: #444;
-  margin-bottom: 20px;
-  margin-top: 20px;
 
   h3, h4 {
     color: black;
@@ -72,266 +57,12 @@ section {
 
 section h2 {
   margin-bottom: 40px;
-  font-size: 48px;
-  line-height: 58px;
-  font-weight: bold;
 }
 
 section.lightgray {
-  background: #F6F6F6;
+  background: #f8f8f8;
 }
 
 #hero .jumbotron {
   background: inherit;
 }
-
-.chapter-teaser {
-  .teaser();
-  color: #444;
-  margin: 20px 0px;
-
-  h3, h4 {
-    color: black;
-    font-weight: bold;
-  }
-}
-
-.field-width {
-  width: 40%;
-  display: inline-block;
-}
-
-.footer-grouped-links {
-  display: none;
-}
-
-.footer-info {
-  border-top: 0px;
-  margin-top: 0px;
-
-  .footer-col-right {
-    padding-top: 1.8rem;
-  }
-}
-
-.web-footer {
-  border-top: 1px solid #E2E6E9;
-  padding: 0px;
-  padding: 2rem 0px;
-  margin-top: 2rem;
-}
-
-.course-type {
-  text-transform: uppercase;
-  font-size: 1.0em;
-  font-weight: bold;
-  color: var(--tag-color);
-}
-
-.course-header {
-  margin-top: 20px;
-}
-
-/*
-.course-header {
-  margin-top: 20px;
-  padding: 20px;
-  background: var(--header-bg);
-  color: var(--header-color);
-  border-radius: 9px;
-}
-
-.course-author-avatar {
-  width: 20px;
-  height: 20px;
-  border-radius: 50%;
-  margin-right: 20px;
-}
-
-.course-header h1 {
-  color: inherit;
-}
-
-*/
-
-// .gray-section {
-//   background:#F6F6F6;
-//   border: 1px solid #C4C4C4;
-//   padding: 20px;
-//   margin: 20px 0px;
-// }
-
-.instructor-title {
-  font-weight: bold;
-  color: black;
-}
-
-.instructor-subtitle {
-  font-size: 0.8em;
-  color: var(--text-color);
-}
-
-// .mentors-wrapper {
-//   .gray-section();
-// }
-
-
-.chapter-number {
-  background: var(--text-color);
-  color: white;
-  border-radius: 50%;
-  height: 24px;
-  min-width: 24px;
-  align-items: center;
-  padding: 5px 8px 2px 8px;
-  margin-right: 5px;
-}
-
-.sidebar {
-  background: var(--sidebar-bg);
-  border: 1px solid var(--sidebar-border);
-  margin: 20px 0px;
-  border-radius: 10px;
-  padding: 1px 20px 20px 20px;
-}
-
-.sidebar h3 {
-  margin-top: 20px;
-  color: black;
-}
-
-.sidebar-batch {
-  background: var(--sidebar-bg);
-  color: var(--text-color);
-  position: fixed;
-  left: 0;
-  height: 100%;
-}
-
-.sidebar-batch a {
-  padding: 16px 8px 8px 16px;
-  display: block;
-}
-
-
-.sidebar .notice {
-  margin-top: 10px;
-  padding: 10px;
-  border-radius: 10px;
-  border: 1px dashed var(--text-color);
-}
-
-.sidebar .notice a {
-  color: inherit;
-  text-decoration: underline;
-}
-
-// LiveCode editor
-
-.livecode-editor {
-
-  .CodeMirror {
-    border: 1px solid #ddd;
-    background: #ffe;
-    height: auto;
-  }
-  .CodeMirror-scroll {
-    max-height: 310px;
-    min-height: 310px;
-  }
-  .controls {
-    padding: 10px 0px;
-  }
-  canvas {
-    border: 5px solid #ddd;
-    position: relative;
-    z-index: 0;
-  }
-
-  .output {
-    position: absolute;
-    z-index: 1;
-    width: 300px;
-    left: 0px;
-    top: 0px;
-    background-color: rgba(255, 255, 255, 0);
-    max-height: 300px;
-    white-space: pre-wrap;
-    margin: 0px;
-    margin-left: 20px;
-    padding: 4px;
-    color: #888;
-  }
-
-  @media (max-width: 768px) {
-    .canvas-wrapper {
-      padding-top: 10px;
-    }
-    .code-wrapper {
-      min-height: 50px;
-    }
-    .CodeMirror {
-      min-height: 50px;
-    }
-  }
-}
-
-.sketch-header {
-  input#sketch-title {
-    font-weight: bold;
-  }
-}
-
-.chapter-description {
-  margin-bottom: 10px;
-}
-
-.lesson-teaser {
-  font-weight: bold;
-  color: black;
-  padding-left: 20px;
-}
-
-#hero h1 {
-  color: black !important;
-}
-
-.lesson-page {
-  margin: 20px 0px;
-}
-
-.lesson-pagination {
-  clear: both;
-}
-
-.exercise-image svg {
-  width: 200px;
-  height: 200px;
-  border: 1px solid #ddd;
-  margin-bottom: 20px;
-}
-
-.svg-200 svg {
-  width: 200px;
-  height: 200px;
-}
-
-.livecode-editor-small .livecode-editor {
-  .CodeMirror-scroll {
-    max-height: 160px;
-    min-height: 160px;
-  }
-
-  canvas {
-    width: 150px;
-    height: 150px;
-  }
-}
-
-.mentor-dashboard {
-  margin-top: 20px;
-
-  .submission {
-    margin: 40px 0px 0px 20px;
-  }
-}

community/public/css/vars.css

@@ -1,6 +1,4 @@
 /* Define all your css variables here. */
 :root {
-  --tag-color: #737373;
-  --sidebar-bg: #F6F6F6;
-  --sidebar-border: #C4C4C4;
+  --primary-color: #08B74F;
 }

community/public/js/livecode-canvas.js

@@ -1,106 +0,0 @@
-
-function getLiveCodeOptions() {
-var START = `
-import sketch
-code = open("main.py").read()
-env = dict(sketch.__dict__)
-exec(code, env)
-`
-
-var SKETCH = `
-import json
-
-def sendmsg(msgtype, function, args):
-  """Sends a message to the frontend.
-
-  The frontend will receive the specified message whenever
-  this function is called. The frontend can decide to some
-  action on each of these messages.
-  """
-  msg = dict(msgtype=msgtype, function=function, args=args)
-  print("--MSG--", json.dumps(msg))
-
-def _draw(func, **kwargs):
-  sendmsg(msgtype="draw", function=func, args=kwargs)
-
-def circle(x, y, d):
-    """Draws a circle of diameter d with center (x, y).
-    """
-    _draw("circle", x=x, y=y, d=d)
-
-def line(x1, y1, x2, y2):
-    """Draws a line from point (x1, y1) to point (x2, y2).
-    """
-    _draw("line", x1=x1, y1=y1, x2=x2, y2=y2)
-
-def rect(x, y, w, h):
-    """Draws a rectangle on the canvas.
-
-    Parameters
-    ----------
-    x: x coordinate of the top-left corner of the rectangle
-    y: y coordinate of the top-left corner of the rectangle
-    w: width of the rectangle
-    h: height of the rectangle
-    """
-    _draw("rect", x=x, y=y, w=w, h=h)
-
-def clear():
-    _draw("clear")
-
-# clear the canvas on start
-clear()
-`
-  const CANVAS_FUNCTIONS = {
-    circle: function(ctx, args) {
-      ctx.beginPath();
-      ctx.arc(args.x, args.y, args.d/2, 0, 2*Math.PI);
-      ctx.stroke();
-    },
-    line: function(ctx, args) {
-      ctx.beginPath();
-      ctx.moveTo(args.x1, args.y1);
-      ctx.lineTo(args.x2, args.y2);
-      ctx.stroke();
-    },
-    rect: function(ctx, args) {
-      ctx.beginPath();
-      ctx.rect(args.x, args.y, args.w, args.h);
-      ctx.stroke();
-    },
-    clear: function(ctx, args) {
-      var width = 300;
-      var height = 300;
-      ctx.clearRect(0, 0, width, height);
-    }
-  }
-
-  function drawOnCanvas(canvasElement, funcName, args) {
-    var ctx = canvasElement.getContext('2d');
-    var func = CANVAS_FUNCTIONS[funcName];
-
-    var scalex = canvasElement.width/300;
-    var scaley = canvasElement.height/300;
-
-    ctx.save();
-    ctx.scale(scalex, scaley);
-    func(ctx, args);
-    ctx.restore();
-  }
-
-  return {
-    runtime: "python",
-    files: [
-        {filename: "start.py", contents: START},
-        {filename: "sketch.py", contents: SKETCH},
-    ],
-    command: ["python", "start.py"],
-    codemirror: true,
-    onMessage: {
-      draw: function(editor, msg) {
-        const canvasElement = editor.parent.querySelector("canvas");
-        drawOnCanvas(canvasElement, msg.function, msg.args);
-      }
-    }
-  }
-}

community/query.py

@@ -1,22 +0,0 @@
-"""Utilities to find docs.
-"""
-import frappe
-
-def find_all(doctype, order_by=None, **filters):
-    """Queries the database for documents of a doctype matching given filters.
-    """
-    rows = frappe.db.get_all(doctype,
-        filters=filters,
-        fields='*',
-        order_by=order_by)
-    return [frappe.get_doc(dict(row, doctype=doctype)) for row in rows]
-
-def find(doctype, **filters):
-    """Queries the database for a document of given doctype matching given filters.
-    """
-    rows = frappe.db.get_all(doctype,
-        filters=filters,
-        fields='*')
-    if rows:
-        row = rows[0]
-        return frappe.get_doc(dict(row, doctype=doctype))

community/templates/emails/lms_invite_request_approved.html

@@ -1,18 +0,0 @@
-<div>
-	{% set site_link = "<a href='" + site_url + "'>" + site_url + "</a>" %}
-	<p>{{_("Dear Community Member,")}}</p>
-	<p>{{_("Your Invite Request to be a part of {0}  has
-		been approved.").format(site_link)}}</p>
-	<p>Click on the link below to complete your Sign up and set a new password</p>
-	<p style="margin: 15px 0px;">
-		<a href="{{ signup_form_link }}" rel="nofollow" class="btn btn-primary">{{ _("Complete Sign Up") }}</a>
-	</p>
-	<br>
-	<p>
-		{{_("You can also copy-paste following link in your browser")}}<br>
-		<a href="{{ signup_form_link }}">{{ site_url }}{{ signup_form_link }}</a>
-	</p>
-	<br>
-	<p>Thanks and Regards,</p>
-	<p>Your Community.</p>
-</div>

community/templates/emails/mentor_request_creation_email.html

@@ -1,9 +0,0 @@
-<div>
-  <p>Dear {{ member_name }},</p>
-  <br>
-  <p>You've applied to become a mentor for this course. Your request is currently under review.</p>
-  <p>If you are not any more interested to mentor the course {{ course }}, you can <a href="{{ course_url }}">cancel your application</a>.</p>
-  <br>
-  <p>Thanks and Regards,</p>
-  <p>Team Community.</p>
-</div>

community/templates/emails/mentor_request_status_update_email.html

@@ -1,8 +0,0 @@
-<div>
-  <p>Dear {{ member_name }},</p>
-  <br>
-  <p>Your request to join us as a mentor for the course {{ course }} has been {{ status }}.</p>
-  <br>
-  <p>Thanks and Regards,</p>
-  <p>Team Community.</p>
-</div>

community/widgets.py

@@ -14,8 +14,7 @@ from frappe.utils.jinja import get_jenv
 # When {{widgets.SomeWidget()}} is called, it looks for
 # widgets/SomeWidgets.html in each of these modules.
 MODULES = [
-    "lms",
-    "community"
+    "lms"
 ]
 
 def update_website_context(context):
@@ -36,9 +35,8 @@ class Widgets:
         '<div>Hello, World!</div>'
     """
     def __getattr__(self, name):
-        widget_globals = {"widgets": self}
         if not name.startswith("__"):
-            return Widget(name, widget_globals)
+            return Widget(name)
         else:
             raise AttributeError(name)
 
@@ -52,13 +50,11 @@ class Widget:
         >>> w(name="World!")
         '<div>Hello, World!</div>'
     """
-    def __init__(self, name, widget_globals={}):
-        self.widget_globals = widget_globals
+    def __init__(self, name):
         self.name = name
 
     def __call__(self, **kwargs):
         # the widget could be in any of the modules
         paths = [f"{module}/widgets/{self.name}.html" for module in MODULES]
         env = get_jenv()
-        kwargs.update(self.widget_globals)
         return env.get_or_select_template(paths).render(kwargs)

community/www/batch/about.py

@@ -1,7 +0,0 @@
-import frappe
-from . import utils
-
-def get_context(context):
-    utils.get_common_context(context)
-
-    print("context", context)

community/www/batch/discuss.py

@@ -1,9 +0,0 @@
-import frappe
-from . import utils
-from community.lms.doctype.lms_batch.lms_batch import get_messages
-
-def get_context(context):
-    utils.get_common_context(context)
-
-    context.members = utils.get_batch_members(context.batch.name)
-    context.member_count = len(context.members)

community/www/batch/learn.py

@@ -1,31 +0,0 @@
-import frappe
-from . import utils
-
-def get_context(context):
-    utils.get_common_context(context)
-
-    chapter_index = frappe.form_dict.get("chapter")
-    lesson_index = frappe.form_dict.get("lesson")
-    lesson_number = f"{chapter_index}.{lesson_index}"
-
-    course_name = context.course.name
-    batch_name = context.batch.name
-
-    if not chapter_index or not lesson_index:
-        frappe.local.flags.redirect_location = f"/courses/{course_name}/{batch_name}/learn/1.1"
-        raise frappe.Redirect
-
-    context.lesson = context.course.get_lesson(chapter_index, lesson_index)
-    context.lesson_index = lesson_index
-    context.chapter_index = chapter_index
-
-    outline = context.course.get_outline()
-    next_ = outline.get_next(lesson_number)
-    prev_ = outline.get_prev(lesson_number)
-    context.next_url = get_learn_url(course_name, batch_name, next_)
-    context.prev_url = get_learn_url(course_name, batch_name, prev_)
-
-def get_learn_url(course_name, batch_name, lesson_number):
-    if not lesson_number:
-        return
-    return f"/courses/{course_name}/{batch_name}/learn/{lesson_number}"

community/www/batch/members.py

@@ -1,8 +0,0 @@
-import frappe
-from . import utils
-
-def get_context(context):
-    utils.get_common_context(context)
-
-    context.members = utils.get_batch_members(context.batch.name)
-    context.member_count = len(context.members)

community/www/batch/progress.html

@@ -1,52 +0,0 @@
-{% extends "templates/base.html" %}
-{% from "www/macros/sidebar.html" import Sidebar %}
-{% from "www/macros/livecode.html" import LiveCodeEditorJS, LiveCodeEditor with context %}
-{% block title %}{{ course.title  }} - Batch Dashboard{% endblock %}
-
-{% block head_include %}
-	<meta name="description" content="{{course.title}} - Batch Dashboard" />
-	<meta name="keywords" content="{{course.title}} - Batch Dashboard" />
-	<style>
-	</style>
-
-<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
-<link rel="stylesheet" href="{{ livecode_url }}/static/codemirror/lib/codemirror.css">
-<link rel="stylesheet" href="/assets/css/lms.css">
-
-<script src="{{ livecode_url }}/static/codemirror/lib/codemirror.js"></script>
-<script src="{{ livecode_url }}/static/codemirror/mode/python/python.js"></script>
-<script src="{{ livecode_url }}/static/codemirror/keymap/sublime.js"></script>
-
-<script src="{{ livecode_url }}/static/codemirror/addon/edit/matchbrackets.js"></script>
-<script src="{{ livecode_url }}/static/codemirror/addon/comment/comment.js"></script>
-{% endblock %}
-
-
-{% block content %}
-{{ Sidebar(course, batch) }}
-
-<div class="container">
-  <div class="mentor-dashboard">
-    <h1>Batch Progress</h1>
-    {% for exercise in report.exercises %}
-      <div class="exercise-submissions">
-        <h2>{{exercise.title}}</h2>
-        {% for s in report.get_submissions_of_exercise(exercise.name) %}
-          <div class="submission">
-            <h4><a href="/{{s.owner.username}}">{{s.owner.full_name}}</a></h4>
-            <div class="livecode-editor-small">
-              {{ LiveCodeEditor(name=s.name, code=s.solution, reset_code=s.solution) }}
-            </div>
-          </div>
-        {% endfor %}
-      </div>
-    {% endfor %}
-  </div>
-</div>
-{% endblock %}
-
-
-{%- block script %}
-  {{ super() }}
-  {{ LiveCodeEditorJS() }}
-{% endblock %}

community/www/batch/progress.py

@@ -1,64 +0,0 @@
-import frappe
-from community.lms.models import Course
-from collections import defaultdict
-from . import utils
-
-def get_context(context):
-    utils.get_common_context(context)
-
-    exercise_name = frappe.form_dict.get("exercise")
-    if exercise_name:
-        exercise = frappe.get_doc("Exercise", exercise_name)
-    else:
-        exercise = None
-
-    context.exercise = exercise
-    context.report = BatchReport(context.course, context.batch)
-
-class BatchReport:
-    def __init__(self, course, batch):
-        self.submissions = get_submissions(batch)
-        self.exercises = self.get_exercises(course.name)
-
-        self.submissions_by_exercise = defaultdict(list)
-        for s in self.submissions:
-            self.submissions_by_exercise[s.exercise].append(s)
-
-    def get_exercises(self, course_name):
-        return frappe.get_all("Exercise", {"course": course_name}, ["name", "title"])
-
-    def get_submissions_of_exercise(self, exercise_name):
-        return self.submissions_by_exercise[exercise_name]
-
-def get_submissions(batch):
-    students = batch.get_students()
-    students_map = {s['email']: s for s in students}
-
-    names, values = nparams("s", students_map.keys())
-
-    sql = """
-    select owner, exercise, name, solution, creation, image
-    from (
-        select owner, exercise, name, solution, creation, image,
-            row_number() over (partition by owner, exercise order by creation desc) as ix
-        from `tabExercise Submission`) as t
-    where t.ix=1 and owner IN {}
-    """.format(names)
-
-    data = frappe.db.sql(sql, values=values, as_dict=True)
-
-    for row in data:
-        row['owner'] = students_map[row['owner']]
-    return data
-
-def nparams(name, values):
-    """Creates n paramters from a list of values for a db query.
-
-    >>> nparams("name", ["a", "b])
-    ("(%(name_1)s, %(name_2)s)", {"name_1": "a", "name_2": "b"})
-    """
-    keys = [f"{name}_{i}" for i, _ in enumerate(values, start=1)]
-    param_names = [f"%({k})s" for k in keys]
-    param_values = dict(zip(keys, values))
-    joined_names = "(" + ", ".join(param_names) + ")"
-    return joined_names, param_values

community/www/batch/schedule.py

@@ -1,20 +0,0 @@
-import frappe
-from community.lms.models import Course
-
-def get_context(context):
-    context.no_cache = 1
-    course_name = frappe.form_dict["course"]
-    batch_name = frappe.form_dict["batch"]
-
-    course = Course.find(course_name)
-    if not course:
-        context.template = "www/404.html"
-        return
-
-    batch = course.get_batch(batch_name)
-    if not batch:
-        frappe.local.flags.redirect_location = "/courses/" + course_name
-        raise frappe.Redirect
-
-    context.course = course
-    context.batch = batch

community/www/batch/utils.py

@@ -1,43 +0,0 @@
-import frappe
-from community.lms.models import Course
-
-def get_common_context(context):
-    context.no_cache = 1
-
-    course_name = frappe.form_dict["course"]
-    batch_name = frappe.form_dict["batch"]
-
-    course = Course.find(course_name)
-    if not course:
-        context.template = "www/404.html"
-        return
-
-    batch = course.get_batch(batch_name)
-    if not batch:
-        frappe.local.flags.redirect_location = "/courses/" + course_name
-        raise frappe.Redirect
-
-    context.course = course
-    context.batch = batch
-    context.livecode_url = get_livecode_url()
-
-def get_livecode_url():
-    return frappe.db.get_single_value("LMS Settings", "livecode_url")
-
-def get_batch_members(batch_name):
-    members = []
-    memberships = frappe.get_all("LMS Batch Membership", {"batch": batch_name}, ["member", "member_type"])
-
-    for membership in memberships:
-        member = get_member_with_name(membership.member)
-        if membership.member_type == "Mentor":
-            member.is_mentor = True
-        members.append(member)
-    return members
-
-def get_member_with_name(name):
-    try:
-        return frappe.get_doc("Community Member", name)
-    except frappe.DoesNotExistError:
-        return
-

community/www/courses/about/index.html

@@ -6,22 +6,22 @@
 {% block head_include %}
 <meta name="description" content="Courses" />
 <meta name="keywords" content="" />
-
-<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course, batch) }}
-
+{{ Sidebar(course_slug, batch_code) }}
 <div class="container">
 	{{ CourseBasicDetail(course)}}
-	{{ InstructorsSection(course.get_instructor()) }}
-	{{ BatchDetails(batch)}}
+	{{ InstructorsSection(instructor) }}
+	{% if batch.description %}
+		{{ BatchDetails(batch.description) }}
+	{% endif %}
+	{{ MentorsSection(mentors, True) }}
 </div>
 {% endblock %}
 
 {% macro CourseBasicDetail(course) %}
-<h2>{{course.title}}</h2>
+<h2>{{course.name}}</h2>
 <div class="course-description">
 	{{course.short_introduction}}
 </div>
@@ -36,23 +36,11 @@
 <div>{{frappe.utils.md_to_html(course.description)}}</div>
 {% endmacro %}
 
-{% macro BatchDetails(batch) %}
-<h2>About the Batch</h2>
-
-<div class="batch">
-  <div class="batch-details">
-  <div>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 batch.get_mentors() %}
-    <div>
-      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
-      <span class="instructor-title">{{m.full_name}}</span>
-    </div>
-  {% endfor %}
-  </div>
+{% macro BatchDetails(description) %}
+<div class="mt-5">
+	<h3>About the Batch</h3>
+	<div>
+		{{ frappe.utils.md_to_html(description) }}
+	</div>
 </div>
-{% endmacro %}
+{% endmacro %}

community/www/courses/about/index.py

@@ -0,0 +1,23 @@
+import frappe
+from community.www.courses.utils import redirect_if_not_a_member, get_course, get_instructor, get_batch
+
+def get_context(context):
+    context.no_cache = 1
+    context.course_slug = frappe.form_dict["course"]
+    context.course = get_course(context.course_slug)
+    context.batch_code = frappe.form_dict["batch"]
+    redirect_if_not_a_member(context.course_slug, context.batch_code)
+
+    context.instructor = get_instructor(context.course.owner)
+    context.batch = get_batch(context.batch_code)
+    context.mentors = get_mentors(context.batch.name)
+    print(context.mentors)
+
+def get_mentors(batch):
+    mentors = []
+    memberships = frappe.get_all("LMS Batch Membership", {"batch": batch, "member_type": "Mentor"}, ["member"])
+    for membership in memberships:
+        member = frappe.db.get_value("Community Member", membership.member, ["name","full_name"], as_dict=True)
+        member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member.name, "member_type": "Mentor"}))
+        mentors.append(member)
+    return mentors

community/www/courses/course.html

@@ -10,33 +10,39 @@
 <div class="container">
   <div class="course-header">
     <div class="course-type">course</div>
-    <h1 id="course-title" data-course="{{course.name}}">{{course.title}}</h1>
-    <div class="course-short-intro">{{ course.short_introduction }}</div>
+    <h1>{{course.title}}</h1>
   </div>
 
   <div class="row">
-    <div class="col-lg-8 col-md-12">
+    <div class="col-lg-9 col-md-12">
       <div  class="course-details">
-        {{ CourseVideo(course) }}
-
         {{ CourseDescription(course) }}
-        {{ BatchSection(course) }}
+        {{ BatchSection(course, is_mentor, upcoming_batches, mentor_batches) }}
         {{ CourseOutline(course) }}
       </div>
     </div>
-    <div class="col-lg-4 col-md-12">
+
+    <div class="col-lg-3 col-md-12">
       <div class="sidebar">
-        {{ InstructorsSection(course.get_instructor()) }}
+        {{ InstructorsSection(instructor) }}
       </div>
+
       <div class="sidebar">
-        {{ MentorsSection(course.get_mentors(), course.is_mentor(frappe.session.user), course.name) }}
+        {{ MentorsSection(mentors, is_mentor) }}
       </div>
     </div>
   </div>
 </div>
 {% endblock %}
 
-{% macro CourseVideo(course) %}
+
+{% macro CourseDescription(course) %}
+  <h2>Course Description</h2>
+
+  <div class="course-description">
+    {{ course.short_introduction }}
+  </div>
+
   {% if course.video_link %}
   <div class="preview-video">
     <iframe
@@ -51,19 +57,11 @@
   {% endif %}
 {% endmacro %}
 
-{% macro CourseDescription(course) %}
-  <h2>Course Description</h2>
-
-  <div class="course-description">
-    {{ frappe.utils.md_to_html(course.description) }}
-  </div>
-{% endmacro %}
-
-{% macro BatchSection(course) %}
-  {% if course.is_mentor(frappe.session.user) %}
-    {{ BatchSectionForMentors(course, course.get_batches(mentor=frappe.session.user)) }}
+{% macro BatchSection(course, is_mentor, upcoming_batches, mentor_batches) %}
+  {% if is_mentor %}
+    {{ BatchSectionForMentors(course, mentor_batches) }}
   {% else %}
-    {{ BatchSectionForStudents(course, course.get_upcoming_batches()) }}
+    {{ BatchSectionForStudents(course, upcoming_batches) }}
   {% endif %}
 {% endmacro %}
 
@@ -76,9 +74,11 @@
   <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 batch.get_mentors() %}
+  {% for m in batch.mentors %}
     <div>
-      {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
+      {% if m.photo_url %}
+      <img class="profile-photo" src="{{m.photo_url}}">
+      {% endif %}
       <span class="instructor-title">{{m.full_name}}</span>
     </div>
   {% endfor %}
@@ -86,10 +86,9 @@
   <div class="cta">
     <div class="">
       {% if can_manage %}
-        <a href="/courses/{{course.name}}/{{batch.name}}/about" class="btn btn-secondary">Manage</a>
+        <button type="button">Manage</button>
       {% else %}
-        <button class="join-batch" data-batch="{{ batch.name | urlencode }}"
-        data-course="{{ course.name | urlencode }}">Join this Batch</button>
+        <button type="button">Join this Batch</button>
       {% endif %}
     </div>
   </div>
@@ -100,7 +99,7 @@
   <h2>Your Batches</h2>
 
   {% if mentor_batches %}
-    <div class="alert alert-secondary">
+    <div class="message">
       You are a mentor for this course. Manage your batches or create a new batch from here.
     </div>
 
@@ -112,11 +111,11 @@
       {% endfor %}
     </div>
 
-    <a class="btn btn-primary add-batch margin-bottom" href="/add-a-new-batch?new=1&course={{course.title}}&slug={{course.name}}">Add a new batch</a>
+    <a class="btn btn-primary 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="btn btn-primary" href="/add-a-new-batch?new=1&course={{course.title}}&slug={{course.name}}" >Create your first batch</a>
+      <a class="btn btn-primary" href="/add-a-new-batch?new=1&course={{course.name}}" >Create your first batch</a>
     </div>
   {% endif %}
 {% endmacro %}
@@ -124,19 +123,33 @@
 {% macro BatchSectionForStudents(course, upcoming_batches) %}
   <h2>Upcoming Batches</h2>
 
-  <div class="row">
-    {% for batch in upcoming_batches %}
-    <div class="col-lg-4 col-md-6">
-      {{ RenderBatch(batch, can_manage=False) }}
-    </div>
-    {% endfor %}
+  {% for batch in upcoming_batches %}
+  <div class="col-lg-4 col-md-6">
+    {{ RenderBatch(batch, can_manage=False) }}
   </div>
+  {% endfor %}
 {% endmacro %}
 
 {% macro CourseOutline(course) %}
-  <h2>Course Outline</h2>
+<h2>Course Outline</h2>
 
-  {% for chapter in course.get_chapters() %}
-    {{ widgets.ChapterTeaser(index=loop.index, chapter=chapter)}}
-  {% endfor %}
+{% for chapter in course.topics %}
+  <div class="chapter-plan">
+    <h3><span class="chapter-number">{{loop.index}}</span> {{chapter.title}}</h3>
+    <div class="chapter-description">
+      {{chapter.preview | markdown}}
+    </div>
+
+    {#
+    <div class="lessons">
+      {% for lesson in chapter.lessons %}
+        <div class="lesson">
+          <span class="lesson-type"><i class="{{lesson.icon}}"></i></span>
+          <span class="lesson-title">{{lesson.title}}</span>
+        </div>
+      {% endfor %}
+    </div>
+    #}
+  </div>
+{% endfor %}
 {% endmacro %}

community/www/courses/course.js

@@ -3,21 +3,20 @@ frappe.ready(() => {
 		frappe.call({
 			'method': 'community.lms.doctype.lms_mentor_request.lms_mentor_request.has_requested',
 			'args': {
-				course: decodeURIComponent($("#course-title").attr("data-course")),
+				course: decodeURIComponent($(".course-title").attr("data-course")),
 			},
 			'callback': (data) => {
-				if (data.message > 0) {
-					$("#mentor-request").addClass("hide");
-					$("#already-applied").removeClass("hide")
+				if (data.message) {
+					$(".mentor-request").addClass("hide");
+					$(".already-applied").removeClass("hide")
 				}
 			}
 		})
 	}
 
-	$("#apply-now").click((e) => {
-    e.preventDefault();
+	$(".apply-now").click((e) => {
 		if (frappe.session.user == "Guest") {
-			window.location.href = `/login?redirect-to=/courses/${$(e.currentTarget).attr("data-course")}`;
+			window.location.href = "/login";
 			return;
 		}
 		frappe.call({
@@ -27,15 +26,14 @@ frappe.ready(() => {
 			},
 			"callback": (data) => {
 				if (data.message == "OK") {
-					$("#mentor-request").addClass("hide");
-					$("#already-applied").removeClass("hide")
+					$(".mentor-request").addClass("hide");
+					$(".already-applied").removeClass("hide")
 				}
 			}
 		})
 	})
 
-	$("#cancel-request").click((e) => {
-    e.preventDefault()
+	$(".cancel-request").click((e) => {
 		frappe.call({
 			"method": "community.lms.doctype.lms_mentor_request.lms_mentor_request.cancel_request",
 			"args": {
@@ -43,17 +41,16 @@ frappe.ready(() => {
 			},
 			"callback": (data) => {
 				if (data.message == "OK") {
-					$("#mentor-request").removeClass("hide");
-					$("#already-applied").addClass("hide")
+					$(".mentor-request").removeClass("hide");
+					$(".already-applied").addClass("hide")
 				}
 			}
 		})
 	})
 
 	$(".join-batch").click((e) => {
-    e.preventDefault()
 		if (frappe.session.user == "Guest") {
-			window.location.href = `/login?redirect-to=/courses/${$(e.currentTarget).attr("data-course")}`;
+			window.location.href = "/login";
 			return;
 		}
 		batch = decodeURIComponent($(e.currentTarget).attr("data-batch"))
@@ -65,8 +62,10 @@ frappe.ready(() => {
 			"callback": (data) => {
 				if (data.message == "OK") {
 					frappe.msgprint(__("You are now a student of this course."))
+					$(".upcoming-batches").addClass("hide")
 				}
 			}
 		})
 	})
 })
+

community/www/courses/course.py

@@ -1,26 +1,101 @@
 import frappe
 from community.www.courses.utils import get_instructor
 from frappe.utils import nowdate, getdate
-from community.lms.models import Course
 
 def get_context(context):
     context.no_cache = 1
-
+    
     try:
-        course_name = frappe.form_dict["course"]
+        course_id = frappe.form_dict["course"]
     except KeyError:
         frappe.local.flags.redirect_location = "/courses"
         raise frappe.Redirect
-
-    course = Course.find(course_name)
-    if course is None:
-        frappe.local.flags.redirect_location = "/courses"
+    
+    context.course = get_course(course_id)
+    context.batches = get_course_batches(context.course.name)
+    context.is_mentor = is_mentor(context.course.name)
+    context.memberships = get_membership(context.batches)
+    if len(context.memberships) and not context.is_mentor:
+        frappe.local.flags.redirect_location = "/courses/" + course_id + "/" + context.memberships[0].code + "/learn"
         raise frappe.Redirect
+    context.upcoming_batches = get_upcoming_batches(context.course.name)
+    context.instructor = get_instructor(context.course.owner)
+    context.mentors = get_mentors(context.course.name)
+    
+    if context.is_mentor:
+        context.mentor_batches = get_mentor_batches(context.memberships)        # Your Bacthes for mentor
 
-    context.course = course
+def get_course(slug):
+    course = frappe.db.get_value("LMS Course", {"slug": slug},
+        ["name", "slug", "title", "description", "short_introduction", "video_link", "owner"], as_dict=1)
 
-    batch = course.get_student_batch(frappe.session.user)
-    if batch:
-        frappe.local.flags.redirect_location = f"/courses/{course.name}/{batch.name}/learn"
-        raise frappe.Redirect
+    course["topics"] = frappe.db.get_all("LMS Topic",
+        filters={
+            "course": course["name"]
+        },
+        fields=["name", "slug", "title", "preview"],
+        order_by="creation"
+    )
+    return course
+
+def get_upcoming_batches(course):
+    batches = frappe.get_all("LMS Batch", {"course": course, "start_date": [">", nowdate()]}, ["start_date", "start_time", "end_time", "sessions_on", "name"])
+    batches = get_batch_mentors(batches)
+    return batches
+
+def get_batch_mentors(batches):
+    for batch in batches:
+        batch.mentors = []
+        mentors = frappe.get_all("LMS Batch Membership", {"batch": batch.name, "member_type": "Mentor"}, ["member"])
+        for mentor in mentors:
+            member = frappe.db.get_value("Community Member", mentor.member, ["full_name", "photo", "abbr"], as_dict=1)
+            batch.mentors.append(member)
+    return batches
+
+def get_membership(batches):
+    memberships = []
+    member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name")
+    for batch in batches:
+        membership = frappe.db.get_value("LMS Batch Membership", {"member": member, "batch": batch.name}, ["batch", "member", "member_type"], as_dict=1)
+        if membership:
+            membership.code = batch.code
+            memberships.append(membership)
+    return memberships
+
+def get_mentors(course):
+    course_mentors = []
+    mentors = frappe.get_all("LMS Course Mentor Mapping", {"course": course}, ["mentor"])
+    for mentor in mentors:
+        member = frappe.get_doc("Community Member", mentor.mentor)
+        member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member.name, "member_type": "Mentor"}))
+        course_mentors.append(member)
+    return course_mentors
+
+def get_course_batches(course):
+    return frappe.get_all("LMS Batch", {"course": course}, ["name", "code"])
+
+def get_mentor_batches(memberships):
+    mentor_batches = []
+    memberships_as_mentor = list(filter(lambda x: x.member_type == "Mentor", memberships))
+    for membership in memberships_as_mentor:
+        batch = frappe.get_doc("LMS Batch", membership.batch)
+        mentor_batches.append(batch)
+    for batch in mentor_batches:
+        if getdate(batch.start_date) < getdate():
+            batch.status = "active"
+            batch.badge_class = "green_badge"
+        else:
+            batch.status = "scheduled"
+            batch.badge_class = "yellow_badge"
+    mentor_batches = get_batch_mentors(mentor_batches)
+    return mentor_batches
+
+def is_mentor(course):
+    try:
+        member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, ["name"])
+    except frappe.DoesNotExistError:
+        return False
+    mapping = frappe.get_all("LMS Course Mentor Mapping", {"course": course, "mentor": member})
+    if len(mapping):
+        return True
 

community/www/courses/discuss/index.html

@@ -6,23 +6,18 @@
 {% block head_include %}
 <meta name="description" content="Courses" />
 <meta name="keywords" content="" />
-
-<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course, batch) }}
-
+{{ Sidebar(course_slug, batch_code) }}
 <div class="">
   <div class="batch-header">
-    {{ BatchHearder(course.title, member_count) }}
+    {{ BatchHearder(course.name, member_count) }}
   </div>
-  <div class="messages">
-    <div class="message-section">
-      {{ Messages(messages) }}
-    </div>
-    {{ TextArea() }}
+  <div class="message-section">
+    {{ Messages(messages) }}
   </div>
+  {{ TextArea() }}
 </div>
 {% endblock %}
 
@@ -49,4 +44,4 @@
   <input type="text" class="msger-input" placeholder="Write your message...">
   <button type="submit" class="msger-send-btn" data-batch="{{batch.name | urlencode }}">Send</button>
 </form>
-{% endmacro %}
+{% endmacro %}

community/www/courses/discuss/index.py

@@ -0,0 +1,15 @@
+import frappe
+from community.www.courses.utils import redirect_if_not_a_member, get_course, get_batch_members, get_batch
+from community.lms.doctype.lms_batch.lms_batch import get_messages
+
+def get_context(context):
+    context.no_cache = 1
+    context.course_slug = frappe.form_dict["course"]
+    context.course = get_course(context.course_slug)
+    context.batch_code = frappe.form_dict["batch"]
+    redirect_if_not_a_member(context.course_slug, context.batch_code)
+    
+    context.batch = get_batch(context.batch_code)
+    context.members = get_batch_members(context.batch.name)
+    context.member_count = len(context.members)
+    context.messages = get_messages(context.batch.name)

community/www/courses/index.html

@@ -26,11 +26,11 @@
 {% macro course_card(course) %}
 <div class="card mb-5 w-100">
   <div class="card-body">
-    <h5 class="card-title"><a href="/courses/{{course.name}}">{{course.title}}</a></h5>
+    <h5 class="card-title"><a href="/courses/{{course.slug}}">{{course.title}}</a></h5>
     {% if course.description %}
     <p class="card-text">{{ frappe.utils.md_to_html(course.description[:250]) }}</p>
     {% endif %}
-    <a href="/courses/{{course.name}}" class="card-link">See more &rarr;</a>
+    <a href="/courses/{{course.slug}}" class="card-link">See more &rarr;</a>
   </div>
 </div>
 {% endmacro %}

community/www/courses/index.py

@@ -7,6 +7,6 @@ def get_context(context):
 def get_courses():
     courses = frappe.get_all(
         "LMS Course",
-        fields=['name', 'title', 'description']
+        fields=['name', 'slug', 'title', 'description']
     )
     return courses

community/www/courses/learn/index.html

@@ -0,0 +1,13 @@
+{% extends "templates/base.html" %}
+{% from "www/macros/sidebar.html" import Sidebar %}
+{% block title %}Learn{% endblock %}
+{% block head_include %}
+<meta name="description" content="Courses" />
+<meta name="keywords" content="" />
+{% endblock %}
+
+{% block content %}
+{{ Sidebar(course, batch_code) }}
+<div class="container">
+</div>
+{% endblock %}

community/www/courses/learn/index.py

@@ -0,0 +1,10 @@
+import frappe
+from community.www.courses.utils import redirect_if_not_a_member
+
+def get_context(context):
+    context.no_cache = 1
+    context.course = frappe.form_dict["course"]
+    context.batch_code = frappe.form_dict["batch"]
+    redirect_if_not_a_member(context.course, context.batch_code)
+    
+    print(context)

community/www/courses/members/index.html

@@ -7,14 +7,12 @@
 {% block head_include %}
 <meta name="description" content="Courses" />
 <meta name="keywords" content="" />
-<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course, batch) }}
-
+{{ Sidebar(course_slug, batch_code) }}
 <div class="container">
-	{{ BatchHearder(course.title, member_count)}}
+	{{ BatchHearder(course.name, member_count)}}
 	{{ MembersList(members)}}
 </div>
 {% endblock %}
@@ -37,4 +35,4 @@
 	<hr>
 	{% endfor %}
 </div>
-{% endmacro %}
+{% endmacro %}

community/www/courses/members/index.py

@@ -0,0 +1,12 @@
+import frappe
+from community.www.courses.utils import redirect_if_not_a_member, get_batch, get_member_with_name, get_course, get_batch_members
+
+def get_context(context):
+    context.no_cache = 1
+    context.course_slug = frappe.form_dict["course"]
+    context.course = get_course(context.course_slug)
+    context.batch_code = frappe.form_dict["batch"]
+    redirect_if_not_a_member(context.course_slug, context.batch_code)
+    context.batch = get_batch(context.batch_code)
+    context.members = get_batch_members(context.batch.name)
+    context.member_count = len(context.members)

community/www/courses/schedule/index.html

@@ -4,11 +4,10 @@
 {% block head_include %}
 <meta name="description" content="Courses" />
 <meta name="keywords" content="" />
-<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course, batch) }}
+{{ Sidebar(course, batch_code) }}
 <div class="container">
 </div>
 {% endblock %}

community/www/courses/schedule/index.py

@@ -0,0 +1,8 @@
+import frappe
+from community.www.courses.utils import redirect_if_not_a_member
+
+def get_context(context):
+    context.no_cache = 1
+    context.course = frappe.form_dict["course"]
+    context.batch_code = frappe.form_dict["batch"]
+    redirect_if_not_a_member(context.course, context.batch_code)

community/www/courses/topic.html

@@ -1,15 +1,12 @@
 {% extends "templates/base.html" %}
-{% from "www/macros/sidebar.html" import Sidebar %}
-{% from "www/macros/livecode.html" import LiveCodeEditorJS, LiveCodeEditor with context %}
-{% block title %}{{ lesson.title }}{% endblock %}
-
+{% from "www/macros/livecode.html" import LiveCodeEditor with context %}
+{% block title %}{{topic.title}} ({{course.title}}){% endblock %}
 {% block head_include %}
-	<meta name="description" content="{{lesson.title}} - {{course.title}}" />
-	<meta name="keywords" content="{{lesson.title}} - {{course.title}}" />
+	<meta name="description" content="Topic {{topic.title}} of the course {{course.title}}" />
+	<meta name="keywords" content="course {{course.title}} {{topic.title}}" />
 	<style>
 	</style>
 
-<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 <link rel="stylesheet" href="{{ livecode_url }}/static/codemirror/lib/codemirror.css">
 <link rel="stylesheet" href="/assets/css/lms.css">
 
@@ -21,40 +18,33 @@
 <script src="{{ livecode_url }}/static/codemirror/addon/comment/comment.js"></script>
 {% endblock %}
 
-
 {% block content %}
-{{ Sidebar(course, batch) }}
+<section class="top-section" style="padding: 1rem 0rem;">
+	<div class='container pb-5'>
+		<nav aria-label="breadcrumb">
+			<ol class="breadcrumb">
+				<li class="breadcrumb-item" aria-current="page"><a href="/courses">Courses</a></li>
+				<li class="breadcrumb-item" aria-current="page"><a href="/courses/{{course.slug}}">{{course.title}}</a></li>
+			</ol>
+		</nav>
 
-<div class="container">
-  <div class="lesson-page">
-    {{ pagination(prev_url, next_url) }}
+		<h1>{{ topic.title }}</h1>
 
-    <h2>{{ lesson.title }}</h2>
-
-    {% for s in lesson.get_sections() %}
+    {% for s in topic.get_sections() %}
     <div class="section section-{{ s.type }}">
       {{ render_section(s) }}
     </div>
     {% endfor %}
 
-    {{ pagination(prev_url, next_url) }}
-
-  </div>
-</div>
+	</div>
+</section>
 {% endblock %}
 
-
 {% macro render_section(s) %}
   {% if s.type == "text" %}
     {{ render_section_text(s) }}
   {% elif s.type == "example" or s.type == "code" %}
-    {{ LiveCodeEditor(s.name,
-          code=s.get_latest_code_for_user(),
-          reset_code=s.contents,
-          is_exercise=False)
-    }}
-  {% elif s.type == "exercise" %}
-    {{ widgets.Exercise(exercise=s.get_exercise())}}
+    {{ LiveCodeEditor(s.name, s.get_latest_code_for_user()) }}
   {% else %}
     <div>Unknown section type: {{s.type}}</div>
   {% endif %}
@@ -68,24 +58,10 @@
   </div>
 {% endmacro %}
 
-{% macro pagination(prev_url, next_url) %}
-  <div class="lesson-pagination">
-    {% if prev_url %}
-      <a href="{{prev_url}}" class="btn">&larr; Prev</a>
-    {% endif %}
-    {% if next_url %}
-      <a href="{{next_url}}" class="btn pull-right">Next &rarr;</a>
-    {% endif %}
-    <div style="clear: both;"></div>
-  </div>
-{% endmacro %}
-
 {%- block script %}
   {{ super() }}
-  {{ LiveCodeEditorJS() }}
-
-
-  <!-- <script type="text/javascript">
+  <script type="text/javascript" src="{{ livecode_url }}/static/livecode.js"></script>
+  <script type="text/javascript">
     $(function() {
       var editorLookup = {};
 
@@ -128,5 +104,5 @@
         })
       })
     })
-  </script> -->
+  </script>
 {%- endblock %}

community/www/courses/topic.py

@@ -0,0 +1,33 @@
+import frappe
+
+def get_context(context):
+    context.no_cache = 1
+
+    try:
+        course_slug = frappe.form_dict['course']
+        topic_slug = frappe.form_dict['topic']
+    except KeyError:
+        context.template = 'www/404.html'
+        return
+
+    course = get_course(course_slug)
+    topic = course and course.get_topic(topic_slug)
+
+    if not topic:
+        context.template = 'www/404.html'
+        return
+
+    context.course = course
+    context.topic = topic
+    context.livecode_url = get_livecode_url()
+
+def notfound(context):
+    context.template = 'www/404.html'
+
+def get_livecode_url():
+    doc = frappe.get_doc("LMS Settings")
+    return doc.livecode_url
+
+def get_course(slug):
+    course = frappe.db.get_value('LMS Course', {"slug": slug}, ["name"], as_dict=1)
+    return course and frappe.get_doc('LMS Course', course['name'])

community/www/courses/utils.py

@@ -14,14 +14,12 @@ def get_member_with_name(name):
 
 def get_batch(code):
     try:
-        print("get_batch", code)
-        return frappe.db.get_value("LMS Batch", {"name": code}, ["name", "description"], as_dict=True)
+        return frappe.db.get_value("LMS Batch", {"code": code}, ["name", "description"], as_dict=True)
     except frappe.DoesNotExistError:
-        print("Error: notfound")
         return
 
 def is_member_of_batch(batch_code):
-    membership = frappe.get_all("LMS Batch Membership", {"batch": batch_code, "member": get_member_with_email()})
+    membership = frappe.get_all("LMS Batch Membership", {"batch": get_batch(batch_code).name, "member": get_member_with_email()})
     if len(membership):
         return True
     return False
@@ -31,9 +29,9 @@ def redirect_if_not_a_member(course,batch_code):
         frappe.local.flags.redirect_location = "/courses/" + course
         raise frappe.Redirect
 
-def get_course(name):
+def get_course(slug):
     try:
-        return frappe.get_doc("LMS Course", {"name": name})
+        return frappe.get_doc("LMS Course", {"slug": slug})
     except frappe.DoesNotExistError:
         return
 
@@ -56,4 +54,4 @@ def get_batch_members(batch):
         if membership.member_type == "Mentor":
             member.is_mentor = True
         members.append(member)
-    return members
+    return members