From 3fc9da686ca7a6c4f0bc9bcd0c276e57057369be Mon Sep 17 00:00:00 2001 From: AASG2003 Date: Tue, 10 Sep 2024 23:45:36 -0400 Subject: [PATCH] feat: :sparkles: add font field add font field in home model and imports, variables and fonts in css and templates --- home/migrations/0042_homepage_fonts.py | 19 ++++++++++ ...nts_homepage_primaryfontfamily_and_more.py | 37 +++++++++++++++++++ home/models.py | 8 ++++ home/templates/home/home_page.html | 12 +++++- website/static/2023/css/main.css | 16 ++++---- 5 files changed, 83 insertions(+), 9 deletions(-) create mode 100644 home/migrations/0042_homepage_fonts.py create mode 100644 home/migrations/0043_remove_homepage_fonts_homepage_primaryfontfamily_and_more.py diff --git a/home/migrations/0042_homepage_fonts.py b/home/migrations/0042_homepage_fonts.py new file mode 100644 index 0000000..5b0f566 --- /dev/null +++ b/home/migrations/0042_homepage_fonts.py @@ -0,0 +1,19 @@ +# Generated by Django 5.0.9 on 2024-09-08 22:45 + +import wagtail.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0041_homepage_externalraws'), + ] + + operations = [ + migrations.AddField( + model_name='homepage', + name='fonts', + field=wagtail.fields.StreamField([('fonts', 3)], blank=True, block_lookup={0: ('wagtail.blocks.CharBlock', (), {'max_length': 250, 'required': True}), 1: ('wagtail.blocks.URLBlock', (), {'required': True}), 2: ('wagtail.blocks.CharBlock', (), {'default': '#000000', 'max_length': 250, 'required': True}), 3: ('wagtail.blocks.StructBlock', [[('name', 0), ('section', 0), ('url', 1), ('font_size', 0), ('font_wight', 0), ('font_family', 0), ('font_color', 2)]], {})}), + ), + ] diff --git a/home/migrations/0043_remove_homepage_fonts_homepage_primaryfontfamily_and_more.py b/home/migrations/0043_remove_homepage_fonts_homepage_primaryfontfamily_and_more.py new file mode 100644 index 0000000..b4fd894 --- /dev/null +++ b/home/migrations/0043_remove_homepage_fonts_homepage_primaryfontfamily_and_more.py @@ -0,0 +1,37 @@ +# Generated by Django 5.0.9 on 2024-09-11 02:04 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0042_homepage_fonts'), + ] + + operations = [ + migrations.RemoveField( + model_name='homepage', + name='fonts', + ), + migrations.AddField( + model_name='homepage', + name='primaryFontFamily', + field=models.CharField(default='sans-serif', max_length=250), + ), + migrations.AddField( + model_name='homepage', + name='primaryFontURL', + field=models.URLField(blank=True, max_length=250), + ), + migrations.AddField( + model_name='homepage', + name='secondaryFontFamily', + field=models.CharField(default='sans-serif', max_length=250), + ), + migrations.AddField( + model_name='homepage', + name='secondaryFontURL', + field=models.URLField(blank=True, max_length=250), + ), + ] diff --git a/home/models.py b/home/models.py index 18ce9c4..598c05a 100644 --- a/home/models.py +++ b/home/models.py @@ -77,6 +77,10 @@ class HomePage(Page): blank=True, use_json_field=True, ) + primaryFontURL = models.URLField(max_length=250, blank=True) + primaryFontFamily= models.CharField(max_length=250, default="sans-serif") + secondaryFontURL = models.URLField(max_length=250, blank=True) + secondaryFontFamily = models.CharField(max_length=250, default="sans-serif") color_gradient_1 = models.CharField(max_length=250, blank=True, default="#FF4D79") color_gradient_2 = models.CharField(max_length=250, blank=True, default="#FF809F") color_primary = models.CharField(max_length=250, blank=True, default="#ff4a67") @@ -145,6 +149,10 @@ class HomePage(Page): FieldPanel("color_text_hero"), FieldPanel("hero_padding_left"), FieldPanel("hero_padding_right"), + FieldPanel("primaryFontURL"), + FieldPanel("primaryFontFamily"), + FieldPanel("secondaryFontURL"), + FieldPanel("secondaryFontFamily"), FieldPanel("color_gradient_1"), FieldPanel("color_gradient_2"), FieldPanel("color_primary"), diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index f4e938d..e35e339 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -20,6 +20,8 @@ --hero-padding-right: {{page.hero_padding_right}}; --footer-bg: {{page.footer_background}}; --footer-text: {{page.footer_color_text}}; + --primary-font: '{{page.primaryFontFamily}}'; + --secondary-font: {{page.secondaryFontFamily}}; } @@ -34,6 +36,15 @@ + +{%if page.value.primaryFontURL != "" %} + +{%endif%} + +{%if page.value.secondaryFontURL != "" %} + +{%endif%} +