Implemented Discourse embedding on topics

renzon · renzon · commit 3453ef8a7d22 · 2018-03-19T00:02:09.000-03:00
close #279
diff --git a/pythonpro/modules/chapters_views.py b/pythonpro/modules/chapters_views.py
@@ -1,8 +1,10 @@
+from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
 
 from pythonpro.modules import facade
 
 
+@login_required
 def detail(request, slug):
     ctx = {'chapter': facade.get_chapter_with_contents(slug=slug)}
     return render(request, 'chapters/chapter_detail.html', context=ctx)
diff --git a/pythonpro/modules/sections_views.py b/pythonpro/modules/sections_views.py
@@ -1,8 +1,10 @@
+from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
 
 from pythonpro.modules import facade
 
 
+@login_required
 def detail(request, slug):
     ctx = {'section': facade.get_section_with_contents(slug=slug)}
     return render(request, 'sections/section_detail.html', ctx)
diff --git a/pythonpro/modules/templates/topics/topic_detail.html b/pythonpro/modules/templates/topics/topic_detail.html
@@ -24,6 +24,22 @@ <h1 class="mt-4 mb-3">{{ topic.title }}</h1>
           <iframe src="https://player.vimeo.com/video/{{ topic.vimeo_id }}" width="640" height="360" frameborder="0"
                   webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
         </div>
+
+        <div id='discourse-comments'></div>
+        <script type="text/javascript">
+          DiscourseEmbed = {
+            discourseUrl: '{{ DISCOURSE_BASE_URL }}',
+            discourseEmbedUrl: '{{ request.build_absolute_uri }}' };
+
+          (function () {
+            var d = document.createElement('script');
+            d.type = 'text/javascript';
+            d.async = true;
+            d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+          })();
+        </script>
+
       </div>
     </div>
   </div>
diff --git a/pythonpro/modules/tests/test_topics_view.py b/pythonpro/modules/tests/test_topics_view.py
@@ -1,4 +1,5 @@
 import pytest
+from django.conf import settings
 from django.urls import reverse
 from model_mommy import mommy
 
@@ -94,3 +95,7 @@ def test_breadcrumb_current(resp, topic):
         resp,
         f'<li class="breadcrumb-item active" aria-current="page">{topic.title}</li>'
     )
+
+
+def test_discourse_url(resp, topic):
+    dj_assert_contains(resp, f"discourseUrl: '{settings.DISCOURSE_BASE_URL}'")
diff --git a/pythonpro/modules/topics_views.py b/pythonpro/modules/topics_views.py
@@ -1,8 +1,10 @@
+from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
 
 from pythonpro.modules import facade
 
 
+@login_required
 def detail(request, slug):
     ctx = {'topic': facade.get_topic_with_contents(slug=slug)}
     return render(request, 'topics/topic_detail.html', context=ctx)
diff --git a/pythonpro/settings.py b/pythonpro/settings.py
@@ -73,7 +73,7 @@
 ]
 
 # Discourse config
-DISCOURSE_BASE_URL = 'https://forum.python.pro.br'
+DISCOURSE_BASE_URL = 'https://forum.python.pro.br/'
 DISCOURSE_SSO_SECRET = config('DISCOURSE_SSO_SECRET')
 
 ROOT_URLCONF = 'pythonpro.urls'

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`]`
`74`	`74`
`75`	`75`	`# Discourse config`
`76`		`-DISCOURSE_BASE_URL = 'https://forum.python.pro.br'`
	`76`	`+DISCOURSE_BASE_URL = 'https://forum.python.pro.br/'`
`77`	`77`	`DISCOURSE_SSO_SECRET = config('DISCOURSE_SSO_SECRET')`
`78`	`78`
`79`	`79`	`ROOT_URLCONF = 'pythonpro.urls'`