From 2ff52a829c7671b340fc89c74507870ca1c4a626 Mon Sep 17 00:00:00 2001 From: Florian Aucomte Date: Tue, 28 Jan 2025 12:54:22 +0000 Subject: [PATCH] fix: Remove donate button (#2400) --- example_project/portal_test_settings.py | 1 - example_project/settings.py | 1 - portal/context_processors.py | 6 +-- portal/forms/dotmailer.py | 22 --------- portal/static/portal/js/common.js | 18 -------- .../static/portal/sass/modules/_colours.scss | 3 -- .../static/portal/sass/partials/_buttons.scss | 31 ------------- .../static/portal/sass/partials/_header.scss | 5 -- portal/templates/portal/base.html | 14 +----- .../portal/partials/donate_popup.html | 46 ------------------- portal/templates/portal/partials/header.html | 4 -- portal/tests/cypress/integration/user.spec.js | 11 +---- portal/tests/test_global_forms.py | 16 ------- portal/urls.py | 4 -- portal/views/dotmailer.py | 23 +--------- 15 files changed, 5 insertions(+), 200 deletions(-) delete mode 100644 portal/templates/portal/partials/donate_popup.html diff --git a/example_project/portal_test_settings.py b/example_project/portal_test_settings.py index a195952a7..ffcfa60e3 100644 --- a/example_project/portal_test_settings.py +++ b/example_project/portal_test_settings.py @@ -172,7 +172,6 @@ "common.context_processors.module_name", "common.context_processors.cookie_management_enabled", "portal.context_processors.process_newsletter_form", - "portal.context_processors.process_donate_form", ] }, } diff --git a/example_project/settings.py b/example_project/settings.py index 6e5d0d4f7..fc7e25902 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -130,7 +130,6 @@ "common.context_processors.module_name", "common.context_processors.cookie_management_enabled", "portal.context_processors.process_newsletter_form", - "portal.context_processors.process_donate_form", ] } } diff --git a/portal/context_processors.py b/portal/context_processors.py index 6b39fd91a..96dbefdf5 100644 --- a/portal/context_processors.py +++ b/portal/context_processors.py @@ -1,9 +1,5 @@ -from portal.forms.dotmailer import DonateForm, NewsletterForm +from portal.forms.dotmailer import NewsletterForm def process_newsletter_form(request): return {"news_form": NewsletterForm()} - - -def process_donate_form(request): - return {"donate_form": DonateForm()} diff --git a/portal/forms/dotmailer.py b/portal/forms/dotmailer.py index 56a190fd9..c669c3ff0 100644 --- a/portal/forms/dotmailer.py +++ b/portal/forms/dotmailer.py @@ -19,28 +19,6 @@ class NewsletterForm(forms.Form): ) -class DonateForm(forms.Form): - email = forms.EmailField( - label="This data will only be used for this purpose and you will be " - "able to opt out anytime. Please read our privacy notice for " - "further details.", - label_suffix="", - widget=forms.EmailInput( - attrs={ - "placeholder": "Enter your email address", - "id": "donate_email_field", - } - ), - help_text="Enter your email address", - ) - - age_verification = forms.BooleanField( - widget=forms.CheckboxInput(attrs={"id": "donate_age_verification"}), - initial=False, - required=True, - ) - - class ConsentForm(forms.Form): email = forms.EmailField( label="Email", diff --git a/portal/static/portal/js/common.js b/portal/static/portal/js/common.js index fbefdb13c..ace53422e 100644 --- a/portal/static/portal/js/common.js +++ b/portal/static/portal/js/common.js @@ -38,24 +38,6 @@ function hidePopupConfirmation() { $("#popup").find(".popup-text").remove(); } -function showDonatePopup(title, text) { - let popup = $("#donate-popup"); - popup.find(".popup-box__title").text(title); - popup.find(".popup-box__msg").append(text); - - popup.addClass("popup--fade"); -} - -function hideDonatePopup() { - $("#donate-popup").removeClass("popup--fade"); - $("#donate-popup").find(".popup-text").remove(); - $("#donate_email_field").val(""); - $('#donate_age_verification').prop("checked", false); - const donateSubmitButton = $('#confirm_donate_button'); - donateSubmitButton.addClass("disabled"); - donateSubmitButton.prop("disabled", true); -} - function showDonateConfirmation(path) { let title = "We would love to have you support our non-profit mission! ❤️"; let text = diff --git a/portal/static/portal/sass/modules/_colours.scss b/portal/static/portal/sass/modules/_colours.scss index 751094387..6a91537e4 100644 --- a/portal/static/portal/sass/modules/_colours.scss +++ b/portal/static/portal/sass/modules/_colours.scss @@ -63,9 +63,6 @@ $color-button-contained-disabled: $color-secondary-100; $color-button-outlined-border: $color-secondary-600; $color-button-outlined-border-active: $color-secondary-600; $color-button-subnav-border: white; -$color-button-pill: #86ae18; -$color-button-pill-hover: #82a210; -$color-button-pill-active: #82a210; // Old buttons $color-button-primary-action-navigation: $color-secondary; $color-button-primary-action-navigation-hover: $color-secondary; diff --git a/portal/static/portal/sass/partials/_buttons.scss b/portal/static/portal/sass/partials/_buttons.scss index 0f41549d4..0ca78bcc0 100644 --- a/portal/static/portal/sass/partials/_buttons.scss +++ b/portal/static/portal/sass/partials/_buttons.scss @@ -138,30 +138,6 @@ table { } } -/* Green button */ -.button--tertiary { - @include _padding(10px, 15px, 10px, 15px); - background: $color-button-pill; - color: $color-text-secondary; - - &:hover:not(.disabled){ - @include material-shadow(); - background: $color-button-pill-hover; - color: $color-text-secondary; - text-decoration: none; - } - - &:active:not(.disabled) { - background: $color-button-pill-active; - color: $color-text-secondary; - box-shadow: none; - } -} - -.button--pill { - @include _border-radius-all(20px); -} - .button-right-arrow { &:after { content: "\e5e1"; @@ -437,13 +413,6 @@ td .button--primary { justify-content: center; } - &.button--donate { - background: $color-button-pill; - border: 0; - color: $color-text-secondary; - justify-content: center; - } - &.button--header--login { border: 2px solid $color-secondary-600; margin: 0; diff --git a/portal/static/portal/sass/partials/_header.scss b/portal/static/portal/sass/partials/_header.scss index c99374356..a444b84ee 100644 --- a/portal/static/portal/sass/partials/_header.scss +++ b/portal/static/portal/sass/partials/_header.scss @@ -265,11 +265,6 @@ font-weight: normal; } - .button--pill:hover, - .button--pill:focus, { - font-weight: 600; - } - .button--menu--secondary { @include _padding($spacing * 3, 0px, $spacing * 3, 0px); } diff --git a/portal/templates/portal/base.html b/portal/templates/portal/base.html index afc9fa4a2..ef911891d 100644 --- a/portal/templates/portal/base.html +++ b/portal/templates/portal/base.html @@ -81,7 +81,6 @@ {% include "portal/tag_manager/tag_manager_body.html" %} {% render_block "js" %} {% include 'portal/mouseflow.html' %} - {% include "portal/partials/donate_popup.html" %}
{% block contentWrapper %}
@@ -240,25 +239,16 @@ }); {% endblock scripts %} diff --git a/portal/templates/portal/partials/donate_popup.html b/portal/templates/portal/partials/donate_popup.html deleted file mode 100644 index 867e3edda..000000000 --- a/portal/templates/portal/partials/donate_popup.html +++ /dev/null @@ -1,46 +0,0 @@ -{% load static %} -{% load app_tags %} -{# A popup with a form input for email addresses. #} - diff --git a/portal/templates/portal/partials/header.html b/portal/templates/portal/partials/header.html index 9bca048d0..2ba281754 100644 --- a/portal/templates/portal/partials/header.html +++ b/portal/templates/portal/partials/header.html @@ -57,7 +57,6 @@ Games Teaching Resources {% endif %} - {% else %} {% if user|is_independent_student %}
Independent
@@ -104,7 +103,6 @@
Teachers Students - {% endif %}
{% if user|is_logged_in %} @@ -241,8 +239,6 @@

{{ user|make_into_username }}

{% else %} Register now -
diff --git a/portal/tests/cypress/integration/user.spec.js b/portal/tests/cypress/integration/user.spec.js index 20f1af311..83d48e9c0 100644 --- a/portal/tests/cypress/integration/user.spec.js +++ b/portal/tests/cypress/integration/user.spec.js @@ -1,10 +1 @@ -/// - -describe('User', () => { - it('can open donate popup', () => { - cy.visit("/"); - cy.get('#donate').click(); - cy.get('.popup-box').should('be.visible'); - cy.get('#donate_form').should('be.visible'); - }); -}); +/// \ No newline at end of file diff --git a/portal/tests/test_global_forms.py b/portal/tests/test_global_forms.py index 84c9857e7..dc3480390 100644 --- a/portal/tests/test_global_forms.py +++ b/portal/tests/test_global_forms.py @@ -18,19 +18,3 @@ def test_newsletter_signup_fail(self): response = client.post(url, data) messages = list(response.wsgi_request._messages) assert len([m for m in messages if "error" in m.tags]) == 1 - - def test_donate_signup_successful(self): - url = reverse("process_donate_form") - client = Client() - data = {"email": "valid_email@example.com", "age_verification": "on"} - response = client.post(url, data) - messages = list(response.wsgi_request._messages) - assert len([m for m in messages if m.tags == "success"]) == 1 - - def test_donate_signup_fail(self): - url = reverse("process_donate_form") - client = Client() - data = {"email": "invalid_email", "age_verification": "on"} - response = client.post(url, data) - messages = list(response.wsgi_request._messages) - assert len([m for m in messages if "error" in m.tags]) == 1 diff --git a/portal/urls.py b/portal/urls.py index 7f944fadd..83e64b67d 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -37,7 +37,6 @@ ) from portal.views.dotmailer import ( dotmailer_consent_form, - process_donate_form, process_newsletter_form, ) from portal.views.email import verify_email @@ -279,9 +278,6 @@ process_newsletter_form, name="process_newsletter_form", ), - re_path( - r"^donate_signup/$", process_donate_form, name="process_donate_form" - ), re_path(r"^consent_form/$", dotmailer_consent_form, name="consent_form"), re_path( r"^verify_email/$", diff --git a/portal/views/dotmailer.py b/portal/views/dotmailer.py index 7261470a5..192724975 100644 --- a/portal/views/dotmailer.py +++ b/portal/views/dotmailer.py @@ -12,7 +12,7 @@ from django.urls import reverse_lazy from django.views.decorators.csrf import csrf_exempt -from portal.forms.dotmailer import NewsletterForm, DonateForm, ConsentForm +from portal.forms.dotmailer import NewsletterForm, ConsentForm @csrf_exempt @@ -40,27 +40,6 @@ def process_newsletter_form(request): return HttpResponse(status=405) -@csrf_exempt -def process_donate_form(request): - if request.method == "POST": - donate_form = DonateForm(data=request.POST) - if donate_form.is_valid(): - user_email = request.POST.get("email", "") - add_to_dotmailer("", "", user_email, address_book_ids["donors"]) - messages.success( - request, "Thank you for registering your interest! 🎉" - ) - return HttpResponseRedirect(reverse_lazy("home")) - messages.error( - request, - "Invalid email address. Please try again.", - extra_tags="sub-nav--warning", - ) - return HttpResponseRedirect(reverse_lazy("home")) - - return HttpResponse(status=405) - - def dotmailer_consent_form(request): if request.method == "POST": consent_form = ConsentForm(data=request.POST)