diff --git a/Makefile b/Makefile index 9fc9251..fbdb3f1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: help build publish -VERSION = 1.5.0 +VERSION = 1.4.1 help: @perl -nle'print $& if m{^[a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' @@ -8,8 +8,7 @@ build: @docker build -t code.headbright.be/konstantin/iamkonstantin:$(VERSION) . publish: - # something to try: --provenance=false - @docker buildx build -t code.headbright.be/konstantin/iamkonstantin:$(VERSION) --platform linux/arm64 --push . + @docker image push code.headbright.be/konstantin/iamkonstantin:$(VERSION) bump: @bash ./bump_version.sh upgrade: build publish \ No newline at end of file diff --git a/blog/templates/blog/blog_index_page.html b/blog/templates/blog/blog_index_page.html index da226bd..fd44827 100644 --- a/blog/templates/blog/blog_index_page.html +++ b/blog/templates/blog/blog_index_page.html @@ -15,54 +15,55 @@
{% for post in blogpages %} {% with post=post.specific %} -
-
-

- - - {{ post.title }} - -

-

{{ post.intro }}

-
- {% if post.main_image %} -
- {% with post.main_image as main_image %} - {% if main_image %} - {% image main_image width-1600 class="blog" %}{% endif %} - {% endwith %} -
-
- {% endif %} -
-
- -
- - {% with tags=post.tags.all %} - {% if tags %} -
-

Tags

-
    - {% for tag in tags %} -
  • 🏷️ - {{ tag }} -
    • - {% endfor %} -
-
- {% endif %} +
+
+

+ + + {{ post.title }} + +

+

{{ post.intro }}

+
+ {% if post.main_image %} +
+ {% with post.main_image as main_image %} + {% if main_image %} + {% image main_image width-1600 class="blog" %}{% endif %} {% endwith %} +
+ {% endif %} +
+
+ +
+ + {% with tags=post.tags.all %} + {% if tags %} +
+

Tags

+
    + {% for tag in tags %} +
  • 🏷️ + {{ tag }} +
    • + {% endfor %} +
+
+ {% endif %} + {% endwith %} +
+
{% endwith %} {% endfor %} - +
- + {% endblock %} \ No newline at end of file diff --git a/home/models.py b/home/models.py index 140aece..34d4bb1 100644 --- a/home/models.py +++ b/home/models.py @@ -4,8 +4,6 @@ from wagtail.models import Page from wagtail.fields import RichTextField, StreamField from wagtail.admin.panels import FieldPanel, MultiFieldPanel from wagtailseo.models import SeoMixin, SeoType - -from blog.models import BlogPage from .blocks import HomeContentBlock @@ -59,10 +57,3 @@ class HomePage(SeoMixin, Page): promote_panels = SeoMixin.seo_panels seo_content_type = SeoType.WEBSITE - - def get_context(self, request, *args, **kwargs): - context = super().get_context(request) - # retrieve the last 3 blogposts - recent_blog_items = BlogPage.objects.live().order_by('-first_published_at')[:3] - context['recent_blog_items'] = recent_blog_items - return context \ No newline at end of file diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 161686a..a0ff15c 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -5,7 +5,7 @@ {% block content %}
@@ -45,36 +45,6 @@ -
-

From the blog

-
    - {% for post in recent_blog_items %} - {% with post=post.specific %} -
    -
    -

    - - - {{ post.title }} - -

    -

    {{ post.intro }}

    -
    - {% if post.main_image %} -
    - {% with post.main_image as main_image %} - {% if main_image %} - {% image main_image width-1600 class="blog" %}{% endif %} - {% endwith %} -
    -
    - {% endif %} -
    - {% endwith %} - {% endfor %} -
-
-
{{ page.body }}