Display categories for links. Move admin area, tidy up filter

digitaloxford · Aug 19, 2024 · d101117 · d101117
1 parent 1e7f9aa
commit d101117
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 6 deletions.
diff --git a/digitaloxford/scss/custom/_custom.scss b/digitaloxford/scss/custom/_custom.scss
@@ -573,7 +573,7 @@ ul.filter-list {
 ul.links {
     display: flex;
     flex-direction: column;
-    gap: ms(2);
+    gap: ms(3);
 
     & .link {
         & h2 {
@@ -592,6 +592,26 @@ ul.links {
                 flex: 0 0 100px;
             }
         }
+
+        & .details *:last-child {
+            margin-bottom: ms(-1);
+        }
+
+        & .categories {
+            border-top: 1px solid $light-grey;
+            display: flex;
+            flex-direction: row;
+            flex-wrap: wrap;
+            column-gap: ms(-1);
+            font-size: ms(0);
+
+            & h3 {
+                margin: 0 0 0 0;
+                padding: 0 0 0 0;
+                font-size: ms(0);
+                font-weight: bold;
+            }
+        }
     }
 }
 

diff --git a/digitaloxford/scss/custom/_utilities.scss b/digitaloxford/scss/custom/_utilities.scss
@@ -0,0 +1,25 @@
+/* Utilities */
+.container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+}
+
+.full-bleed {
+    width: 100vw;
+    margin-left: calc(50% - 50vw);
+}
+
+.list-reset {
+    margin: 0 0 0 0;
+    padding: 0 0 0 0;
+    list-style-type: none;
+}
+
+.list-inline {
+    display: flex;
+    flex-direction: row;
+    column-gap: ms(-1)
+}
diff --git a/digitaloxford/scss/main.scss b/digitaloxford/scss/main.scss
@@ -4,6 +4,9 @@
 // Normalise
 @import "base/normalize";
 
+// Utilities
+@import "custom/utilities";
+
 // Layout/branding/etc
 @import "custom/variables";
 @import "custom/custom";
diff --git a/digitaloxford/templates/links/link_index_page.html b/digitaloxford/templates/links/link_index_page.html
@@ -41,6 +41,17 @@ <h2><a href="{{ link.link }}">{{ link.title }}</a></h2>
                                 <blockquote>{{ link.testimonial }}</blockquote>
                             {% endif %}
                         </div>
+                        {% if link.categories %}
+                            <div class="categories">
+                                <h3>Categories:</h3>
+                                <ul class="list-reset list-inline">
+                                    {% for category in link.prefetched_categories %}
+                                        <li><a href="{{ page.url }}?category={{ category.link_category.slug }}">{{ category.link_category.name }}</a></li>
+                                    {% endfor %}
+                                </ul>
+                            </div>
+                        {% endif %}
+
                     </li>
                 {% endfor %}
             </ul>

diff --git a/digitaloxford/urls.py b/digitaloxford/urls.py
@@ -10,8 +10,8 @@
 from search import views as search_views
 
 urlpatterns = [
-    path("django-admin/", admin.site.urls),
-    path("admin/", include(wagtailadmin_urls)),
+    path("django-spires/", admin.site.urls),
+    path("spires/", include(wagtailadmin_urls)),
     path("documents/", include(wagtaildocs_urls)),
     path("search/", search_views.search, name="search"),
     path("robots.txt", RobotsView.as_view()),

diff --git a/links/filters.py b/links/filters.py
@@ -15,7 +15,7 @@
 
 
 class LinkFilter(django_filters.FilterSet):
-    categories = django_filters.ChoiceFilter(
+    category = django_filters.ChoiceFilter(
         label="Category",
         field_name="categories__link_category__slug",
         empty_label="-- All --",
@@ -26,4 +26,4 @@ class LinkFilter(django_filters.FilterSet):
 
     class Meta:
         model = LinkPage
-        fields = ["categories"]
+        fields = ["category"]
diff --git a/links/models.py b/links/models.py
@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.db import models
+from django.db.models import Prefetch
 from django.shortcuts import render
 from django.utils.functional import cached_property
 from modelcluster.contrib.taggit import ClusterTaggableManager
@@ -41,7 +42,13 @@ def get_context(self, request, *args, **kwargs):
         # TODO: I could just define the filter in models.py
         from .filters import LinkFilter
 
-        links_list = LinkPage.objects.descendant_of(self).live().order_by("title")
+        links_list = LinkPage.objects.descendant_of(self).live().order_by("title").prefetch_related(
+            Prefetch(
+                'categories',
+                queryset=LinkPageCategory.objects.select_related('link_category'),
+                to_attr='prefetched_categories'
+            )
+        )
 
         queryset = links_list
         link_page_filter = LinkFilter(request.GET, queryset=queryset)