Merge branch 'master' into master

Author: the-xperimentalist

.gitignore

@@ -87,6 +87,9 @@ qr_files/
 # mypy cache
 **/.mypy_cache
 
+#VSCode
+.vscode/
+
 tmp/
 
 # generated by command to create csv

README.md

@@ -27,29 +27,6 @@ sudo apt-get -y install redis-server
 
 Initial auth data: admin/123123
 
-If docker and docker-compose are not installed already (Not mandatory):
---------------------------------------------
-Refer to (http://docs.docker.com/installation/) for detailed installation instructions.
-
-```
-curl -sSL https://get.docker.com/ | sudo sh
-sudo pip install docker-compose
-```
-
-Create aliases for docker and docker-compose to avoid running them with sudo everytime.
-Append the following lines to your ~/.bashrc or ~/.zshrc
-
-```
-alias docker='sudo docker'
-alias docker-compose='sudo docker-compose'
-```
-
-Finally, run
-```
-docker-compose up
-```
-
-
 Configuring Django-allauth
 ---------------------------
 

junction/proposals/forms.py

@@ -114,6 +114,11 @@ class ProposalForm(forms.Form):
         required=False,
         help_text="What should the participants know before attending your session?",
     )
+    video_url = forms.CharField(
+        required=False,
+        help_text="Short 1-2 min video describing your talk",
+        widget=forms.TextInput(attrs={"class": "charfield"}),
+    )
     content_urls = forms.CharField(
         widget=PagedownWidget(show_preview=True),
         required=False,
@@ -148,6 +153,7 @@ def populate_form_for_update(self, proposal):
                 "description": proposal.description,
                 "target_audience": proposal.target_audience,
                 "prerequisites": proposal.prerequisites,
+                "video_url": proposal.video_url,
                 "content_urls": proposal.content_urls,
                 "speaker_info": proposal.speaker_info,
                 "speaker_links": proposal.speaker_links,

junction/proposals/migrations/0027_auto_20200502_0540.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2020-05-02 00:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("proposals", "0026_auto_20200323_2010"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalproposal",
+            name="video_url",
+            field=models.URLField(
+                blank=True,
+                default="",
+                help_text="A short 1-2 mins video link about your talk",
+            ),
+        ),
+        migrations.AddField(
+            model_name="proposal",
+            name="video_url",
+            field=models.URLField(
+                blank=True,
+                default="",
+                help_text="A short 1-2 mins video link about your talk",
+            ),
+        ),
+    ]

junction/proposals/models.py

@@ -100,6 +100,9 @@ class Proposal(TimeAuditModel):
         default=ProposalTargetAudience.BEGINNER,
         verbose_name="Target Audience",
     )
+    video_url = models.URLField(
+        blank=True, default="", help_text="Short 1-2 min video describing your talk",
+    )
     prerequisites = models.TextField(blank=True, default="")
     content_urls = models.TextField(blank=True, default="")
     speaker_info = models.TextField(blank=True, default="")

junction/proposals/views.py

@@ -169,6 +169,7 @@ def create_proposal(request, conference_slug):
         description=form.cleaned_data["description"],
         target_audience=form.cleaned_data["target_audience"],
         prerequisites=form.cleaned_data["prerequisites"],
+        video_url=form.cleaned_data["video_url"],
         content_urls=form.cleaned_data["content_urls"],
         speaker_info=form.cleaned_data["speaker_info"],
         speaker_links=form.cleaned_data["speaker_links"],
@@ -319,6 +320,7 @@ def update_proposal(request, conference_slug, slug):
     proposal.description = form.cleaned_data["description"]
     proposal.target_audience = form.cleaned_data["target_audience"]
     proposal.prerequisites = form.cleaned_data["prerequisites"]
+    proposal.video_url = form.cleaned_data["video_url"]
     proposal.content_urls = form.cleaned_data["content_urls"]
     proposal.speaker_info = form.cleaned_data["speaker_info"]
     proposal.speaker_links = form.cleaned_data["speaker_links"]

junction/templates/profiles/dashboard.html

@@ -34,7 +34,7 @@ <h1>Your Proposals</h1>
             <br>
             {% if conf_proposals %}
                 {% for conference,proposals in conf_proposals.items %}
-                <h3><a href="{% url 'proposals-list' conference|slugify %}">{{ conference }}</a></h3>
+                <h3><a href="{% url 'proposals-list' proposals.0.conference.slug %}">{{ conference }}</a></h3>
                 {% for proposal in proposals %}
         <div class="row user-proposals proposal" data-type="{{proposal.proposal_type}}" data-comment="{{proposal|reviewer_comments:request.user}}">
             <div class="col-xs-12" >

junction/templates/proposals/detail/base.html

@@ -137,6 +137,13 @@ <h4 class='heading'><b>Prerequisites:</b></h4>
           </div>
           {% endif %}
 
+          {% if proposal.video_url %}
+          <div class="proposal-writeup--section">
+            <h4 class='heading'><b>Video URL:</b></h4>
+            <p>{{ proposal.video_url|markdown_safe }}</p>
+          </div>
+          {% endif %}
+
           {% if proposal.content_urls %}
           <div class="proposal-writeup--section">
             <h4 class='heading'><b>Content URLs:</b></h4>