Skip to content

Commit beab81f

Browse files
Merge pull request #22 from hotosm/feat/project-pages
individual project and individual news pages mostly complete
2 parents e1b8dc9 + 8007891 commit beab81f

File tree

63 files changed

+1400
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1400
-81
lines changed

app/news/__init__.py

Whitespace-only changes.

app/news/admin.py

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from django.contrib import admin
2+
3+
# Register your models here.

app/news/apps.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from django.apps import AppConfig
2+
3+
4+
class NewsConfig(AppConfig):
5+
default_auto_field = 'django.db.models.BigAutoField'
6+
name = 'app.news'

app/news/migrations/0001_initial.py

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 16:49
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+
initial = True
12+
13+
dependencies = [
14+
('wagtailimages', '0025_alter_image_file_alter_rendition_file'),
15+
('wagtailcore', '0089_log_entry_data_json_null_to_object'),
16+
]
17+
18+
operations = [
19+
migrations.CreateModel(
20+
name='IndividualNewsPage',
21+
fields=[
22+
('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')),
23+
('intro', wagtail.fields.RichTextField(blank=True)),
24+
('description', wagtail.fields.StreamField([('text_block', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'embed', 'code', 'blockquote']))], null=True, use_json_field=True)),
25+
('image', models.ForeignKey(blank=True, help_text='Cover image', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')),
26+
],
27+
options={
28+
'abstract': False,
29+
},
30+
bases=('wagtailcore.page',),
31+
),
32+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 16:53
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+
('news', '0001_initial'),
12+
]
13+
14+
operations = [
15+
migrations.AlterField(
16+
model_name='individualnewspage',
17+
name='description',
18+
field=wagtail.fields.StreamField([('text_block', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'embed', 'code', 'blockquote']))], blank=True, null=True, use_json_field=True),
19+
),
20+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 16:59
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('news', '0002_alter_individualnewspage_description'),
10+
]
11+
12+
operations = [
13+
migrations.RenameField(
14+
model_name='individualnewspage',
15+
old_name='description',
16+
new_name='article_body',
17+
),
18+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 17:22
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('news', '0003_rename_description_individualnewspage_article_body'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='individualnewspage',
15+
name='related_news_title',
16+
field=models.CharField(default='Related News'),
17+
),
18+
migrations.AddField(
19+
model_name='individualnewspage',
20+
name='related_projects_title',
21+
field=models.CharField(default='Related Projects'),
22+
),
23+
migrations.AddField(
24+
model_name='individualnewspage',
25+
name='view_all_news_text',
26+
field=models.CharField(default='View all News'),
27+
),
28+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 18:15
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('news', '0004_individualnewspage_related_news_title_and_more'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='individualnewspage',
15+
name='categories_title',
16+
field=models.CharField(default='Categories'),
17+
),
18+
migrations.AddField(
19+
model_name='individualnewspage',
20+
name='tags_title',
21+
field=models.CharField(default='Tags'),
22+
),
23+
]
+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 19:08
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('news', '0005_individualnewspage_categories_title_and_more'),
10+
]
11+
12+
operations = [
13+
migrations.CreateModel(
14+
name='NewsCategory',
15+
fields=[
16+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
17+
('category_name', models.CharField()),
18+
],
19+
),
20+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 19:15
2+
3+
from django.db import migrations
4+
import modelcluster.fields
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('news', '0006_newscategory'),
11+
]
12+
13+
operations = [
14+
migrations.AlterModelOptions(
15+
name='newscategory',
16+
options={'verbose_name_plural': 'News Categories'},
17+
),
18+
migrations.AddField(
19+
model_name='individualnewspage',
20+
name='categories',
21+
field=modelcluster.fields.ParentalManyToManyField(blank=True, to='news.newscategory'),
22+
),
23+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 19:52
2+
3+
from django.db import migrations
4+
import modelcluster.fields
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('projects', '0007_rename_call_to_action_link_individualprojectpage_call_to_action_link_text_and_more'),
11+
('news', '0007_alter_newscategory_options_and_more'),
12+
]
13+
14+
operations = [
15+
migrations.AddField(
16+
model_name='individualnewspage',
17+
name='related_projects',
18+
field=modelcluster.fields.ParentalManyToManyField(to='projects.individualprojectpage'),
19+
),
20+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 21:21
2+
3+
from django.db import migrations
4+
import modelcluster.fields
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('projects', '0007_rename_call_to_action_link_individualprojectpage_call_to_action_link_text_and_more'),
11+
('news', '0008_individualnewspage_related_projects'),
12+
]
13+
14+
operations = [
15+
migrations.AddField(
16+
model_name='individualnewspage',
17+
name='related_news',
18+
field=modelcluster.fields.ParentalManyToManyField(blank=True, to='news.individualnewspage'),
19+
),
20+
migrations.AlterField(
21+
model_name='individualnewspage',
22+
name='related_projects',
23+
field=modelcluster.fields.ParentalManyToManyField(blank=True, to='projects.individualprojectpage'),
24+
),
25+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 21:51
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+
('news', '0009_individualnewspage_related_news_and_more'),
12+
]
13+
14+
operations = [
15+
migrations.AddField(
16+
model_name='individualnewspage',
17+
name='test_thing',
18+
field=wagtail.fields.StreamField([('project_page', wagtail.blocks.PageChooserBlock(page_type=['projects.IndividualProjectPage']))], blank=True, null=True, use_json_field=True),
19+
),
20+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 21:57
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+
('news', '0010_individualnewspage_test_thing'),
12+
]
13+
14+
operations = [
15+
migrations.RemoveField(
16+
model_name='individualnewspage',
17+
name='test_thing',
18+
),
19+
migrations.RemoveField(
20+
model_name='individualnewspage',
21+
name='related_news',
22+
),
23+
migrations.RemoveField(
24+
model_name='individualnewspage',
25+
name='related_projects',
26+
),
27+
migrations.AddField(
28+
model_name='individualnewspage',
29+
name='related_news',
30+
field=wagtail.fields.StreamField([('news_page', wagtail.blocks.PageChooserBlock(page_type=['news.IndividualNewsPage']))], blank=True, null=True, use_json_field=True),
31+
),
32+
migrations.AddField(
33+
model_name='individualnewspage',
34+
name='related_projects',
35+
field=wagtail.fields.StreamField([('project_page', wagtail.blocks.PageChooserBlock(page_type=['projects.IndividualProjectPage']))], blank=True, null=True, use_json_field=True),
36+
),
37+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Generated by Django 4.2.7 on 2024-05-13 22:55
2+
3+
from django.db import migrations, models
4+
import django.utils.timezone
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('news', '0011_remove_individualnewspage_test_thing_and_more'),
11+
]
12+
13+
operations = [
14+
migrations.AddField(
15+
model_name='individualnewspage',
16+
name='date',
17+
field=models.DateField(default=django.utils.timezone.now, verbose_name='Post date'),
18+
preserve_default=False,
19+
),
20+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Generated by Django 4.2.7 on 2024-05-14 16:44
2+
3+
from django.db import migrations, models
4+
import django.db.models.deletion
5+
import modelcluster.contrib.taggit
6+
import modelcluster.fields
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
dependencies = [
12+
('taggit', '0005_auto_20220424_2025'),
13+
('news', '0012_individualnewspage_date'),
14+
]
15+
16+
operations = [
17+
migrations.CreateModel(
18+
name='NewsTag',
19+
fields=[
20+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21+
('content_object', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='tagged_items', to='news.individualnewspage')),
22+
('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s_items', to='taggit.tag')),
23+
],
24+
options={
25+
'abstract': False,
26+
},
27+
),
28+
migrations.AddField(
29+
model_name='individualnewspage',
30+
name='tags',
31+
field=modelcluster.contrib.taggit.ClusterTaggableManager(blank=True, help_text='A comma-separated list of tags.', through='news.NewsTag', to='taggit.Tag', verbose_name='Tags'),
32+
),
33+
]

app/news/migrations/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)