Merge pull request #14 from samwelkanda/ft-custom-tags

samwelkanda · web-flow · commit cfb034302f8e · 2020-11-24T15:19:36.000+03:00
Ft custom tags
diff --git a/mysite/apps/blog/templates/blog/post/detail.html b/mysite/apps/blog/templates/blog/post/detail.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load blog_tags %}
 
 {% block title %}{{ post.title }}{% endblock %}
 
@@ -7,7 +8,7 @@ <h1>{{ post.title }}</h1>
   <p class="date">
     Published {{ post.publish }} by {{ post.author }}
   </p>
-  {{ post.body|linebreaks }}
+  {{ post.body|markdown }}
   <p>
     <a href="{% url "blog:post_share" post.id %}">
       Share this post
diff --git a/mysite/apps/blog/templates/blog/post/latest_posts.html b/mysite/apps/blog/templates/blog/post/latest_posts.html
@@ -0,0 +1,7 @@
+<ul>
+    {% for post in latest_posts %}
+      <li>
+        <a href="{{ post.get_absolute_url }}">{{ post.title }}</a>
+      </li>
+    {% endfor %}
+  </ul>
diff --git a/mysite/apps/blog/templates/blog/post/list.html b/mysite/apps/blog/templates/blog/post/list.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load blog_tags %}
 
 {% block title %}My Blog{% endblock %}
 
@@ -26,7 +27,7 @@ <h2>
     <p class="date">
       Published {{ post.publish }} by {{ post.author }}
     </p>
-    {{ post.body|truncatewords:30|linebreaks }}
+    {{ post.body|markdown|truncatewords_html:30 }}
   {% endfor %}
   {% include "pagination.html" with page=posts %}
 {% endblock %}
diff --git a/mysite/apps/blog/templatetags/__init__.py b/mysite/apps/blog/templatetags/__init__.py
diff --git a/mysite/apps/blog/templatetags/blog_tags.py b/mysite/apps/blog/templatetags/blog_tags.py
@@ -0,0 +1,31 @@
+from django import template
+from django.db.models import Count
+from django.utils.safestring import mark_safe
+import markdown
+from ..models import Post
+
+
+register = template.Library()
+
+
+@register.simple_tag
+def total_posts():
+    return Post.published.count()
+
+
+@register.inclusion_tag('blog/post/latest_posts.html')
+def show_latest_posts(count=5):
+    latest_posts = Post.published.order_by('-publish')[:count]
+    return {'latest_posts': latest_posts}
+
+
+@register.simple_tag
+def get_most_commented_posts(count=5):
+    return Post.published.annotate(
+               total_comments=Count('comments')
+           ).order_by('-total_comments')[:count]
+
+
+@register.filter(name='markdown')
+def markdown_format(text):
+    return mark_safe(markdown.markdown(text))
diff --git a/mysite/templates/base.html b/mysite/templates/base.html
@@ -1,4 +1,5 @@
 {% load static %}
+{% load blog_tags %}
 <!DOCTYPE html>
 <html>
 <head>
@@ -12,7 +13,18 @@
   </div>
   <div id="sidebar">
     <h2>My blog</h2>
-    <p>This is my blog.</p>
+    <p>This is my blog. I've written {% total_posts %} posts so far.</p>
+    <h3>Latest posts</h3>
+    {% show_latest_posts 3 %}
+    <h3>Most commented posts</h3>
+    {% get_most_commented_posts as most_commented_posts %}
+    <ul>
+      {% for post in most_commented_posts %}
+        <li>
+          <a href="{{ post.get_absolute_url }}">{{ post.title }}</a>
+        </li>
+      {% endfor %}
+    </ul>
   </div>
 </body>
 </html>
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,6 +9,7 @@ python = "^3.7"
 django = "^3.1.3"
 psycopg2-binary = "^2.8.6"
 django_taggit = "^1.3.0"
+markdown = "^3.3.3"
 
 [tool.poetry.dev-dependencies]
 
