tag list handlers

web/api/v1/blog/filters.py

@@ -1,9 +1,21 @@
+from functools import reduce
+from operator import and_
+
 from django.db.models import Q
 from django_filters import rest_framework as filters
 
+from main.filters import ListCharFilter
+
 
 class ArticleFilter(filters.FilterSet):
     search = filters.CharFilter(method='search_filter')
+    tags = ListCharFilter(method='tags_filter')
 
-    def search_filter(self, queryset, name, value):
+    def search_filter(self, queryset, name: str, value: str):
         return queryset.filter(Q(title__icontains=value) | Q(content__icontains=value))
+
+    def tags_filter(self, queryset, name: str, value: list[str]):
+        tag_queries = [Q(tags__slug=tag) for tag in value]
+        # Use the reduce function to combine the Q objects with the 'and' operator
+        combined_query = reduce(and_, tag_queries)
+        return queryset.filter(combined_query)

web/blog/static/blog/js/list.js

@@ -1,5 +1,5 @@
 $(function () {
-  apiRequest()
+  articleListRequest()
 
 })
 let requestedNewPage = false
@@ -11,17 +11,24 @@ $(window).scroll(function () {
     if (nextUrl && nextUrl != 'None'){
        requestedNewPage = true
        console.log(nextUrl)
-       apiRequest()
+       articleListRequest()
     }
   }
 });
 
 
-function apiRequest() {
+function articleListRequest() {
   let pagination = $('#pagination')
+  const urlParams = new URLSearchParams(window.location.search);
+  const endpoint = pagination.attr('data-href-next')
+
+  const url = new URL(endpoint, window.location.origin);
+
+  urlParams.forEach((value, key) => url.searchParams.set(key, value))
+
   $.ajax({
       type: "GET",
-      url: pagination.attr('data-href-next'),
+      url: url,
       success: function (data) {
         if (data.results) {
           appendUrls(pagination,data.next, data.previous)
@@ -78,11 +85,10 @@ const articleTemplate = (article) => {
 
 
 function newArticlesRender(data, pagination) {
-  for (let article of data.results) {
-    const template = articleTemplate(article)
-    pagination.append(template);
-    $('.tag-list').click(tagClickHandler)
-
-  }
+  const template = data.results.map((article) => articleTemplate(article)).join('');
+  pagination.empty();
+  pagination.append(template);
+  $('.tag-list').unbind();
+  $('.tag-list').click(tagClickHandler);
   return true;
 }

web/blog/templates/blog/includes/sidebar_blocks/popular_tags.html

@@ -4,11 +4,7 @@
   <h4><i class="fa fa-tags"></i> Popular Tags:</h4>
   <div class="row">
     <div class="col-lg-6">
-      <ul class="list-unstyled" id="tagList">
-        {% for tag in popular_tags %}
-          <li><a href=""><span class="badge badge-info">{{ tag.name }}</span></a></li>
-        {% endfor %}
-      </ul>
+      <ul class="list-unstyled" id="tagList"></ul>
     </div>
   </div>
 </div>

web/blog/templates/blog/post_list.html

@@ -4,7 +4,7 @@
 
 {% block container %}
 <div class="row">
-  <div id="pagination" data-href-next="{% url 'api:v1:blog:post-list' %}" class="col-lg-8"></div>
+  <div id="pagination" data-href-next="/api/v1/blog/articles/?page_size=5" class="col-lg-8"></div>
   {% include 'blog/includes/right_sidebar.html' %}
 </div>
 {% endblock container %}