fix: Remove donate button

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",
             ]
         },
     }

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",
             ]
         }
     }

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()}

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",

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 =

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;

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;

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);
     }

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" %}
         <div class="content-footer-wrapper">
             {% block contentWrapper %}
                 <div {% block pageID %}id="contentWrapper"{% endblock %}>
@@ -240,25 +239,16 @@
     });
             </script>
             <script>
-    // disable newsletter signup and donate buttons by default
+    // disable newsletter signup button by default
     const newsletterSubmitButton = $('#submit_newsletter');
     newsletterSubmitButton.addClass("disabled");
     newsletterSubmitButton.prop("disabled", true);
 
-    const donateSubmitButton = $('#confirm_donate_button');
-    donateSubmitButton.addClass("disabled");
-    donateSubmitButton.prop("disabled", true);
-
-    // enable them or disable them depending on age verification checkbox
+    // enable them or disable it depending on age verification checkbox
     $('#id_age_verification').on("click", function() {
         newsletterSubmitButton.prop("disabled", !this.checked);
         newsletterSubmitButton.toggleClass("disabled", !this.checked);
     });
-
-    $('#donate_age_verification').on("click", function() {
-        donateSubmitButton.prop("disabled", !this.checked);
-        donateSubmitButton.toggleClass("disabled", !this.checked);
-    })
             </script>
         {% endblock scripts %}
     </body>

portal/templates/portal/partials/header.html

@@ -57,7 +57,6 @@
                     <a class="button--menu button--menu--secondary button--menu--disabled">Games</a>
                     <a class="button--menu button--menu--secondary button--menu--disabled">Teaching Resources</a>
                 {% endif %}
-            <button onclick="showDonateConfirmation()" class="button--menu button--pill button--tertiary">Donate</button>
             {% else %}
                 {% if user|is_independent_student %}
                     <div class="menu--title">Independent</div>
@@ -104,7 +103,6 @@
             <div class="menu__left-side col-md-5">
                 <a href="{% url 'teach' %}" class="button--menu button--menu--primary button--menu--enabled">Teachers</a>
                 <a href="{% url 'play' %}" class="button--menu button--menu--primary  button--menu--enabled">Students</a>
-                <button id="donate" onclick="showDonateConfirmation()" class="button--menu button--pill button--tertiary">Donate</button>
         {% endif %}
         </div>
         {% if user|is_logged_in %}
@@ -241,8 +239,6 @@ <h1>{{ user|make_into_username }}</h1>
         {% else %}
             <a class="button button--menu__item button--register"
               href="{% url 'register' %}">Register now</a>
-            <button onclick="showDonateConfirmation()"
-                    class="button--menu__item button--donate">Donate</button>
             <button class="button--menu__item button--menu__item--sub-header login"
                     data-toggle="collapse" data-target="#login-tabs">Log in</button>
             <div id="login-tabs" class="collapse">

portal/tests/cypress/integration/user.spec.js

@@ -1,10 +1 @@
-/// <reference types="cypress" />
-
-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');
-  });
-});
+/// <reference types="cypress" />

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": "[email protected]", "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

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/$",

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)