feat: discussions

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

@@ -27,6 +27,11 @@
         {% if membership %}
         {{ pagination(prev_url, next_url) }}
         {% endif %}
+
+        {% set title = lesson.title + " - " + course.title %}
+        {{ widgets.DiscussionMessage(doctype="Lesson", docname=lesson.name,
+          title=title, condition=membership, button_name="Start Learning",
+          redirect_to="/courses/" + course.name) }}
       </div>
     </div>
   </div>
@@ -45,7 +50,8 @@
   <div class="common-card-style lesson-content-card markdown-source">{{ lesson.render_html() }}</div>
   {% else %}
   <div class="common-card-style lesson-content-card">
-    <span>This lesson is not available for Preview. Please join the course to access this lesson. <a href="/courses/{{ course.name }}">Checkout Course Details.</a></span>
+    <span>This lesson is not available for Preview. Please join the course to access this lesson. <a
+        href="/courses/{{ course.name }}">Checkout Course Details.</a></span>
   </div>
   {% endif %}
 

community/www/courses/course.js

@@ -169,6 +169,7 @@ var show_review_dialog = (e) => {
 }
 
 var rotate_chapter_icon = (e) => {
+  e.preventDefault();
   var icon = $(e.currentTarget).children(".chapter-icon");
   if (icon.css("transform") == "none") {
     icon.css("transform", "rotate(90deg)");

community/www/discussions/discussion.html

@@ -0,0 +1,16 @@
+{% extends "templates/base.html" %}
+{% block title %}{{ thread.title }}{% endblock %}
+{% block head_include %}
+<style>
+</style>
+{% endblock %}
+
+{% block content %}
+<div class="common-page-style">
+  <div class="container">
+    {{ widgets.BreadCrumb(thread=thread) }}
+    <div class="course-home-headings">{{ thread.title }}</div>
+    {{ widgets.DiscussionMessage(thread=thread.name) }}
+  </div>
+</div>
+{% endblock %}

community/www/discussions/discussion.py

@@ -0,0 +1,18 @@
+import frappe
+
+def get_context(context):
+    context.no_cache = 1
+
+    try:
+        thread_name = frappe.form_dict["discussion"]
+    except KeyError:
+        redirect_to_discussions()
+
+    context.thread = frappe.db.get_value("Discussion Thread", thread_name, ["name", "title"], as_dict=True)
+
+    if not len(context.thread):
+        redirect_to_discussions
+
+def redirect_to_discussions():
+    frappe.local.flags.redirect_location = "/discussions"
+    raise frappe.Redirect

community/www/discussions/index.html

@@ -0,0 +1,65 @@
+{% extends "templates/base.html" %}
+{% block title %}{{ 'Discussions' }}{% endblock %}
+{% block head_include %}
+<style>
+</style>
+{% endblock %}
+
+{% block content %}
+<div class="common-page-style">
+  <div class="container">
+    <div class="courses-header">
+      <span>{{_('Discussions')}}</span>
+      <div id="new-topic" class="button is-primary pull-right">
+        <img src="/assets/community/icons/small-add.svg">
+        Start a Discussion</div>
+    </div>
+    <div class="card-divider-dark"></div>
+    {% if threads | length %}
+    <div class="cards-parent">
+      {% for thread in threads %}
+      <div class="common-card-style thread-card">
+        <div class="course-card-title">{{ thread.title }}</div>
+        <div class="card-divider"></div>
+        <div>
+          <span class="course-student-count">
+            <span class="mr-4">
+              <img class="icon-background" src="/assets/community/icons/message.svg" />
+              {{ thread.message_count }}
+            </span>
+            <span class="mr-4">
+              <img class="icon-background" src="/assets/community/icons/user.svg" />
+              {{ thread.member_count }}
+            </span>
+          </span>
+        </div>
+        <a class="stretched-link" href="/discussions/{{ thread.name }}"></a>
+      </div>
+      {% endfor %}
+    </div>
+    {% else %}
+    <div class="text-center font-weight-bold mt-5">
+      No discussions yet.
+    </div>
+    {% endif %}
+  </div>
+</div>
+
+<!-- New Topic Modal -->
+<div class="modal fade discussion-modal" id="discussion-modal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <div class="course-home-headings modal-headings">Start a Discussion</div>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        {{ widgets.DiscussionComment() }}
+      </div>
+    </div>
+  </div>
+</div>
+
+{% endblock %}

community/www/discussions/index.js

@@ -0,0 +1,14 @@
+frappe.ready(() => {
+  $("#new-topic").click((e) => {
+    show_new_topic_modal(e);
+  })
+})
+
+var show_new_topic_modal = (e) => {
+  e.preventDefault();
+  if (frappe.session.user == "Guest") {
+    window.location.href = `/login?redirect-to=/discussions/`;
+    return;
+  }
+  $("#discussion-modal").modal("show");
+}

community/www/discussions/index.py

@@ -0,0 +1,17 @@
+import frappe
+
+def get_context(context):
+    context.threads = get_threads()
+
+def get_threads():
+    threads = frappe.get_all("Discussion Thread", fields=["name", "title"])
+    for thread in threads:
+        messages = frappe.get_all("Discussion Message",
+                        {
+                            "thread": thread.name
+                        },
+                        ["owner"],
+                        as_list=True)
+        thread.message_count = len(messages)
+        thread.member_count = len(set(messages))
+    return threads