Compare commits
19 Commits
widgets
...
invite-flo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5fdecb708e | ||
|
|
565787eeb6 | ||
|
|
cd1d2067ad | ||
|
|
52f16131af | ||
|
|
59dba7730f | ||
|
|
4bc05bfda8 | ||
|
|
0cfd6d7634 | ||
|
|
f7434f376f | ||
|
|
905f51ee76 | ||
|
|
e207320721 | ||
|
|
20ccc09869 | ||
|
|
e78c6020e7 | ||
|
|
4874d99e44 | ||
|
|
a022804381 | ||
|
|
7a40b3e7a5 | ||
|
|
7b142fd72d | ||
|
|
fc8ff9c7fd | ||
|
|
c6bd47eb62 | ||
|
|
d68f1de796 |
48
README.md
48
README.md
@@ -9,7 +9,51 @@ 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.
|
Community is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript.
|
||||||
|
|
||||||
### Local Setup
|
## 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
|
||||||
|
|
||||||
To setup the repository locally follow the steps mentioned below:
|
To setup the repository locally follow the steps mentioned below:
|
||||||
|
|
||||||
@@ -21,7 +65,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. 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.
|
1. Now open the URL http://community.test:8000/docs in your browser, you should see the app running.
|
||||||
|
|
||||||
### Contribution Guidelines
|
### Contribution Guidelines (for The Hard Way)
|
||||||
|
|
||||||
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. 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).
|
1. Check out a working branch in git (e.g. git checkout -b my-new-branch).
|
||||||
|
|||||||
@@ -50,18 +50,3 @@ class CommunityCourseMember(WebsiteGenerator):
|
|||||||
send_priority=0,
|
send_priority=0,
|
||||||
queue_separately=True,
|
queue_separately=True,
|
||||||
args=args)
|
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
|
|
||||||
|
|||||||
@@ -11,15 +11,15 @@
|
|||||||
"email",
|
"email",
|
||||||
"enabled",
|
"enabled",
|
||||||
"column_break_4",
|
"column_break_4",
|
||||||
"role",
|
"username",
|
||||||
"short_intro",
|
"email_preference",
|
||||||
"section_break_7",
|
"section_break_7",
|
||||||
"bio",
|
"bio",
|
||||||
"section_break_9",
|
"section_break_9",
|
||||||
"username",
|
"role",
|
||||||
"photo",
|
"photo",
|
||||||
"column_break_12",
|
"column_break_12",
|
||||||
"email_preference",
|
"short_intro",
|
||||||
"route",
|
"route",
|
||||||
"abbr"
|
"abbr"
|
||||||
],
|
],
|
||||||
@@ -77,8 +77,10 @@
|
|||||||
"unique": 1
|
"unique": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"allow_in_quick_entry": 1,
|
||||||
"fieldname": "username",
|
"fieldname": "username",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
|
"in_list_view": 1,
|
||||||
"label": "User Name",
|
"label": "User Name",
|
||||||
"unique": 1
|
"unique": 1
|
||||||
},
|
},
|
||||||
@@ -111,10 +113,9 @@
|
|||||||
"read_only": 1
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"has_web_view": 1,
|
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-04-16 10:22:46.837311",
|
"modified": "2021-04-28 11:22:35.402217",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Community",
|
"module": "Community",
|
||||||
"name": "Community Member",
|
"name": "Community Member",
|
||||||
|
|||||||
@@ -4,12 +4,12 @@
|
|||||||
|
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
import frappe
|
import frappe
|
||||||
from frappe.website.website_generator import WebsiteGenerator
|
|
||||||
import re
|
import re
|
||||||
from frappe import _
|
from frappe import _
|
||||||
from frappe.model.rename_doc import rename_doc
|
from frappe.model.document import Document
|
||||||
|
import random
|
||||||
|
|
||||||
class CommunityMember(WebsiteGenerator):
|
class CommunityMember(Document):
|
||||||
|
|
||||||
def validate(self):
|
def validate(self):
|
||||||
self.validate_username()
|
self.validate_username()
|
||||||
@@ -18,6 +18,9 @@ class CommunityMember(WebsiteGenerator):
|
|||||||
self.route = self.username
|
self.route = self.username
|
||||||
|
|
||||||
def validate_username(self):
|
def validate_username(self):
|
||||||
|
if not self.username:
|
||||||
|
self.username = create_username_from_email(self.email)
|
||||||
|
|
||||||
if self.username:
|
if self.username:
|
||||||
if len(self.username) < 4:
|
if len(self.username) < 4:
|
||||||
frappe.throw(_("Username must be atleast 4 characters long."))
|
frappe.throw(_("Username must be atleast 4 characters long."))
|
||||||
@@ -29,12 +32,33 @@ class CommunityMember(WebsiteGenerator):
|
|||||||
return f"<CommunityMember: {self.email}>"
|
return f"<CommunityMember: {self.email}>"
|
||||||
|
|
||||||
def create_member_from_user(doc, method):
|
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({
|
member = frappe.get_doc({
|
||||||
"doctype": "Community Member",
|
"doctype": "Community Member",
|
||||||
"full_name": doc.full_name,
|
"full_name": doc.full_name,
|
||||||
"username": doc.username if len(doc.username) > 3 else ("").join([ s for s in doc.full_name.split() ]),
|
"username": username,
|
||||||
"email": doc.email,
|
"email": doc.email,
|
||||||
"route": doc.username,
|
"route": doc.username,
|
||||||
"owner": doc.email
|
"owner": doc.email
|
||||||
})
|
})
|
||||||
member.save(ignore_permissions=True)
|
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)))
|
||||||
@@ -2,9 +2,91 @@
|
|||||||
# Copyright (c) 2021, Frappe and Contributors
|
# Copyright (c) 2021, Frappe and Contributors
|
||||||
# See license.txt
|
# See license.txt
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
from community.lms.doctype.lms_course.test_lms_course import new_user
|
||||||
# import frappe
|
import frappe
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
class TestCommunityMember(unittest.TestCase):
|
class TestCommunityMember(unittest.TestCase):
|
||||||
pass
|
|
||||||
|
@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})
|
||||||
@@ -7,7 +7,6 @@ def create_members_from_users():
|
|||||||
doc = frappe.get_doc("User", {"email": user.email})
|
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() ])
|
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):
|
if not frappe.db.exists("Community Member", username):
|
||||||
print(doc.email, username)
|
|
||||||
member = frappe.new_doc("Community Member")
|
member = frappe.new_doc("Community Member")
|
||||||
member.full_name = doc.full_name
|
member.full_name = doc.full_name
|
||||||
member.username = username
|
member.username = username
|
||||||
|
|||||||
@@ -94,6 +94,9 @@ web_include_css = "/assets/css/community.css"
|
|||||||
doc_events = {
|
doc_events = {
|
||||||
"User": {
|
"User": {
|
||||||
"after_insert": "community.community.doctype.community_member.community_member.create_member_from_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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -147,6 +150,7 @@ primary_rules = [
|
|||||||
|
|
||||||
# Any frappe default URL is blocked by profile-rules, add it here to unblock it
|
# Any frappe default URL is blocked by profile-rules, add it here to unblock it
|
||||||
whitelist = [
|
whitelist = [
|
||||||
|
"/home",
|
||||||
"/login",
|
"/login",
|
||||||
"/update-password",
|
"/update-password",
|
||||||
"/update-profile",
|
"/update-profile",
|
||||||
@@ -159,7 +163,8 @@ whitelist = [
|
|||||||
"/hackathons",
|
"/hackathons",
|
||||||
"/dashboard",
|
"/dashboard",
|
||||||
"/join-request"
|
"/join-request"
|
||||||
"/add-a-new-batch"
|
"/add-a-new-batch",
|
||||||
|
"/new-sign-up"
|
||||||
]
|
]
|
||||||
whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]
|
whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]
|
||||||
|
|
||||||
|
|||||||
0
community/lms/doctype/invite_request/__init__.py
Normal file
0
community/lms/doctype/invite_request/__init__.py
Normal file
8
community/lms/doctype/invite_request/invite_request.js
Normal file
8
community/lms/doctype/invite_request/invite_request.js
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright (c) 2021, FOSS United and contributors
|
||||||
|
// For license information, please see license.txt
|
||||||
|
|
||||||
|
frappe.ui.form.on('Invite Request', {
|
||||||
|
// refresh: function(frm) {
|
||||||
|
|
||||||
|
// }
|
||||||
|
});
|
||||||
88
community/lms/doctype/invite_request/invite_request.json
Normal file
88
community/lms/doctype/invite_request/invite_request.json
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
{
|
||||||
|
"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
|
||||||
|
}
|
||||||
78
community/lms/doctype/invite_request/invite_request.py
Normal file
78
community/lms/doctype/invite_request/invite_request.py
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
# -*- 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):
|
||||||
|
try:
|
||||||
|
frappe.get_doc({
|
||||||
|
"doctype": "Invite Request",
|
||||||
|
"invite_email": invite_email
|
||||||
|
}).save(ignore_permissions=True)
|
||||||
|
return "OK"
|
||||||
|
except frappe.UniqueValidationError:
|
||||||
|
frappe.throw(_("Email {0} has already been used to request an invite").format(invite_email))
|
||||||
|
|
||||||
|
@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"
|
||||||
69
community/lms/doctype/invite_request/test_invite_request.py
Normal file
69
community/lms/doctype/invite_request/test_invite_request.py
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
# -*- 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)
|
||||||
@@ -27,6 +27,8 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "course",
|
"fieldname": "course",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"in_standard_filter": 1,
|
||||||
"label": "Course",
|
"label": "Course",
|
||||||
"options": "LMS Course"
|
"options": "LMS Course"
|
||||||
},
|
},
|
||||||
@@ -91,11 +93,13 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "start_date",
|
"fieldname": "start_date",
|
||||||
"fieldtype": "Date",
|
"fieldtype": "Date",
|
||||||
|
"in_list_view": 1,
|
||||||
"label": "Start Date"
|
"label": "Start Date"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "start_time",
|
"fieldname": "start_time",
|
||||||
"fieldtype": "Time",
|
"fieldtype": "Time",
|
||||||
|
"in_list_view": 1,
|
||||||
"label": "Start Time"
|
"label": "Start Time"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -106,6 +110,7 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "end_time",
|
"fieldname": "end_time",
|
||||||
"fieldtype": "Time",
|
"fieldtype": "Time",
|
||||||
|
"in_list_view": 1,
|
||||||
"label": "End Time"
|
"label": "End Time"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@@ -117,7 +122,7 @@
|
|||||||
"link_fieldname": "batch"
|
"link_fieldname": "batch"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"modified": "2021-04-21 12:45:21.144972",
|
"modified": "2021-04-30 09:52:18.941276",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "LMS",
|
"module": "LMS",
|
||||||
"name": "LMS Batch",
|
"name": "LMS Batch",
|
||||||
|
|||||||
@@ -37,4 +37,3 @@ def save_message(message, batch):
|
|||||||
"message": message
|
"message": message
|
||||||
})
|
})
|
||||||
doc.save(ignore_permissions=True)
|
doc.save(ignore_permissions=True)
|
||||||
return doc
|
|
||||||
@@ -14,7 +14,7 @@ class LMSBatchMembership(Document):
|
|||||||
self.validate_membership_in_different_batch_same_course()
|
self.validate_membership_in_different_batch_same_course()
|
||||||
|
|
||||||
def validate_membership_in_same_batch(self):
|
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)
|
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:
|
if previous_membership:
|
||||||
member_name = frappe.db.get_value("Community Member", self.member, "full_name")
|
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))
|
frappe.throw(_("{0} is already a {1} of {2}").format(member_name, previous_membership.member_type, self.batch))
|
||||||
@@ -29,7 +29,7 @@ class LMSBatchMembership(Document):
|
|||||||
frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))
|
frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def create_membership(batch, member=None, member_type="Student", role="Member"):
|
def create_membership(batch, course, member=None, member_type="Student", role="Member"):
|
||||||
if not member:
|
if not member:
|
||||||
member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name")
|
member = frappe.db.get_value("Community Member", {"email": frappe.session.user}, "name")
|
||||||
frappe.get_doc({
|
frappe.get_doc({
|
||||||
@@ -39,4 +39,5 @@ def create_membership(batch, member=None, member_type="Student", role="Member"):
|
|||||||
"member_type": member_type,
|
"member_type": member_type,
|
||||||
"member": member
|
"member": member
|
||||||
}).save(ignore_permissions=True)
|
}).save(ignore_permissions=True)
|
||||||
return "OK"
|
course_slug = frappe.db.get_value("LMS Course", {"title": course}, ["slug"])
|
||||||
|
return course_slug
|
||||||
@@ -88,3 +88,15 @@ class LMSCourse(Document):
|
|||||||
member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member.name, "member_type": "Mentor"}))
|
member.batch_count = len(frappe.get_all("LMS Batch Membership", {"member": member.name, "member_type": "Mentor"}))
|
||||||
course_mentors.append(member)
|
course_mentors.append(member)
|
||||||
return course_mentors
|
return course_mentors
|
||||||
|
|
||||||
|
def get_instructor(self):
|
||||||
|
return frappe.get_doc("User", self.owner)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def find_all():
|
||||||
|
"""Returns all published courses.
|
||||||
|
"""
|
||||||
|
rows = frappe.db.get_all("LMS Course",
|
||||||
|
filters={"is_published": True},
|
||||||
|
fields='*')
|
||||||
|
return [frappe.get_doc(dict(row, doctype='LMS Course')) for row in rows]
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import frappe
|
import frappe
|
||||||
|
from .lms_course import LMSCourse
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
class TestLMSCourse(unittest.TestCase):
|
class TestLMSCourse(unittest.TestCase):
|
||||||
@@ -11,7 +12,6 @@ class TestLMSCourse(unittest.TestCase):
|
|||||||
frappe.db.sql('delete from `tabLMS Course Mentor Mapping`')
|
frappe.db.sql('delete from `tabLMS Course Mentor Mapping`')
|
||||||
frappe.db.sql('delete from `tabLMS Course`')
|
frappe.db.sql('delete from `tabLMS Course`')
|
||||||
frappe.db.sql('delete from `tabCommunity Member`')
|
frappe.db.sql('delete from `tabCommunity Member`')
|
||||||
frappe.db.sql('delete from `tabUser` where email like "%@example.com"')
|
|
||||||
|
|
||||||
def new_course(self, title):
|
def new_course(self, title):
|
||||||
doc = frappe.get_doc({
|
doc = frappe.get_doc({
|
||||||
@@ -21,28 +21,48 @@ class TestLMSCourse(unittest.TestCase):
|
|||||||
doc.insert()
|
doc.insert()
|
||||||
return doc
|
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):
|
def test_new_course(self):
|
||||||
course = self.new_course("Test Course")
|
course = self.new_course("Test Course")
|
||||||
assert course.title == "Test Course"
|
assert course.title == "Test Course"
|
||||||
assert course.slug == "test-course"
|
assert course.slug == "test-course"
|
||||||
assert course.get_mentors() == []
|
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.slug for c in courses] == [course.slug]
|
||||||
|
|
||||||
# disabled this test as it is failing
|
# disabled this test as it is failing
|
||||||
def _test_add_mentors(self):
|
def _test_add_mentors(self):
|
||||||
course = self.new_course("Test Course")
|
course = self.new_course("Test Course")
|
||||||
assert course.get_mentors() == []
|
assert course.get_mentors() == []
|
||||||
|
|
||||||
user = self.new_user("Tester", "tester@example.com")
|
user = new_user("Tester", "tester@example.com")
|
||||||
course.add_mentor("tester@example.com")
|
course.add_mentor("tester@example.com")
|
||||||
|
|
||||||
mentors = course.get_mentors()
|
mentors = course.get_mentors()
|
||||||
mentors_data = [dict(email=mentor.email, batch_count=mentor.batch_count) for mentor in 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}]
|
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
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ def send_creation_email(course, member):
|
|||||||
subject = _('Request for Mentorship')
|
subject = _('Request for Mentorship')
|
||||||
send_email([frappe.session.user, get_course_author(course)], None, subject, message)
|
send_email([frappe.session.user, get_course_author(course)], None, subject, message)
|
||||||
|
|
||||||
def send_email(recipients, cc, subject, message):
|
def send_email(recipients, cc=None, subject=None, message=None, template=None, args=None):
|
||||||
frappe.sendmail(
|
frappe.sendmail(
|
||||||
recipients = recipients,
|
recipients = recipients,
|
||||||
cc = cc,
|
cc = cc,
|
||||||
@@ -87,5 +87,7 @@ def send_email(recipients, cc, subject, message):
|
|||||||
subject = subject,
|
subject = subject,
|
||||||
send_priority = 0,
|
send_priority = 0,
|
||||||
queue_separately = True,
|
queue_separately = True,
|
||||||
message = message
|
message = message,
|
||||||
|
template=template,
|
||||||
|
args=args
|
||||||
)
|
)
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
],
|
],
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-04-26 16:11:20.142164",
|
"modified": "2021-04-28 10:17:57.618127",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "LMS",
|
"module": "LMS",
|
||||||
"name": "LMS Message",
|
"name": "LMS Message",
|
||||||
@@ -80,5 +80,6 @@
|
|||||||
"quick_entry": 1,
|
"quick_entry": 1,
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
|
"title_field": "author",
|
||||||
"track_changes": 1
|
"track_changes": 1
|
||||||
}
|
}
|
||||||
@@ -7,10 +7,11 @@ import frappe
|
|||||||
from frappe.model.document import Document
|
from frappe.model.document import Document
|
||||||
from frappe import _
|
from frappe import _
|
||||||
from frappe.utils import add_days, nowdate
|
from frappe.utils import add_days, nowdate
|
||||||
|
from community.www.courses.utils import get_batch_members
|
||||||
|
|
||||||
class LMSMessage(Document):
|
class LMSMessage(Document):
|
||||||
def after_insert(self):
|
""" def after_insert(self):
|
||||||
frappe.publish_realtime("new_lms_message", {"message":"JJannat"}, user="Administrator")
|
self.send_email() """
|
||||||
self.send_email()
|
|
||||||
|
|
||||||
def send_email(self):
|
def send_email(self):
|
||||||
membership = frappe.get_all("LMS Batch Membership", {"batch": self.batch}, ["member"])
|
membership = frappe.get_all("LMS Batch Membership", {"batch": self.batch}, ["member"])
|
||||||
@@ -61,3 +62,43 @@ def send_daily_digest():
|
|||||||
},
|
},
|
||||||
delayed = False
|
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>
|
||||||
|
"""
|
||||||
@@ -6,10 +6,11 @@
|
|||||||
"engine": "InnoDB",
|
"engine": "InnoDB",
|
||||||
"field_order": [
|
"field_order": [
|
||||||
"livecode_url",
|
"livecode_url",
|
||||||
|
"column_break_2",
|
||||||
|
"email_sender",
|
||||||
"mentor_request_section",
|
"mentor_request_section",
|
||||||
"mentor_request_creation",
|
"mentor_request_creation",
|
||||||
"mentor_request_status_update",
|
"mentor_request_status_update"
|
||||||
"email_sender"
|
|
||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
@@ -40,12 +41,16 @@
|
|||||||
"fieldname": "mentor_request_section",
|
"fieldname": "mentor_request_section",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "Mentor Request"
|
"label": "Mentor Request"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_2",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"issingle": 1,
|
"issingle": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2021-04-21 13:28:35.783395",
|
"modified": "2021-04-29 17:14:43.589700",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "LMS",
|
"module": "LMS",
|
||||||
"name": "LMS Settings",
|
"name": "LMS Settings",
|
||||||
|
|||||||
@@ -10,9 +10,6 @@ from frappe.model.document import Document
|
|||||||
from . import livecode
|
from . import livecode
|
||||||
|
|
||||||
class LMSSketch(Document):
|
class LMSSketch(Document):
|
||||||
def get_owner_name(self):
|
|
||||||
return get_userinfo(self.owner)['full_name']
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def sketch_id(self):
|
def sketch_id(self):
|
||||||
"""Returns the numeric part of the name.
|
"""Returns the numeric part of the name.
|
||||||
@@ -21,6 +18,14 @@ class LMSSketch(Document):
|
|||||||
"""
|
"""
|
||||||
return self.name.replace("SKETCH-", "")
|
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):
|
def get_livecode_url(self):
|
||||||
doc = frappe.get_cached_doc("LMS Settings")
|
doc = frappe.get_cached_doc("LMS Settings")
|
||||||
return doc.livecode_url
|
return doc.livecode_url
|
||||||
@@ -46,6 +51,22 @@ class LMSSketch(Document):
|
|||||||
cache.set(key, value)
|
cache.set(key, value)
|
||||||
return 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):
|
def __repr__(self):
|
||||||
return f"<LMSSketch {self.name}>"
|
return f"<LMSSketch {self.name}>"
|
||||||
|
|
||||||
@@ -76,36 +97,3 @@ def save_sketch(name, title, code):
|
|||||||
"status": status,
|
"status": status,
|
||||||
"name": doc.name,
|
"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
|
|
||||||
}
|
|
||||||
|
|||||||
5
community/lms/models.py
Normal file
5
community/lms/models.py
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
"""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
|
||||||
|
|
||||||
@@ -5,27 +5,35 @@ frappe.ready(function () {
|
|||||||
"method": "community.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
|
"method": "community.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
|
||||||
"args": {
|
"args": {
|
||||||
"batch": data.title,
|
"batch": data.title,
|
||||||
"member_type": "Mentor"
|
"member_type": "Mentor",
|
||||||
|
"course": data.course
|
||||||
},
|
},
|
||||||
"callback": (data) => {
|
"callback": (data) => {
|
||||||
if (data.message == "OK") {
|
if (data.message) {
|
||||||
window.location.href = "/courses"
|
window.location.href = `courses/${data.message}`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
frappe.web_form.validate = () => {
|
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();
|
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)) {
|
if (!frappe.datetime.validate(data.start_time) || !frappe.datetime.validate(data.end_time)) {
|
||||||
frappe.msgprint(__('Invalid Start or End Time.'));
|
frappe.msgprint(__('Invalid Start or End Time.'));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.start_time > data.end_time) {
|
if (data.start_time > data.end_time) {
|
||||||
frappe.msgprint(__('Start Time should be less than End Time.'));
|
frappe.msgprint(__('Start Time should be less than End Time.'));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
console.log(data.start_date, date.nowdate())
|
|
||||||
if (data.start_date < date.nowdate()) {
|
if (data.start_date < date.nowdate()) {
|
||||||
frappe.msgprint(__('Start date cannot be a past date.'))
|
frappe.msgprint(__('Start date cannot be a past date.'))
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
"apply_document_permissions": 0,
|
"apply_document_permissions": 0,
|
||||||
"button_label": "Save",
|
"button_label": "Save",
|
||||||
"creation": "2021-04-20 11:37:49.135114",
|
"creation": "2021-04-20 11:37:49.135114",
|
||||||
|
"custom_css": ".datepicker.active {\n background-color: white;\n}",
|
||||||
"doc_type": "LMS Batch",
|
"doc_type": "LMS Batch",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"doctype": "Web Form",
|
"doctype": "Web Form",
|
||||||
@@ -18,7 +19,7 @@
|
|||||||
"is_standard": 1,
|
"is_standard": 1,
|
||||||
"login_required": 1,
|
"login_required": 1,
|
||||||
"max_attachment_size": 0,
|
"max_attachment_size": 0,
|
||||||
"modified": "2021-04-26 11:08:00.026388",
|
"modified": "2021-04-30 11:22:18.188712",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "LMS",
|
"module": "LMS",
|
||||||
"name": "add-a-new-batch",
|
"name": "add-a-new-batch",
|
||||||
@@ -37,13 +38,13 @@
|
|||||||
{
|
{
|
||||||
"allow_read_on_all_link_options": 0,
|
"allow_read_on_all_link_options": 0,
|
||||||
"fieldname": "course",
|
"fieldname": "course",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Data",
|
||||||
"hidden": 0,
|
"hidden": 0,
|
||||||
"label": "Course",
|
"label": "Course",
|
||||||
"max_length": 0,
|
"max_length": 0,
|
||||||
"max_value": 0,
|
"max_value": 0,
|
||||||
"options": "LMS Course",
|
"options": "",
|
||||||
"read_only": 0,
|
"read_only": 1,
|
||||||
"reqd": 0,
|
"reqd": 0,
|
||||||
"show_in_filter": 0
|
"show_in_filter": 0
|
||||||
},
|
},
|
||||||
@@ -90,7 +91,7 @@
|
|||||||
"fieldname": "start_time",
|
"fieldname": "start_time",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"hidden": 0,
|
"hidden": 0,
|
||||||
"label": "Start Time (HH:MM:SS)",
|
"label": "Start Time",
|
||||||
"max_length": 0,
|
"max_length": 0,
|
||||||
"max_value": 0,
|
"max_value": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
@@ -102,7 +103,7 @@
|
|||||||
"fieldname": "end_time",
|
"fieldname": "end_time",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"hidden": 0,
|
"hidden": 0,
|
||||||
"label": "End Time (HH:MM:SS)",
|
"label": "End Time",
|
||||||
"max_length": 0,
|
"max_length": 0,
|
||||||
"max_value": 0,
|
"max_value": 0,
|
||||||
"read_only": 0,
|
"read_only": 0,
|
||||||
|
|||||||
13
community/lms/widgets/CourseTeaser.html
Normal file
13
community/lms/widgets/CourseTeaser.html
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<div class="course-teaser">
|
||||||
|
<div class="course-body">
|
||||||
|
<h3 class="course-title"><a href="/courses/{{ course.slug }}">{{ course.title }}</a></h3>
|
||||||
|
<div class="course-intro">
|
||||||
|
{{ course.short_introduction or "" }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="course-footer">
|
||||||
|
<div class="course-author">
|
||||||
|
{{ course.get_instructor().full_name }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
25
community/lms/widgets/RequestInvite.html
Normal file
25
community/lms/widgets/RequestInvite.html
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
<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 () {
|
||||||
|
frappe.call({
|
||||||
|
method: "community.lms.doctype.invite_request.invite_request.create_invite_request",
|
||||||
|
args: {
|
||||||
|
invite_email: $("#invite_email").val()
|
||||||
|
},
|
||||||
|
callback: (data) => {
|
||||||
|
if (data.message == "OK") {
|
||||||
|
$("#invite-request-form").hide();
|
||||||
|
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>`;
|
||||||
|
$(".jumbotron").append(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
</script>
|
||||||
15
community/lms/widgets/SketchTeaser.html
Normal file
15
community/lms/widgets/SketchTeaser.html
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<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>
|
||||||
@@ -3,6 +3,8 @@
|
|||||||
"public/css/lms.css"
|
"public/css/lms.css"
|
||||||
],
|
],
|
||||||
"css/community.css": [
|
"css/community.css": [
|
||||||
"public/css/style.css"
|
"public/css/vars.css",
|
||||||
|
"public/css/style.css",
|
||||||
|
"public/css/style.less"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,12 +25,14 @@
|
|||||||
--cta-color: var(--c4);
|
--cta-color: var(--c4);
|
||||||
--send-message: var(--c7);
|
--send-message: var(--c7);
|
||||||
--received-message: var(--c8);
|
--received-message: var(--c8);
|
||||||
|
|
||||||
|
--primary-color: #08B74F;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
background: var(--bg);
|
background: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.course-header {
|
.course-header {
|
||||||
@@ -200,10 +202,6 @@ img.profile-photo {
|
|||||||
|
|
||||||
/* override style of base */
|
/* override style of base */
|
||||||
|
|
||||||
nav.navbar {
|
|
||||||
background: var(--c1) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.message {
|
.message {
|
||||||
border: 1px dashed var(--text-color);
|
border: 1px dashed var(--text-color);
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
@@ -290,4 +288,5 @@ nav.navbar {
|
|||||||
|
|
||||||
.message-section {
|
.message-section {
|
||||||
margin-left: 5%;
|
margin-left: 5%;
|
||||||
|
display: inline-block;
|
||||||
}
|
}
|
||||||
73
community/public/css/style.less
Normal file
73
community/public/css/style.less
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
@primary-color: #08B74F;
|
||||||
|
|
||||||
|
.teaser {
|
||||||
|
background: white;
|
||||||
|
border-radius: 10px;
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sketch-teaser {
|
||||||
|
.teaser();
|
||||||
|
width: 220px;
|
||||||
|
|
||||||
|
svg {
|
||||||
|
width: 200px;
|
||||||
|
height: 200px;
|
||||||
|
}
|
||||||
|
.sketch-image {
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
.sketch-footer {
|
||||||
|
padding: 10px;
|
||||||
|
background: #eee;
|
||||||
|
border-radius: 0px 0px 10px 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.course-teaser {
|
||||||
|
.teaser();
|
||||||
|
color: #444;
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
section.lightgray {
|
||||||
|
background: #f8f8f8;
|
||||||
|
}
|
||||||
|
|
||||||
|
#hero .jumbotron {
|
||||||
|
background: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
.field-width {
|
||||||
|
width: 40%;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
4
community/public/css/vars.css
Normal file
4
community/public/css/vars.css
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
/* Define all your css variables here. */
|
||||||
|
:root {
|
||||||
|
--primary-color: #08B74F;
|
||||||
|
}
|
||||||
18
community/templates/emails/lms_invite_request_approved.html
Normal file
18
community/templates/emails/lms_invite_request_approved.html
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<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>
|
||||||
@@ -1,15 +1,4 @@
|
|||||||
frappe.ready(() => {
|
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") {
|
if (frappe.session.user != "Guest") {
|
||||||
frappe.call({
|
frappe.call({
|
||||||
'method': 'community.lms.doctype.lms_mentor_request.lms_mentor_request.has_requested',
|
'method': 'community.lms.doctype.lms_mentor_request.lms_mentor_request.has_requested',
|
||||||
@@ -25,21 +14,6 @@ frappe.ready(() => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
$(".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) => {
|
$(".apply-now").click((e) => {
|
||||||
if (frappe.session.user == "Guest") {
|
if (frappe.session.user == "Guest") {
|
||||||
window.location.href = "/login";
|
window.location.href = "/login";
|
||||||
@@ -94,19 +68,4 @@ frappe.ready(() => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
/*
|
|
||||||
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()
|
|
||||||
});
|
|
||||||
}); */
|
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,6 @@
|
|||||||
<div class="mt-5">
|
<div class="mt-5">
|
||||||
{{ message.message }}
|
{{ message.message }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|||||||
@@ -1,22 +1,18 @@
|
|||||||
frappe.ready(() => {
|
frappe.ready(() => {
|
||||||
const assets = [
|
const assets = [
|
||||||
"/assets/frappe/js/lib/socket.io.min.js",
|
"/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, () => {
|
frappe.require(assets, () => {
|
||||||
if (window.dev_server) {
|
if (window.dev_server) {
|
||||||
frappe.boot.socketio_port = "9000" //use socketio port shown when bench starts
|
frappe.boot.socketio_port = "9000" //use socketio port shown when bench starts
|
||||||
}
|
}
|
||||||
frappe.socketio.init(9000);
|
frappe.socketio.init(9000);
|
||||||
console.log(frappe.socketio)
|
|
||||||
})
|
|
||||||
frappe.realtime.on("new_lms_message", (data) => {
|
|
||||||
console.log(data)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
window.scrollTo(0, document.body.scrollHeight);
|
window.scrollTo(0, document.body.scrollHeight);
|
||||||
}, 0);
|
}, 300);
|
||||||
|
|
||||||
$(".msger-send-btn").click((e) => {
|
$(".msger-send-btn").click((e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@@ -27,10 +23,6 @@ frappe.ready(() => {
|
|||||||
"args": {
|
"args": {
|
||||||
"batch": decodeURIComponent($(e.target).attr("data-batch")),
|
"batch": decodeURIComponent($(e.target).attr("data-batch")),
|
||||||
"message": message
|
"message": message
|
||||||
},
|
|
||||||
"callback": (data) => {
|
|
||||||
$(".msger-input").val("");
|
|
||||||
frappe.realtime.publish("new_lms_message", {"message":"JJK"})
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
49
community/www/home/index.html
Normal file
49
community/www/home/index.html
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
{% 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 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 %}
|
||||||
7
community/www/home/index.py
Normal file
7
community/www/home/index.py
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
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)
|
||||||
70
community/www/new-sign-up.html
Normal file
70
community/www/new-sign-up.html
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
{% 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 %}
|
||||||
@@ -12,6 +12,6 @@ def get_context(context):
|
|||||||
|
|
||||||
def get_member(username):
|
def get_member(username):
|
||||||
try:
|
try:
|
||||||
frappe.get_doc("Community Member", {"username":username})
|
return frappe.get_doc("Community Member", {"username":username})
|
||||||
except frappe.DoesNotExistError:
|
except frappe.DoesNotExistError:
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -16,37 +16,13 @@
|
|||||||
<a href="/sketches/new">Create a New Sketch</a>
|
<a href="/sketches/new">Create a New Sketch</a>
|
||||||
</div>
|
</div>
|
||||||
<div class='container'>
|
<div class='container'>
|
||||||
<div class="row row-cols-1 row-cols-xl-5 row-cols-lg-4 row-cols-md-3 row-cols-sm-2 ">
|
<div class="row">
|
||||||
{% for sketch in sketches %}
|
{% for sketch in sketches %}
|
||||||
<div class="col mb-4">
|
<div class="col-md-3">
|
||||||
<div class="card sketch-card" style="width: 200px;">
|
{{ widgets.SketchTeaser(sketch=sketch) }}
|
||||||
<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>
|
|
||||||
<div class="sketch-author">
|
|
||||||
by {{sketch.get_owner_name()}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block style %}
|
|
||||||
{{super()}}
|
|
||||||
<style type="text/css">
|
|
||||||
svg {
|
|
||||||
width: 200px;
|
|
||||||
height: 200px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
{% endblock %}
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import frappe
|
import frappe
|
||||||
from ...lms.doctype.lms_sketch.lms_sketch import get_recent_sketches
|
from community.lms.models import Sketch
|
||||||
|
|
||||||
def get_context(context):
|
def get_context(context):
|
||||||
context.no_cache = 1
|
context.no_cache = 1
|
||||||
context.sketches = get_recent_sketches()
|
context.sketches = Sketch.get_recent_sketches()
|
||||||
|
|
||||||
|
|||||||
34
docker-compose.yml
Normal file
34
docker-compose.yml
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
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: {}
|
||||||
Reference in New Issue
Block a user