Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
37e28d5
feat: :sparkles: add past events section
AASG2003 Sep 4, 2024
b698e59
style: :lipstick: correct the style of past-events
AASG2003 Sep 5, 2024
58c41c6
feat: :sparkles: add color picker panel
AASG2003 Sep 5, 2024
66d623e
feat(home): add metatags og and twitter
GutberBG Sep 9, 2024
3fc9da6
feat: :sparkles: add font field
AASG2003 Sep 11, 2024
051fbec
Merge pull request #14 from python-la-paz/feature/12_public_images
jevillanueva Sep 20, 2024
3c1a8e4
Merge branch 'master' into feature/2-add-color-picker
AASG2003 Sep 26, 2024
d8288d7
Merge pull request #11 from python-la-paz/feature/9-add-metatags
jevillanueva Sep 26, 2024
8de0d0b
Merge pull request #16 from python-la-paz/feature/2-add-color-picker
jevillanueva Sep 26, 2024
4f6846b
Merge branch 'master' into feature/10-add-font-type-field
AASG2003 Oct 1, 2024
1bdc008
Merge branch 'develop' into feature/10-add-font-type-field
jevillanueva Oct 1, 2024
b3ac80e
Merge pull request #18 from python-la-paz/feature/10-add-font-type-field
jevillanueva Oct 1, 2024
e77bcdd
fix(segments): :bug: Fix preview segment panels to admin panel
jevillanueva Oct 1, 2024
820feb6
Merge pull request #19 from python-la-paz/fix/17_bloques_segmentos_pr…
jevillanueva Oct 1, 2024
b1ee0d3
fix: :bug: Correct default values in models
AASG2003 Oct 2, 2024
b092d80
style: :lipstick: Correct alignment of past-events on footer
AASG2003 Oct 2, 2024
348cda6
Merge branch 'master' into feature/3-past-events-footer
AASG2003 Oct 2, 2024
8af389b
Merge pull request #22 from python-la-paz/feature/2-add-color-picker
jevillanueva Oct 2, 2024
9d37ace
Merge pull request #23 from python-la-paz/feature/3-past-events-footer
jevillanueva Oct 2, 2024
da2cdf4
fix(home): :bug: Fix Show descendants in bottom menu
jevillanueva Oct 3, 2024
ac485e1
refactor: :recycle: Sort Code in Models
jevillanueva Oct 3, 2024
8cf87d9
Merge pull request #24 from python-la-paz/fix/7_add_descendants
taicoding Oct 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions home/migrations/0042_alter_homepage_background_section_and_more.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Generated by Django 5.0.9 on 2024-10-02 01:43

import wagtail_color_panel.fields
from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('home', '0041_homepage_externalraws'),
]

operations = [
migrations.AlterField(
model_name='homepage',
name='background_section',
field=wagtail_color_panel.fields.ColorField(blank=True, default='#FFFFFF', max_length=250),
),
migrations.AlterField(
model_name='homepage',
name='color_gradient_1',
field=wagtail_color_panel.fields.ColorField(blank=True, default='#FF4D79', max_length=250),
),
migrations.AlterField(
model_name='homepage',
name='color_gradient_2',
field=wagtail_color_panel.fields.ColorField(blank=True, default='#FF809F', max_length=250),
),
migrations.AlterField(
model_name='homepage',
name='color_primary',
field=wagtail_color_panel.fields.ColorField(blank=True, default='#ff4a67', max_length=250),
),
migrations.AlterField(
model_name='homepage',
name='color_text_hero',
field=wagtail_color_panel.fields.ColorField(blank=True, default='#FFFFFF', max_length=250),
),
migrations.AlterField(
model_name='homepage',
name='color_text_section',
field=wagtail_color_panel.fields.ColorField(blank=True, default='#FFFFFF', max_length=250),
),
migrations.AlterField(
model_name='homepage',
name='navbar_background',
field=wagtail_color_panel.fields.ColorField(blank=True, default='#000000', max_length=250),
),
migrations.AlterField(
model_name='homepage',
name='navbar_links_color',
field=wagtail_color_panel.fields.ColorField(blank=True, default='#FFFFFF', max_length=250),
),
migrations.AlterField(
model_name='segmentpage',
name='background_section',
field=wagtail_color_panel.fields.ColorField(blank=True, default='#FFFFFF', max_length=250),
),
migrations.AlterField(
model_name='segmentpage',
name='color_text_section',
field=wagtail_color_panel.fields.ColorField(blank=True, default='#000000', max_length=250),
),
]
19 changes: 19 additions & 0 deletions home/migrations/0042_homepage_fonts.py
Original file line number Diff line number Diff line change
@@ -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)]], {})}),
),
]
Original file line number Diff line number Diff line change
@@ -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),
),
]
125 changes: 81 additions & 44 deletions home/models.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from django.db import models
from wagtail.fields import RichTextField, StreamField
from wagtail.models import Page
from wagtail.admin.panels import FieldPanel
from wagtail import blocks
from wagtail.admin.panels import FieldPanel
from wagtail.fields import RichTextField, StreamField
from wagtail.images.blocks import ImageChooserBlock
from wagtail.models import Page
from wagtail_color_panel.edit_handlers import NativeColorPanel
from wagtail_color_panel.fields import ColorField


class HomePage(Page):
Expand Down Expand Up @@ -47,7 +49,9 @@ class HomePage(Page):
on_delete=models.SET_NULL,
related_name="+",
)
hero_image_overlay_opacity = models.DecimalField(default=0.70, decimal_places=2, max_digits=3)
hero_image_overlay_opacity = models.DecimalField(
default=0.70, decimal_places=2, max_digits=3
)
hero_padding_left = models.CharField(max_length=250, default="20px")
hero_padding_right = models.CharField(max_length=250, default="20px")
footer_title = models.CharField(max_length=250, blank=True)
Expand Down Expand Up @@ -77,41 +81,54 @@ class HomePage(Page):
blank=True,
use_json_field=True,
)
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")
color_text_hero = models.CharField(max_length=250, blank=True, default="#FFFFFF")

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 = ColorField(max_length=250, blank=True, default="#FF4D79")
color_gradient_2 = ColorField(max_length=250, blank=True, default="#FF809F")
color_primary = ColorField(max_length=250, blank=True, default="#ff4a67")
color_text_hero = ColorField(max_length=250, blank=True, default="#FFFFFF")

show_time = models.BooleanField(default=True)
background_section = models.CharField(max_length=250, blank=True, default="#FFFFFF")
color_text_section = models.CharField(max_length=250, blank=True, default="white")
navbar_background = models.CharField(max_length=250, default="transparent")
navbar_links_color = models.CharField(max_length=250,default="white")
message_show_time = models.CharField(max_length=250, blank=True, default="Próximamente...")
background_section = ColorField(max_length=250, blank=True, default="#FFFFFF")
color_text_section = ColorField(max_length=250, blank=True, default="#FFFFFF")
navbar_background = ColorField(max_length=250, blank=True, default="#000000")
navbar_links_color = ColorField(max_length=250, blank=True, default="#FFFFFF")
message_show_time = models.CharField(
max_length=250, blank=True, default="Próximamente..."
)
menu_links = StreamField(
[
(
"menu_links",
blocks.StructBlock(
[
("text", blocks.CharBlock(max_length=250, required=True)),
("url",blocks.CharBlock(max_length=250, required=True, default="#")),
]
),
[
(
"menu_links",
blocks.StructBlock(
[
("text", blocks.CharBlock(max_length=250, required=True)),
(
"url",
blocks.CharBlock(
max_length=250, required=True, default="#"
),
),
]
),
],
blank=True,
use_json_field=True,
)
),
],
blank=True,
use_json_field=True,
)
favicon = models.ForeignKey(
"wagtailimages.Image",
null=True,
blank=True,
on_delete=models.SET_NULL,
related_name="+",
help_text="max size 256x256 png format"
help_text="max size 256x256 png format",
)
footer_background = models.CharField(max_length=250, blank=True, default="#161E26")
footer_color_text = models.CharField(max_length=250, blank=True, default="#9e9e9e")
footer_color_text = models.CharField(max_length=250, blank=True, default="#9e9e9e")
externalRaws = StreamField(
[
(
Expand All @@ -129,8 +146,8 @@ class HomePage(Page):
content_panels = Page.content_panels + [
FieldPanel("event"),
FieldPanel("favicon"),
FieldPanel("navbar_background"),
FieldPanel("navbar_links_color"),
NativeColorPanel("navbar_background"),
NativeColorPanel("navbar_links_color"),
FieldPanel("position_event"),
FieldPanel("about"),
FieldPanel("location"),
Expand All @@ -142,30 +159,40 @@ class HomePage(Page):
FieldPanel("logo_image_big"),
FieldPanel("hero_image"),
FieldPanel("hero_image_overlay_opacity"),
FieldPanel("color_text_hero"),
NativeColorPanel("color_text_hero"),
FieldPanel("hero_padding_left"),
FieldPanel("hero_padding_right"),
FieldPanel("color_gradient_1"),
FieldPanel("color_gradient_2"),
FieldPanel("color_primary"),
FieldPanel("primaryFontURL"),
FieldPanel("primaryFontFamily"),
FieldPanel("secondaryFontURL"),
FieldPanel("secondaryFontFamily"),
NativeColorPanel("color_gradient_1"),
NativeColorPanel("color_gradient_2"),
NativeColorPanel("color_primary"),
FieldPanel("show_time"),
FieldPanel("background_section"),
FieldPanel("color_text_section"),
NativeColorPanel("background_section"),
NativeColorPanel("color_text_section"),
FieldPanel("message_show_time"),
FieldPanel("menu_links"),
FieldPanel("footer_title"),
FieldPanel("footer_site_info"),
FieldPanel("footer_networks"),
FieldPanel("footer_background"),
FieldPanel("footer_color_text"),
NativeColorPanel("color_gradient_1"),
NativeColorPanel("footer_background"),
NativeColorPanel("footer_color_text"),
FieldPanel("externalRaws"),
]

def get_context(self, request):
# Update context to include only published posts, ordered by reverse-chron
context = super().get_context(request)
segments = SegmentPage.objects.child_of(self).live().order_by("order")
context["segments"] = segments # sorted (segments, key=lambda x: x.order)
context["exist_descendants"] = [
descendant
for descendant in self.get_descendants()
if descendant.live and descendant.content_type == self.content_type
]
return context


Expand All @@ -188,6 +215,7 @@ class SponsorBlock(blocks.StructBlock):
)
url = blocks.URLBlock(required=False)


class TiersBlock(blocks.StructBlock):
classname = blocks.CharBlock(required=False)
name = blocks.CharBlock()
Expand All @@ -200,6 +228,7 @@ class TiersBlock(blocks.StructBlock):
url_text = blocks.CharBlock(required=False, default="Buy now")
bg_color = blocks.CharBlock(required=False, default="#fff")


class ScheduleDetailBlock(blocks.StructBlock):
menu_title = blocks.CharBlock()
menu_subtitle = blocks.CharBlock(default="Workshop")
Expand All @@ -210,15 +239,17 @@ class ScheduleDetailBlock(blocks.StructBlock):
location = blocks.CharBlock(required=False)
image = ImageChooserBlock(required=False)


class ScheduleBlock(blocks.StructBlock):
name = blocks.CharBlock()
detail = blocks.CharBlock()
schedule_details = blocks.ListBlock(ScheduleDetailBlock(required=False))


class SegmentPage(Page):
order = models.IntegerField(default=0)
background_section = models.CharField(max_length=250, blank=True, default="#FFFFFF")
color_text_section = models.CharField(max_length=250, blank=True, default="black")
background_section = ColorField(max_length=250, blank=True, default="#FFFFFF")
color_text_section = ColorField(max_length=250, blank=True, default="#000000")
segments = StreamField(
[
# detail segment
Expand Down Expand Up @@ -253,7 +284,8 @@ class SegmentPage(Page):
),
),
(
"list_style",blocks.BooleanBlock(required=False, default=False),
"list_style",
blocks.BooleanBlock(required=False, default=False),
),
]
),
Expand Down Expand Up @@ -363,7 +395,12 @@ class SegmentPage(Page):

content_panels = Page.content_panels + [
FieldPanel("order"),
FieldPanel("background_section"),
FieldPanel("color_text_section"),
NativeColorPanel("color_text_section"),
FieldPanel("segments"),
NativeColorPanel("background_section"),
]

def get_context(self, request):
context = super().get_context(request)
context["parent"] = self.get_parent().specific
return context
Loading