feat: widgets interface

Widgets are reusable jinja templates which can be used in other
themplates. Widgets are written in widgets/ directory in every frappe
module and can be accessed as `{{ widgets.WidgetName(...) }}` from any
template.

.github/workflows/ci.yml

@@ -38,25 +38,10 @@ jobs:
       with:
         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,7 +50,7 @@ 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

README.md

@@ -9,51 +9,7 @@ The App has following components:
 
 Community is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript.
 
-## Development Setup
-
-**Step 1:** Clone the repo
-
-```
-$ git clone https://github.com/fossunited/community.git
-
-$ cd community
-```
-
-**Step 2:** Run docker-compose
-
-```
-$ docker-compose up
-```
-
-**Step 3:** Visit the website at http://localhost:8000/
-
-You'll have to go through the setup wizard to setup the website for the first time you access it. Login using the following credentiasl to complete the setup wizard.
-
-```
-Username: Administrator
-password: admin
-```
-
-TODO: Explain how to load sample data
-
-## Stopping the server
-
-Press `ctrl+c` in the terminal to stop the server. You can also run `docker-compose down` in another terminal to stop it.
-
-To completely reset the instance, do the following:
-
-```
-$ docker-compose down --volumes
-$ docker-compose up
-```
-
-## Making Code Changes
-
-The dev setup is configured to reload whenever any code is changed. Just edit the code and reload the webpage.
-
-Commit the changes in a branch and send a pull request.
-
-## Local Setup - The Hard Way
+### Local Setup
 
 To setup the repository locally follow the steps mentioned below:
 
@@ -65,7 +21,7 @@ To setup the repository locally follow the steps mentioned below:
 1. Map your site to localhost with the command ```bench --site community.test add-to-hosts```
 1. Now open the URL http://community.test:8000/docs in your browser, you should see the app running.
 
-### Contribution Guidelines (for The Hard Way)
+### Contribution Guidelines
 
 1. Go to the apps/community directory of your installation and execute git pull --unshallow to ensure that you have the full git repository. Also fork the fossunited/community repository on GitHub.
 1. Check out a working branch in git (e.g. git checkout -b my-new-branch).
@@ -76,4 +32,4 @@ To setup the repository locally follow the steps mentioned below:
 
 #### License
 
-AGPL
+AGPL

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.json

@@ -11,15 +11,15 @@
   "email",
   "enabled",
   "column_break_4",
-  "username",
-  "email_preference",
+  "role",
+  "short_intro",
   "section_break_7",
   "bio",
   "section_break_9",
-  "role",
+  "username",
   "photo",
   "column_break_12",
-  "short_intro",
+  "email_preference",
   "route",
   "abbr"
  ],
@@ -77,10 +77,8 @@
    "unique": 1
   },
   {
-   "allow_in_quick_entry": 1,
    "fieldname": "username",
    "fieldtype": "Data",
-   "in_list_view": 1,
    "label": "User Name",
    "unique": 1
   },
@@ -113,9 +111,10 @@
    "read_only": 1
   }
  ],
+ "has_web_view": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-04-28 11:22:35.402217",
+ "modified": "2021-04-16 10:22:46.837311",
  "modified_by": "Administrator",
  "module": "Community",
  "name": "Community Member",

community/community/doctype/community_member/community_member.py

@@ -4,98 +4,37 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe.website.website_generator import WebsiteGenerator
 import re
 from frappe import _
-from frappe.model.document import Document
-import random
-from frappe.utils import cint
-import hashlib
+from frappe.model.rename_doc import rename_doc
 
-class CommunityMember(Document):
+class CommunityMember(WebsiteGenerator):
 
-    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 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 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()
-
-    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_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
-
-    if ( doc.username and  username_exists(doc.username)) or not doc.username:
-        username = create_username_from_email(doc.email)
-
-    elif len(doc.username) < 4:
-        username = adjust_username(doc.username)
-
-    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)
-
-def username_exists(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())
-
-def adjust_username(username):
-    return username.ljust(4, str(random.randint(0,9)))
+	member = frappe.get_doc({
+		"doctype": "Community Member",
+		"full_name": doc.full_name,
+		"username": doc.username if len(doc.username) > 3 else ("").join([ s for s in doc.full_name.split() ]),
+		"email": doc.email,
+		"route": doc.username,
+		"owner": doc.email
+	})
+	member.save(ignore_permissions=True)

community/community/doctype/community_member/test_community_member.py

@@ -2,91 +2,9 @@
 # Copyright (c) 2021, Frappe and Contributors
 # See license.txt
 from __future__ import unicode_literals
-from community.lms.doctype.lms_course.test_lms_course import new_user
-import frappe
+
+# import frappe
 import unittest
 
 class TestCommunityMember(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(self):
-        users = ["test_user@example.com","test_user1@example.com"]
-
-        for user in users:
-            if not frappe.db.exists("User", user):
-                new_user("Test User", user)
-
-    def test_member_created_from_user(self):
-        user = frappe.db.get_value("User","test_user@example.com", ["full_name", "email", "username"], as_dict=True)
-        self.assertTrue(frappe.db.exists("Community Member", {"username":user.username}))
-
-        member = frappe.db.get_value("Community Member",
-                        filters={"email": user.email},
-                        fieldname=["full_name", "email", "owner", "username", "route"],
-                        as_dict=True
-                    )
-
-        self.assertEqual(user.full_name, member.full_name)
-        self.assertEqual(member.owner, user.email)
-        self.assertEqual(user.username, member.username)
-        self.assertEqual(member.username, member.route)
-        
-    def test_members_with_same_name(self):
-        user1 = frappe.db.get_value("User","test_user@example.com", ["email"], as_dict=True)
-        user2 = frappe.get_doc("User","test_user1@example.com", ["email"], as_dict=True)
-
-        self.assertTrue(frappe.db.exists("Community Member", {"email": user1.email} ))
-        self.assertTrue(frappe.db.exists("Community Member", {"email": user2.email }))
-
-        member1 = frappe.db.get_value("Community Member",
-                        filters={"email": user1.email},
-                        fieldname=["full_name", "email", "owner", "username", "route"],
-                        as_dict=True
-                    )
-        member2 = frappe.db.get_value("Community Member",
-                        filters={"email": user2.email},
-                        fieldname=["full_name", "email", "owner", "username", "route"],
-                        as_dict=True
-                    )
-
-        self.assertEqual(member1.full_name, member2.full_name)
-        self.assertEqual(member1.email, user1.email)
-        self.assertEqual(member2.email, user2.email)
-        self.assertNotEqual(member1.username, member2.username)
-
-    def test_username_validations(self):
-        user = new_user("Tst", "tst@example.com")
-        self.assertTrue(frappe.db.exists("Community Member", {"email":user.email} ))
-
-        member = frappe.db.get_value("Community Member",
-                        filters={"email": user.email},
-                        fieldname=["username"],
-                        as_dict=True
-                    )
-
-        self.assertEqual(len(member.username), 4)
-        frappe.delete_doc("User", user.email)
-
-    def test_user_without_username(self):
-        user = new_user("Test User", "test_user2@example.com")
-        self.assertTrue(frappe.db.exists("Community Member", {"email":user.email} ))
-
-        member = frappe.db.get_value("Community Member",
-                        filters={"email": user.email},
-                        fieldname=["username"],
-                        as_dict=True
-                    )
-
-        self.assertTrue(member.username)
-        frappe.delete_doc("User", user.email)
-
-    @classmethod
-    def tearDownClass(self):
-        users = ["test_user@example.com","test_user1@example.com"]
-
-        for user in users:
-            if frappe.db.exists("User", user):
-                frappe.delete_doc("User", user)
-
-            if frappe.db.exists("Community Member", {"email": user}):
-                frappe.delete_doc("Community Member", {"email": user})
+	pass

community/community/utils.py

@@ -7,6 +7,7 @@ def create_members_from_users():
 			doc = frappe.get_doc("User", {"email": user.email})
 			username = doc.username if doc.username and len(doc.username) > 3 else ("").join([ s for s in doc.full_name.split() ])
 			if not frappe.db.exists("Community Member", username):
+				print(doc.email, username)
 				member = frappe.new_doc("Community Member")
 				member.full_name = doc.full_name
 				member.username = username

community/community/widgets/Avatar.html

@@ -1,12 +0,0 @@
-{% set color = member.get_palette() %}
-<span class="avatar {{ avatar_class }}" title="{{ member.full_name }}">
-  {% if member.photo %}
-  <img class="avatar-frame standard-image" src="{{ member.photo }}" 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 %}
-</span>

community/hooks.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 from . import __version__ as app_version
-from .install import APP_LOGO_URL
 
 app_name = "community"
 app_title = "Community"
@@ -11,9 +10,6 @@ app_icon = "octicon octicon-file-directory"
 app_color = "grey"
 app_email = "jannat@erpnext.com"
 app_license = "AGPL"
-
-app_logo_url = APP_LOGO_URL
-
 # Includes in <head>
 # ------------------
 
@@ -63,7 +59,7 @@ web_include_css = "/assets/css/community.css"
 # ------------
 
 # before_install = "community.install.before_install"
-after_install = "community.install.after_install"
+# after_install = "community.install.after_install"
 
 # Desk Notifications
 # ------------------
@@ -98,10 +94,7 @@ after_install = "community.install.after_install"
 doc_events = {
 	"User": {
 		"after_insert": "community.community.doctype.community_member.community_member.create_member_from_user"
-	},
-    "LMS Message": {
-        "after_insert": "community.lms.doctype.lms_message.lms_message.publish_message"
-    }
+	}
  }
 
 # Scheduled Tasks
@@ -140,6 +133,7 @@ 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": ""},
@@ -153,7 +147,6 @@ primary_rules = [
 
 # Any frappe default URL is blocked by profile-rules, add it here to unblock it
 whitelist = [
-    "/home",
     "/login",
     "/update-password",
     "/update-profile",
@@ -166,9 +159,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/install.py

@@ -1,42 +0,0 @@
-"""Hooks that are executed during and after install.
-"""
-import os
-import frappe
-
-APP_LOGO_URL = os.getenv("APP_LOGO_URL") or "/files/logo.png"
-
-def after_install():
-    set_app_name()
-    disable_signup()
-    add_header_items()
-    add_footer_items()
-
-def set_app_name():
-    app_name = os.getenv("FRAPPE_APP_NAME")
-    if app_name:
-        frappe.db.set_value('System Settings', None, 'app_name', app_name)
-
-def disable_signup():
-    frappe.db.set_value("Website Settings", None, "disable_signup", 1)
-
-def add_header_items():
-    items = [
-        {"label": "Sketches", "url": "/sketches"},
-    ]
-    doc = frappe.get_doc("Website Settings", None)
-    doc.update({
-        "top_bar_items": items
-    })
-    doc.save()
-
-def add_footer_items():
-    items = [
-        {"label": "About", "url": "/about"},
-        {"label": "Blog", "url": "/blog"},
-        {"label": "Github", "url": "https://github.com/fossunited/community"}
-    ]
-    doc = frappe.get_doc("Website Settings", None)
-    doc.update({
-        "footer_items": items
-    })
-    doc.save()

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.json

@@ -1,72 +0,0 @@
-{
- "actions": [],
- "autoname": "format:{####} {title}",
- "creation": "2021-05-03 05:49:08.383057",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "course",
-  "title",
-  "description",
-  "locked"
- ],
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title"
-  },
-  {
-   "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"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [
-  {
-   "group": "Lessons",
-   "link_doctype": "Lesson",
-   "link_fieldname": "chapter"
-  }
- ],
- "modified": "2021-05-03 06:52:10.894328",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "Chapter",
- "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/chapter/chapter.py

@@ -1,14 +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='*')
-        return [frappe.get_doc(dict(row, doctype='Lesson')) for row in rows]

community/lms/doctype/chapter/test_chapter.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 TestChapter(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,83 +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 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.js

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

community/lms/doctype/lesson/lesson.json

@@ -1,60 +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"
- ],
- "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"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-05-03 06:51:43.588969",
- "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,10 +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 Lesson(Document):
-	pass

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,34 +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 community.query import find, find_all
 
 class LMSBatch(Document):
-    def validate(self):
-        if not self.code:
-            self.generate_code()
+	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)
-
-    def get_mentors(self):
-        mentors = []
-        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):
-        """Checks if a person is part of a batch.
-        """
-        member = find("Community Member", email=email)
-        return member and frappe.db.exists(
-                    "LMS Batch Membership",
-                    {"batch": self.name, "member": member.name})
+	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):
@@ -55,3 +37,4 @@ def save_message(message, batch):
         "message": message
     })
     doc.save(ignore_permissions=True)
+    return doc

community/lms/doctype/lms_batch_membership/lms_batch_membership.py

@@ -8,38 +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, course=None, 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)
-    if course:
-        course_slug = frappe.db.get_value("LMS Course", {"title": course}, ["name"])
-        return course_slug
-    return "OK"
+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"

community/lms/doctype/lms_course/lms_course.json

@@ -2,6 +2,7 @@
  "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,
@@ -73,8 +74,8 @@
  "is_published_field": "is_published",
  "links": [
   {
-   "group": "Chapters",
-   "link_doctype": "Chapter",
+   "group": "Topics",
+   "link_doctype": "LMS Topic",
    "link_fieldname": "course"
   },
   {
@@ -88,7 +89,7 @@
    "link_fieldname": "course"
   }
  ],
- "modified": "2021-05-06 11:15:45.728976",
+ "modified": "2021-04-21 14:45:41.658056",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",

community/lms/doctype/lms_course/lms_course.py

@@ -6,24 +6,11 @@ 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(
@@ -33,7 +20,7 @@ class LMSCourse(Document):
         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.
@@ -63,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
 
@@ -101,50 +88,3 @@ class LMSCourse(Document):
             member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member.name, "member_type": "Mentor"}))
             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_instructor(self):
-        member_name = self.get_community_member(self.owner)
-        return frappe.get_doc("Community Member", member_name)
-
-    def get_chapters(self):
-        """Returns all chapters of this course.
-        """
-        # 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
-

community/lms/doctype/lms_course/test_lms_course.py

@@ -4,7 +4,6 @@
 from __future__ import unicode_literals
 
 import frappe
-from .lms_course import LMSCourse
 import unittest
 
 class TestLMSCourse(unittest.TestCase):
@@ -12,6 +11,7 @@ class TestLMSCourse(unittest.TestCase):
         frappe.db.sql('delete from `tabLMS Course Mentor Mapping`')
         frappe.db.sql('delete from `tabLMS Course`')
         frappe.db.sql('delete from `tabCommunity Member`')
+        frappe.db.sql('delete from `tabUser` where email like "%@example.com"')
 
     def new_course(self, title):
         doc = frappe.get_doc({
@@ -21,48 +21,28 @@ class TestLMSCourse(unittest.TestCase):
         doc.insert()
         return doc
 
+    def new_user(self, name, email):
+        doc = frappe.get_doc(dict(
+                doctype='User',
+                email=email,
+                first_name=name))
+        doc.insert()
+        return doc
+
     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):
-        courses = LMSCourse.find_all()
-        assert courses == []
-
-        # new couse, but not published
-        course = self.new_course("Test Course")
-        assert courses == []
-
-        # publish the course
-        course.is_published = True
-        course.save()
-
-        # now we should find one course
-        courses = LMSCourse.find_all()
-        assert [c.name for c in courses] == [course.name]
-
     # disabled this test as it is failing
     def _test_add_mentors(self):
         course = self.new_course("Test Course")
         assert course.get_mentors() == []
 
-        user = new_user("Tester", "tester@example.com")
+        user = self.new_user("Tester", "tester@example.com")
         course.add_mentor("tester@example.com")
 
         mentors = course.get_mentors()
         mentors_data = [dict(email=mentor.email, batch_count=mentor.batch_count) for mentor in mentors]
         assert mentors_data == [{"email": "tester@example.com", "batch_count": 0}]
-
-    def tearDown(self):
-        if frappe.db.exists("User", "tester@example.com"):
-            frappe.delete_doc("User", "tester@example.com")
-
-def new_user(name, email):
-    doc = frappe.get_doc(dict(
-            doctype='User',
-            email=email,
-            first_name=name))
-    doc.insert()
-    return doc

community/lms/doctype/lms_mentor_request/lms_mentor_request.py

@@ -79,7 +79,7 @@ def send_creation_email(course, member):
 	subject = _('Request for Mentorship')
 	send_email([frappe.session.user, get_course_author(course)], None, subject, message)
 
-def send_email(recipients, cc=None, subject=None, message=None, template=None, args=None):
+def send_email(recipients, cc, subject, message):
 	frappe.sendmail(
 		recipients = recipients,
 		cc = cc,
@@ -87,7 +87,5 @@ def send_email(recipients, cc=None, subject=None, message=None, template=None, a
 		subject = subject, 
 		send_priority = 0, 
 		queue_separately = True,
-		message = message,
-		template=template,
-		args=args
+		message = message
 	)

community/lms/doctype/lms_message/lms_message.json

@@ -58,7 +58,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-04-28 10:17:57.618127",
+ "modified": "2021-04-26 16:11:20.142164",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Message",
@@ -80,6 +80,5 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "title_field": "author",
  "track_changes": 1
 }

community/lms/doctype/lms_message/lms_message.py

@@ -7,12 +7,11 @@ import frappe
 from frappe.model.document import Document
 from frappe import _
 from frappe.utils import add_days, nowdate
-from community.www.courses.utils import get_batch_members
-
 class LMSMessage(Document):
-	""" def after_insert(self):
-		self.send_email() """
-
+	def after_insert(self):
+		frappe.publish_realtime("new_lms_message", {"message":"JJannat"}, user="Administrator")
+		self.send_email()
+		
 	def send_email(self):
 		membership = frappe.get_all("LMS Batch Membership", {"batch": self.batch}, ["member"])
 		for entry in membership:
@@ -61,44 +60,4 @@ def send_daily_digest():
 				"batches": group_by_batch
 			},
 			delayed = False
-		)
-
-def publish_message(doc, method):
-	email = frappe.db.get_value("Community Member", doc.author, "email")
-	template = get_message_template()
-	message = frappe._dict()
-	message.author_name = doc.author_name
-	message.message_time = frappe.utils.pretty_date(doc.creation)
-	message.message = frappe.utils.md_to_html(doc.message)
-
-	js = """
-			$(".msger-input").val("");
-			var template = `{0}`;
-			var message = {1};
-			var session_user = ("{2}" == frappe.session.user) ? true : false;
-			message.author_name = session_user ? "You" : message.author_name
-			message.is_author = session_user;
-			template = frappe.render_template(template, {{
-				"message": message
-			}})
-			$(".message-section").append(template);
-		""".format(template, message, email)
-
-	frappe.publish_realtime(event="eval_js", message=js, after_commit=True)
-
-def get_message_template():
-	return """  
-			<div class="discussion {% if message.is_author %} is-author {% endif %}">
-				<div class="d-flex justify-content-between">
-				<div class="font-weight-bold">
-						{{ message.author_name }}
-				</div>
-				<div class="text-muted">
-					{{ message.message_time }}
-				</div>
-				</div>
-				<div class="mt-5">
-					{{ message.message }}
-				</div>
-			</div>
-		"""
+		)

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/lms_sketch.py

@@ -10,6 +10,9 @@ from frappe.model.document import Document
 from . import livecode
 
 class LMSSketch(Document):
+    def get_owner_name(self):
+        return get_userinfo(self.owner)['full_name']
+
     @property
     def sketch_id(self):
         """Returns the numeric part of the name.
@@ -18,14 +21,6 @@ class LMSSketch(Document):
         """
         return self.name.replace("SKETCH-", "")
 
-    def get_owner(self):
-        """Returns the owner of this sketch as a document.
-        """
-        return frappe.get_doc("User", self.owner)
-
-    def get_owner_name(self):
-        return self.get_owner().full_name
-
     def get_livecode_url(self):
         doc = frappe.get_cached_doc("LMS Settings")
         return doc.livecode_url
@@ -51,22 +46,6 @@ class LMSSketch(Document):
             cache.set(key, value)
         return value
 
-    @staticmethod
-    def get_recent_sketches(limit=100, owner=None):
-        """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
-        )
-        return [frappe.get_doc(doctype='LMS Sketch', **doc) for doc in sketches]
-
     def __repr__(self):
         return f"<LMSSketch {self.name}>"
 
@@ -97,3 +76,36 @@ def save_sketch(name, title, code):
         "status": status,
         "name": doc.name,
     }
+
+def get_recent_sketches():
+    """Returns the recent sketches.
+
+    The return value will be a list of dicts with each entry containing
+    the following fields:
+        - name
+        - title
+        - owner
+        - owner_name
+        - modified
+    """
+    sketches = frappe.get_all(
+        "LMS Sketch",
+        fields='*',
+        order_by='modified desc',
+        page_length=100
+    )
+    for s in sketches:
+        s['owner_name'] = get_userinfo(s['owner'])['full_name']
+    return [frappe.get_doc(doctype='LMS Sketch', **doc) for doc in sketches]
+
+def get_userinfo(email):
+    """Returns the username and fullname of a user.
+
+    Please note that the email could be "Administrator" or "Guest"
+    as a special case to denote the system admin and guest user respectively.
+    """
+    user = frappe.get_doc("User", email)
+    return {
+        "full_name": user.full_name,
+        "username": user.username
+    }

community/lms/models.py

@@ -1,5 +0,0 @@
-"""Handy module to make access to all doctypes from a single place.
-"""
-from .doctype.lms_course.lms_course import LMSCourse as Course
-from .doctype.lms_sketch.lms_sketch import LMSSketch as Sketch
-

community/lms/web_form/add_a_new_batch/add_a_new_batch.js

@@ -1,43 +1,35 @@
 frappe.ready(function () {
-  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",
-        "course": data.course
-      },
-      "callback": (data) => {
-        if (data.message) {
-          window.location.href = `courses/${data.message}`
-        }
-      }
-    })
-  }
+	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 (!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;
-    }
-
-    if (data.start_date < date.nowdate()) {
-      frappe.msgprint(__('Start date cannot be a past date.'))
-      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,13 +0,0 @@
-<div class="course-teaser">
-  <div class="course-body">
-    <h3 class="course-title"><a href="/courses/{{ course.name }}">{{ course.title }}</a></h3>
-    <div class="course-intro">
-      {{ course.short_introduction or "" }}
-    </div>
-  </div>
-  <div class="course-footer">
-    <div class="course-author">
-      <img class="course-author-avatar" src="{{ course.get_instructor().avatar }}" />{{ course.get_instructor().full_name }}
-    </div>
-  </div>
-</div>

community/lms/widgets/RequestInvite.html

@@ -1,40 +0,0 @@
-<form id="invite-request-form">
-  <input class="form-control field-width mr-5" id="invite_email" type="email" placeholder="Email Address">
-  <a type="submit" id="submit-invite-request" class="btn btn-primary btn-lg" href="#" role="button">Request Invite</a>
-</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) => {
-          $("#invite-request-form").hide();
-
-          if (data.message == "OK") {
-            var message = `<div>
-              <p class="lead">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">Email ${invite_email} has already been used to request an invitation.</p>
-            </div>`;
-          }
-
-          else if (data.message == "user") {
-            var message = `<div>
-              <p class="lead">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

@@ -1,15 +0,0 @@
-<div class="sketch-teaser">
-  <div class="sketch-image">
-    <a href="/sketches/{{sketch.sketch_id}}">
-      {{ sketch.to_svg() }}
-    </a>
-  </div>
-  <div class="sketch-footer">
-    <div class="sketch-title">
-      <a href="sketches/{{sketch.sketch_id}}">{{sketch.title}}</a>
-    </div>
-    <div class="sketch-author">
-      by {{sketch.get_owner().full_name}}
-    </div>
-  </div>
-</div>

community/public/build.json

@@ -3,8 +3,6 @@
     "public/css/lms.css"
   ],
   "css/community.css": [
-    "public/css/style.css",
-    "public/css/vars.css",
-    "public/css/style.less"
+    "public/css/style.css"
   ]
 }

community/public/css/style.css

@@ -25,17 +25,83 @@
   --cta-color: var(--c4);
   --send-message: var(--c7);
   --received-message: var(--c8);
-
-  --primary-color: #08B74F;
 }
 
 body {
   padding: 0px;
   margin: 0px;
+  background: var(--bg);
 }
 
+.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;
 }
 
@@ -44,7 +110,7 @@ body {
   font-size: 1.4em;
   font-weight: bold;
   margin: 20px 0px 10px 0px;
-} */
+}
 
 .chapter-plan {
   border-radius: 10px;
@@ -59,7 +125,7 @@ body {
   font-weight: bold;
 }
 
-/* .chapter-number {
+.chapter-number {
   background: var(--text-color);
   color: white;
   border-radius: 50%;
@@ -72,7 +138,7 @@ body {
 
 .chapter-description {
   margin: 20px 0px;
-} */
+}
 
 .lessons {
   padding-left: 20px;
@@ -134,6 +200,10 @@ img.profile-photo {
 
 /* override style of base */
 
+nav.navbar {
+  background: var(--c1) !important;
+}
+
 .message {
   border: 1px dashed var(--text-color);
   padding: 20px;
@@ -219,13 +289,5 @@ img.profile-photo {
 }
 
 .message-section {
-  margin-left: 3%;
-  display: inline-block;
-  width: 95%;
-}
-
-.display-4 {
-  color: #2D005A;
-  font-weight: 600;
-  line-height: 51px;
-}
+  margin-left: 5%;
+}

community/public/css/style.less

@@ -1,234 +0,0 @@
-@primary-color: #08B74F;
-@import url('https://rsms.me/inter/inter.css');
-
-body {
-  font-family: "Inter", sans-serif;
-}
-
-h2 {
-  margin: 20px 0px;
-  color: black;
-}
-
-.teaser {
-  background: white;
-  border-radius: 9px;
-  border: 1px solid #C4C4C4;
-
-  .teaser-body {
-    padding: 20px;
-  }
-  .teaser-footer {
-    padding: 20px;
-  }
-}
-
-.sketch-teaser {
-  .teaser();
-  width: 220px;
-  margin-bottom: 30px;
-  margin-top: 30px;
-
-  svg {
-    width: 200px;
-    height: 200px;
-  }
-  .sketch-image {
-    padding: 10px;
-  }
-  .sketch-footer {
-    border-top: 1px solid#C4C4C4;
-    padding: 10px;
-    background: #F6F6F6;
-    border-radius: 0px 0px 10px 10px;
-  }
-}
-
-.course-teaser {
-  .teaser();
-  color: #444;
-  margin-bottom: 20px;
-  margin-top: 20px;
-
-  h3, h4 {
-    color: black;
-    font-weight: bold;
-  }
-
-  .course-body, .course-footer {
-    padding: 20px;
-  }
-
-  .course-body {
-    min-height: 8em;
-  }
-
-  .course-footer {
-    border-top: 1px solid #ddd;
-  }
-
-  a, a:hover {
-    color: inherit;
-    text-decoration: none;
-  }
-}
-
-section {
-  padding: 60px 0px;
-}
-
-section h2 {
-  margin-bottom: 40px;
-  font-size: 48px;
-  line-height: 58px;
-  font-weight: bold;
-}
-
-section.lightgray {
-  background: #F6F6F6;
-}
-
-#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;
-}

community/public/css/vars.css

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

community/public/images/fossunited-logo.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="104px" height="81px" viewBox="0 0 104 81" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
-    <title>Group 2</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="site" transform="translate(-160.803147, -89.000000)">
-            <g id="Group-2" transform="translate(163.323899, 91.260768)">
-                <g id="g1593" transform="translate(10.217829, 8.684369)" fill="black" fill-rule="nonzero">
-                    <g id="text1571" transform="translate(0.248104, 0.000000)">
-                        <polygon id="path1919" points="6.20610364 30.6588166 0.0881167018 30.6588166 0.0881167018 0.711614981 15.1331308 0.711614981 15.1331308 6.82960641 6.20610364 6.82960641 6.20610364 12.6143164 15.1331308 12.6143164 15.1331308 18.7323078 6.20610364 18.7323078"></polygon>
-                        <path d="M24.0601557,24.5170177 L29.8448702,24.5170177 L29.8448702,6.82960641 L24.0601557,6.82960641 L24.0601557,24.5170177 Z M20.917843,30.6588166 L20.917843,27.6593507 L17.9421688,27.6593507 L17.9421688,3.68729595 L20.917843,3.68729595 L20.917843,0.711614981 L32.9871829,0.711614981 L32.9871829,3.68729595 L35.9628571,3.68729595 L35.9628571,27.6593507 L32.9871829,27.6593507 L32.9871829,30.6588166 L20.917843,30.6588166 Z M18.108805,0.806844685 L20.917843,0.806844685 L20.917843,3.68729595 L18.108805,3.68729595 L18.108805,0.806844685 Z M32.9871829,0.711525057 L35.9628571,0.711525057 L35.9628571,3.68720602 L32.9871829,3.68720602 L32.9871829,0.711525057 Z M32.9871829,27.6592608 L35.9628571,27.6592608 L35.9628571,30.5635195 L32.9871829,30.5635195 L32.9871829,27.6592608 Z M17.9421688,27.6592608 L20.917843,27.6592608 L20.917843,30.6587267 L17.9421688,30.6587267 L17.9421688,27.6592608 Z" id="path1921"></path>
-                        <path d="M53.8169092,30.6588166 L38.7718951,30.6588166 L38.7718951,24.5170177 L50.6745942,24.5170177 L50.6745942,18.7323078 L41.7475693,18.7323078 L41.7475693,15.7566493 L38.7718951,15.7566493 L38.7718951,3.68729595 L41.7475693,3.68729595 L41.7475693,0.711614981 L56.7925834,0.711614981 L56.7925834,6.82960641 L44.889882,6.82960641 L44.889882,12.6143164 L53.8169092,12.6143164 L53.8169092,15.5899973 L56.7925834,15.5899973 L56.7925834,27.6593507 L53.8169092,27.6593507 L53.8169092,30.6588166 Z M38.9385313,0.806844685 L41.7475693,0.806844685 L41.7475693,3.68729595 L38.9385313,3.68729595 L38.9385313,0.806844685 Z M38.7719018,15.7566493 L41.747576,15.7566493 L41.747576,18.7323078 L38.7719018,18.7323078 L38.7719018,15.7566493 Z M53.8169159,12.6143164 L56.7925901,12.6143164 L56.7925901,15.5899973 L53.8169159,15.5899973 L53.8169159,12.6143164 Z M53.8169159,27.6593507 L56.7925901,27.6593507 L56.7925901,30.5636094 L53.8169159,30.5636094 L53.8169159,27.6593507 Z" id="path1923"></path>
-                        <path d="M74.64664,30.6588166 L59.6016259,30.6588166 L59.6016259,24.5170177 L71.5043273,24.5170177 L71.5043273,18.7323078 L62.5773023,18.7323078 L62.5773023,15.7566493 L59.6016259,15.7566493 L59.6016259,3.68729595 L62.5773023,3.68729595 L62.5773023,0.711614981 L77.6223164,0.711614981 L77.6223164,6.82960641 L65.7196151,6.82960641 L65.7196151,12.6143164 L74.64664,12.6143164 L74.64664,15.5899973 L77.6223164,15.5899973 L77.6223164,27.6593507 L74.64664,27.6593507 L74.64664,30.6588166 Z M59.7682644,0.806844685 L62.5773023,0.806844685 L62.5773023,3.68729595 L59.7682644,3.68729595 L59.7682644,0.806844685 Z M59.6016349,15.7566493 L62.5773113,15.7566493 L62.5773113,18.7323078 L59.6016349,18.7323078 L59.6016349,15.7566493 Z M74.646649,12.6143164 L77.6223254,12.6143164 L77.6223254,15.5899973 L74.646649,15.5899973 L74.646649,12.6143164 Z M74.646649,27.6593507 L77.6223254,27.6593507 L77.6223254,30.5636094 L74.646649,30.5636094 L74.646649,27.6593507 Z" id="path1925"></path>
-                    </g>
-                    <g id="text1575" transform="translate(0.127883, 35.473579)">
-                        <path d="M2.35734791,22.5432945 L2.35734791,20.3720424 L0.206884567,20.3720424 L0.206884567,0.865355398 L4.62823747,0.865355398 L4.62823747,18.0974048 L8.80873794,18.0974048 L8.80873794,0.865355398 L13.2300908,0.865355398 L13.2300908,20.3720424 L11.0796275,20.3720424 L11.0796275,22.5432945 L2.35734791,22.5432945 Z M0.206884567,20.3720424 L2.35734791,20.3720424 L2.35734791,22.5432945 L0.206884567,22.5432945 L0.206884567,20.3720424 Z M11.0796275,20.3720424 L13.2300908,20.3720424 L13.2300908,22.4743558 L11.0796275,22.4743558 L11.0796275,20.3720424 Z" id="path1928"></path>
-                        <polygon id="path1930" points="19.6814809 22.5432945 15.260128 22.5432945 15.260128 0.865355398 28.2833343 0.865355398 28.2833343 22.5432945 23.8619814 22.5432945 23.8619814 5.29401037 19.6814809 5.29401037"></polygon>
-                        <polygon id="path1932" points="34.7347243 22.5432945 30.3133714 22.5432945 30.3133714 0.865355398 34.7347243 0.865355398"></polygon>
-                        <polygon id="path1934" points="45.4870433 22.5432945 41.0656904 22.5432945 41.0656904 5.29401037 36.7647637 5.29401037 36.7647637 0.865355398 49.7879699 0.865355398 49.7879699 5.29401037 45.4870433 5.29401037"></polygon>
-                        <polygon id="path1936" points="62.6907478 22.5432945 51.8180048 22.5432945 51.8180048 0.865355398 62.6907478 0.865355398 62.6907478 5.29401037 56.2393577 5.29401037 56.2393577 9.48138012 62.6907478 9.48138012 62.6907478 13.9100351 56.2393577 13.9100351 56.2393577 18.0974048 62.6907478 18.0974048"></polygon>
-                        <path d="M69.1421378,18.0974048 L73.3226383,18.0974048 L73.3226383,5.29401037 L69.1421378,5.29401037 L69.1421378,18.0974048 Z M64.7207849,22.5432945 L64.7207849,0.865355398 L75.5935278,0.865355398 L75.5935278,3.01937283 L77.7439912,3.01937283 L77.7439912,20.3720424 L75.5935278,20.3720424 L75.5935278,22.5432945 L64.7207849,22.5432945 Z" id="path1938"></path>
-                    </g>
-                </g>
-                <rect id="rect1579" stroke="black" stroke-width="3.99998745" x="0" y="0" width="98.6425638" height="76.0972583"></rect>
-            </g>
-        </g>
-    </g>
-</svg>

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/includes/footer/footer_info.html

@@ -1,14 +0,0 @@
-<div class="footer-info">
-	<div class="row">
-		<div class="footer-col-left col-sm-6 col-12">
-      <img src="/assets/community/images/fossunited-logo.svg" style="width: 50px;">
-		</div>
-		{# powered #}
-		<div class="footer-col-right col-sm-6 col-12 footer-powered">
-			{% block powered %}
-			{% include "templates/includes/footer/footer_powered.html" %}
-			{% endblock %}
-		</div>
-	</div>
-</div>
-

community/templates/includes/footer/footer_logo_extension.html

@@ -1,12 +0,0 @@
-<div class="footer-logo-extension">
-	<div class="row">
-		<div class="text-left col-6">
-      <h3>Mon School</h3>
-		</div>
-		<div class="text-right col-6">
-			{% block extension %}
-			{% include "templates/includes/footer/footer_extension.html" %}
-			{% endblock %}
-		</div>
-	</div>
-</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):

community/www/courses/about/index.html

@@ -9,16 +9,19 @@
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course.name, batch.name) }}
+{{ 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>
@@ -33,25 +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>
-      {% if m.photo_url %}
-      <img class="profile-photo" src="{{m.photo_url}}">
-      {% endif %}
-      <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

@@ -1,21 +1,23 @@
 import frappe
-from community.lms.models import Course
+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)
 
-    course_name = frappe.form_dict["course"]
-    batch_name = frappe.form_dict["batch"]
+    context.instructor = get_instructor(context.course.owner)
+    context.batch = get_batch(context.batch_code)
+    context.mentors = get_mentors(context.batch.name)
+    print(context.mentors)
 
-    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
+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">
-    {{ course.short_introduction }}
-  </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,9 +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 }}">Join this Batch</button>
+        <button type="button">Join this Batch</button>
       {% endif %}
     </div>
   </div>
@@ -111,11 +111,11 @@
       {% endfor %}
     </div>
 
-    <a class="btn btn-primary add-batch margin-bottom" href="/add-a-new-batch?new=1&course={{course.title}}">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}}" >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 %}
@@ -123,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

@@ -1,21 +1,46 @@
 frappe.ready(() => {
+	frappe.require("/assets/frappe/js/lib/socket.io.min.js");
+	frappe.require("/assets/frappe/js/frappe/socketio_client.js");
+	if (window.dev_server) {
+		frappe.boot.socketio_port = "9000" //use socketio port shown when bench starts
+	}
+	frappe.socketio.init();
+	console.log(frappe.socketio)
+	//frappe.socketio.emittedDemo("mydata");
+	frappe.realtime.on("new_lms_message", (data) => {
+		console.log(data)
+	})
 	if (frappe.session.user != "Guest") {
 		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) {
-					$("#mentor-request").addClass("hide");
-					$("#already-applied").removeClass("hide")
+					$(".mentor-request").addClass("hide");
+					$(".already-applied").removeClass("hide")
 				}
 			}
 		})
 	}
 
-	$("#apply-now").click((e) => {
-    e.preventDefault();
+	$(".list-batch").click((e) => {
+		var batch = decodeURIComponent($(e.currentTarget).attr("data-label"))
+		$(".current-batch").text(batch)
+		$(".send-message").attr("data-batch", batch)
+		frappe.call("community.www.courses.course.get_messages", { batch: batch }, (data) => {
+			if (data.message) {
+				$(".discussions").children().remove();
+				for (var i = 0; i < data.message.length; i++) {
+					var element = add_message(data.message[i])
+					$(".discussions").append(element);
+				}
+			}
+		})
+	})
+
+	$(".apply-now").click((e) => {
 		if (frappe.session.user == "Guest") {
 			window.location.href = "/login";
 			return;
@@ -27,15 +52,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,15 +67,14 @@ 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";
 			return;
@@ -65,9 +88,25 @@ frappe.ready(() => {
 			"callback": (data) => {
 				if (data.message == "OK") {
 					frappe.msgprint(__("You are now a student of this course."))
+					$(".upcoming-batches").addClass("hide")
 				}
 			}
 		})
 	})
 })
+/*
+var show_enrollment_badge = () => {
+	$(".btn-enroll").addClass("hide");
+	$(".enrollment-badge").removeClass("hide");
+}
+
+var get_search_params = () => {
+	return new URLSearchParams(window.location.search)
+}
+
+$('.btn-enroll').on('click', (e) => {
+	frappe.call('community.www.courses.course.enroll', { course: get_search_params().get("course") }, (data) => {
+		show_enrollment_badge()
+	});
+}); */
 

community/www/courses/course.py

@@ -1,21 +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)
+
+    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

@@ -35,6 +35,7 @@
   <div class="mt-5">
     {{ message.message }}
   </div>
+
 </div>
 {% endfor %}
 {% endmacro %}

community/www/courses/discuss/index.js

@@ -1,18 +1,22 @@
 frappe.ready(() => {
 	const assets = [
 		"/assets/frappe/js/lib/socket.io.min.js",
-		"/assets/frappe/js/frappe/socketio_client.js",
+		"/assets/frappe/js/frappe/socketio_client.js"
 	]
 	frappe.require(assets, () => {
 		if (window.dev_server) {
 			frappe.boot.socketio_port = "9000" //use socketio port shown when bench starts
 		}
 		frappe.socketio.init(9000);
+		console.log(frappe.socketio)
+	})
+	frappe.realtime.on("new_lms_message", (data) => {
+		console.log(data)
 	})
 
 	setTimeout(() => {
 		window.scrollTo(0, document.body.scrollHeight);
-	}, 300);
+	}, 0);
 
 	$(".msger-send-btn").click((e) => {
 		e.preventDefault();
@@ -23,6 +27,10 @@ frappe.ready(() => {
 				"args": {
 					"batch": decodeURIComponent($(e.target).attr("data-batch")),
 					"message": message
+				},
+				"callback": (data) => {
+					$(".msger-input").val("");
+					frappe.realtime.publish("new_lms_message", {"message":"JJK"})
 				}
 			})
 		}

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/learn/index.html

@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course.name, batch.name) }}
+{{ Sidebar(course, batch_code) }}
 <div class="container">
 </div>
 {% endblock %}

community/www/courses/learn/index.py

@@ -1,21 +1,10 @@
 import frappe
-from community.lms.models import Course
+from community.www.courses.utils import redirect_if_not_a_member
 
 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
+    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/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

community/www/dashboard/index.html

@@ -182,8 +182,8 @@
 							{% for course in courses %}
 							<div class="dashboard__course">
 								<div class="dashboard__courseHeader">
-									<a class="text-decoration-none" target="_blank" href="/courses/{{course.name}}">
-										<h5 class="w-75">{{ course.title }}</h5>
+									<a class="text-decoration-none" target="_blank" href="/courses/{{course.slug}}">
+										<h5 class="w-75">{{ course.name }}</h5>
 									</a>
 									{% if course.member_type %}
 									<div class="dashboard__badge">

community/www/dashboard/index.py

@@ -1,42 +1,38 @@
 import frappe
-from community.lms.models import Sketch
-
+from ...lms.doctype.lms_sketch.lms_sketch import get_recent_sketches
 
 def get_context(context):
-    context.no_cache = 1
-    if frappe.session.user == "Guest":
-        frappe.local.flags.redirect_location = "/login"
-        raise frappe.Redirect
-    context.member = frappe.get_all("Community Member", {"email": frappe.session.user}, ["name", "email", "photo", "full_name", "abbr"])[0]
-    context.memberships = get_memberships(context.member.name)
-    context.courses = get_courses(context.memberships)
-    context.activity = get_activity(context.memberships)
-    context.sketches = list(filter(lambda x: x.owner == frappe.session.user, Sketch.get_recent_sketches(owner=context.member.email)))
+	context.no_cache = 1
+	context.member = frappe.get_all("Community Member", {"email": frappe.session.user}, ["name", "email", "photo", "full_name", "abbr"])[0]
+	context.memberships = get_memberships(context.member.name)
+	context.courses = get_courses(context.memberships)
+	context.activity = get_activity(context.memberships)
+	context.sketches = list(filter(lambda x: x.owner == frappe.session.user, get_recent_sketches()))
 
 def get_memberships(member):
-    return frappe.get_all("LMS Batch Membership", {"member": member}, ["batch", "member_type", "creation"])
+	return frappe.get_all("LMS Batch Membership", {"member": member}, ["batch", "member_type", "creation"])
 
 def get_courses(memberships):
-    courses = []
-    for membership in memberships:
-        course = frappe.db.get_value("LMS Batch", membership.batch, "course")
-        course_details = frappe.get_doc("LMS Course", course)
-        course_in_list = list(filter(lambda x: x.name == course_details.name, courses))
-        if not len(course_in_list):
-            course_details.description = course_details.description[0:100] + "..."
-            course_details.joining = membership.creation
-            if membership.member_type != "Student":
-                course_details.member_type = membership.member_type
-            courses.append(course_details)
-    return courses
+	courses = []
+	for membership in memberships:
+		course = frappe.db.get_value("LMS Batch", membership.batch, "course")
+		course_details = frappe.get_doc("LMS Course", course)
+		course_in_list = list(filter(lambda x: x.name == course_details.name, courses))
+		if not len(course_in_list):
+			course_details.description = course_details.description[0:100] + "..."
+			course_details.joining = membership.creation
+			if membership.member_type != "Student":
+				course_details.member_type = membership.member_type
+			courses.append(course_details)
+	return courses
 
 def get_activity(memberships):
-    messages, courses = [], {}
-    batches = [x.batch for x in memberships]
-    for batch in batches:
-        courses[batch] = frappe.db.get_value("LMS Batch", batch, "course")
-    messages = frappe.get_all("LMS Message", {"batch": ["in", ",".join(batches)]}, ["message", "author", "creation", "batch"], order_by='creation desc')
-    for message in messages:
-        message.course = courses[message.batch]
-        message.profile, message.full_name, message.abbr = frappe.db.get_value("Community Member", message.author, ["photo", "full_name", "abbr"])
-    return messages
+	messages, courses = [], {}
+	batches = [x.batch for x in memberships]
+	for batch in batches:
+		courses[batch] = frappe.db.get_value("LMS Batch", batch, "course")
+	messages = frappe.get_all("LMS Message", {"batch": ["in", ",".join(batches)]}, ["message", "author", "creation", "batch"], order_by='creation desc')
+	for message in messages:
+		message.course = courses[message.batch]
+		message.profile, message.full_name, message.abbr = frappe.db.get_value("Community Member", message.author, ["photo", "full_name", "abbr"])
+	return messages

community/www/home/index.html

@@ -1,49 +0,0 @@
-{% extends "templates/base.html" %}
-
-{% block content %}
-  {{ HeroSection() }}
-  {{ ExploreCourses(courses) }}
-  {{ RecentSketches(recent_sketches) }}
-{% endblock %}
-
-{% macro HeroSection() %}
-<section id="hero">
-  <div class="container">
-    <div class="jumbotron">
-      <h1 class="display-4">Guided online courses, with a <br />mentor at your back.</h1>
-      <p class="lead">Hands-on online courses designed by experts, delivered by passionate mentors.</p>
-      {{ widgets.RequestInvite() }}
-    </div>
-  </div>
-</section>
-{% endmacro %}
-
-{% macro ExploreCourses(courses) %}
-<section id="explore-courses" class="lightgray">
-  <div class="container lightgray">
-    <h2>Explore Courses</h2>
-    <div class="row">
-      {% for course in courses %}
-        <div class="col-md-6">
-          {{ widgets.CourseTeaser(course=course) }}
-        </div>
-      {% endfor %}
-    </div>
-  </div>
-</section>
-{% endmacro %}
-
-{% macro RecentSketches(sketches) %}
-<section id="recet-sketches">
-  <div class="container">
-    <h2>Recent Sketches</h2>
-    <div class="row">
-      {% for sketch in sketches %}
-      <div class="col-md-3">
-        {{ widgets.SketchTeaser(sketch=sketch) }}
-      </div>
-      {% endfor %}
-    </div>
-  </div>
-</section>
-{% endmacro %}

community/www/home/index.py

@@ -1,7 +0,0 @@
-import frappe
-from community.lms.models import Course, Sketch
-
-def get_context(context):
-	context.no_cache = 1
-	context.courses = Course.find_all()
-	context.recent_sketches = Sketch.get_recent_sketches(limit=8)

community/www/macros/common_macro.html

@@ -1,37 +1,32 @@
 {% macro InstructorsSection(instructor) %}
-  <h3>Instructor</h3>
-  <div class="instructor">
-      <div class="instructor-title">{{instructor.full_name}}</div>
-      <div class="instructor-subtitle">Created {{instructor.get_course_count()}} courses</div>
-  </div>
+<h3>Instructor</h3>
+<div class="instructor">
+    <div class="instructor-title">{{instructor.full_name}}</div>
+    <div class="instructor-subtitle">Created {{instructor.course_count}} courses</div>
+</div>
 {% endmacro %}
 
-{% macro MentorsSection(mentors, is_mentor, course_name) %}
-  <h3>Mentors</h3>
-  {% for m in mentors %}
-  <div class="instructor">
-      <div class="instructor-title">{{m.full_name}}</div>
-      <div class="instructor-subtitle">Mentored {{m.get_batch_count()}} batches</div>
-  </div>
-  {% endfor %}
-  {% if not is_mentor %}
-  <div id="mentor-request" class="notice">
-      Interested to become a mentor?
+{% macro MentorsSection(mentors, is_mentor) %}
+<h3>Mentors</h3>
+{% for m in mentors %}
+<div class="instructor">
+    <div class="instructor-title">{{m.full_name}}</div>
+    <div class="instructor-subtitle">Mentored {{m.batch_count}} batches</div>
+</div>
+{% endfor %}
+{% if not is_mentor %}
+<div class="notice">
+    Interested to become a mentor?
 
-      <div><a id="apply-now" data-course="{{course_name | urlencode}}" href="">Apply Now!</a></div>
-  </div>
-  <div id="already-applied" class="notice hide">
-    You've applied to become a mentor for this course. Your request is currently under review.
-
-    If you are not any more interested to mentor this course, you can <a id="cancel-request" data-course="{{course_name | urlencode}}" href="">cancel your application</a>.
-  </div>
-  {% endif %}
+    <div><a href="#">Apply Now!</a></div>
+</div>
+{% endif %}
 {% endmacro %}
 
 
 {% macro BatchHearder(course_name, member_count) %}
 <div class="border p-3">
-  <h3>{{course_name}}</h3>
-  <div class="text-muted">{{member_count}} members</div>
+	<h3>{{course_name}}</h3>
+	<div class="text-muted">{{member_count}} members</div>
 </div>
-{% endmacro %}
+{% endmacro %}

community/www/new-sign-up.html

@@ -1,70 +0,0 @@
-{% extends "templates/web.html" %}
-
-{% block title %} {{_("New Sign Up")}} {% endblock %}
-
-{% block page_content %}
-
-<form id="new-sign-up">
-	<div class="form-group">
-		<label for="full_name">Full Name:</label>
-		<input id="full_name" type="text" class="form-control" required>
-	</div>
-	<div class="form-group">
-		<label for="signup_email">Email:</label>
-		<input id="signup_email" type="email" class="form-control" required>
-	</div>
-	<div class="form-group">
-		<label for="username">Username:</label>
-		<input id="username" type="text" class="form-control" required>
-	</div>
-	<div class="form-group">
-		<label for="password">Password:</label>
-		<input id="password" type="password" class="form-control" required>
-		<span class="password-strength-indicator indicator"></span>
-
-	</div>
-	<p class='password-strength-message text-muted small hidden'></p>
-	<div class="form-group">
-		<label for="invite_code">Invite Code:</label>
-		<input id="invite_code" type="text" class="form-control" readonly required
-			value="{{ frappe.form_dict['invite_code'] }}">
-	</div>
-	<button type="submit" id="submit" class="btn btn-primary">{{_("Submit")}}</button>
-</form>
-
-<script>
-	frappe.ready(() => {
-		$("#submit").click(function () {
-			var data = {
-				full_name: $("#full_name").val(),
-				signup_email: $("#signup_email").val(),
-				username: $("#username").val(),
-				password: $("#password").val(),
-				invite_code: $("#invite_code").val(),
-			};
-
-			frappe.call({
-				type: "POST",
-				method: "community.lms.doctype.invite_request.invite_request.update_invite",
-				args: {
-					"data": data
-				},
-				callback: (data) => {
-					$("input").val("");
-					if (data.message == "OK") {
-						frappe.msgprint({
-							message: __("Your Account has been successfully created!"),
-							clear: true
-						});
-						setTimeout(function() {
-							window.location.href = "/login";
-						}, 2000);
-					}
-				}
-			});
-			return false;
-		});
-	})
-</script>
-
-{% endblock %}

community/www/profiles/profile.py

@@ -1,5 +1,5 @@
 import frappe
-from community.lms.models import Sketch
+from ...lms.doctype.lms_sketch.lms_sketch import get_recent_sketches
 
 def get_context(context):
     context.no_cache = 1
@@ -8,10 +8,10 @@ def get_context(context):
     if not context.member:
         context.template = "www/404.html"
     else:
-        context.sketches = Sketch.get_recent_sketches(owner=context.member.email)
+        context.sketches = list(filter(lambda x: x.owner == context.member.email, get_recent_sketches()))
 
 def get_member(username):
     try:
-        return frappe.get_doc("Community Member", {"username":username})
+        frappe.get_doc("Community Member", {"username":username})
     except frappe.DoesNotExistError:
         return

community/www/sketches/index.html

@@ -16,13 +16,37 @@
     <a href="/sketches/new">Create a New Sketch</a>
 	</div>
 	<div class='container'>
-    <div class="row">
-      {% for sketch in sketches %}
-        <div class="col-md-3">
-          {{ widgets.SketchTeaser(sketch=sketch) }}
+    <div class="row row-cols-1 row-cols-xl-5 row-cols-lg-4 row-cols-md-3 row-cols-sm-2 ">
+    {% for sketch in sketches %}
+    <div class="col mb-4">
+      <div class="card sketch-card" style="width: 200px;">
+      <div class="card-img-top">
+        <a href="/sketches/{{sketch.sketch_id}}">
+        {{ sketch.to_svg() }}
+        </a>
+      </div>
+      <div class="card-footer">
+        <div class="sketch-title">
+          <a href="sketches/{{sketch.sketch_id}}">{{sketch.title}}</a>
         </div>
-      {% endfor %}
+        <div class="sketch-author">
+          by {{sketch.get_owner_name()}}
+        </div>
+      </div>
+      </div>
+    </div>
+    {% endfor %}
     </div>
 	</div>
 </section>
 {% endblock %}
+
+{% block style %}
+  {{super()}}
+  <style type="text/css">
+    svg {
+      width: 200px;
+      height: 200px;
+    }
+  </style>
+{% endblock %}

community/www/sketches/index.py

@@ -1,7 +1,7 @@
 import frappe
-from community.lms.models import Sketch
+from ...lms.doctype.lms_sketch.lms_sketch import get_recent_sketches
 
 def get_context(context):
     context.no_cache = 1
-    context.sketches = Sketch.get_recent_sketches()
+    context.sketches = get_recent_sketches()
 

docker-compose.yml

@@ -1,34 +0,0 @@
-version: "3"
-
-services:
-  redis-cache:
-    image: redis:alpine
-  redis-queue:
-    image: redis:alpine
-  redis-socketio:
-    image: redis:alpine
-  mariadb:
-    image: mariadb
-    volumes:
-      - mariadb-storage:/var/lib/mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=root
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-  bench:
-    image: anandology/frappe-bench
-    volumes:
-      - .:/home/bench/frappe-bench/apps/community
-    environment:
-      - FRAPPE_APPS=community
-      - FRAPPE_ALLOW_TESTS=true
-      - FRAPPE_SITE_NAME=frappe.localhost
-    depends_on:
-      - mariadb
-      - redis-cache
-      - redis-queue
-      - redis-socketio
-    ports:
-      - 8000:8000
-      - 9000:9000
-volumes:
-  mariadb-storage: {}

license.txt

@@ -1 +1 @@
-License: AGPL
+License: MIT