fix: exhibitor template

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on:
   pull_request: {}
 jobs:
   tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     services:
       redis-cache:
         image: redis:alpine
@@ -32,7 +32,7 @@ jobs:
     - name: setup python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.9'
+        python-version: 3.9
     - name: setup node
       uses: actions/setup-node@v2
       with:
@@ -53,22 +53,19 @@ jobs:
         then
            (cd && tar xzf ~/bench-cache/bench.tgz)
         else
-          bench init ~/frappe-bench --skip-redis-config-generation --skip-assets --python "$(which python)"
+          bench init ~/frappe-bench --skip-redis-config-generation
           mkdir -p ~/bench-cache
           (cd && tar czf ~/bench-cache/bench.tgz frappe-bench)
         fi
-    - name: add school app to bench
+    - name: add community app to bench
       working-directory: /home/runner/frappe-bench
-      run: bench get-app school $GITHUB_WORKSPACE
+      run: bench get-app community $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 school app
+    - name: install community app
       working-directory: /home/runner/frappe-bench
-      run: bench --verbose --site frappe.local install-app school
-    - name: setup requirements
-      working-directory: /home/runner/frappe-bench
-      run: bench setup requirements --dev
+      run: bench --verbose --site frappe.local install-app community
     - name: allow tests
       working-directory: /home/runner/frappe-bench
       run: bench --site frappe.local set-config allow_tests true
@@ -77,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 school
+      run: bench --site frappe.local run-tests --app community
 

.gitignore

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

Contribution.md

@@ -1,7 +0,0 @@
-
-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.
-1. Commit your changes to your branch. Make sure to use a semantic commit message.
-1. Push your branch to your fork on Github, and issue a pull request.

MANIFEST.in

@@ -4,15 +4,15 @@ include *.json
 include *.md
 include *.py
 include *.txt
-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
+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

README.md

@@ -1,25 +1,79 @@
-## School
+## Community
 
-Create online courses without much hassle.
+This app helps people organize and manage their own communities.
 
-![Course Home](/school/public/images/course-home.png)
+The App has following components:
 
-## Features
+1. Hackathons
+1. LMS
 
-1. Simple Backend Forms.
-1. The UI is clean and minimal.
-1. Lessons can be in the form of texts, videos, quizzes or a combination of all of these.
+Community is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript.
 
 ## Development Setup
 
-1. [Through Docker](docker-installation.md)
-1. [Direct install through bench](bench-installation.md)
+**Step 1:** Clone the repo
 
+```
+$ git clone https://github.com/fossunited/community.git
 
-### Contributing
+$ cd community
+```
 
-1. [Contribution Guidelines](Contribution.md)
+**Step 2:** Run docker-compose
 
-## License
+```
+$ docker-compose up
+```
 
-[GNU AFFERO GENERAL PUBLIC LICENSE](license.txt)
+**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:
+
+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.
+
+### 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. 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.
+1. Commit your changes to your branch. Make sure to use a semantic commit message.
+1. Push your branch to your fork on Github, and issue a pull request.
+
+#### License
+
+AGPL

bench-installation.md

@@ -1,10 +0,0 @@
-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 school.test.
-1. Fork the school app
-1. Run bench get-app <url-of-your-form>.
-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.

community/community/doctype/discussion_message/discussion_message.js

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

community/community/doctype/discussion_message/discussion_message.json

@@ -1,54 +1,53 @@
 {
  "actions": [],
- "creation": "2021-08-16 15:47:19.494055",
+ "creation": "2021-08-11 10:59:38.597046",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "student",
-  "issue_date",
-  "column_break_3",
-  "course",
-  "expiry_date"
+  "thread",
+  "column_break_2",
+  "parent_message",
+  "section_break_4",
+  "message"
  ],
  "fields": [
   {
-   "fieldname": "student",
+   "fieldname": "message",
+   "fieldtype": "Long Text",
+   "in_list_view": 1,
+   "label": "Message"
+  },
+  {
+   "fieldname": "thread",
    "fieldtype": "Link",
    "in_list_view": 1,
    "in_standard_filter": 1,
-   "label": "Student",
-   "options": "User"
+   "label": "Thread",
+   "options": "Discussion Thread"
   },
   {
-   "fieldname": "issue_date",
-   "fieldtype": "Date",
-   "label": "Issue Date"
-  },
-  {
-   "fieldname": "column_break_3",
+   "fieldname": "column_break_2",
    "fieldtype": "Column Break"
   },
   {
-   "fieldname": "course",
+   "fieldname": "parent_message",
    "fieldtype": "Link",
    "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Course",
-   "options": "LMS Course"
+   "label": "Parent Message",
+   "options": "Discussion Message"
   },
   {
-   "fieldname": "expiry_date",
-   "fieldtype": "Date",
-   "label": "Expiry Date"
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-16 15:47:19.494055",
+ "modified": "2021-08-12 15:59:04.811286",
  "modified_by": "Administrator",
- "module": "LMS",
- "name": "LMS Certification",
+ "module": "Community",
+ "name": "Discussion Message",
  "owner": "Administrator",
  "permissions": [
   {

community/community/doctype/discussion_message/discussion_message.py

@@ -0,0 +1,22 @@
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.model.document import Document
+from community.widgets import Widget, Widgets
+
+class DiscussionMessage(Document):
+    def after_insert(self):
+        data = {
+            "message": self,
+            "widgets": Widgets()
+        }
+        template = frappe.render_template("community/templates/message_card.html", data)
+        thread_info = frappe.db.get_value("Discussion Thread", self.thread, ["reference_doctype", "reference_docname"], as_dict=True)
+        frappe.publish_realtime(event="publish_message",
+                                message = {
+                                    "thread": self.thread,
+                                    "template": template,
+                                    "thread_info": thread_info
+                                },
+                                after_commit=True)

community/community/doctype/discussion_message/test_discussion_message.py

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

community/community/doctype/discussion_thread/discussion_thread.js

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

community/community/doctype/discussion_thread/discussion_thread.json

@@ -0,0 +1,57 @@
+{
+ "actions": [],
+ "creation": "2021-08-11 10:55:29.341674",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "title",
+  "reference_doctype",
+  "reference_docname"
+ ],
+ "fields": [
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Title"
+  },
+  {
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "label": "Reference Doctype",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "reference_docname",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Docname",
+   "options": "reference_doctype"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-08-11 12:29:43.564123",
+ "modified_by": "Administrator",
+ "module": "Community",
+ "name": "Discussion Thread",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "search_fields": "title",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "title",
+ "track_changes": 1
+}

community/community/doctype/discussion_thread/discussion_thread.py

@@ -0,0 +1,48 @@
+# Copyright (c) 2021, FOSS United and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.model.document import Document
+
+class DiscussionThread(Document):
+    pass
+
+@frappe.whitelist()
+def submit_discussion(doctype, docname, message, title=None, thread_name=None):
+    thread = []
+    filters = {}
+    if doctype and docname:
+        filters = {
+                    "reference_doctype": doctype,
+                    "reference_docname": docname
+                }
+
+    elif thread_name:
+        filters = {
+            "name": thread_name
+        }
+
+    if filters:
+        thread = frappe.get_all("Discussion Thread",filters)
+    if len(thread):
+        thread = thread[0]
+        save_message(message, thread)
+
+    else:
+        thread = frappe.get_doc({
+                    "doctype": "Discussion Thread",
+                    "title": title,
+                    "reference_doctype": doctype,
+                    "reference_docname": docname
+                })
+        thread.save(ignore_permissions=True)
+        save_message(message, thread)
+
+    return thread.name
+
+def save_message(message, thread):
+        frappe.get_doc({
+            "doctype": "Discussion Message",
+            "message": message,
+            "thread": thread.name
+        }).save(ignore_permissions=True)

community/community/doctype/discussion_thread/test_discussion_thread.py

@@ -4,5 +4,5 @@
 # import frappe
 import unittest
 
-class TestExhibitor(unittest.TestCase):
+class TestDiscussionThread(unittest.TestCase):
 	pass

community/community/widgets/Avatar.html

@@ -1,5 +1,5 @@
 {% set color = member.get_palette() %}
-<a class="button-links" href="{{ get_profile_url(member.username) }}">
+<a class="button-links" href="/{{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 }}">

community/community/widgets/DiscussionComment.html

@@ -0,0 +1,70 @@
+<div class="discussions">
+
+  <form class="discussion-form {% if doctype or thread %} discussion-on-page {% endif %}" id="discussion-form">
+
+
+    <div class="form-group" {% if title or thread %} style="display: none;" {% endif %}>
+      <div class="control-input-wrapper">
+        <div class="control-input">
+          <input type="text" autocomplete="off" class="input-with-feedback form-control thread-title"
+            data-fieldtype="Data" data-fieldname="feedback_comments" placeholder="Title" spellcheck="false" {% if title
+            %} value="{{ title }}" {% endif %}></input>
+        </div>
+      </div>
+    </div>
+
+    <div class="form-group">
+      <div class="control-input-wrapper">
+        <div class="control-input">
+          <textarea type="text" autocomplete="off" class="input-with-feedback form-control comment-field"
+            data-fieldtype="Text" data-fieldname="feedback_comments" placeholder="Enter a comment..."
+            spellcheck="false"></textarea>
+        </div>
+      </div>
+    </div>
+    <div class="comment-footer">
+      <div class="button is-secondary pull-right" id="submit-discussion"
+        {% if doctype %} data-doctype="{{ doctype | urlencode}}" {% endif %}
+        {% if docname %} data-docname="{{ docname | urlencode}}" {% endif %}
+        {% if thread %} data-thread="{{ thread }}" {% endif %}>
+        Post</div>
+    </div>
+  </form>
+</div>
+<script>
+  frappe.ready(() => {
+    $("#submit-discussion").click((e) => {
+      submit_discussion(e);
+    })
+  })
+
+  var submit_discussion = (e) => {
+    var message = $(".comment-field").val().trim();
+
+    if (message) {
+      var doctype = $(e.currentTarget).attr("data-doctype");
+      doctype = doctype ? decodeURIComponent(doctype) : doctype;
+
+      var docname = $(e.currentTarget).attr("data-docname");
+      docname = docname ? decodeURIComponent(docname) : docname;
+
+      frappe.call({
+      method: "community.community.doctype.discussion_thread.discussion_thread.submit_discussion",
+      args: {
+        "doctype": doctype ? doctype : "",
+        "docname": docname ? docname : "",
+        "message": $(".comment-field").val(),
+        "title": $(".thread-title").val(),
+        "thread_name": $(e.currentTarget).attr("data-thread")
+      },
+      callback: (data) => {
+        if (! $(".discussion-on-page").length) {
+          $("#discussion-modal").modal("hide");
+          window.location.href = `/discussions/${data.message}`;
+        }
+      }
+    })
+
+    }
+  }
+</script>

community/community/widgets/DiscussionMessage.html

@@ -0,0 +1,80 @@
+{% if doctype and docname and not thread %}
+
+{% set thread_info = frappe.get_all("Discussion Thread", {"reference_doctype": doctype, "reference_docname": docname},
+["name"]) %}
+
+{% if thread_info | length %}
+{% set thread = thread_info[0].name %}
+{% endif %}
+
+{% endif %}
+
+{% if thread %}
+{% set messages = frappe.get_all("Discussion Message", {"thread": thread}, ["name", "message", "owner", "creation"],
+order_by="creation") %}
+{% endif %}
+
+{% if doctype %}
+<div class="course-home-headings mt-5"> Discussions </div>
+{% endif %}
+
+<div class="messages mt-5">
+  {% for message in messages %}
+    {% include "community/templates/message_card.html" %}
+  {% endfor %}
+</div>
+
+{% if frappe.session.user == "Guest" or (condition is defined and not condition) %}
+<div class="d-flex flex-column align-items-center font-weight-bold">
+  Want to join the discussion?
+  {% if frappe.session.user == "Guest" %}
+  <div class="button is-primary" id="login-from-discussion">Log In</div>
+  {% elif not condition %}
+  <div class="button is-primary" id="login-from-discussion" data-redirect="{{ redirect_to }}">{{ button_name }}</div>
+  {% endif %}
+</div>
+{% else %}
+{{ widgets.DiscussionComment(doctype=doctype, docname=docname, title=title, thread=thread ) }}
+{% endif %}
+
+<script>
+  frappe.ready(() => {
+    setup_socket_io();
+
+    $("#login-from-discussion").click((e) => {
+      login_from_discussion(e);
+    })
+
+  })
+
+  var setup_socket_io = () => {
+    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";
+      }
+
+      frappe.socketio.init(9000);
+      var target = $("#submit-discussion");
+
+      frappe.socketio.socket.on("publish_message", (data) => {
+        if (target.attr("data-thread") == data.thread
+          || (decodeURIComponent(target.attr("data-doctype")) == data.thread_info.reference_doctype
+              && decodeURIComponent(target.attr("data-docname")) == data.thread_info.reference_docname)) {
+          $(".comment-field").val("");
+          $(".messages").append(data.template);
+        }
+      })
+    })
+  }
+
+  var login_from_discussion = (e) => {
+    var redirect = $(e.currentTarget).attr("data-redirect") || window.location.href;
+    window.location.href = `/login?redirect-to=${redirect}`;
+  }
+
+</script>

community/event_management/doctype/attendee_registration/attendee_registration.js

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

community/event_management/doctype/attendee_registration/attendee_registration.json

@@ -5,15 +5,40 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "user",
-  "full_name",
-  "column_break_3",
+  "attendee_info_section",
+  "name1",
+  "email",
+  "phone_number",
+  "occupation",
   "company",
-  "is_paid",
-  "section_break_6",
   "what_are_you_hoping_to_learn"
  ],
  "fields": [
+  {
+   "fieldname": "attendee_info_section",
+   "fieldtype": "Section Break",
+   "label": "Attendee Info"
+  },
+  {
+   "fieldname": "name1",
+   "fieldtype": "Data",
+   "label": "Name"
+  },
+  {
+   "fieldname": "email",
+   "fieldtype": "Data",
+   "label": "Email"
+  },
+  {
+   "fieldname": "phone_number",
+   "fieldtype": "Data",
+   "label": "Phone Number"
+  },
+  {
+   "fieldname": "occupation",
+   "fieldtype": "Data",
+   "label": "Occupation"
+  },
   {
    "fieldname": "company",
    "fieldtype": "Data",
@@ -22,42 +47,15 @@
   {
    "fieldname": "what_are_you_hoping_to_learn",
    "fieldtype": "Text",
-   "label": "What are you hoping to learn?"
-  },
-  {
-   "fieldname": "user",
-   "fieldtype": "Link",
-   "label": "User",
-   "options": "User"
-  },
-  {
-   "fetch_from": "user.full_name",
-   "fieldname": "full_name",
-   "fieldtype": "Data",
-   "label": "Full Name",
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_paid",
-   "fieldtype": "Check",
-   "label": "Is Paid"
-  },
-  {
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_6",
-   "fieldtype": "Section Break"
+   "label": "What are you hoping to learn"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-20 17:03:09.741997",
+ "modified": "2021-08-11 10:07:53.262504",
  "modified_by": "Administrator",
  "module": "Event Management",
- "name": "Attendee",
+ "name": "Attendee Registration",
  "owner": "Administrator",
  "permissions": [
   {
@@ -75,6 +73,5 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "title_field": "user",
  "track_changes": 1
 }

community/event_management/doctype/attendee_registration/attendee_registration.py

@@ -4,5 +4,5 @@
 # import frappe
 from frappe.model.document import Document
 
-class ChapterReference(Document):
+class AttendeeRegistration(Document):
 	pass

community/event_management/doctype/attendee_registration/test_attendee_registration.py

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