From dc7d3a11348d4035dee66bf3b719a07798b98a8d Mon Sep 17 00:00:00 2001
From: Tris Forster <tris.git@shoddynet.org>
Date: Mon, 5 Oct 2020 15:22:13 +1100
Subject: [PATCH] Added markdown support to descriptions

---
 interface/templates/interface/project_detail.html |  4 +++-
 interface/templates/interface/resource_list.html  |  5 +++--
 polyphonic/settings_default.py                    |  3 ++-
 requirements.txt                                  | 13 ++++++++++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/interface/templates/interface/project_detail.html b/interface/templates/interface/project_detail.html
index ac044f4..f5b3f1e 100644
--- a/interface/templates/interface/project_detail.html
+++ b/interface/templates/interface/project_detail.html
@@ -1,9 +1,11 @@
 {% extends "interface/project_base.html" %}
+{% load md2 %}
+
 
     {% block page %}
     <div class="narrow">
     <h3 class="text-center">Due in {{ project.deadline|timeuntil }}!</h3>
-	<p>{{ project.description }}</p>
+	<p>{{ project.description|markdown }}</p>
     {% if project.owner %}
     <p>Project email: <a href="mailto:{{ project.owner }}">{{ project.owner }}</a></p>
     {% endif %}
diff --git a/interface/templates/interface/resource_list.html b/interface/templates/interface/resource_list.html
index a0fa19f..600b2b1 100644
--- a/interface/templates/interface/resource_list.html
+++ b/interface/templates/interface/resource_list.html
@@ -1,4 +1,5 @@
 {% extends "interface/project_base.html" %}
+{% load md2 %}
 
 {% block admin %}
 <a href="{% url 'resource_create' project=project.pk %}"><i class="fas fa-plus-circle"></i> Add new</a>
@@ -30,7 +31,7 @@
                 {% endif %}
             </h3>
             <p>
-                <small>{{ resource.description }}</small>
+                <small>{{ resource.description|markdown }}</small>
                 {% if not resource.visible %}
                 <br/>(This resource is hidden from participants)
                 {% endif %}
@@ -43,4 +44,4 @@
     {% endfor %}
     </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/polyphonic/settings_default.py b/polyphonic/settings_default.py
index b2b4f8d..e88c89e 100644
--- a/polyphonic/settings_default.py
+++ b/polyphonic/settings_default.py
@@ -37,6 +37,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django_markdown2',
     'interface',
 ]
 
@@ -121,4 +122,4 @@ USE_TZ = True
 STATIC_URL = '/static/'
 
 # Need to set this
-AWS_BUCKET = ''
\ No newline at end of file
+AWS_BUCKET = ''
diff --git a/requirements.txt b/requirements.txt
index 34fb0c1..7849108 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,13 @@
+asgiref==3.2.10
+boto3==1.15.11
+botocore==1.18.11
 Django==3.1.1
-markdown2==2.3.9
\ No newline at end of file
+django-markdown2==0.3.1
+jmespath==0.10.0
+markdown2==2.3.9
+python-dateutil==2.8.1
+pytz==2020.1
+s3transfer==0.3.3
+six==1.15.0
+sqlparse==0.3.1
+urllib3==1.25.10