diff --git a/.gitignore b/.gitignore index 1f30251..8833c3d 100644 --- a/.gitignore +++ b/.gitignore @@ -165,4 +165,7 @@ cython_debug/ # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ -.env.production \ No newline at end of file +.env.production + +media/images/ +media/original_images/ \ No newline at end of file diff --git a/Makefile b/Makefile index 9fc9251..bf0f14d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: help build publish -VERSION = 1.5.0 +VERSION = 1.7.0 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}' diff --git a/base/blocks.py b/base/blocks.py index a109031..aef8178 100644 --- a/base/blocks.py +++ b/base/blocks.py @@ -1,3 +1,4 @@ +from wagtail.api import APIField from wagtail.blocks import ( CharBlock, ChoiceBlock, @@ -14,6 +15,13 @@ class ImageBlock(StructBlock): caption = CharBlock(required=False) attribution = CharBlock(required=False) + api_fields = [ + APIField('image'), + # Adds a URL to a rendered thumbnail of the image to the API + APIField('caption'), + APIField('attribution'), + ] + class Meta: icon = "image" template = "base/blocks/image_block.html" diff --git a/blog/models.py b/blog/models.py index 64ad0d5..54357fa 100644 --- a/blog/models.py +++ b/blog/models.py @@ -6,6 +6,7 @@ from modelcluster.fields import ParentalKey, ParentalManyToManyField from modelcluster.contrib.taggit import ClusterTaggableManager from taggit.models import TaggedItemBase from wagtail.api import APIField +from wagtail.images.api.fields import ImageRenditionField from wagtail.models import Page, Orderable from wagtail.fields import RichTextField, StreamField @@ -78,6 +79,7 @@ class BlogPage(SeoMixin, Page): # Export fields over the API api_fields = [ APIField('gallery_images'), + # Adds a URL to a rendered thumbnail of the image to the API APIField('body'), APIField('intro'), APIField('tags'), diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 161686a..fb01ee1 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -9,13 +9,13 @@ >
- Drawing of my computer desk where we see a computer with an open Terminal + Hero image +
+ Drawing of my computer desk where we see a computer with an open Terminal with Elixir code snippets. On the shelf behind we can see programming books for Rust, Elixir and JavaScript. The books are arranges vertically next to a small flower pot. The flower has big green leaves. A cup of - steaming coffee sits on the desk, to the left of the computer. The cup has a Python logo on it. - </figcaption> - <img src= + steaming coffee sits on the desk, to the left of the computer. The cup has a Python logo on it." />

Hi! I'm Konstantin + alt="waving hand emoji" + src="static/images/waving-hand-sign_1f44b.png" />Hi! I'm Konstantin

@@ -50,7 +50,7 @@ diff --git a/iamkonstantin_web/settings/base.py b/iamkonstantin_web/settings/base.py index d3cff38..a978cde 100644 --- a/iamkonstantin_web/settings/base.py +++ b/iamkonstantin_web/settings/base.py @@ -152,7 +152,7 @@ WAGTAIL_CONTENT_LANGUAGES = LANGUAGES = [ ('nl', "Dutch"), ] -WAGTAILSIMPLETRANSLATION_SYNC_PAGE_TREE = True +WAGTAILSIMPLETRANSLATION_SYNC_PAGE_TREE = False # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/5.0/howto/static-files/ diff --git a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.2e16d0ba.fill-160x100.png b/media/images/097d70b8f56ef0dbeaefd4a981ccc510.2e16d0ba.fill-160x100.png deleted file mode 100644 index 53861fa..0000000 Binary files a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.2e16d0ba.fill-160x100.png and /dev/null differ diff --git a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.2e16d0ba.fill-320x240.png b/media/images/097d70b8f56ef0dbeaefd4a981ccc510.2e16d0ba.fill-320x240.png deleted file mode 100644 index a695f88..0000000 Binary files a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.2e16d0ba.fill-320x240.png and /dev/null differ diff --git a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.max-165x165.png b/media/images/097d70b8f56ef0dbeaefd4a981ccc510.max-165x165.png deleted file mode 100644 index 5723675..0000000 Binary files a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.max-165x165.png and /dev/null differ diff --git a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.width-1600.png b/media/images/097d70b8f56ef0dbeaefd4a981ccc510.width-1600.png deleted file mode 100644 index ae99c41..0000000 Binary files a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.width-1600.png and /dev/null differ diff --git a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.width-400.png b/media/images/097d70b8f56ef0dbeaefd4a981ccc510.width-400.png deleted file mode 100644 index 0586455..0000000 Binary files a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.width-400.png and /dev/null differ diff --git a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.width-800.png b/media/images/097d70b8f56ef0dbeaefd4a981ccc510.width-800.png deleted file mode 100644 index c79bb07..0000000 Binary files a/media/images/097d70b8f56ef0dbeaefd4a981ccc510.width-800.png and /dev/null differ diff --git a/media/images/_508d3ac3-6905-4b23-b662-a3604050a.2e16d0ba.fill-168x168.jpg b/media/images/_508d3ac3-6905-4b23-b662-a3604050a.2e16d0ba.fill-168x168.jpg deleted file mode 100644 index 9bcd145..0000000 Binary files a/media/images/_508d3ac3-6905-4b23-b662-a3604050a.2e16d0ba.fill-168x168.jpg and /dev/null differ diff --git a/media/images/_508d3ac3-6905-4b23-b662-a3604050ac8.2e16d0ba.fill-28x28.jpg b/media/images/_508d3ac3-6905-4b23-b662-a3604050ac8.2e16d0ba.fill-28x28.jpg deleted file mode 100644 index 896ff85..0000000 Binary files a/media/images/_508d3ac3-6905-4b23-b662-a3604050ac8.2e16d0ba.fill-28x28.jpg and /dev/null differ diff --git a/media/images/_508d3ac3-6905-4b23-b662-a3604050ac8.2e16d0ba.fill-40x60.jpg b/media/images/_508d3ac3-6905-4b23-b662-a3604050ac8.2e16d0ba.fill-40x60.jpg deleted file mode 100644 index ba35712..0000000 Binary files a/media/images/_508d3ac3-6905-4b23-b662-a3604050ac8.2e16d0ba.fill-40x60.jpg and /dev/null differ diff --git a/media/images/_508d3ac3-6905-4b23-b662-a3604050ac8.2e16d0ba.fill-64x64.jpg b/media/images/_508d3ac3-6905-4b23-b662-a3604050ac8.2e16d0ba.fill-64x64.jpg deleted file mode 100644 index 21e5798..0000000 Binary files a/media/images/_508d3ac3-6905-4b23-b662-a3604050ac8.2e16d0ba.fill-64x64.jpg and /dev/null differ diff --git a/media/images/_508d3ac3-6905-4b23-b662-a3604050ac80.max-165x165.jpg b/media/images/_508d3ac3-6905-4b23-b662-a3604050ac80.max-165x165.jpg deleted file mode 100644 index d363d9c..0000000 Binary files a/media/images/_508d3ac3-6905-4b23-b662-a3604050ac80.max-165x165.jpg and /dev/null differ diff --git a/media/images/_508d3ac3-6905-4b23-b662-a3604050ac80.width-28.jpg b/media/images/_508d3ac3-6905-4b23-b662-a3604050ac80.width-28.jpg deleted file mode 100644 index 896ff85..0000000 Binary files a/media/images/_508d3ac3-6905-4b23-b662-a3604050ac80.width-28.jpg and /dev/null differ diff --git a/media/images/moon_and_planets_design.2e16d0ba.fill-320x240.jpg b/media/images/moon_and_planets_design.2e16d0ba.fill-320x240.jpg deleted file mode 100644 index 87942ed..0000000 Binary files a/media/images/moon_and_planets_design.2e16d0ba.fill-320x240.jpg and /dev/null differ diff --git a/media/images/moon_and_planets_design.2e16d0ba.fill-600x338.jpg b/media/images/moon_and_planets_design.2e16d0ba.fill-600x338.jpg deleted file mode 100644 index 9f8798a..0000000 Binary files a/media/images/moon_and_planets_design.2e16d0ba.fill-600x338.jpg and /dev/null differ diff --git a/media/images/moon_and_planets_design.max-165x165.jpg b/media/images/moon_and_planets_design.max-165x165.jpg deleted file mode 100644 index c290590..0000000 Binary files a/media/images/moon_and_planets_design.max-165x165.jpg and /dev/null differ diff --git a/media/images/moon_and_planets_design.original.jpg b/media/images/moon_and_planets_design.original.jpg deleted file mode 100644 index 074d2c1..0000000 Binary files a/media/images/moon_and_planets_design.original.jpg and /dev/null differ diff --git a/media/images/pexels-life-of-pix-8892.2e16d0ba.fill-480x320.jpg b/media/images/pexels-life-of-pix-8892.2e16d0ba.fill-480x320.jpg deleted file mode 100644 index 7af1a8c..0000000 Binary files a/media/images/pexels-life-of-pix-8892.2e16d0ba.fill-480x320.jpg and /dev/null differ diff --git a/media/images/pexels-life-of-pix-8892.max-165x165.jpg b/media/images/pexels-life-of-pix-8892.max-165x165.jpg deleted file mode 100644 index d5d8705..0000000 Binary files a/media/images/pexels-life-of-pix-8892.max-165x165.jpg and /dev/null differ diff --git a/media/images/pexels-life-of-pix-8892.max-800x600.jpg b/media/images/pexels-life-of-pix-8892.max-800x600.jpg deleted file mode 100644 index 9128c36..0000000 Binary files a/media/images/pexels-life-of-pix-8892.max-800x600.jpg and /dev/null differ diff --git a/media/images/pexels-life-of-pix-8892.width-800.jpg b/media/images/pexels-life-of-pix-8892.width-800.jpg deleted file mode 100644 index 9128c36..0000000 Binary files a/media/images/pexels-life-of-pix-8892.width-800.jpg and /dev/null differ diff --git a/media/original_images/097d70b8f56ef0dbeaefd4a981ccc510.png b/media/original_images/097d70b8f56ef0dbeaefd4a981ccc510.png deleted file mode 100644 index eb1805b..0000000 Binary files a/media/original_images/097d70b8f56ef0dbeaefd4a981ccc510.png and /dev/null differ diff --git a/media/original_images/_508d3ac3-6905-4b23-b662-a3604050ac80.jpeg b/media/original_images/_508d3ac3-6905-4b23-b662-a3604050ac80.jpeg deleted file mode 100644 index 94a9f3a..0000000 Binary files a/media/original_images/_508d3ac3-6905-4b23-b662-a3604050ac80.jpeg and /dev/null differ diff --git a/media/original_images/moon_and_planets_design.jpeg b/media/original_images/moon_and_planets_design.jpeg deleted file mode 100644 index d0c1440..0000000 Binary files a/media/original_images/moon_and_planets_design.jpeg and /dev/null differ diff --git a/media/original_images/pexels-life-of-pix-8892.jpg b/media/original_images/pexels-life-of-pix-8892.jpg deleted file mode 100644 index 22e38e6..0000000 Binary files a/media/original_images/pexels-life-of-pix-8892.jpg and /dev/null differ diff --git a/newsletter/templates/newsletter/snippets/signup_form.html b/newsletter/templates/newsletter/snippets/signup_form.html index 500fc82..1b44eb3 100644 --- a/newsletter/templates/newsletter/snippets/signup_form.html +++ b/newsletter/templates/newsletter/snippets/signup_form.html @@ -1,4 +1,4 @@
- +
\ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 04fcbe1..2f1f0bf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ wagtail>=6.3.1,<6.4 whitenoise>=6.6,<7.0 wagtailcodeblock>=1.29.0.2,<2.0 django-tailwind>=3.6.0 -django-browser-reload>=1.12 +django-browser-reload>=1.17 Wand==0.6.13 wagtail-seo==2.5.0 \ No newline at end of file