From 7151b795b9d1bd8f5225584516d00f036c392c25 Mon Sep 17 00:00:00 2001
From: joeyjurjens <joeyjurjens@gmail.com>
Date: Wed, 28 Oct 2020 23:43:50 +0100
Subject: [PATCH 1/2] Add react streamfield editor as streamfield editor

---
 coderedcms/blocks/base_blocks.py              |  3 ++-
 .../basic/project_name/settings/base.py       |  1 +
 .../sass/project_name/settings/base.py        |  1 +
 .../base_block_settings_struct.html           | 25 -------------------
 setup.py                                      |  4 ++-
 5 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 coderedcms/templates/wagtailadmin/block_forms/base_block_settings_struct.html

diff --git a/coderedcms/blocks/base_blocks.py b/coderedcms/blocks/base_blocks.py
index 065df10b..ad22ad61 100644
--- a/coderedcms/blocks/base_blocks.py
+++ b/coderedcms/blocks/base_blocks.py
@@ -162,8 +162,9 @@ class CoderedAdvSettings(blocks.StructBlock):
     )
 
     class Meta:
-        form_template = 'wagtailadmin/block_forms/base_block_settings_struct.html'
         label = _('Advanced Settings')
+        icon = "cog"
+        closed = True
 
     def __init__(self, local_blocks=None, template_choices=None, **kwargs):
         if not local_blocks:
diff --git a/coderedcms/project_template/basic/project_name/settings/base.py b/coderedcms/project_template/basic/project_name/settings/base.py
index e72782aa..3590cd05 100755
--- a/coderedcms/project_template/basic/project_name/settings/base.py
+++ b/coderedcms/project_template/basic/project_name/settings/base.py
@@ -44,6 +44,7 @@
     'wagtail.sites',
     'wagtail.users',
     'wagtail.snippets',
+    'wagtail_react_streamfield',
     'wagtail.documents',
     'wagtail.images',
     'wagtail.search',
diff --git a/coderedcms/project_template/sass/project_name/settings/base.py b/coderedcms/project_template/sass/project_name/settings/base.py
index 8a507c6a..c7e07403 100644
--- a/coderedcms/project_template/sass/project_name/settings/base.py
+++ b/coderedcms/project_template/sass/project_name/settings/base.py
@@ -43,6 +43,7 @@
     'wagtail.sites',
     'wagtail.users',
     'wagtail.snippets',
+    'wagtail_react_streamfield',
     'wagtail.documents',
     'wagtail.images',
     'wagtail.search',
diff --git a/coderedcms/templates/wagtailadmin/block_forms/base_block_settings_struct.html b/coderedcms/templates/wagtailadmin/block_forms/base_block_settings_struct.html
deleted file mode 100644
index 0c70c9af..00000000
--- a/coderedcms/templates/wagtailadmin/block_forms/base_block_settings_struct.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="tab-content">
-    <section id="content" class= " active">
-        <ul class="objects">
-            <li class="object codered-collapsible collapsed multi-field">
-                <button type="button" class="button button-small button-nostroke button-advanced-settings">
-                    <i class="icon icon-fa-cog" aria-hidden="true"></i> Advanced Settings
-                </button>
-                <fieldset style="display:none;">
-                    <legend>Advanced Settings</legend>
-                    <ul class="fields">
-                    {% for child in children.values %}
-                        <li class="char_field">
-                            {% if child.block.label %}
-                                <label{% if child.id_for_label %} for="{{ child.id_for_label }}"{% endif %}>{{ child.block.label }}</label>
-                            {% endif %}
-                            {{ child.render_form }}
-                        </li>
-                    {% endfor %}
-                    </ul>
-                </fieldset>
-            </li>
-        </ul>
-    </section>
-</div>
-
diff --git a/setup.py b/setup.py
index 2572b514..4cf8d489 100755
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,9 @@
         'wagtail==2.9.*',
         'wagtailfontawesome>=1.2.*',
         'wagtail-cache==1.*',
-        'wagtail-import-export>=0.2,<0.3'
+        'wagtail-import-export>=0.2,<0.3',
+        'wagtail-react-streamfield==1.3.6'
+
     ],
     entry_points="""
             [console_scripts]

From 27e3dae77f232462d60860f65c7474d3d34388e4 Mon Sep 17 00:00:00 2001
From: joeyjurjens <joeyjurjens@gmail.com>
Date: Thu, 29 Oct 2020 00:45:29 +0100
Subject: [PATCH 2/2] Add backwards support people that do not want to use the
 react streamfield editor.

---
 coderedcms/blocks/base_blocks.py              |  5 +++-
 .../base_block_settings_struct.html           | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 coderedcms/templates/wagtailadmin/block_forms/base_block_settings_struct.html

diff --git a/coderedcms/blocks/base_blocks.py b/coderedcms/blocks/base_blocks.py
index ad22ad61..6363ccfd 100644
--- a/coderedcms/blocks/base_blocks.py
+++ b/coderedcms/blocks/base_blocks.py
@@ -162,8 +162,11 @@ class CoderedAdvSettings(blocks.StructBlock):
     )
 
     class Meta:
+        form_template = 'wagtailadmin/block_forms/base_block_settings_struct.html'
         label = _('Advanced Settings')
-        icon = "cog"
+
+        # Specific react streamfield settings
+        icon = 'cog'
         closed = True
 
     def __init__(self, local_blocks=None, template_choices=None, **kwargs):
diff --git a/coderedcms/templates/wagtailadmin/block_forms/base_block_settings_struct.html b/coderedcms/templates/wagtailadmin/block_forms/base_block_settings_struct.html
new file mode 100644
index 00000000..9f6e6bde
--- /dev/null
+++ b/coderedcms/templates/wagtailadmin/block_forms/base_block_settings_struct.html
@@ -0,0 +1,24 @@
+<div class="tab-content">
+    <section id="content" class= " active">
+        <ul class="objects">
+            <li class="object codered-collapsible collapsed multi-field">
+                <button type="button" class="button button-small button-nostroke button-advanced-settings">
+                    <i class="icon icon-fa-cog" aria-hidden="true"></i> Advanced Settings
+                </button>
+                <fieldset style="display:none;">
+                    <legend>Advanced Settings</legend>
+                    <ul class="fields">
+                    {% for child in children.values %}
+                        <li class="char_field">
+                            {% if child.block.label %}
+                                <label{% if child.id_for_label %} for="{{ child.id_for_label }}"{% endif %}>{{ child.block.label }}</label>
+                            {% endif %}
+                            {{ child.render_form }}
+                        </li>
+                    {% endfor %}
+                    </ul>
+                </fieldset>
+            </li>
+        </ul>
+    </section>
+</div>