Merge branch 'main' of https://github.com/frappe/school into rename-app-to-school

fix: error on reindex-exercises

.github/workflows/ci.yml

@@ -53,19 +53,19 @@ jobs:
         then
            (cd && tar xzf ~/bench-cache/bench.tgz)
         else
-          bench init ~/frappe-bench --skip-redis-config-generation
+          bench init ~/frappe-bench --skip-redis-config-generation --skip-assets --python "$(which python)"
           mkdir -p ~/bench-cache
           (cd && tar czf ~/bench-cache/bench.tgz frappe-bench)
         fi
-    - name: add community app to bench
+    - name: add school app to bench
       working-directory: /home/runner/frappe-bench
-      run: bench get-app community $GITHUB_WORKSPACE
+      run: bench get-app school $GITHUB_WORKSPACE
     - name: create bench site
       working-directory: /home/runner/frappe-bench
       run: bench new-site --mariadb-root-password root --admin-password admin frappe.local
-    - name: install community app
+    - name: install school app
       working-directory: /home/runner/frappe-bench
-      run: bench --verbose --site frappe.local install-app community
+      run: bench --verbose --site frappe.local install-app school
     - name: allow tests
       working-directory: /home/runner/frappe-bench
       run: bench --site frappe.local set-config allow_tests true
@@ -74,5 +74,5 @@ jobs:
       run: bench --site frappe.local build
     - name: run tests
       working-directory: /home/runner/frappe-bench
-      run: bench --site frappe.local run-tests --app community
+      run: bench --site frappe.local run-tests --app school
 

.gitignore

@@ -3,8 +3,8 @@
 *.egg-info
 *.swp
 tags
-community/docs/current
-community/public/dist
+school/docs/current
+school/public/dist
 __pycache__/
 *.py[cod]
 *$py.class

MANIFEST.in

@@ -4,15 +4,15 @@ include *.json
 include *.md
 include *.py
 include *.txt
-recursive-include community *.css
-recursive-include community *.csv
-recursive-include community *.html
-recursive-include community *.ico
-recursive-include community *.js
-recursive-include community *.json
-recursive-include community *.md
-recursive-include community *.png
-recursive-include community *.py
-recursive-include community *.svg
-recursive-include community *.txt
-recursive-exclude community *.pyc
+recursive-include school *.css
+recursive-include school *.csv
+recursive-include school *.html
+recursive-include school *.ico
+recursive-include school *.js
+recursive-include school *.json
+recursive-include school *.md
+recursive-include school *.png
+recursive-include school *.py
+recursive-include school *.svg
+recursive-include school *.txt
+recursive-exclude school *.pyc

README.md

@@ -1,4 +1,4 @@
-## Community
+## School
 
 This app helps people organize and manage their own communities.
 
@@ -7,16 +7,16 @@ The App has following components:
 1. Hackathons
 1. LMS
 
-Community is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript.
+School 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
+$ git clone https://github.com/frappe/school.git
 
-$ cd community
+$ cd school
 ```
 
 **Step 2:** Run docker-compose
@@ -59,15 +59,15 @@ To setup the repository locally follow the steps mentioned below:
 
 1. Install bench and setup a frappe-bench directory by following the [Installation Steps](https://frappeframework.com/docs/user/en/installation).
 1. Start the server by running bench start.
-1. In a separate terminal window, create a new site by running bench new-site community.test.
-1. Run bench get-app https://github.com/fossunited/community.
-1. Run bench --site community.test install-app community.
-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. In a separate terminal window, create a new site by running bench new-site school.test.
+1. Run bench get-app https://github.com/frappe/school.
+1. Run bench --site school.test install-app school.
+1. Map your site to localhost with the command ```bench --site school.test add-to-hosts```
+1. Now open the URL http://school.test:8000/ in your browser, you should see the app running.
 
 ### 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/school directory of your installation and execute git pull --unshallow to ensure that you have the full git repository. Also fork the frappe/school repository on GitHub.
 1. Check out a working branch in git (e.g. git checkout -b my-new-branch).
 1. Make your proposed changes to the source
 1. Run your local version (e.g. bench start in your bench installation). Make sure that your changes work the way you want them to.

community/hooks.py

@@ -1,205 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-from . import __version__ as app_version
-
-app_name = "community"
-app_title = "Community"
-app_publisher = "FOSS United"
-app_description = "Community App"
-app_icon = "octicon octicon-file-directory"
-app_color = "grey"
-app_email = "jannat@erpnext.com"
-app_license = "AGPL"
-
-# Includes in <head>
-# ------------------
-
-# include js, css files in header of desk.html
-# app_include_css = "/assets/community/css/community.css"
-# app_include_js = "/assets/community/js/community.js"
-
-# include js, css files in header of web template
-web_include_css = "community.bundle.css"
-# web_include_css = "/assets/community/css/community.css"
-# web_include_js = "/assets/community/js/community.js"
-
-# include custom scss in every website theme (without file extension ".scss")
-# website_theme_scss = "community/public/scss/website"
-
-# include js, css files in header of web form
-# webform_include_js = {"doctype": "public/js/doctype.js"}
-# webform_include_css = {"doctype": "public/css/doctype.css"}
-
-# include js in page
-# page_js = {"page" : "public/js/file.js"}
-
-# include js in doctype views
-# doctype_js = {"doctype" : "public/js/doctype.js"}
-# doctype_list_js = {"doctype" : "public/js/doctype_list.js"}
-# doctype_tree_js = {"doctype" : "public/js/doctype_tree.js"}
-# doctype_calendar_js = {"doctype" : "public/js/doctype_calendar.js"}
-
-# Home Pages
-# ----------
-
-# application home page (will override Website Settings)
-# home_page = "login"
-
-# website user home page (by Role)
-# role_home_page = {
-#	"Role": "home_page"
-# }
-
-# Generators
-# ----------
-
-# automatically create page for each record of this doctype
-# website_generators = ["Web Page"]
-
-# Installation
-# ------------
-
-# before_install = "community.install.before_install"
-# after_install = "community.install.after_install"
-
-# Desk Notifications
-# ------------------
-# See frappe.core.notifications.get_notification_config
-
-# notification_config = "community.notifications.get_notification_config"
-
-# Permissions
-# -----------
-# Permissions evaluated in scripted ways
-
-# permission_query_conditions = {
-# 	"Event": "frappe.desk.doctype.event.event.get_permission_query_conditions",
-# }
-#
-# has_permission = {
-# 	"Event": "frappe.desk.doctype.event.event.has_permission",
-# }
-
-# DocType Class
-# ---------------
-# Override standard doctype classes
-
-override_doctype_class = {
-	"User": "community.overrides.user.CustomUser"
-}
-
-# Document Events
-# ---------------
-# Hook on document methods and events
-
-doc_events = {
-
-}
-
-# Scheduled Tasks
-# ---------------
-#scheduler_events = {
-#	"daily": [
-#		"erpnext.stock.reorder_item.reorder_item"
-#	]
-#}
-
-fixtures = ["Custom Field"]
-
-# Testing
-# -------
-
-# before_tests = "community.install.before_tests"
-
-# Overriding Methods
-# ------------------------------
-#
-# override_whitelisted_methods = {
-# 	"frappe.desk.doctype.event.event.get_events": "community.event.get_events"
-# }
-#
-# each overriding function accepts a `data` argument;
-# generated from the base implementation of the doctype dashboard,
-# along with any modifications made in other Frappe apps
-# override_doctype_dashboards = {
-# 	"Task": "community.task.get_dashboard_data"
-# }
-
-# exempt linked doctypes from being automatically cancelled
-#
-# auto_cancel_exempted_doctypes = ["Auto Repeat"]
-
-# Add all simple route rules here
-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/<hackathon>", "to_route": "hackathons/hackathon"},
-    {"from_route": "/hackathons/<hackathon>/<project>", "to_route": "hackathons/project"},
-    {"from_route": "/add-a-new-batch", "to_route": "add-a-new-batch"},
-    {"from_route": "/courses/<course>/home", "to_route": "batch/home"},
-    {"from_route": "/courses/<course>/learn", "to_route": "batch/learn"},
-    {"from_route": "/courses/<course>/learn/<int:chapter>.<int:lesson>", "to_route": "batch/learn"},
-    {"from_route": "/courses/<course>/schedule", "to_route": "batch/schedule"},
-    {"from_route": "/courses/<course>/members", "to_route": "batch/members"},
-    {"from_route": "/courses/<course>/discuss", "to_route": "batch/discuss"},
-    {"from_route": "/courses/<course>/about", "to_route": "batch/about"},
-    {"from_route": "/courses/<course>/progress", "to_route": "batch/progress"},
-    {"from_route": "/courses/<course>/join", "to_route": "batch/join"}
-]
-
-# Any frappe default URL is blocked by profile-rules, add it here to unblock it
-whitelist = [
-    "/home",
-    "/login",
-    "/update-password",
-    "/update-profile",
-    "/third-party-apps",
-    "/website_script.js",
-    "/courses",
-    "/sketches",
-    "/admin",
-    "/socket.io",
-    "/hackathons",
-    "/dashboard",
-    "/join-request",
-    "/add-a-new-batch",
-    "/new-sign-up",
-    "/message",
-    "/about",
-    "/edit-profile"
-]
-whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]
-
-# regex rule to match all profiles
-profile_rules = [
-    {"from_route": "/<string(minlength=4):username>", "to_route": "profiles/profile"},
-]
-
-website_route_rules = primary_rules + whitelist_rules + profile_rules
-
-website_redirects = [
-    {"source": "/update-profile", "target": "/edit-profile"},
-]
-
-update_website_context = 'community.widgets.update_website_context'
-
-## Specify the additional tabs to be included in the user profile page.
-## Each entry must be a subclass of community.community.plugins.ProfileTab
-# profile_tabs = []
-
-## Specify the extension to be used to control what scripts and stylesheets
-## to be included in lesson pages. The specified value must be be a
-## subclass of community.community.plugins.PageExtension
-# community_lesson_page_extension = None
-
-community_lesson_page_extensions = [
-	"community.plugins.LiveCodeExtension"
-]
-
-## Markdown Macros for Lessons
-community_markdown_macro_renderers = {
-	"Exercise": "community.plugins.exercise_renderer",
-	"Quiz": "community.plugins.quiz_renderer",
-	"YouTubeVideo": "community.plugins.youtube_video_renderer",
-}

community/lms/doctype/exercise_submission/exercise_submission.py

@@ -1,13 +0,0 @@
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe.model.document import Document
-from ..lesson.lesson import update_progress
-
-class ExerciseSubmission(Document):
-
-    def after_insert(self):
-        course_details = frappe.get_doc("LMS Course", self.course)
-        if not (course_details.is_mentor(frappe.session.user) or frappe.flags.in_test):
-            update_progress(self.lesson)

community/lms/doctype/lms_message/lms_message.py

@@ -1,110 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from frappe import _
-from frappe.utils import add_days, nowdate
-
-class LMSMessage(Document):
-    def after_insert(self):
-        self.publish_message()
-        #Todo: Adding email preference field for users
-        #self.send_email()
-
-    def publish_message(self):
-        template = self.get_message_template()
-        message = frappe._dict({
-            "author_name": self.author_name,
-            "message_time": frappe.utils.format_datetime(self.creation, "dd-mm-yyyy HH:mm"),
-            "message": frappe.utils.md_to_html(self.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
-                }})
-                $(".messages").append(template);
-                var message_element = document.getElementsByClassName("messages")[0]
-		        message_element.scrollTo(0, message_element.scrollHeight);
-            """.format(template, message, self.owner)
-
-        frappe.publish_realtime(event="eval_js", message=js, after_commit=True)
-
-    def get_message_template(self):
-        return """
-                <li class="{% if message.is_author %} ours {% endif %}">
-                    <div class="d-flex justify-content-between">
-                    <div class="font-weight-bold">
-                            {{ message.author_name }}
-                    </div>
-                    <small class="">
-                        {{ message.message_time }}
-                    </small>
-                    </div>
-                    <div class="message-para">
-                        {{ message.message }}
-                    </div>
-                </li>
-            """
-
-    def send_email(self):
-        membership = frappe.get_all("LMS Batch Membership", {"batch": self.batch}, ["member"])
-        for entry in membership:
-            member = frappe.get_doc("User", entry.member)
-            if member.name != self.author:
-                #Todo: wrap sendmail in frappe.enqueue, else messages takes long to display.
-                frappe.sendmail(
-                    recipients = member.email,
-                    subject = _("New Message on ") + self.batch,
-                    header = _("New Message on ") + self.batch,
-                    template = "lms_message",
-                    args = {
-                        "author": self.author,
-                        "message": frappe.utils.md_to_html(self.message),
-                        "creation": frappe.utils.format_datetime(self.creation, "medium"),
-                        "course": frappe.db.get_value("LMS Batch", self.batch, ["course"])
-                    }
-                )
-
-def send_daily_digest():
-    #Todo: Optimize this
-    emails = frappe._dict()
-    messages = frappe.get_all("LMS Message", {"creation": [">=", add_days(nowdate(), -1)]}, ["message", "batch", "author", "creation"])
-    for message in messages:
-        membership = frappe.get_all("LMS Batch Membership", {"batch": message.batch}, ["member"])
-        for entry in membership:
-            member = frappe.db.get_value("User", entry.member, ["name", "email"], as_dict=1)
-            if member.name != message.author:
-                if member.name in emails.keys():
-                    emails[member.name]["messages"].append(message)
-                else:
-                    emails[member.name] = frappe._dict({
-                        "email": member.email,
-                        "messages": [message]
-                    })
-    for email in emails:
-        group_by_batch = frappe._dict()
-        for message in emails[email]["messages"]:
-            if message.batch in group_by_batch.keys():
-                group_by_batch[message.batch].append(message)
-            else:
-                group_by_batch[message.batch] = [message]
-        frappe.sendmail(
-            recipients = frappe.db.get_value("User", email, "email"),
-            subject = _("Message Digest"),
-            header = _("Message Digest"),
-            template = "lms_daily_digest",
-            args = {
-                "batches": group_by_batch
-            },
-            delayed = False
-        )

community/lms/widgets/BatchHeader.html

@@ -1,4 +0,0 @@
-<div class="p-5 batch-header">
-  <h3>{{batch_name}}</h3>
-  <div class="text-muted">{{member_count}} members</div>
-</div>

community/lms/widgets/CourseCard.html

@@ -1,90 +0,0 @@
-<div class="common-card-style course-card">
-  <div class="course-image {% if not course.image %}default-image{% endif %}"
-    {% if course.image %} style="background-image: url( {{ course.image }} );" {% endif %}>
-    <div class="course-tags">
-      {% for tag in course.get_tags() %}
-      <div class="course-card-pills">{{ tag }}</div>
-      {% endfor %}
-    </div>
-    {% if not course.image %}
-    <div class="default-image-text">{{ course.title[0] }}</div>
-    {% endif %}
-  </div>
-  <div class="course-card-content">
-    <div class="course-card-meta muted-text">
-      {% if course.get_chapters() | length %}
-      <span>
-        {{ course.get_chapters() | length }} Chapters
-      </span>
-      {% endif %}
-      {% if course.get_chapters() | length and course.get_upcoming_batches() | length %}
-      <span class="font-weight-bold ml-3 mr-3"> . </span>
-      {% endif %}
-      {% if course.get_upcoming_batches() | length %}
-      <span class="">
-        {{ course.get_upcoming_batches() | length }} Open Batches
-      </span>
-      {% endif %}
-    </div>
-    <div class="course-card-title">{{ course.title }}</div>
-    <div class="card-divider"></div>
-    <div class="course-card-meta-2">
-      {{ widgets.Avatar(member=course.get_instructor(), avatar_class="avatar-small") }}
-      <span class="course-instructor">
-        {{ course.get_instructor().full_name }}
-      </span>
-      <span class="course-student-count">
-        {% if course.get_students() | length %}
-        <span class="mr-4">
-          <img class="icon-background" src="/assets/community/icons/user.svg" />
-          {{ course.get_students() | length }}
-        </span>
-        {% endif %}
-        {% set avg_rating = course.get_average_rating() %}
-        {% if avg_rating %}
-        <span>
-          <img class="icon-background" src="/assets/community/icons/rating.svg" />
-          {{ avg_rating }}
-        </span>
-        {% endif %}
-      </span>
-    </div>
-    {% set membership = course.get_membership(frappe.session.user) %}
-
-    {% set lesson_index = course.get_lesson_index(membership.current_lesson) if membership and
-    membership.current_lesson
-    else '1.1' %}
-
-    {% set query_parameter = "?batch=" + membership.batch if membership and membership.batch else "" %}
-
-    {% if course.upcoming %}
-    <div class="view-course-link is-default">
-      Upcoming Course <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
-    </div>
-    <a class="stretched-link" href="/courses/{{ course.name }}"></a>
-
-    {% elif membership %}
-    <div class="view-course-link is-primary">
-      Continue Course <img class="ml-3" src="/assets/community/icons/white-arrow.svg" />
-    </div>
-    <a class="stretched-link" href="{{ course.get_learn_url(lesson_index) }}{{ query_parameter }}"></a>
-
-    {% else %}
-    <div class="view-course-link">
-      View Course <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
-    </div>
-    <a class="stretched-link" href="/courses/{{ course.name }}"></a>
-
-    {% endif %}
-  </div>
-</div>
-<script>
-  frappe.ready(() => {
-    $(".course-card-title").each((i, element) => {
-      var title = $(element).text();
-      var length = $(window).width() <= 375 ? 60 : 65;
-      var suffix = title.length > length ? "..." : "";
-      $(element).text(title.substring(0, length) + suffix);
-    })
-  })
-</script>

community/lms/widgets/InstructorSection.html

@@ -1,6 +0,0 @@
-<div class="instructor">
-  {{ widgets.Avatar(member=instructor, avatar_class="avatar-medium") }}
-  <a class="ml-1 instructor-title" href="/{{instructor.username}}">{{ instructor.full_name }}</a>
-  <div class="instructor-subtitle">Course Creator</div>
-  <!-- <div class="instructor-subtitle">Created {{instructor.get_course_count()}} courses</div> -->
-</div>

community/lms/widgets/SketchTeaser.html

@@ -1,16 +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">
-      {% set owner = sketch.get_owner() %}
-      by <a href="/{{owner.username}}">{{owner.full_name}}</a>
-    </div>
-  </div>
-</div>

community/modules.txt

@@ -1,4 +0,0 @@
-Community
-Hackathon
-LMS
-Conference

community/patches.txt

@@ -1,9 +0,0 @@
-community.patches.set_email_preferences
-community.patches.change_name_for_community_members
-community.patches.save_abbr_for_community_members
-community.patches.create_mentor_request_email_templates
-community.patches.replace_member_with_user_in_batch_membership
-community.patches.replace_member_with_user_in_course_mentor_mapping
-community.patches.replace_member_with_user_in_lms_message
-community.patches.replace_member_with_user_in_mentor_request
-community.patches.v0_0.chapter_lesson_index_table

community/templates/message.html

@@ -1,13 +0,0 @@
-<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/www/batch/discuss.html

@@ -1,47 +0,0 @@
-{% extends "templates/base.html" %}
-
-{% block title %}Discuss{% endblock %}
-{% block head_include %}
-<meta name="description" content="Courses" />
-<meta name="keywords" content="" />
-
-<link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
-{% endblock %}
-
-{% block content %}
-
-<div class="container">
-  <div class="messages-container mt-5">
-    {{ widgets.BatchHeader(batch_name=batch.title, member_count=member_count)}}
-    <ol class="messages">
-      {{ Messages(messages) }}
-    </ol>
-    {{ TextArea() }}
-  </div>
-</div>
-{% endblock %}
-
-{% macro Messages(messages) %}
-{% for message in messages %}
-<li class="{% if message.is_author %} ours {% endif %}">
-  <div class="d-flex justify-content-between">
-    <div class="font-weight-bold">
-      {{ message.author_name }}
-    </div>
-    <small class="">
-      {{ frappe.utils.format_datetime(message.creation, "dd-mm-yyyy HH:mm") }}
-    </small>
-  </div>
-  <div class="message-para">
-    {{ message.message }}
-  </div>
-</li>
-{% endfor %}
-{% endmacro %}
-
-{% macro TextArea() %}
-<form class="msger-inputarea mb-1">
-  <input type="text" class="msger-input" placeholder="Write your message...">
-  <button type="submit" class="btn btn-primary msger-send-btn" data-batch="{{batch.name | urlencode }}">Send</button>
-</form>
-{% endmacro %}

community/www/batch/discuss.js

@@ -1,35 +0,0 @@
-frappe.ready(() => {
-	const assets = [
-		"/assets/frappe/js/lib/socket.io.min.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);
-	})
-
-	setTimeout(() => {
-    var message_element = document.getElementsByClassName("messages")[0]
-		message_element.scrollTo(0, message_element.scrollHeight);
-    document.getElementsByClassName("messages-container")[0].scrollIntoView({block: "center"})
-	}, 300);
-
-	$(".msger-send-btn").click((e) => {
-		e.preventDefault();
-		var message = $(".msger-input").val().trim();
-		if (message) {
-			frappe.call({
-				"method": "community.lms.doctype.lms_batch.lms_batch.save_message",
-				"args": {
-					"batch": decodeURIComponent($(e.target).attr("data-batch")),
-					"message": message
-				}
-			})
-		}
-		else {
-			$(".msger-input").val("");
-		}
-	})
-})

community/www/batch/discuss.py

@@ -1,8 +0,0 @@
-import frappe
-from . import utils
-
-def get_context(context):
-    utils.get_common_context(context)
-    context.messages = context.batch.get_messages()
-    if not context.membership:
-        utils.redirect_to_lesson(context.course)

community/www/courses/index.html

@@ -1,22 +0,0 @@
-{% extends "templates/base.html" %}
-{% from "www/hackathons/macros/card.html" import null_card %}
-{% block title %}{{ 'Courses' }}{% endblock %}
-{% block head_include %}
-<style>
-</style>
-{% endblock %}
-
-{% block content %}
-<div class="common-page-style">
-  <div class="container">
-    <div class="courses-header">
-      {{ 'All Courses' }}
-    </div>
-    <div class="cards-parent">
-      {% for course in courses %}
-      {{ widgets.CourseCard(course=course) }}
-      {% endfor %}
-    </div>
-  </div>
-</div>
-{% endblock %}

community/www/courses/index.py

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

docker-compose.yml

@@ -17,9 +17,9 @@ services:
   bench:
     image: anandology/frappe-bench
     volumes:
-      - .:/home/bench/frappe-bench/apps/community
+      - .:/home/bench/frappe-bench/apps/school
     environment:
-      - FRAPPE_APPS=community
+      - FRAPPE_APPS=school
       - FRAPPE_ALLOW_TESTS=true
       - FRAPPE_SITE_NAME=frappe.localhost
     depends_on:

mockups/README.md

@@ -1,39 +0,0 @@
-# Mockups
-
-HTML Mockups using [Mockdown][].
-
-[Mockdown]: https://github.com/anandology/mockdown
-
-## How to use
-
-**Step 1:** Get into `mockups` directory
-
-```
-$ cd mockups
-```
-
-**Step 2:** Instal `mockdown`
-
-```
-$ pip install mockdown
-```
-
-**Step 3:** Start mockdown server
-
-```
-$ mockdown
-...
- * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
-...
-```
-
-**Step 4:** See the mockups at <http://localhost:5000/>.
-
-## How does it work?
-
-Mockdown uses [Jinja][] templates for writing HTML.
-
-[Jinja]: https://jinja.palletsprojects.com/
-
-To make is easy to provide test data, Mockdown looks for YAML file with the same name as the template. For example, `home.html` template uses the data from `home.yml`.
-

mockups/base.html

@@ -1,42 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
-    <link href="/static/style.css" rel="stylesheet">
-
-    <title>{% block title %}FOSS United{% endblock %}</title>
-  </head>
-  <body>
-    <nav class="navbar navbar-light navbar-expand-lg">
-      <div class="container">
-        <a class="navbar-brand" href="/"><span>Home</span></a>
-        <button aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation" class="navbar-toggler" data-target="#navbarSupportedContent" data-toggle="collapse" type="button">
-        <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarSupportedContent">
-          <ul class="mr-auto navbar-nav">
-            <li class="nav-item">
-            <a class="nav-link" href="/sketches.html">
-                Sketches
-              </a>
-            </li>
-          </ul>
-          <ul class="ml-auto navbar-nav">
-            <!-- post login tools -->
-            <li class="nav-item">
-            <a class="nav-link btn-login-area" href="/login.html">Login</a>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </nav>
-    {% block content %}
-      <h1>Lorem ipsum...</h1>
-    {% endblock %}
-  </body>
-</html>

mockups/course.html

@@ -1,114 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-  <div class="container">
-    <div class="course-header">
-      <div class="course-type">course</div>
-      <h1>{{title}}</h1>
-    </div>
-
-    <div class="row">
-      <div class="col-lg-9 col-md-12">
-        <div  class="course-details">
-
-          <h2>Course Description</h2>
-
-          <div class="course-description">
-            {{ description }}
-          </div>
-
-          <div class="preview-video">
-            <iframe
-              width="560"
-              height="315"
-              src="{{youtube_embed_url}}"
-              title="YouTube video player"
-              frameborder="0"
-              allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-              allowfullscreen></iframe>
-          </div>
-
-          <h2>Upcoming Batches</h2>
-
-          <div class="row">
-          {% for batch in batches %}
-            <div class="col-lg-4 col-md-6">
-              <div class="batch">
-                <div class="batch-details">
-                <div>Session every {{batch.weekdays}}</div>
-                <div>{{batch.timeslot}}</div>
-                <div>Starting from {{batch.start_date}}</div>
-
-                <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
-
-                {% for m in batch.mentors %}
-                  <div>
-                    <img class="profile-photo" src="{{m.photo_url}}">
-                    <span class="instructor-title">{{m.name}}</span>
-                  </div>
-                {% endfor %}
-                </div>
-                <div class="cta">
-                  <div class="">
-                    <button type="button">Join this Batch</button>
-                  </div>
-                </div>
-              </div>
-            </div>
-          {% endfor %}
-        </div>
-
-
-          <h2>Course Outline</h2>
-
-          {% for chapter in chapters %}
-            <div class="chapter-plan">
-              <h3><span class="chapter-number">{{loop.index}}</span> {{chapter.title}}</h3>
-              <div class="chapter-description">
-                {{chapter.description}}
-              </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 %}
-        </div>
-      </div>
-
-      <div class="col-lg-3 col-md-12">
-        <div class="sidebar">
-          <h3>Instructor</h3>
-          <div class="instructor">
-            <div class="instructor-title">{{instructor.name}}</div>
-            <div class="instructor-subtitle">Created {{instructor.num_courses}} courses</div>
-          </div>
-        </div>
-
-        <div class="sidebar">
-          <h3>Mentors</h3>
-          {% for m in mentors %}
-            <div class="instructor">
-              <div class="instructor-title">{{m.name}}</div>
-              <div class="instructor-subtitle">Mentored {{m.num_courses}} batches</div>
-            </div>
-          {% endfor %}
-
-          <div class="notice">
-            Interested to become a mentor?
-
-            <div><a href="#">Apply Now!</a></div>
-          </div>
-        </div>
-      </div>
-
-      </div>
-    </div>
-  </div>
-
-{% endblock %}

mockups/course.yml

@@ -1,89 +0,0 @@
-title: The Joy of Programming
-description: |
-  Learn the joy of programming by turning the computer into a canvas.
-youtube_embed_url: "https://www.youtube.com/embed/IFWAYnUeHR8?start=149"
-stats:
-  chapters: 4
-  lessons: 25
-  videos: 6
-  completed: 287
-
-instructor:
-  name: Anand Chitipothu
-  num_courses: 4
-
-mentors:
-  - name: Anand Chitipothu
-    num_courses: 4
-  - name: Rushabh Mehta
-    num_courses: 3
-  - name: Jannat Patel
-    num_courses: 3
-
-batches:
-  - id: jp01
-    status: scheduled
-    mentors:
-      - name: Anand Chitipothu
-        photo_url: https://pbs.twimg.com/profile_images/2599066714/igu5hx4wlg3mxucodinl.jpeg
-        num_batches: 4
-    start_date: May 3, 2021
-    weekdays: Mon, Thu
-    timeslot: 5:00-6:00 PM
-
-  - id: jp02
-    status: scheduled
-    mentors:
-      - name: Anand Chitipothu
-        photo_url: https://pbs.twimg.com/profile_images/2599066714/igu5hx4wlg3mxucodinl.jpeg
-        num_batches: 4
-    start_date: May 4, 2021
-    weekdays: Tue, Fri
-    timeslot: 5:00-6:00 PM
-
-  - id: jp03
-    status: scheduled
-    mentors:
-      - name: Rusbhabh Mehta
-        photo_url: https://pbs.twimg.com/profile_images/2599066714/igu5hx4wlg3mxucodinl.jpeg
-        num_batches: 4
-    start_date: May 15, 2021
-    weekdays: Sat
-    timeslot: 5:00-6:00 PM
-
-
-chapters:
-  - title: Getting Started
-    description: |
-      Getting started with programming by turning the computer into a canvas.
-    lessons:
-      - index: 1
-        type: video
-        icon: bi bi-play-circle
-        title: Introduction to Programming
-      - index: 2
-        type: practice
-        icon: bi bi-code-square
-        title: Drawing Shapes
-
-  - title: Repeating Things
-    description: |
-      Isn't it very boring to do the same thing again and again?
-      Well, that is for humans. Computers love to do the same thing again and again.
-      Learn how to tell the computer to repeat multiple times the same task, or
-      with slight change every time.
-
-    lessons:
-      - index: 1
-        type: video
-        icon: bi bi-play-circle
-        title: Rinse and Repeat
-      - index: 2
-        type: practice
-        title: many circles
-        icon: bi bi-check2-circle
-      - index: 3
-        type: practice
-        icon: bi bi-code-square
-        title: print, print, print!
-

mockups/sketches.html

@@ -1,33 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-  <div class="container">
-    <div class="course-header">
-      <h1>Sketches</h1>
-    </div>
-
-    <div class="row sketches-gallery">
-      {% for s in sketches %}
-        <div class="col-md-3">
-          <div class="sketch-card">
-            <div class="sketch-image">
-              <a href="#">
-                <svg width="300" height="300" viewBox="0 0 300 300" fill="none" stroke="black" xmlns="http://www.w3.org/2000/svg">
-                  <circle cx="150" cy="150" r="150.0"></circle>
-                </svg>
-              </a>
-            </div>
-            <div class="sketch-footer">
-              <div class="sketch-title">
-                <a href="#">{{s.title}}</a>
-              </div>
-              <div class="sketch-author">
-                by {{s.author}}
-              </div>
-            </div>
-          </div>
-        </div>
-      {% endfor %}
-    </div>
-  </div>
-{% endblock %}

mockups/sketches.yml

@@ -1,38 +0,0 @@
-sketches:
-  - id: 20
-    title: Big Circle
-    author: Anand Chitipothu
-  - id: 19
-    title: Small Circle
-    author: Anand Chitipothu
-  - id: 18
-    title: Circles in Queue
-    author: Chaitanya
-  - id: 17
-    title: Random Bottom Circles
-    author: Anand Chitipothu
-  - id: 16
-    title: Pipes
-    author: Vishal
-  - id: 15
-    title: New Sketch
-    author: Malleshwari
-
-  - id: 20
-    title: Big Circle
-    author: Anand Chitipothu
-  - id: 19
-    title: Small Circle
-    author: Anand Chitipothu
-  - id: 18
-    title: Circles in Queue
-    author: Chaitanya
-  - id: 17
-    title: Random Bottom Circles
-    author: Anand Chitipothu
-  - id: 16
-    title: Pipes
-    author: Vishal
-  - id: 15
-    title: New Sketch
-    author: Malleshwari

mockups/static/style.css

@@ -1,221 +0,0 @@
-@import url("https://cdn.jsdelivr.net/npm/bootstrap-icons@1.4.1/font/bootstrap-icons.css");
-
-:root {
-  --c1: #fefae0;
-  --c2: #264653;
-  --c3: #e9c46a;
-  --c4: #2a9d8f;
-  --c5: #f4a261;
-  --c6: #e76f51;
-
-  --c7: #ccd5ae;
-
-  --bg: var(--c1);
-  --header-bg: var(--c2);
-  --header-color: var(--c3);
-  --tag-color: var(--c7);
-  --sidebar-bg: var(--c7);
-
-  --h-color: var(--c2);
-
-  --text-color: #333;
-  --text-color-light: #ccc;
-
-  --cta-color: var(--c4);
-}
-
-body {
-  padding: 0px;
-  margin: 0px;
-  background: var(--bg);
-}
-
-.navbar-light {
-  border-bottom: 1px solid #E2E6E9;
-}
-
-.page-header {
-  margin-top: 20px;
-  padding: 20px;
-  border-radius: 10px;
-}
-
-.page-header .page-header{
-  margin-top: 20px;
-  padding: 20px;
-  border-radius: 10px;
-}
-
-.course-header {
-  margin-top: 20px;
-  padding: 20px;
-  background: var(--header-bg);
-  color: var(--header-color);
-  border-radius: 10px;
-}
-
-.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);
-}
-
-.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;
-}
-
-.course-details h2 {
-  color: var(--h-color);
-  font-size: 1.4em;
-  font-weight: bold;
-  margin: 20px 0px 10px 0px;
-}
-
-.chapter-plan {
-  border-radius: 10px;
-  margin: 20px 0px;
-  padding: 20px;
-  border: 1px solid #ddc;
-  background: white;
-}
-
-.chapter-plan h3 {
-  font-size: 1.1em;
-  font-weight: bold;
-}
-
-.chapter-number {
-  background: var(--text-color);
-  color: white;
-  border-radius: 50%;
-  height: 24px;
-  min-width: 24px;
-  align-items: center;
-  padding: 2px 8px 2px 8px;
-  margin-right: 5px;
-}
-
-.chapter-description {
-  margin: 20px 0px;
-}
-
-.lessons {
-  padding-left: 20px;
-}
-.lesson {
-  margin: 5px 0px;
-  font-weight: bold;
-}
-
-.batch {
-  border-radius: 10px;
-  margin: 10px 0px;
-  background: white;
-  border: 1px solid #ddc;
-}
-
-.batch-details {
-  padding: 20px;
-}
-
-.batch .cta {
-  margin-top: 10px;
-  padding: 10px;
-  min-height: 28px;
-  text-align: right;
-  border-top: 1px solid #ddc;
-}
-
-.batch .cta button {
-  background: var(--cta-color);
-  color: white;
-  border: none;
-  border-radius: 5px;
-  padding: 5px 10px;
-}
-
-.batch .right {
-  float: right;
-}
-
-img.profile-photo {
-  width: 24px;
-  height: 24px;
-  border-radius: 50%;
-}
-
-.lesson-type {
-  padding-right: 5px;
-}
-
-.preview-video {
-  text-align: center;
-  margin: 20px 0px;
-}
-
-.preview-video iframe {
-  max-width: 100%
-}
-
-.sketches-gallery svg {
-  width: 200px;
-  height: 200px;
-}
-
-.sketch-card {
-  background: white;
-  border-radius: 10px;
-  border: 1px solid #ddd;
-
-  margin: 10px;
-}
-
-.sketch-card .sketch-image {
-  padding: 10px;
-}
-
-.sketch-footer {
-  padding: 10px;
-  background: #eee;
-}

school/community/widgets/Avatar.html

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

school/event_management/doctype/attendee/attendee.js

@@ -0,0 +1,14 @@
+// Copyright (c) 2021, FOSS United and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Attendee', {
+	onload: function (frm) {
+		frm.set_query('user', function (doc) {
+			return {
+				filters: {
+					"ignore_user_type": 1,
+				}
+			};
+		});
+	}
+});

school/event_management/doctype/attendee/attendee.json

@@ -1,51 +1,47 @@
 {
  "actions": [],
- "creation": "2021-03-19 12:19:32.355307",
+ "creation": "2021-08-11 10:07:53.262504",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "author",
-  "batch",
+  "user",
+  "full_name",
   "column_break_3",
-  "author_name",
-  "pin",
+  "company",
+  "is_paid",
   "section_break_6",
-  "message"
+  "what_are_you_hoping_to_learn"
  ],
  "fields": [
   {
-   "fieldname": "batch",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Batch",
-   "options": "LMS Batch"
+   "fieldname": "company",
+   "fieldtype": "Data",
+   "label": "Company"
   },
   {
-   "fieldname": "author",
+   "fieldname": "what_are_you_hoping_to_learn",
+   "fieldtype": "Text",
+   "label": "What are you hoping to learn?"
+  },
+  {
+   "fieldname": "user",
    "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Author",
+   "label": "User",
    "options": "User"
   },
   {
-   "fieldname": "message",
-   "fieldtype": "Markdown Editor",
-   "in_list_view": 1,
-   "label": "Message"
+   "fetch_from": "user.full_name",
+   "fieldname": "full_name",
+   "fieldtype": "Data",
+   "label": "Full Name",
+   "read_only": 1
   },
   {
    "default": "0",
-   "fieldname": "pin",
+   "fieldname": "is_paid",
    "fieldtype": "Check",
-   "label": "Pin"
-  },
-  {
-   "fetch_from": "author.full_name",
-   "fieldname": "author_name",
-   "fieldtype": "Data",
-   "label": "Author Name",
-   "read_only": 1
+   "label": "Is Paid"
   },
   {
    "fieldname": "column_break_3",
@@ -58,10 +54,10 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-05-21 11:49:34.911479",
+ "modified": "2021-08-20 17:03:09.741997",
  "modified_by": "Administrator",
- "module": "LMS",
- "name": "LMS Message",
+ "module": "Event Management",
+ "name": "Attendee",
  "owner": "Administrator",
  "permissions": [
   {
@@ -77,9 +73,8 @@
    "write": 1
   }
  ],
- "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "title_field": "author",
+ "title_field": "user",
  "track_changes": 1
-}
+}