diff --git a/Makefile b/Makefile index c76eb02..dbfd489 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: help build publish -VERSION = 1.1.7 +VERSION = 1.1.8 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/migrations/0005_alter_footertext_locale.py b/base/migrations/0005_alter_footertext_locale.py new file mode 100644 index 0000000..d3eaeec --- /dev/null +++ b/base/migrations/0005_alter_footertext_locale.py @@ -0,0 +1,20 @@ +# Generated by Django 5.0.2 on 2024-10-05 19:39 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0004_alter_footertext_body'), + ('wagtailcore', '0094_alter_page_locale'), + ] + + operations = [ + migrations.AlterField( + model_name='footertext', + name='locale', + field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailcore.locale', verbose_name='locale'), + ), + ] diff --git a/base/migrations/0006_navigationsettings_bluesky_url_and_more.py b/base/migrations/0006_navigationsettings_bluesky_url_and_more.py new file mode 100644 index 0000000..edb4f3c --- /dev/null +++ b/base/migrations/0006_navigationsettings_bluesky_url_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 5.0.2 on 2024-10-05 19:50 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0005_alter_footertext_locale'), + ] + + operations = [ + migrations.AddField( + model_name='navigationsettings', + name='bluesky_url', + field=models.URLField(blank=True, verbose_name='Bluesky URL'), + ), + migrations.AddField( + model_name='navigationsettings', + name='threads_url', + field=models.URLField(blank=True, verbose_name='Threads URL'), + ), + ] diff --git a/base/models.py b/base/models.py index fd159a0..a590d8c 100644 --- a/base/models.py +++ b/base/models.py @@ -32,6 +32,8 @@ class NavigationSettings(BaseGenericSetting): linkedin_url = models.URLField(verbose_name="LinkedIn URL", blank=True) github_url = models.URLField(verbose_name="GitHub URL", blank=True) mastodon_url = models.URLField(verbose_name="Mastodon URL", blank=True) + bluesky_url = models.URLField(verbose_name="Bluesky URL", blank=True) + threads_url = models.URLField(verbose_name="Threads URL", blank=True) panels = [ MultiFieldPanel( @@ -39,6 +41,8 @@ class NavigationSettings(BaseGenericSetting): FieldPanel("linkedin_url"), FieldPanel("github_url"), FieldPanel("mastodon_url"), + FieldPanel("bluesky_url"), + FieldPanel("threads_url"), ], "Social settings", ) diff --git a/iamkonstantin_web/templates/includes/footer.html b/iamkonstantin_web/templates/includes/footer.html index da51d72..5ea9029 100644 --- a/iamkonstantin_web/templates/includes/footer.html +++ b/iamkonstantin_web/templates/includes/footer.html @@ -1,12 +1,13 @@ {% load navigation_tags %} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 71bfd81..a373c2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Django>=4.2,<5.1 -wagtail>=6.2,<6.3 +wagtail>=6.2.2,<6.3 whitenoise>=6.6,<7.0 wagtailcodeblock>=1.29.0.2,<2.0 django-tailwind>=3.6.0 diff --git a/theme/static/images/threads-logo-black-01.png b/theme/static/images/threads-logo-black-01.png new file mode 100644 index 0000000..edac6a4 Binary files /dev/null and b/theme/static/images/threads-logo-black-01.png differ diff --git a/theme/static/images/threads-logo-white-01.png b/theme/static/images/threads-logo-white-01.png new file mode 100644 index 0000000..b286681 Binary files /dev/null and b/theme/static/images/threads-logo-white-01.png differ