Added recaptcha to formpage (#493)

* Rename extra css to extra head

* Install wagtail recaptcha

* added recaptcha to form page

* added missing migration

* small fixes

requirements.txt

@@ -31,3 +31,6 @@ wagtailmedia==0.6.0
 django-instagram==0.3.2
 
 djangorestframework==3.12.1
+
+# Recaptcha for wagtail form pages
+wagtail-django-recaptcha==1.0

src/home/migrations/0047_auto_20201023_1815.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.13 on 2020-10-23 16:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0046_auto_20201023_1650'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='formpage',
+            name='use_recaptcha',
+            field=models.BooleanField(default=False, verbose_name='Use Recaptcha'),
+        ),
+    ]

src/home/models/form_page.py

@@ -9,12 +9,17 @@
 from blocks.models import WAGTAIL_STATIC_BLOCKTYPES
 from utils.translation import TranslatedField
 from involvement.blocks import ContactCardBlock
+from wagtailcaptcha.models import WagtailCaptchaEmailForm
 
 
-class FormPage(AbstractEmailForm):
+class FormPage(WagtailCaptchaEmailForm):
 
     title_sv = models.CharField(max_length=255)
     translated_title = TranslatedField('title', 'title_sv')
+    use_recaptcha = models.BooleanField(
+        default=False,
+        verbose_name=_("Use Recaptcha"),
+    )
 
     intro_en = StreamField(
         WAGTAIL_STATIC_BLOCKTYPES + [
@@ -84,10 +89,16 @@ class FormPage(AbstractEmailForm):
         StreamFieldPanel('thank_you_text_sv'),
     ]
 
+    custom_settings_panel = Page.settings_panels + [
+        MultiFieldPanel([
+            FieldPanel('use_recaptcha'),
+        ],  'Recaptcha')
+    ]
+
     edit_handler = TabbedInterface([
         ObjectList(general_panels, heading=_('General')),
         ObjectList(content_panels_en, heading=_('English')),
         ObjectList(content_panels_sv, heading=_('Swedish')),
         ObjectList(Page.promote_panels, heading=_('Promote')),
-        ObjectList(Page.settings_panels, heading=_('Settings')),
+        ObjectList(custom_settings_panel, heading=_('Settings')),
     ])

src/home/templates/home/contact_page.html

@@ -1,7 +1,7 @@
 {% extends "page.html" %}
 {% load i18n involvement_tags wagtailcore_tags %}
 
-{% block extra_css %}
+{% block extra_head %}
     {{ block.super }}
     <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" integrity="sha512-wcw6ts8Anuw10Mzh9Ytw4pylW8+NAD4ch3lqm9lzAsTxg0GFeJgoAtxuCLREZSC5lUXdVyo/7yfsqFjQ4S+aKw==" crossorigin=""/>
 {% endblock %}
@@ -62,4 +62,4 @@ <h2>{% trans 'our team'|title %}</h2>
             {% endfor %}
         </div>
     </div>
-{% endblock %}
+{% endblock %}

src/home/templates/home/form_page.html

@@ -10,7 +10,11 @@
                 <form action="{% pageurl page %}" method="POST">
                     {% csrf_token %}
                     {% for field in form %}
-                        {% materialize_field field %}
+                        {% if field.id_for_label != 'id_wagtailcaptcha' %}
+                            {% materialize_field field %}
+                        {% elif page.use_recaptcha %}
+                            {{field}}
+                        {% endif %}
                     {% endfor %}
                     <button id="submit" type="submit" class="btn btn-inverse">{% trans 'send' %}</button>
                 </form>

src/involvement/templates/involvement/admin/position_appointment.html

@@ -1,7 +1,7 @@
 {% extends "modeladmin/create.html" %}
 {% load i18n %}
 
-{% block extra_css %}
+{% block extra_head %}
 {{ block.super }}
 <style>
 .field-content {
@@ -89,4 +89,4 @@ <h2>{% trans 'manual appointment' %}</h2>
             <span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em>
         </button>
     </div>
-{% endblock %}
+{% endblock %}

src/involvement/templates/involvement/admin/position_approval.html

@@ -1,7 +1,7 @@
 {% extends "modeladmin/create.html" %}
 {% load i18n %}
 
-{% block extra_css %}
+{% block extra_head %}
 {{ block.super }}
 <style>
 .field-content {
@@ -74,4 +74,4 @@ <h2>{{ form.instance.applicant }}</h2>
             <span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em>
         </button>
     </div>
-{% endblock %}
+{% endblock %}

src/members/templates/wagtailusers/users/create.html

@@ -51,7 +51,7 @@
     </form>
 {% endblock %}
 
-{% block extra_css %}
+{% block extra_head %}
     {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
     {{ form.media.css }}
@@ -60,4 +60,4 @@
     {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
     {{ form.media.js }}
-{% endblock %}
+{% endblock %}

src/members/templates/wagtailusers/users/edit.html

@@ -71,7 +71,7 @@
     </form>
 {% endblock %}
 
-{% block extra_css %}
+{% block extra_head %}
     {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
     {{ form.media.css }}

src/moore/settings/base.py

@@ -64,6 +64,8 @@
     'wagtailfontawesome',
     'django_instagram',
     'rest_framework',
+    'wagtailcaptcha',
+    'captcha',
 
     'django.contrib.admin',  # Used for wagtail admin filters
     'django.contrib.auth',
@@ -225,3 +227,5 @@
         'rest_framework.renderers.JSONRenderer',
     ]
 }
+
+SILENCED_SYSTEM_CHECKS = ['captcha.recaptcha_test_key_error']

src/moore/settings/production.py

@@ -116,6 +116,9 @@
 # Google API
 GOOGLE_API_KEY = os.environ.get('GOOGLE_API_KEY')
 
+RECAPTCHA_PUBLIC_KEY = os.environ.get("RECAPTCHA_PUBLIC_KEY", "ss")
+RECAPTCHA_PRIVATE_KEY = os.environ.get("RECAPTCHA_PRIVATE_KEY", "ss")
+
 try:
     from .local import *
 except ImportError:

src/moore/templates/skeleton.html

@@ -24,8 +24,8 @@
         <link href="{% static 'sass/noyce.scss' %}" rel="stylesheet" type="text/x-scss" id="css-primary">
     {% endcompress %}
 
-    {% block extra_css %}
-        {# Override this in templates to add extra stylesheets #}
+    {% block extra_head %}
+        {# Override this in templates to add extra things in head tag #}
     {% endblock %}
 </head>
 
@@ -49,4 +49,4 @@
 {% endblock %}
 </body>
 
-</html>
+</html>