Update examples (#84)

.gitignore

@@ -10,6 +10,5 @@ __pycache__/
 coverage.xml
 build/
 dist/
-site/
 src/wagtailbakery/build/
 src/wagtailbakery/tests/public/

examples/aws/example/__init__.py

@@ -1,3 +0,0 @@
-from example.celery import app as celery_app
-
-__all__ = ['celery_app']

examples/aws/example/migrations/0001_initial.py

@@ -1,61 +1,62 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2016-11-22 14:31
+# Generated by Django 4.1.7 on 2023-03-18 10:27
+
 import django.db.models.deletion
+import wagtail.blocks
+import wagtail.fields
 from django.db import migrations, models
-from wagtail import blocks, fields
 
 
 class Migration(migrations.Migration):
 
     initial = True
 
     dependencies = [
-        ('wagtailcore', '0030_index_on_pagerevision_created_at'),
+        ('wagtailcore', '0083_workflowcontenttype'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='BlogListPage',
             fields=[
-                ('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')),
-                ('body', fields.StreamField([(b'paragraph', blocks.RichTextBlock())], use_json_field=True)),
+                ('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')),
+                ('body', wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock())], use_json_field=True)),
             ],
             options={
                 'abstract': False,
             },
-            bases=('wagtailcore.page',),
+            bases=('wagtailcore.page', models.Model),
         ),
         migrations.CreateModel(
             name='BlogPostPage',
             fields=[
-                ('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')),
-                ('body', fields.StreamField([(b'paragraph', blocks.RichTextBlock())], use_json_field=True)),
+                ('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')),
+                ('body', wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock())], use_json_field=True)),
             ],
             options={
                 'abstract': False,
             },
-            bases=('wagtailcore.page',),
+            bases=('wagtailcore.page', models.Model),
         ),
         migrations.CreateModel(
             name='GenericPage',
             fields=[
-                ('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')),
-                ('body', fields.StreamField([(b'paragraph', blocks.RichTextBlock())], use_json_field=True)),
+                ('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')),
+                ('body', wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock())], use_json_field=True)),
             ],
             options={
                 'abstract': False,
             },
-            bases=('wagtailcore.page',),
+            bases=('wagtailcore.page', models.Model),
         ),
         migrations.CreateModel(
             name='HomePage',
             fields=[
-                ('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')),
-                ('body', fields.StreamField([(b'paragraph', blocks.RichTextBlock())], use_json_field=True)),
+                ('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')),
+                ('body', wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock())], use_json_field=True)),
             ],
             options={
                 'abstract': False,
             },
-            bases=('wagtailcore.page',),
+            bases=('wagtailcore.page', models.Model),
         ),
     ]

examples/aws/example/models.py

@@ -7,9 +7,12 @@
 
 
 class AbstractExamplePage(Page, AutoPublishingWagtailBakeryModel):
-    body = StreamField([
-        ('paragraph', blocks.RichTextBlock())
-    ])
+    body = StreamField(
+        [
+            ('paragraph', blocks.RichTextBlock())
+        ],
+        use_json_field=True,
+    )
 
     content_panels = [
         FieldPanel('title'),

examples/aws/example/settings.py

@@ -59,7 +59,6 @@
     'modelcluster',
     'taggit',
 
-    'djcelery',
     'bakery',
     'wagtailbakery',
 
@@ -150,9 +149,10 @@
 
 
 # Wagtail
-# http://docs.wagtail.io/en/v1.6.2/getting_started/integrating_into_django.html
+# https://docs.wagtail.org/en/stable/getting_started/integrating_into_django.html
 
 WAGTAIL_SITE_NAME = 'Example'
+WAGTAILADMIN_BASE_URL = 'http://127.0.0.1:8000'
 
 
 # Wagtail bakery
@@ -170,9 +170,3 @@
 
 AWS_ACCESS_KEY_ID = env.str('AWS_ACCESS_KEY_ID', '')
 AWS_SECRET_ACCESS_KEY = env.str('AWS_SECRET_ACCESS_KEY', '')
-
-
-# Django-celery
-# http://docs.celeryproject.org/en/latest/
-
-CELERY_ALWAYS_EAGER = True

examples/aws/example/templates/base.html

@@ -1,8 +1,9 @@
 {% load static %}
 
-<!DOCTYPE HTML>
-<html>
+<!DOCTYPE html>
+<html lang="en">
     <head>
+        <meta charset="utf-8" />
         <link rel="stylesheet" href="{% static 'example/css/main.css' %}">
         <title>{{ self.title }}</title>
     </head>