Merge remote-tracking branch 'origin/master' into feat/deps/344/djang…

…o-3.0
gustavwilliam · Jul 15, 2020 · dec440d · dec440d
2 parents 9208e0a + 1835332
commit dec440d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 46 deletions.
diff --git a/Pipfile b/Pipfile
@@ -5,15 +5,13 @@ verify_ssl = true
 
 [packages]
 django = "~=3.0.4"
-django-crispy-forms = "~=1.9.0"
 django-environ = "~=0.4.5"
 django-filter = "~=2.1.0"
 django-hosts = "~=4.0"
 djangorestframework = "~=3.11.0"
 djangorestframework-bulk = "~=0.2.1"
 psycopg2-binary = "~=2.8"
 django-simple-bulma = "~=1.2"
-django-crispy-bulma = {git = "https://github.com/python-discord/django-crispy-bulma.git", ref = "0.3"}
 whitenoise = "~=5.0"
 requests = "~=2.21"
 pygments = "~=2.3.1"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/pydis_site/apps/home/forms/account_deletion.py b/pydis_site/apps/home/forms/account_deletion.py
@@ -1,23 +1,9 @@
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout
 from django.forms import CharField, Form
-from django_crispy_bulma.layout import IconField, Submit
 
 
 class AccountDeletionForm(Form):
     """Account deletion form, to collect username for confirmation of removal."""
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.helper = FormHelper()
-
-        self.helper.form_method = "post"
-        self.helper.add_input(Submit("submit", "I understand, delete my account"))
-
-        self.helper.layout = Layout(
-            IconField("username", icon_prepend="user")
-        )
-
     username = CharField(
         label="Username",
         required=True

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
@@ -52,6 +52,8 @@
             'api.pythondiscord.local',
             'admin.pythondiscord.local',
             'staff.pythondiscord.local',
+            '0.0.0.0',  # noqa: S104
+            'localhost',
             'web',
             'api.web',
             'admin.web',
@@ -104,8 +106,6 @@
     'allauth.socialaccount.providers.discord',
     'allauth.socialaccount.providers.github',
 
-    'crispy_forms',
-    'django_crispy_bulma',
     'django_hosts',
     'django_filters',
     'django_nyt.apps.DjangoNytConfig',
@@ -288,7 +288,6 @@
 }
 
 # Django Messages framework config
-
 MESSAGE_TAGS = {
     messages.DEBUG: 'primary',
     messages.INFO: 'info',
@@ -297,17 +296,6 @@
     messages.ERROR: 'danger',
 }
 
-# Custom settings for Crispyforms
-CRISPY_ALLOWED_TEMPLATE_PACKS = (
-    "bootstrap",
-    "uni_form",
-    "bootstrap3",
-    "bootstrap4",
-    "bulma",
-)
-
-CRISPY_TEMPLATE_PACK = "bulma"
-
 # Custom settings for django-simple-bulma
 BULMA_SETTINGS = {
     "variables": {  # If you update these colours, please update the notification.css file

diff --git a/pydis_site/templates/home/account/delete.html b/pydis_site/templates/home/account/delete.html
@@ -1,6 +1,4 @@
 {% extends 'base/base.html' %}
-
-{% load crispy_forms_tags %}
 {% load static %}
 
 {% block title %}Delete Account{% endblock %}
@@ -36,7 +34,12 @@ <h2 class="is-size-2 has-text-centered">Account Deletion</h2>
 
       <div class="columns is-centered">
         <div class="column is-half-desktop is-full-tablet is-full-mobile">
-          {% crispy form %}
+          <form method="post">
+            {% csrf_token %}
+            <label for="id_username" class="label requiredField">Username</label>
+            <input id="id_username" class="input" type="text" required name="username">
+            <input style="margin-top: 1em;" type="submit" value="I understand, delete my account" class="button is-primary">
+          </form>
         </div>
       </div>
     </div>