From 7cb9aef4c88a426767fe8d92931a06a55f591d12 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Fri, 30 Aug 2019 12:35:09 +0300
Subject: [PATCH] feat(core): add ability to work with categories for blog #186

---
 site/themes/default/templates/blog.html | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/site/themes/default/templates/blog.html b/site/themes/default/templates/blog.html
index dca6128e..35698a1a 100644
--- a/site/themes/default/templates/blog.html
+++ b/site/themes/default/templates/blog.html
@@ -6,18 +6,27 @@
 
 
     {# pagination #}
+
     {% set page = query.page %}
+    {% set tag = query.tag %}
+    {% set category = query.category %}
+
+    {% set entries_length = entries.fetchAll('blog')|length %}
     {% set entries_limit = entries.fetch('blog').entries_limit %}
-    {% if query.tag %}
-        {% set entries = entries.fetchAll('blog', {'where': {'key': 'tag', 'expr': 'contains', 'value': query.tag}, 'order_by': {'field': 'published_at', 'direction': 'desc'}, 'set_max_result': entries_limit, 'set_first_result': entries_offset}) %}
-    {% else %}
-        {% set entries = entries.fetchAll('blog', {'order_by': {'field': 'published_at', 'direction': 'desc'}, 'set_max_result': entries_limit, 'set_first_result': entries_offset}) %}
-    {% endif %}
-    {% set entries_length = entries|length %}
+
     {% set entries_pages = (entries_length/entries_limit)|round %}
     {% if page < 1 %}{% set page = 1 %}{% elseif page > entries_pages %}{% set page = entries_pages %}{% endif %}
     {% set entries_offset = (page-1)*entries_limit %}
     {% if entries_offset < 0 %}{% set entries_offset = 0 %}{% endif %}
+
+    {% if tag %}
+        {% set entries = entries.fetchAll('blog', {'where': {'key': 'tag', 'expr': 'contains', 'value': query.tag}, 'order_by': {'field': 'published_at', 'direction': 'desc'}, 'set_max_result': entries_limit, 'set_first_result': entries_offset}) %}
+    {% elseif category %}
+        {% set entries = entries.fetchAll('blog', {'where': {'key': 'category', 'expr': 'contains', 'value': query.category}, 'order_by': {'field': 'published_at', 'direction': 'desc'}, 'set_max_result': entries_limit, 'set_first_result': entries_offset}) %}
+    {% else %}
+        {% set entries = entries.fetchAll('blog', {'order_by': {'field': 'published_at', 'direction': 'desc'}, 'set_max_result': entries_limit, 'set_first_result': entries_offset}) %}
+    {% endif %}
+
     {# /pagination #}
 
     {% for entry in entries %}