codeforlife-portal 7.3.8__py2.py3-none-any.whl → 7.4.0__py2.py3-none-any.whl

portal/static/portal/sass/modules/_colours.scss

@@ -63,6 +63,9 @@ $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/modules/_levels.scss

@@ -1,4 +1,4 @@
 $hover-content-level: 100;
 $nav-bar-level: 1001;
-$popup-overlay-level: 300;
+$popup-overlay-level: 1100;
 $behind-content-level: -100;

portal/static/portal/sass/modules/_mixins.scss

@@ -55,6 +55,11 @@
     calculate-rem($radius-bottom-left);
 }
 
+@mixin _border-radius-all($radius) {
+  border-radius: calculate-rem($radius) calculate-rem($radius)
+    calculate-rem($radius) calculate-rem($radius);
+}
+
 @mixin _box-shadow($h-offset, $v-offset, $blur, $spread, $color) {
   box-shadow: calculate-rem($h-offset) calculate-rem($v-offset)
     calculate-rem($blur) calculate-rem($spread) $color;

portal/static/portal/sass/partials/_buttons.scss

@@ -89,7 +89,6 @@ table {
     color: $color-text-primary;
     box-shadow: none;
   }
-
 }
 
 /* Outlined button */
@@ -139,6 +138,30 @@ 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";
@@ -172,8 +195,6 @@ table {
 }
 
 .button--menu {
-  background-color: transparent;
-  border-radius: 0;
   text-decoration: none;
 }
 
@@ -416,6 +437,13 @@ 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

@@ -260,13 +260,14 @@
     width: 100%;
     z-index: $nav-bar-level;
 
-    .button--menu {
-      border-radius: 0;
+    .button--menu:hover,
+    .button--menu:focus, {
+      font-weight: normal;
+    }
 
-      &:hover,
-      &:focus {
-        font-weight: normal;
-      }
+    .button--pill:hover,
+    .button--pill:focus, {
+      font-weight: 600;
     }
 
     .button--menu--secondary {

portal/static/portal/sass/partials/_popup.scss

@@ -20,9 +20,9 @@
   .popup-box {
     background-color: $color-background-secondary;
     box-shadow: 0 0 4 * $spacing $color-background-box-shadow;
-    margin: 20% auto 0;
+    margin: 10% auto;
     overflow: hidden;
-    width: 460px;
+    width: 520px;
 
     .popup-box__msg {
       @include _padding(0px, 5 * $spacing, 5 * $spacing, 5 * $spacing);
@@ -47,6 +47,7 @@
     .popup-box__title {
       @include _padding(5 * $spacing, 5 * $spacing, 0px, 5 * $spacing);
       background-color: $color-background-secondary;
+      color: $color-text-primary;
       display: flex;
       justify-content: flex-start;
       font-family: "Space Grotesk", sans-serif;
@@ -57,6 +58,10 @@
       min-width:0;
       @include _margin(8px, 8px, 8px, 8px);
     }
+
+    label {
+      text-align: left;
+    }
   }
 
   &#screentime-popup,

portal/templates/portal/base.html

@@ -32,7 +32,6 @@
                   type="image/x-icon">
         {% endblock css %}
         {% include "portal/tag_manager/tag_manager_head.html" %}
-
         <script type="text/javascript" src="{% static 'portal/js/lib/modernizr-build.js' %}"></script>
         <script type="text/javascript" src="{% static 'portal/js/common.js' %}"></script>
         <script type="text/javascript" src="{% static 'portal/js/jquery.placeholder.js' %}"></script>
@@ -82,6 +81,7 @@
         {% 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,16 +240,25 @@
     });
             </script>
             <script>
-    // disable newsletter signup button by default
+    // disable newsletter signup and donate buttons by default
     const newsletterSubmitButton = $('#submit_newsletter');
     newsletterSubmitButton.addClass("disabled");
     newsletterSubmitButton.prop("disabled", true);
 
-    // enable it or disable it depending on age verification checkbox
+    const donateSubmitButton = $('#confirm_donate_button');
+    donateSubmitButton.addClass("disabled");
+    donateSubmitButton.prop("disabled", true);
+
+    // enable them or disable them 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/donate_popup.html

@@ -0,0 +1,46 @@
+{% load static %}
+{% load app_tags %}
+{# A popup with a form input for email addresses. #}
+<section id="donate-popup" class="popup-wrapper">
+    <div class="popup-box">
+        <div>
+            <button type="button" onclick="hideDonatePopup()" class="close popup-box__close" aria-label="Close">
+                <span class="iconify" data-icon="mdi:close"></span>
+            </button>
+        </div>
+        <div class="popup-box__title"></div>
+        <div class="popup-box__msg"></div>
+        <form id="donate_form" action="{% url 'process_donate_form' %}"
+              method="post">
+            <div class="col-sm-12">
+                {{ donate_form.non_field_errors }}
+                <div class="form--row">
+                    <div class="form--row__input">
+                        <label><small>{{ donate_form.email.label }}</small></label>
+                        <div class="input--icon">
+                            {{ donate_form.email }}
+                            <span class="iconify" data-icon="mdi:email-outline"></span>
+                        </div>
+                        {{ donate_form.email.errors }}
+                        <small>{{ donate_form.email.help_text }}</small>
+                    </div>
+                </div>
+                <div class="form--row justify-content-between">
+                    <div class="form__checkbox">
+                        <div class="form__checkbox-input">
+                            {{ donate_form.age_verification }}
+                        </div>
+                        <p class="p-0">Please confirm that you are over 18.</p>
+                    </div>
+                </div>
+            </div>
+            <div class="popup-box__buttons">
+                <a class="button button--small button--secondary button--secondary--dark"
+                   onclick="hideDonatePopup()" aria-labelledby="cancel_button">Cancel</a>
+                <button type="submit" id="confirm_donate_button"
+                   class='button button--small button--primary'
+                        aria-labelledby="confirm_button">Confirm</button>
+            </div>
+        </form>
+    </div>
+</section>

portal/templates/portal/partials/header.html

@@ -57,6 +57,7 @@
                     <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>
@@ -103,6 +104,7 @@
             <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 %}
@@ -145,36 +147,36 @@
                     {% endif %}
                 </ul>
             </div>
-            {% else %}
-            <div class="menu__right-side col-md-5">
-                <a href="{% url 'register' %}" id="signup_button" class="button button--primary button--register register">Register</a>
-                <div class="dropdown">
-                    <button id="login_dropdown" class="button--regular button--secondary button--header--login button--dropdown"
-                            data-toggle="dropdown">
-                        <div class="dropdown__text">Log in</div>
-                    </button>
-                    <ul class="dropdown-menu header__login-options-dropdown-menu">
-                        <li class="dropdown-menu__option">
-                            <a id="teacher_login_button" class="button--regular" aria-labelledby="Teacher" href="{% url 'teacher_login' %}">
-                                <div class="dropdown-menu__option__text">Teacher</div>
-                                <span data-nosnippet class="material-icons-outlined">chevron_right</span>
-                            </a>
-                        </li>
-                        <li class="dropdown-menu__option">
-                            <a id="student_login_button" class="button--regular" aria-labelledby="Student" href="{% url 'student_login_access_code' %}">
-                                <div class="dropdown-menu__option__text">Student</div>
-                                <span data-nosnippet class="material-icons-outlined">chevron_right</span>
-                            </a>
-                        </li>
-                        <li class="dropdown-menu__option">
-                            <a id="independent_login_button" class="button--regular" aria-labelledby="Independent" href="{% url 'independent_student_login' %}">
-                                <div class="dropdown-menu__option__text">Independent</div>
-                                <span data-nosnippet class="material-icons-outlined">chevron_right</span>
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-            {% endif %}
+        {% else %}
+        <div class="menu__right-side col-md-5">
+            <a href="{% url 'register' %}" id="signup_button" class="button button--primary button--register register">Register</a>
+            <div class="dropdown">
+                <button id="login_dropdown" class="button--regular button--secondary button--header--login button--dropdown"
+                        data-toggle="dropdown">
+                    <div class="dropdown__text">Log in</div>
+                </button>
+                <ul class="dropdown-menu header__login-options-dropdown-menu">
+                    <li class="dropdown-menu__option">
+                        <a id="teacher_login_button" class="button--regular" aria-labelledby="Teacher" href="{% url 'teacher_login' %}">
+                            <div class="dropdown-menu__option__text">Teacher</div>
+                            <span data-nosnippet class="material-icons-outlined">chevron_right</span>
+                        </a>
+                    </li>
+                    <li class="dropdown-menu__option">
+                        <a id="student_login_button" class="button--regular" aria-labelledby="Student" href="{% url 'student_login_access_code' %}">
+                            <div class="dropdown-menu__option__text">Student</div>
+                            <span data-nosnippet class="material-icons-outlined">chevron_right</span>
+                        </a>
+                    </li>
+                    <li class="dropdown-menu__option">
+                        <a id="independent_login_button" class="button--regular" aria-labelledby="Independent" href="{% url 'independent_student_login' %}">
+                            <div class="dropdown-menu__option__text">Independent</div>
+                            <span data-nosnippet class="material-icons-outlined">chevron_right</span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        {% endif %}
         </div>
     </div>
     <div id="menu-items" class="collapse">
@@ -239,6 +241,8 @@
         {% 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/test_emails.py

@@ -10,6 +10,7 @@ from common.helpers.emails import (
     send_dotmailer_consent_confirmation_email_to_user,
     DotmailerUserType,
 )
+from common.mail import address_book_ids
 from django.test import Client
 from django.urls import reverse
 
@@ -21,7 +22,6 @@ from example_project.portal_test_settings import (
     DOTMAILER_THANKS_FOR_STAYING_CAMPAIGN_ID,
     DOTMAILER_CREATE_CONTACT_URL,
     DOTMAILER_DELETE_USER_BY_ID_URL,
-    DOTMAILER_MAIN_ADDRESS_BOOK_URL,
     DOTMAILER_TEACHER_ADDRESS_BOOK_URL,
     DOTMAILER_STUDENT_ADDRESS_BOOK_URL,
     DOTMAILER_NO_ACCOUNT_ADDRESS_BOOK_URL,
@@ -47,7 +47,11 @@ def test_newsletter_calls_correct_requests(mocker, monkeypatch):
     )
 
     add_to_dotmailer(
-        "Ray", "Charles", "ray.charles@example.com", DotmailerUserType.TEACHER
+        "Ray",
+        "Charles",
+        "ray.charles@example.com",
+        address_book_ids["newsletter"],
+        DotmailerUserType.TEACHER,
     )
 
     mocked_create_contact.assert_called_once()
@@ -121,17 +125,15 @@ def test_newsletter_sends_correct_request_data(
     )
 
     add_contact_to_address_book(
-        "Ray", "Charles", "ray.charles@example.com", DotmailerUserType.TEACHER
+        "Ray",
+        "Charles",
+        "ray.charles@example.com",
+        address_book_ids["newsletter"],
+        DotmailerUserType.TEACHER,
     )
 
     assert mocked_post.call_count == 3
 
-    mocked_post.assert_any_call(
-        DOTMAILER_MAIN_ADDRESS_BOOK_URL,
-        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
-        json=expected_body2,
-    )
-
     mocked_post.assert_any_call(
         DOTMAILER_TEACHER_ADDRESS_BOOK_URL,
         auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
@@ -141,17 +143,15 @@ def test_newsletter_sends_correct_request_data(
     mocked_post.reset_mock()
 
     add_contact_to_address_book(
-        "Ray", "Charles", "ray.charles@example.com", DotmailerUserType.STUDENT
+        "Ray",
+        "Charles",
+        "ray.charles@example.com",
+        address_book_ids["newsletter"],
+        DotmailerUserType.STUDENT,
     )
 
     assert mocked_post.call_count == 2
 
-    mocked_post.assert_any_call(
-        DOTMAILER_MAIN_ADDRESS_BOOK_URL,
-        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
-        json=expected_body2,
-    )
-
     mocked_post.assert_any_call(
         DOTMAILER_STUDENT_ADDRESS_BOOK_URL,
         auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
@@ -164,17 +164,12 @@ def test_newsletter_sends_correct_request_data(
         "Ray",
         "Charles",
         "ray.charles@example.com",
+        address_book_ids["newsletter"],
         DotmailerUserType.NO_ACCOUNT,
     )
 
     assert mocked_post.call_count == 2
 
-    mocked_post.assert_any_call(
-        DOTMAILER_MAIN_ADDRESS_BOOK_URL,
-        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
-        json=expected_body2,
-    )
-
     mocked_post.assert_any_call(
         DOTMAILER_NO_ACCOUNT_ADDRESS_BOOK_URL,
         auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),

portal/tests/{test_newsletter_footer.py → test_global_forms.py}

@@ -2,7 +2,7 @@ from django.urls import reverse
 from django.test import TestCase, Client
 
 
-class TestNewsletterFooter(TestCase):
+class TestGlobalForms(TestCase):
     def test_newsletter_signup_successful(self):
         url = reverse("process_newsletter_form")
         client = Client()
@@ -18,3 +18,19 @@ class TestNewsletterFooter(TestCase):
         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

portal/urls.py

@@ -38,6 +38,7 @@ from portal.views.api import (
 )
 from portal.views.dotmailer import (
     dotmailer_consent_form,
+    process_donate_form,
     process_newsletter_form,
 )
 from portal.views.email import verify_email
@@ -278,6 +279,7 @@ urlpatterns = [
         process_newsletter_form,
         name="process_newsletter_form",
     ),
+    url(r"^donate_signup/$", process_donate_form, name="process_donate_form"),
     url(r"^consent_form/$", dotmailer_consent_form, name="consent_form"),
     url(
         r"^verify_email/$",

portal/views/dotmailer.py

@@ -5,13 +5,14 @@ from common.helpers.emails import (
     add_consent_record_to_dotmailer_user,
     DotmailerUserType,
 )
+from common.mail import address_book_ids
 from django.contrib import messages as messages
 from django.http import HttpResponseRedirect, HttpResponse
 from django.shortcuts import render
 from django.urls import reverse_lazy
 from django.views.decorators.csrf import csrf_exempt
 
-from portal.forms.dotmailer import NewsletterForm, ConsentForm
+from portal.forms.dotmailer import NewsletterForm, DonateForm, ConsentForm
 
 
 @csrf_exempt
@@ -20,7 +21,13 @@ def process_newsletter_form(request):
         newsletter_form = NewsletterForm(data=request.POST)
         if newsletter_form.is_valid():
             user_email = newsletter_form.cleaned_data["email"]
-            add_to_dotmailer("", "", user_email, DotmailerUserType.NO_ACCOUNT)
+            add_to_dotmailer(
+                "",
+                "",
+                user_email,
+                address_book_ids["newsletter"],
+                DotmailerUserType.NO_ACCOUNT,
+            )
             messages.success(request, "Thank you for signing up! 🎉")
             return HttpResponseRedirect(reverse_lazy("home"))
         messages.error(
@@ -33,6 +40,27 @@ 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)