From 5fb0fcd629f936d91439d2ac4491eb32430569de Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Tue, 14 Jun 2022 21:53:31 +0100
Subject: [PATCH] Make navbar dynamic

This also adds some caching to them for performance reasons
---
 templates/base.html                           | 11 ++++++++---
 .../common/templates/common}/footer.html      |  4 +++-
 .../common/templates/common}/navbar.html      | 18 +++++++++++-------
 website/common/templatetags/footer_tags.py    | 12 ++++++++++++
 website/common/templatetags/navbar_tags.py    | 19 +++++++++++++++++++
 website/settings.py                           |  3 +++
 6 files changed, 56 insertions(+), 11 deletions(-)
 rename {templates => website/common/templates/common}/footer.html (67%)
 rename {templates => website/common/templates/common}/navbar.html (60%)
 create mode 100644 website/common/templatetags/footer_tags.py
 create mode 100644 website/common/templatetags/navbar_tags.py
diff --git a/templates/base.html b/templates/base.html
index d0bd299..282a55a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,4 +1,4 @@
-{% load static wagtailcore_tags wagtailuserbar %}
+{% load static wagtailcore_tags wagtailuserbar navbar_tags footer_tags cache %}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -23,13 +23,18 @@
   <body class="{% block body_class %}{% endblock %}">
     {% wagtailuserbar %}
 
-    {% include "navbar.html" %}
+    {% cache 3600 "navbar" page %}
+      {% navbar page %}
+    {% endcache %}
 
     <main>
       {% block content %}{% endblock %}
     </main>
 
-    {% include "footer.html" %}
+    {% cache 3600 "footer" %}
+      {% footer %}
+    {% endcache %}
+
 
     <script async defer type="text/javascript" src="{% static 'js/base.js' %}"></script>
 
diff --git a/templates/footer.html b/website/common/templates/common/footer.html
similarity index 67%
rename from templates/footer.html
rename to website/common/templates/common/footer.html
index 413b10c..7b0f885 100644
--- a/templates/footer.html
+++ b/website/common/templates/common/footer.html
@@ -1,7 +1,9 @@
+{% load wagtailcore_tags %}
+
 <footer class="footer">
   <div class="has-text-centered">
     <p>
-      &copy; <a href="/">TheOrangeOne</a> {% now "Y" %}
+      &copy; <a href="{% pageurl homepage %}">TheOrangeOne</a> {% now "Y" %}
     </p>
   </div>
   <div class="has-text-centered is-size-7" id="to-top">
diff --git a/templates/navbar.html b/website/common/templates/common/navbar.html
similarity index 60%
rename from templates/navbar.html
rename to website/common/templates/common/navbar.html
index 08b730d..4de57af 100644
--- a/templates/navbar.html
+++ b/website/common/templates/common/navbar.html
@@ -1,7 +1,9 @@
-<nav class="navbar has-background-black has-text-white is-family-code" role="navigation" aria-label="main navigation">
+{% load wagtailcore_tags %}
+
+<nav class="navbar has-background-black has-text-white" role="navigation" aria-label="main navigation">
   <div class="navbar-brand">
-    <a class="navbar-item" href="/">
-      <img src="">
+    <a class="navbar-item has-text-white is-family-code" href="{% pageurl homepage %}">
+      /home/theorangeone
     </a>
 
     <a role="button" class="navbar-burger" id="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbar">
@@ -11,11 +13,13 @@
     </a>
   </div>
 
-  <div id="navbar" class="navbar-menu has-background-black">
+  <div id="navbar" class="navbar-menu has-background-black is-family-code">
     <div class="navbar-start">
-      <a class="navbar-item has-text-white">
-        Posts
-      </a>
+      {% for nav_page in nav_pages %}
+        <a class="navbar-item has-text-grey" href="{% pageurl nav_page %}">
+          ~/{{ nav_page.slug }}
+        </a>
+      {% endfor %}
     </div>
 
     <div class="navbar-end is-hidden-touch mr-2">
diff --git a/website/common/templatetags/footer_tags.py b/website/common/templatetags/footer_tags.py
new file mode 100644
index 0000000..b50f0de
--- /dev/null
+++ b/website/common/templatetags/footer_tags.py
@@ -0,0 +1,12 @@
+from django.template import Library
+
+from website.home.models import HomePage
+
+register = Library()
+
+
+@register.inclusion_tag("common/footer.html")
+def footer() -> dict:
+    return {
+        "homepage": HomePage.objects.live().get(),
+    }
diff --git a/website/common/templatetags/navbar_tags.py b/website/common/templatetags/navbar_tags.py
new file mode 100644
index 0000000..15a4c5a
--- /dev/null
+++ b/website/common/templatetags/navbar_tags.py
@@ -0,0 +1,19 @@
+from django.template import Library
+from wagtail.models import Page
+
+from website.home.models import HomePage
+
+register = Library()
+
+
+@register.inclusion_tag("common/navbar.html")
+def navbar(current_page: Page) -> dict:
+    homepage = HomePage.objects.live().get()
+    return {
+        "current_page": current_page,
+        "homepage": homepage,
+        "nav_pages": homepage.get_children()
+        .live()
+        .filter(show_in_menus=True)
+        .order_by("title"),
+    }
diff --git a/website/settings.py b/website/settings.py
index 3a6fe6f..af338c6 100644
--- a/website/settings.py
+++ b/website/settings.py
@@ -81,6 +81,9 @@ WSGI_APPLICATION = "website.wsgi.application"
 
 DATABASES = {"default": env.db(default=f"sqlite:///{BASE_DIR}/db.sqlite3")}
 
+CACHES = {"default": env.cache(default="dummycache://")}
+
+
 # Internationalization
 # https://docs.djangoproject.com/en/4.0/topics/i18n/
 
