Updated SnippetList new feature.

Author: Antoliny0919

base/main.py

@@ -0,0 +1,28 @@
+from .pagination import PAGE_VAR, Pagination
+
+
+class ObjectList:
+    pagination_class = Pagination
+
+    def __init__(self, request, model, queryset, list_per_page):
+        self.model = model
+        self.queryset = queryset
+        self.list_per_page = list_per_page
+        self.params = dict(request.GET.lists())
+        if PAGE_VAR in self.params:
+            del self.params[PAGE_VAR]
+        self.result_objects = self.get_objects(request)
+
+    def paginate(self, request, queryset):
+        pagination = self.pagination_class(
+            request,
+            self.model,
+            queryset,
+            self.list_per_page,
+        )
+        self.pagination = pagination
+        return pagination.get_objects()
+
+    def get_objects(self, request):
+        paginate_result = self.paginate(request, self.queryset)
+        return paginate_result

cab/components/components.py

@@ -0,0 +1,19 @@
+from django_components import Component, register
+from pydantic import BaseModel
+
+from base.main import ObjectList
+
+
+@register("snippet_list")
+class SnippetListComponent(Component):
+
+    template_file = "templates/snippet_list.html"
+
+    class Kwargs(BaseModel):
+        snippet_list: ObjectList
+        model_config = {"arbitrary_types_allowed": True}
+
+    def get_template_data(self, args, kwargs, slots, context):
+        return {
+            "snippet_list": kwargs.snippet_list.result_objects,
+        }

cab/components/templates/snippet_list.html

@@ -0,0 +1,30 @@
+<section class="border-2 border-base-green-400 rounded-sm" aria-labelledby="snippet-list-title">
+    <h2 id="snippet-list-title" class="sr-only">Snippet List</h2>
+    {% for snippet in snippet_list %}
+    <article class="relative flex flex-col px-8 pt-4 pb-1 border-b-2 border-base-green-400 last:border-b-0 lg:flex-row">
+        <div class="flex flex-row justify-start gap-3 text-sm md:text-base lg:my-6 lg:w-1/5 lg:flex-col">
+            <span>{{ snippet.rating_score }} rating</span>
+            <span>{{ snippet.bookmark_count }} bookmark</span>
+        </div>
+        <div class="flex flex-col lg:w-4/5">
+            <h3 class="py-2 my-0 text-lg md:text-2xl">
+                <a href="{{ snippet.get_absolute_url }}" class="text-base-green-400 hover:text-base-green-800 underline underline-offset-8 decoration-3 decoration-base-orange-400 hover:decoration-10 duration-500">{{ snippet.title|truncatechars:"80" }}</a>
+            </h3>
+            <p class="mb-0 py-4 min-h-[4rem] text-xs md:text-sm">{{ snippet.description|truncatechars:"250" }}</p>
+            <footer class="flex flex-col flex-wrap py-2 text-xs md:text-sm">
+                <div class="my-1">
+                    <strong class="text-sm md:text-base mr-2">Tags : </strong>
+                    <ul class="inline-flex gap-2 flex-wrap list-none m-0 text-xs md:text-sm">{% for tag in snippet.tags.all %}<li class="my-2 inline"><a href="{% url 'cab_snippet_matches_tag' tag.slug %}" class="py-1.5 px-2 text-white border-2 bg-base-green-400 border-base-green-400 rounded-lg hover:bg-base-white hover:text-base-green-400 duration-500 transition-colors no-underline">{{ tag.name }}</a></li>{% endfor %}</ul>
+                </div>
+                <p class="text-start">
+                    <strong class="text-sm md:text-base">Author : </strong>
+                    <a href="{{ snippet.author.get_absolute_url }}" class="text-base-green-400 underline underline-offset-4 hover:text-base-green-800">{{ snippet.author.username }}</a>
+                    <span class="mx-2" aria-hidden="true"> | </span>
+                    <strong class="text-sm md:text-base">Updated : </strong>
+                    <time>{{ snippet.updated_date }}</time>
+                </p>
+            </footer>
+        </div>
+    </article>
+    {% endfor %}
+</section>

cab/utils.py

@@ -7,6 +7,7 @@
 from django.utils.safestring import mark_safe
 from markdown import markdown as markdown_func
 
+from base.main import ObjectList
 from base.pagination import Pagination
 
 
@@ -35,23 +36,29 @@ def object_list(
         hits
             number of objects, total
     """
+    from cab.models import Snippet
+
     if extra_context is None:
         extra_context = {}
     queryset = queryset._clone()
     model = queryset.model
     opts = model._meta
     if paginate_by:
-        pagination = Pagination(request, model, queryset, paginate_by)
-        object_list = pagination.get_objects()
+        if queryset.model == Snippet:
+            object_list = ObjectList(request, queryset.model, queryset, 15)
+            pagination = object_list.pagination
+        else:
+            pagination = Pagination(request, model, queryset, paginate_by)
+            object_list = pagination.get_objects()
 
         context = {
-            "%s_list" % template_object_name: object_list,
+            "object_list": object_list,
             "pagination": pagination,
             "hits": pagination.result_count,
         }
     else:
         context = {
-            "%s_list" % template_object_name: object_list,
+            "object_list": queryset,
         }
         if not allow_empty and len(queryset) == 0:
             raise Http404

djangosnippets/templates/base.html

@@ -35,7 +35,7 @@
       </ul>
     </nav>
   </div></header>
-  <div id="main">
+  <div id="main" class="container mb-auto mx-auto w-7/8">
     {% block secondary_nav %}
     <nav id="subnav">
       <ul>
@@ -59,14 +59,16 @@
 
   <div id="base-container">
   <h1>{% block content_header %}{% endblock %}</h1>
-  <div id="content">
+  {% with current_url_name=request.resolver_match.url_name %}
+  <div id="content" class="{% if current_url_name == 'home' %}w-1/2{% else %}w-full md:w-3/4{% endif %}">
       {% block content %}
       {% endblock %}
   </div>
-  <div id="sidebar">
+  <div id="sidebar" class="{% if current_url_name == 'home' %}w-1/2{% else %}hidden md:block md:w-1/4{% endif %}">
     {% block sidebar %}
     {% endblock %}
   </div>
+  {% endwith %}
   {% block extra_content %}
   {% endblock %}
   </div>

djangosnippets/templates/cab/partials/most_bookmarked.html

@@ -4,32 +4,11 @@
 
 <h1>Most bookmarked snippets{% if months %} last {{ months }} months{% endif %}</h1>
 
-<div id="content">
+<div id="content" class="w-full md:w-3/4">
 
 
   {% if object_list %}
-    <table class="snippet_list">
-      <thead>
-        <tr>
-          <th>Title</th>
-          <th>Author</th>
-          <th>Tags</th>
-          <th>Publication date</th>
-          <th>Rating</th>
-        </tr>
-      </thead>
-      <tbody>
-    {% for snippet in object_list %}
-      <tr>
-        <td><a href="{{ snippet.get_absolute_url }}">{% if not snippet.title|strip %}Untitled{% else %}{{ snippet.title }}{% endif %}</a></td>
-        <td><a href="{{ snippet.author.get_absolute_url }}">{{ snippet.author.username }}</a></td>
-        <td>{% for tag in snippet.tags.all %}<a href="{% url 'cab_snippet_matches_tag' tag.slug %}">{{ tag.name }}</a> {% endfor %}</td>
-        <td>{{ snippet.pub_date }}</td>
-        <td><span class="rating-{% if snippet.rating_score >= 0 %}positive{% else %}negative{% endif %}">{% if snippet.rating_score >= 0 %}+{% endif %}{{ snippet.rating_score }}</span></td>
-      </tr>
-    {% endfor %}
-      </tbody>
-    </table>
+    {% component 'snippet_list' snippet_list=object_list / %}
     {% component "pagination" pagination_obj=pagination / %}
     <p class="count">{{ hits }} snippet{{ hits|pluralize }} posted so far.</p>
   {% else %}
@@ -38,7 +17,7 @@ <h1>Most bookmarked snippets{% if months %} last {{ months }} months{% endif %}<
 </div>
 
 
-<div id="sidebar">
+<div id="sidebar" class="hidden md:block md:w-1/4">
 <p>You're looking at the most-bookmarked snippets on the site; {% if user.is_authenticated %}you can help useful snippets show up here by clicking the "bookmark this snippet" link on their pages and ading them to <a href="{% url 'cab_user_bookmarks' %}">your bookmarks</a>{% else %}if you'd like to help useful snippets show up here, <a href="{% url 'account_login' %}">sign up for an account</a> and you'll get your own bookmarks list{% endif %}.</p>
 
   <nav class="filter">

djangosnippets/templates/cab/partials/tag_list.html

@@ -1,7 +1,7 @@
 
 {% load core_tags %}
 <h1>All tags</h1>
-<div id="content">
+<div id="content" class="w-full md:w-3/4">
   {% if object_list %}
     <ul>
     {% for tag in object_list %}

djangosnippets/templates/cab/partials/top_rated.html

@@ -4,38 +4,17 @@
 
 
 <h1>Top-rated snippets{% if months %} last {{ months }} months{% endif %}</h1>
-<div id="content">
+<div id="content" class="w-full md:w-3/4">
 {% if object_list %}
-  <table class="snippet_list">
-    <thead>
-      <tr>
-        <th>Title</th>
-        <th>Author</th>
-        <th>Tags</th>
-        <th>Publication date</th>
-        <th>Rating</th>
-      </tr>
-    </thead>
-    <tbody>
-  {% for snippet in object_list %}
-    <tr>
-      <td><a href="{{ snippet.get_absolute_url }}">{% if not snippet.title|strip %}Untitled{% else %}{{ snippet.title }}{% endif %}</a></td>
-      <td><a href="{{ snippet.author.get_absolute_url }}">{{ snippet.author.username }}</a></td>
-      <td>{% for tag in snippet.tags.all %}<a href="{% url 'cab_snippet_matches_tag' tag.slug %}">{{ tag.name }}</a> {% endfor %}</td>
-      <td>{{ snippet.pub_date }}</td>
-      <td><span class="rating-{% if snippet.rating_score >= 0 %}positive{% else %}negative{% endif %}">{% if snippet.rating_score >= 0 %}+{% endif %}{{ snippet.rating_score }}</span></td>
-    </tr>
-  {% endfor %}
-    </tbody>
-  </table>
+  {% component 'snippet_list' snippet_list=object_list / %}
   {% component "pagination" pagination_obj=pagination / %}
   <p class="count">{{ hits }} snippet{{ hits|pluralize }} posted so far.</p>
 {% else %}
   <p class="empty">No snippets posted yet.</p>
 {% endif %}
 </div>
 
-<div id="sidebar">
+<div id="sidebar" class="hidden md:block md:w-1/4">
 <p>You're looking at the top-rated snippets currently on the site; {% if user.is_authenticated %}if you'd like to contribute, just click the ratings link in the sidebar of a particular snippet's page; you can rate any snippet "useful" or "not useful"{% else %}if you'd like to contribute, <a href="{% url 'account_login' %}">sign up for an account</a> and you'll be able to rate any snippet you see{% endif %}.</p>
 
 <nav class="filter">

djangosnippets/templates/cab/snippet_list.html

@@ -8,29 +8,8 @@
 
 {% block content %}
   {% if object_list %}
-    <table class="snippet_list">
-      <thead>
-        <tr>
-          <th>Title</th>
-          <th>Author</th>
-          <th>Tags</th>
-          <th>Publication date</th>
-          <th>Rating</th>
-        </tr>
-      </thead>
-      <tbody>
-    {% for snippet in object_list %}
-      <tr>
-        <td><a href="{{ snippet.get_absolute_url }}">{% if not snippet.title|strip %}Untitled{% else %}{{ snippet.title }}{% endif %}</a></td>
-        <td><a href="{{ snippet.author.get_absolute_url }}">{{ snippet.author.username }}</a></td>
-        <td>{% for tag in snippet.tags.all %}<a href="{% url 'cab_snippet_matches_tag' tag.slug %}">{{ tag.name }}</a> {% endfor %}</td>
-        <td>{{ snippet.pub_date }}</td>
-        <td><span class="rating-{% if snippet.rating_score >= 0 %}positive{% else %}negative{% endif %}">{% if snippet.rating_score >= 0 %}+{% endif %}{{ snippet.rating_score }}</span></td>
-      </tr>
-    {% endfor %}
-      </tbody>
-    </table>
-    {% component "pagination" pagination_obj=pagination / %}
+    {% component 'snippet_list' snippet_list=object_list / %}
+    {% component 'pagination' pagination_obj=pagination / %}
     <p class="count">{{ hits }} snippet{{ hits|pluralize }} posted so far.</p>
   {% else %}
     <p class="empty">No snippets posted yet.</p>

djangosnippets/templates/cab/user_bookmarks.html

@@ -8,27 +8,7 @@
 
 {% block content %}
   {% if object_list %}
-    <table>
-      <thead>
-        <tr>
-          <th>Title</th>
-          <th>Language</th>
-          <th>Added</th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-      {% for bookmark in object_list %}
-        <tr>
-          <td><a href="{{ bookmark.snippet.get_absolute_url }}">{{ bookmark.snippet.title }}</a></td>
-          <td><a href="{% url 'cab_language_detail' slug=bookmark.snippet.language.slug %}">{{ bookmark.snippet.language.name }}</a></td>
-          <td>{{ bookmark.date|timesince }}</td>
-          <td><a href="{% url 'cab_bookmark_delete' snippet_id=bookmark.snippet.id %}">Delete this bookmark</a></td>
-        </tr>
-      {% endfor %}
-      </tbody>
-    </table>
-
+    {% component 'snippet_list' snippet_list=object_list / %}
     {% component "pagination" pagination_obj=pagination / %}
   {% else %}
     <p>You haven't bookmarked any snippets yet.</p>