Skip to content

Commit a3856c9

Browse files
luminaryFlowersluminaryFlowers
authored
Merge pull request #25 from hotosm/feat/ind-impact-area-page
individual impact area page should be ready to go
2 parents 131414f + c69f50c commit a3856c9

25 files changed

+390
-25
lines changed

‎app/impact_areas/migrations/0011_individualimpactareapage.py

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Generated by Django 4.2.7 on 2024-05-23 19:31
2+
3+
from django.db import migrations, models
4+
import django.db.models.deletion
5+
import wagtail.blocks
6+
import wagtail.fields
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
dependencies = [
12+
('wagtailimages', '0025_alter_image_file_alter_rendition_file'),
13+
('wagtailcore', '0089_log_entry_data_json_null_to_object'),
14+
('impact_areas', '0010_alter_impactareaspage_impact_area_blocks'),
15+
]
16+
17+
operations = [
18+
migrations.CreateModel(
19+
name='IndividualImpactAreaPage',
20+
fields=[
21+
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
22+
('header_text', wagtail.fields.RichTextField(blank=True)),
23+
('intro', wagtail.fields.RichTextField(blank=True)),
24+
('description', wagtail.fields.RichTextField(blank=True)),
25+
('use_cases_title', models.CharField(default='Use Cases')),
26+
('use_cases', wagtail.fields.StreamField([('blocks', wagtail.blocks.StructBlock([('description', wagtail.blocks.RichTextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_url', wagtail.blocks.URLBlock(blank=True))]))], blank=True, null=True, use_json_field=True)),
27+
('projects_title', models.CharField(default='Projects')),
28+
('view_all_projects_text', models.CharField(default='View all projects')),
29+
('view_all_projects_link', models.URLField(blank=True)),
30+
('load_more_projects_text', models.CharField(blank=True)),
31+
('explore_impact_areas_text', models.CharField(default='Explore Other Impact Areas')),
32+
('red_dogear_box_title', models.CharField(blank=True)),
33+
('red_dogear_box_link_text', models.CharField(blank=True)),
34+
('red_dogear_box_link_url', models.URLField(blank=True)),
35+
('black_dogear_box_title', models.CharField(blank=True)),
36+
('black_dogear_box_link_text', models.CharField(blank=True)),
37+
('black_dogear_box_link_url', models.URLField(blank=True)),
38+
('header_image', models.ForeignKey(blank=True, help_text='Header image', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')),
39+
('intro_image', models.ForeignKey(blank=True, help_text='Intro image', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')),
40+
],
41+
options={
42+
'abstract': False,
43+
},
44+
bases=('wagtailcore.page',),
45+
),
46+
]

‎app/impact_areas/migrations/0012_alter_individualimpactareapage_use_cases.py

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Generated by Django 4.2.7 on 2024-05-23 20:38
2+
3+
from django.db import migrations
4+
import wagtail.blocks
5+
import wagtail.fields
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('impact_areas', '0011_individualimpactareapage'),
12+
]
13+
14+
operations = [
15+
migrations.AlterField(
16+
model_name='individualimpactareapage',
17+
name='use_cases',
18+
field=wagtail.fields.StreamField([('blocks', wagtail.blocks.StructBlock([('description', wagtail.blocks.RichTextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_url', wagtail.blocks.URLBlock(blank=True, null=True))]))], blank=True, null=True, use_json_field=True),
19+
),
20+
]

‎app/impact_areas/migrations/0013_individualimpactareapage_external_icon_and_more.py

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Generated by Django 4.2.7 on 2024-05-23 21:58
2+
3+
from django.db import migrations, models
4+
import django.db.models.deletion
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('wagtailimages', '0025_alter_image_file_alter_rendition_file'),
11+
('impact_areas', '0012_alter_individualimpactareapage_use_cases'),
12+
]
13+
14+
operations = [
15+
migrations.AddField(
16+
model_name='individualimpactareapage',
17+
name='external_icon',
18+
field=models.ForeignKey(blank=True, help_text='The icon representing this page which is shown for previews of this page on other pages.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image'),
19+
),
20+
migrations.AlterField(
21+
model_name='individualimpactareapage',
22+
name='load_more_projects_text',
23+
field=models.CharField(default='Load More Projects'),
24+
),
25+
]

‎app/impact_areas/models.py

+121-2
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,140 @@
11
from django.db import models
2+
from django.db.models import Q
3+
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
24

35
from wagtail.models import Page
46
from wagtail.fields import RichTextField, StreamField
57
from wagtail.blocks import StreamBlock, CharBlock, URLBlock, RichTextBlock, StructBlock
68
from wagtail.images.blocks import ImageChooserBlock
79
from wagtail.admin.panels import FieldPanel, MultiFieldPanel
810

11+
from app.projects.models import IndividualProjectPage
912

10-
class IndividualBlock(StructBlock):
13+
14+
class UseCaseStructBlock(StructBlock):
15+
description = RichTextBlock()
16+
link_text = CharBlock()
17+
link_url = URLBlock(blank=True, null=True)
18+
19+
20+
class UseCaseBlock(StreamBlock):
21+
blocks = UseCaseStructBlock()
22+
23+
24+
class IndividualImpactAreaPage(Page):
25+
def get_context(self, request, *args, **kwargs):
26+
context = super().get_context(request, *args, **kwargs)
27+
28+
projects_list = IndividualProjectPage.objects.live().filter(
29+
Q(impact_area_list__contains=[{'type': 'impact_area', 'value': context['page'].id}])
30+
)
31+
# print(IndividualProjectPage.objects.first().impact_area_list[0].value.id)
32+
# print(context['page'].id)
33+
# print(IndividualProjectPage.objects.first().impact_area_list.__contains__([{'value__id': context['page'].id}]))
34+
# print(dir(IndividualProjectPage.objects.first().impact_area_list))
35+
page = request.GET.get('page', 1)
36+
paginator = Paginator(projects_list, 4)
37+
try:
38+
projects = paginator.page(page)
39+
except PageNotAnInteger:
40+
projects = paginator.page(1)
41+
except EmptyPage:
42+
projects = paginator.page(paginator.num_pages)
43+
44+
context['projects'] = projects
45+
other_impact_areas = IndividualImpactAreaPage.objects.live()
46+
context['other_impact_areas'] = other_impact_areas
47+
return context
48+
49+
header_image = models.ForeignKey(
50+
"wagtailimages.Image",
51+
null=True,
52+
blank=True,
53+
on_delete=models.SET_NULL,
54+
related_name="+",
55+
help_text="Header image"
56+
)
57+
header_text = RichTextField(blank=True)
58+
59+
external_icon = models.ForeignKey(
60+
"wagtailimages.Image",
61+
null=True,
62+
blank=True,
63+
on_delete=models.SET_NULL,
64+
related_name="+",
65+
help_text="The icon representing this page which is shown for previews of this page on other pages."
66+
)
67+
intro_image = models.ForeignKey(
68+
"wagtailimages.Image",
69+
null=True,
70+
blank=True,
71+
on_delete=models.SET_NULL,
72+
related_name="+",
73+
help_text="Intro image"
74+
)
75+
intro = RichTextField(blank=True)
76+
description = RichTextField(blank=True)
77+
78+
use_cases_title = models.CharField(default="Use Cases")
79+
use_cases = StreamField(UseCaseBlock(), use_json_field=True, blank=True, null=True)
80+
81+
projects_title = models.CharField(default="Projects")
82+
view_all_projects_text = models.CharField(default="View all projects")
83+
view_all_projects_link = models.URLField(blank=True)
84+
load_more_projects_text = models.CharField(default="Load More Projects")
85+
86+
explore_impact_areas_text = models.CharField(default="Explore Other Impact Areas")
87+
88+
red_dogear_box_title = models.CharField(blank=True)
89+
red_dogear_box_link_text = models.CharField(blank=True)
90+
red_dogear_box_link_url = models.URLField(blank=True)
91+
92+
black_dogear_box_title = models.CharField(blank=True)
93+
black_dogear_box_link_text = models.CharField(blank=True)
94+
black_dogear_box_link_url = models.URLField(blank=True)
95+
96+
content_panels = Page.content_panels + [
97+
MultiFieldPanel([
98+
FieldPanel('header_image'),
99+
FieldPanel('header_text'),
100+
], heading="Header"),
101+
MultiFieldPanel([
102+
FieldPanel('external_icon'),
103+
FieldPanel('intro_image'),
104+
FieldPanel('intro'),
105+
FieldPanel('description'),
106+
], heading="Body"),
107+
MultiFieldPanel([
108+
FieldPanel('use_cases_title'),
109+
FieldPanel('use_cases'),
110+
], heading="Use Cases"),
111+
MultiFieldPanel([
112+
FieldPanel('projects_title'),
113+
FieldPanel('view_all_projects_text'),
114+
FieldPanel('view_all_projects_link'),
115+
FieldPanel('load_more_projects_text'),
116+
], heading="Projects"),
117+
FieldPanel('explore_impact_areas_text'),
118+
MultiFieldPanel([
119+
FieldPanel('red_dogear_box_title'),
120+
FieldPanel('red_dogear_box_link_text'),
121+
FieldPanel('red_dogear_box_link_url'),
122+
FieldPanel('black_dogear_box_title'),
123+
FieldPanel('black_dogear_box_link_text'),
124+
FieldPanel('black_dogear_box_link_url'),
125+
], heading="Dogear Boxes"),
126+
]
127+
128+
129+
class ImpactAreaStructBlock(StructBlock):
11130
image = ImageChooserBlock()
12131
title = CharBlock()
13132
description = RichTextBlock()
14133
link = URLBlock(required=False)
15134

16135

17136
class ImpactAreaBlock(StreamBlock):
18-
impact_area_block = IndividualBlock()
137+
impact_area_block = ImpactAreaStructBlock()
19138

20139

21140
class ImpactAreasPage(Page):

‎app/impact_areas/templates/impact_areas/components/UseCaseBox.html

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<div class="bg-hot-off-white p-4 flex flex-col">
2+
<h1 class="text-hot-red text-h4 font-bold">
3+
{{ number }}.
4+
</h1>
5+
<div class="my-2">
6+
{{ body }}
7+
</div>
8+
<a href={{ linkurl }} class="text-hot-red mt-auto font-medium py-2">
9+
<p>
10+
{{ linktext }}
11+
{% include "ui/components/icon_svgs/LinkCaret.html" %}
12+
</p>
13+
</a>
14+
</div>

‎app/impact_areas/templates/impact_areas/individual_impact_area_page.html

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
{% extends "base.html" %}
2+
{% load static %}
3+
{% load wagtailcore_tags %}
4+
{% load wagtailimages_tags %}
5+
{% load compress %}
6+
{% block body_class %}template-individualmappinghubpage{% endblock %}
7+
{% block extra_css %}
8+
{% compress css %}
9+
{% endcompress css %}
10+
{% endblock extra_css %}
11+
12+
{% block content %}
13+
{% include "ui/components/PageHeaderWithBlur.html" with title=page.title subtitle=page.header_text image=page.header_image full_length=True %}
14+
15+
<div class="max-w-7xl mx-auto mb-20">
16+
<div class="px-8 my-10">
17+
{% comment %} MAIN BODY {% endcomment %}
18+
<div class="grid grid-cols-1 lg:grid-cols-2 gap-x-10">
19+
<div class="base-article-m [&_p:first-child]:mt-0 lg:order-2">
20+
<div class="text-intro font-medium">
21+
{{ page.intro|safe }}
22+
</div>
23+
{{ page.description|safe }}
24+
</div>
25+
{% image page.intro_image original class="pb-8 lg:order-1" %}
26+
</div>
27+
28+
{% comment %} USE CASES {% endcomment %}
29+
{% include "ui/components/SectionHeadingWithUnderline.html" with title=page.use_cases_title %}
30+
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-8 my-10">
31+
{% for case in page.use_cases %}
32+
{% include "./components/UseCaseBox.html" with number=forloop.counter body=case.value.description linktext=case.value.link_text linkurl=case.value.link_url %}
33+
{% endfor %}
34+
</div>
35+
36+
{% comment %} PROJECTS {% endcomment %}
37+
<div class="my-20">
38+
<div class="grid grid-cols-1 md:grid-cols-2 gap-y-4">
39+
<div>
40+
{% include "ui/components/SectionHeadingWithUnderline.html" with title=page.projects_title %}
41+
</div>
42+
<p class="md:text-right">
43+
{% include "ui/components/BaseLink.html" with linktext=page.view_all_projects_text linkurl=page.view_all_projects_link %}
44+
</p>
45+
</div>
46+
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-x-8 mt-10" id="projects-list">
47+
{% for project in projects %}
48+
{% include "ui/components/projects/ProjectPreviewBlockNews.html" with project=project showimage=True %}
49+
{% endfor %}
50+
</div>
51+
<p class="text-center mt-10" id="next-project" class="{% if not projects.has_next %}hidden{% endif %}">
52+
{% if projects.has_next %}
53+
{% comment %} <a href="?page={{ projects.next_page_number }}"></a> {% endcomment %}
54+
<button hx-get="?page={{ projects.next_page_number }}"
55+
hx-trigger="click"
56+
hx-select="#projects-list, #next-project"
57+
hx-swap="beforeend"
58+
hx-select-oob="#projects-list:beforeend, #next-project:outerHTML"
59+
>
60+
<span class="border-b-hot-red border-b-2 pb-1 font-medium mr-4 text-intro">
61+
Load More Projects
62+
</span>
63+
{% include "ui/components/icon_svgs/LinkCaret.html" with class="rotate-90 text-hot-red" %}
64+
</button>
65+
{% endif %}
66+
</p>
67+
</div>
68+
69+
{% comment %} OTHER IMPACT AREAS {% endcomment %}
70+
<div class="my-20">
71+
<h1 class="text-h2 font-bold">
72+
{{ page.explore_impact_areas_text }}
73+
</h1>
74+
<div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-6 mt-10">
75+
{% for area in other_impact_areas %}
76+
{% if area != page %}
77+
<a href="{{ area.url }}" class="rounded-2xl shadow-md">
78+
<div class="bg-hot-off-white p-6 text-center font-medium text-intro h-full">
79+
{% image area.external_icon fill-200x200 class="px-10" %}
80+
<p>
81+
{{ area.title }}
82+
</p>
83+
</div>
84+
</a>
85+
{% endif %}
86+
{% endfor %}
87+
</div>
88+
</div>
89+
90+
91+
{% comment %} DOGEAR BOXES {% endcomment %}
92+
<div class="grid grid-cols-1 md:grid-cols-2 text-white my-10 gap-8">
93+
<div>
94+
{% include "ui/components/dogear_boxes/DogearRed.html" with title=page.red_dogear_box_title linktext=page.red_dogear_box_link_text linkurl=page.red_dogear_box_link_url %}
95+
</div>
96+
<div>
97+
{% include "ui/components/dogear_boxes/DogearBlack.html" with title=page.black_dogear_box_title linktext=page.black_dogear_box_link_text linkurl=page.black_dogear_box_link_url %}
98+
</div>
99+
</div>
100+
</div>
101+
</div>
102+
{% endblock %}

‎app/impact_areas/views.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from django.shortcuts import render
22

3-
# Create your views here.
3+
from projects.models import IndividualProjectPage

‎app/news/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class IndividualNewsPage(Page):
5151

5252
article_body = StreamField([
5353
('text_block', RichTextBlock(features=[
54-
'h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'embed', 'code', 'blockquote'
54+
'h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote'
5555
]))
5656
], use_json_field=True, null=True, blank=True)
5757

‎app/programs/templates/programs/individual_program_page.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
<div class="max-w-7xl mx-auto">
1616
<div class="grid grid-cols-1 lg:grid-cols-2 p-10 gap-x-10">
17-
{% image page.intro_image original class="pb-8" %}
18-
<div class="base-article-m [&_p:first-child]:mt-0">
17+
<div class="base-article-m [&_p:first-child]:mt-0 lg:order-2">
1918
<div class="text-intro font-medium">
2019
{{ page.intro|safe }}
2120
</div>
2221
{{ page.description|safe }}
2322
</div>
23+
{% image page.intro_image original class="pb-8 lg:order-1" %}
2424
</div>
2525

2626
<h1 class="text-h2 px-10 font-bold">

0 commit comments

Comments
 (0)