codeforlife-portal 6.44.3__tar.gz → 6.44.8__tar.gz

codeforlife-portal-6.44.8/PKG-INFO

@@ -0,0 +1,48 @@
+Metadata-Version: 2.1
+Name: codeforlife-portal
+Version: 6.44.8
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Framework :: Django
+Description-Content-Type: text/markdown
+License-File: LICENSE.md
+
+# Code for Life Portal
+
+[![Workflow Status](https://github.com/ocadotechnology/codeforlife-portal/actions/workflows/ci.yml/badge.svg)](https://github.com/ocadotechnology/codeforlife-portal/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/ocadotechnology/codeforlife-portal/branch/master/graph/badge.svg)](https://codecov.io/gh/ocadotechnology/codeforlife-portal)
+
+## LICENCE
+In accordance with the [Terms of Use](https://www.codeforlife.education/terms#terms)
+of the Code for Life website, all copyright, trademarks, and other
+intellectual property rights in and relating to Code for Life (including all
+content of the Code for Life website, the Rapid Router application, the
+Kurono application, related software (including any drawn and/or animated
+avatars, whether or not such avatars have any modifications) and any other
+games, applications or any other content that we make available from time to
+time) are owned by Ocado Innovation Limited.
+
+The source code of the Code for Life portal, the Rapid Router application
+and the Kurono/aimmo application are [licensed under the GNU Affero General
+Public License](https://github.com/ocadotechnology/codeforlife-workspace/blob/main/LICENSE.md).
+All other assets including images, logos, sounds etc., are not covered by
+this licence and no-one may copy, modify, distribute, show in public or
+create any derivative work from these assets.
+
+## Code for Life
+
+[Code for Life](https://www.codeforlife.education/) has been developed by Ocado Technology as a **free, open-source** project to inspire the next generation of computer scientists and to help teachers deliver the computing curriculum.
+
+This repository hosts the source code of the [main website](https://www.codeforlife.education/), which includes the registration, log in, teacher and student dashboards, the teaching materials, etc.
+
+We are open to contributors from anywhere around the world. Please read ahead if you'd like to get involved.
+
+## To get started
+
+- [Developer Guide](https://docs.codeforlife.education/developer-guide)
+
+- [Good First Issues](https://github.com/ocadotechnology/codeforlife-portal/contribute)
+
+- [How to set up your work environment](https://docs.codeforlife.education/git/common-setup)
+
+- [Testing](https://docs.codeforlife.education/git/testing)

codeforlife-portal-6.44.8/codeforlife_portal.egg-info/PKG-INFO

@@ -0,0 +1,48 @@
+Metadata-Version: 2.1
+Name: codeforlife-portal
+Version: 6.44.8
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Framework :: Django
+Description-Content-Type: text/markdown
+License-File: LICENSE.md
+
+# Code for Life Portal
+
+[![Workflow Status](https://github.com/ocadotechnology/codeforlife-portal/actions/workflows/ci.yml/badge.svg)](https://github.com/ocadotechnology/codeforlife-portal/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/ocadotechnology/codeforlife-portal/branch/master/graph/badge.svg)](https://codecov.io/gh/ocadotechnology/codeforlife-portal)
+
+## LICENCE
+In accordance with the [Terms of Use](https://www.codeforlife.education/terms#terms)
+of the Code for Life website, all copyright, trademarks, and other
+intellectual property rights in and relating to Code for Life (including all
+content of the Code for Life website, the Rapid Router application, the
+Kurono application, related software (including any drawn and/or animated
+avatars, whether or not such avatars have any modifications) and any other
+games, applications or any other content that we make available from time to
+time) are owned by Ocado Innovation Limited.
+
+The source code of the Code for Life portal, the Rapid Router application
+and the Kurono/aimmo application are [licensed under the GNU Affero General
+Public License](https://github.com/ocadotechnology/codeforlife-workspace/blob/main/LICENSE.md).
+All other assets including images, logos, sounds etc., are not covered by
+this licence and no-one may copy, modify, distribute, show in public or
+create any derivative work from these assets.
+
+## Code for Life
+
+[Code for Life](https://www.codeforlife.education/) has been developed by Ocado Technology as a **free, open-source** project to inspire the next generation of computer scientists and to help teachers deliver the computing curriculum.
+
+This repository hosts the source code of the [main website](https://www.codeforlife.education/), which includes the registration, log in, teacher and student dashboards, the teaching materials, etc.
+
+We are open to contributors from anywhere around the world. Please read ahead if you'd like to get involved.
+
+## To get started
+
+- [Developer Guide](https://docs.codeforlife.education/developer-guide)
+
+- [Good First Issues](https://github.com/ocadotechnology/codeforlife-portal/contribute)
+
+- [How to set up your work environment](https://docs.codeforlife.education/git/common-setup)
+
+- [Testing](https://docs.codeforlife.education/git/testing)

{codeforlife-portal-6.44.3 → codeforlife-portal-6.44.8}/codeforlife_portal.egg-info/requires.txt

@@ -10,14 +10,14 @@ aimmo>=2
 reportlab==3.6.13
 django-formtools==2.2
 django-otp==1.0.2
-requests==2.31.0
+requests==2.32.0
 django-treebeard==4.3.1
 django-sekizai==2.0.0
 django-classy-tags==2.0.0
 libsass==0.23.0
 phonenumbers==8.12.12
 more-itertools==8.7.0
-cfl-common==6.44.3
+cfl-common==6.44.8
 django-ratelimit==3.0.1
 django-preventconcurrentlogins==0.8.2
 django-csp==3.7

codeforlife-portal-6.44.8/portal/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.44.8"

{codeforlife-portal-6.44.3 → codeforlife-portal-6.44.8}/portal/templates/portal/contribute.html

@@ -10,7 +10,7 @@
 {% block content %}
 <div class="background container">
     <section>
-        <h4>How to get involved and gain experience</h4>
+        <h3>How to get involved and gain experience</h3>
     </section>
         <div class="row">
             <div class="col-sm-6">
@@ -25,7 +25,7 @@
                 Ocado Technology deployed an army of internal volunteers who worked after hours, fuelled by
                 free pizzas and fizzy drinks.
                 </p>
-                <p>What came out of this, is what you see today, used by educators and learners from over 150
+                <p>What came out of this, is what you see today, used by educators and learners from over 180
                 countries. Our products are open-source and free forever.
                 </p>
             </div>
@@ -50,14 +50,14 @@
                 </p>
 
                 <p><b>Rapid Router</b></p>
-                <p>An introduction to coding that is aimed at Key Stages 1-3 (age 5 to 14).
+                <p>An introduction to coding that is aimed at Key Stages 1-3 (age 5 to 15).
                 Built on Blockly, it's a visual programming language similar to Scratch.
-                The levels start off with Blockly and gradually progress to Python. With 109 levels,
+                The levels start off with Blockly and gradually progress to Python. With over 100 levels,
                 Rapid Router is our flagship game with the biggest user base.
                 </p>
 
                 <p><b>Kurono</b></p>
-                <p>A multiplayer game that is aimed at older students of Key Stages 3 and up,
+                <p>A multiplayer game that is aimed at students at Key Stages 3 and up,
                 it is primarily for use in a class or a club setting. Students code in Python to
                 move their avatar around in order to complete tasks. Parts of Kurono are still in development.
                 </p>
@@ -77,8 +77,10 @@
         <div class="col-sm-6">
             <h4>How you can contribute</h4>
             <p>Today, there is a small dedicated team working full time on Code for Life.
-            In 2021, we're expecting to reach over 100,000 newly registered teachers and students.
-            We need your help to do even more.
+            Our community, made up of dedicated teachers, tutors, students, and volunteers, 
+            has played a vital part in Code For Life's growth. The resources and games are 
+            aligned to the UK National Curriculum and have reached over 265,000 active users 
+            across 180 countries, and over 600,000 users since the launch in 2014. We need your help to grow even more.
             </p>
             <p>
             If contributing to open-source projects to support education in coding and technology

codeforlife-portal-6.44.8/portal/templates/portal/reset_password_email_sent.html

@@ -0,0 +1,19 @@
+{% extends 'portal/form_shapes.html' %}
+{% load static %}
+
+{% block form_content %}
+<div id="reset_password_email_sent_page"></div>
+<h4>Thank you</h4>
+<h5>If you have entered a valid email address, you will receive a link to
+    reset your password. Make sure to check your <strong>spam</strong>.</h5>
+<img class="background" title="Paper Plane" alt="Verification email sent"
+    src="{% static 'portal/img/paper_plane.png' %}">
+<div>
+    <a target="_blank"
+        href="https://mail.google.com/mail/#search/from%3AOcado.Innovation.Ltd%40r1.dotdigital-email.com+subject%3APassword+reset+request"
+        class="button button--home button-email">Open in Gmail</a>
+    <a target="_blank" href="https://outlook.live.com/mail/" class="button button--home button-email">Open in
+        Outlook</a>
+</div>
+<p class="text-left"><a id="home_button" href="{% url 'home' %}">&lt; back to homepage</a></p>
+{% endblock form_content %}

{codeforlife-portal-6.44.3 → codeforlife-portal-6.44.8}/portal/tests/test_emails.py

@@ -10,7 +10,6 @@ from common.helpers.emails import (
     send_dotmailer_consent_confirmation_email_to_user,
     DotmailerUserType,
 )
-from django.core import mail
 from django.test import Client
 from django.urls import reverse
 
@@ -41,19 +40,15 @@ def patch_datetime_now(monkeypatch):
     monkeypatch.setattr(datetime, "datetime", mydatetime)
 
 
-@pytest.mark.django_db
-def test_send_new_users_numbers_email():
-    client = Client()
-    response = client.get(reverse("send_new_users_report"))
-    assert response.status_code == 200
-    assert len(mail.outbox) == 1
-
-
 def test_newsletter_calls_correct_requests(mocker, monkeypatch):
     mocked_create_contact = mocker.patch("common.helpers.emails.create_contact")
-    mocked_add_to_address_book = mocker.patch("common.helpers.emails.add_contact_to_address_book")
+    mocked_add_to_address_book = mocker.patch(
+        "common.helpers.emails.add_contact_to_address_book"
+    )
 
-    add_to_dotmailer("Ray", "Charles", "ray.charles@example.com", DotmailerUserType.TEACHER)
+    add_to_dotmailer(
+        "Ray", "Charles", "ray.charles@example.com", DotmailerUserType.TEACHER
+    )
 
     mocked_create_contact.assert_called_once()
     mocked_add_to_address_book.assert_called_once()
@@ -74,10 +69,15 @@ def test_delete_account(mocker):
 
     delete_contact("example@mail.com")
 
-    mocked_delete.assert_called_once_with(DOTMAILER_DELETE_USER_BY_ID_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD))
+    mocked_delete.assert_called_once_with(
+        DOTMAILER_DELETE_USER_BY_ID_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+    )
 
 
-def test_newsletter_sends_correct_request_data(mocker, monkeypatch, patch_datetime_now):
+def test_newsletter_sends_correct_request_data(
+    mocker, monkeypatch, patch_datetime_now
+):
     mocked_post = mocker.patch("common.helpers.emails.post")
 
     expected_body1 = {
@@ -91,7 +91,13 @@ def test_newsletter_sends_correct_request_data(mocker, monkeypatch, patch_dateti
                 {"key": "FULLNAME", "value": "Ray Charles"},
             ],
         },
-        "consentFields": [{"fields": [{"key": "DATETIMECONSENTED", "value": FAKE_TIME.__str__()}]}],
+        "consentFields": [
+            {
+                "fields": [
+                    {"key": "DATETIMECONSENTED", "value": FAKE_TIME.__str__()}
+                ]
+            }
+        ],
         "preferences": [{"trout": True}],
     }
 
@@ -109,51 +115,76 @@ def test_newsletter_sends_correct_request_data(mocker, monkeypatch, patch_dateti
     create_contact("Ray", "Charles", "ray.charles@example.com")
 
     mocked_post.assert_called_once_with(
-        DOTMAILER_CREATE_CONTACT_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body1
+        DOTMAILER_CREATE_CONTACT_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body1,
     )
 
-    add_contact_to_address_book("Ray", "Charles", "ray.charles@example.com", DotmailerUserType.TEACHER)
+    add_contact_to_address_book(
+        "Ray", "Charles", "ray.charles@example.com", 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
+        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), json=expected_body2
+        DOTMAILER_TEACHER_ADDRESS_BOOK_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
     mocked_post.reset_mock()
 
-    add_contact_to_address_book("Ray", "Charles", "ray.charles@example.com", DotmailerUserType.STUDENT)
+    add_contact_to_address_book(
+        "Ray", "Charles", "ray.charles@example.com", 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
+        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), json=expected_body2
+        DOTMAILER_STUDENT_ADDRESS_BOOK_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
     mocked_post.reset_mock()
 
-    add_contact_to_address_book("Ray", "Charles", "ray.charles@example.com", DotmailerUserType.NO_ACCOUNT)
+    add_contact_to_address_book(
+        "Ray",
+        "Charles",
+        "ray.charles@example.com",
+        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
+        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), json=expected_body2
+        DOTMAILER_NO_ACCOUNT_ADDRESS_BOOK_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
 
-def test_consent_calls_send_correct_request_data(mocker, monkeypatch, patch_datetime_now):
+def test_consent_calls_send_correct_request_data(
+    mocker, monkeypatch, patch_datetime_now
+):
     mocked_post = mocker.patch("common.helpers.emails.post")
     mocked_put = mocker.patch("common.helpers.emails.put")
 
@@ -181,21 +212,34 @@ def test_consent_calls_send_correct_request_data(mocker, monkeypatch, patch_date
                 {"key": "FULLNAME", "value": "Ray Charles"},
             ],
         },
-        "consentFields": [{"fields": [{"key": "DATETIMECONSENTED", "value": FAKE_TIME.__str__()}]}],
+        "consentFields": [
+            {
+                "fields": [
+                    {"key": "DATETIMECONSENTED", "value": FAKE_TIME.__str__()}
+                ]
+            }
+        ],
     }
 
-    expected_body2 = {"campaignID": DOTMAILER_THANKS_FOR_STAYING_CAMPAIGN_ID, "contactIds": ["1"]}
+    expected_body2 = {
+        "campaignID": DOTMAILER_THANKS_FOR_STAYING_CAMPAIGN_ID,
+        "contactIds": ["1"],
+    }
 
     add_consent_record_to_dotmailer_user(user)
 
     mocked_put.assert_called_once_with(
-        DOTMAILER_PUT_CONSENT_DATA_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body1
+        DOTMAILER_PUT_CONSENT_DATA_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body1,
     )
 
     send_dotmailer_consent_confirmation_email_to_user(user)
 
     mocked_post.assert_called_with(
-        DOTMAILER_SEND_CAMPAIGN_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body2
+        DOTMAILER_SEND_CAMPAIGN_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
 
@@ -212,9 +256,15 @@ def test_dotmailer_consent_form(mocker, monkeypatch):
     c = Client()
     consent_form_url = reverse("consent_form")
 
-    mocked_get_user_success = mocker.patch("portal.views.dotmailer.get_dotmailer_user_by_email")
-    mocked_add_consent = mocker.patch("portal.views.dotmailer.add_consent_record_to_dotmailer_user")
-    mocked_send_campaign = mocker.patch("portal.views.dotmailer.send_dotmailer_consent_confirmation_email_to_user")
+    mocked_get_user_success = mocker.patch(
+        "portal.views.dotmailer.get_dotmailer_user_by_email"
+    )
+    mocked_add_consent = mocker.patch(
+        "portal.views.dotmailer.add_consent_record_to_dotmailer_user"
+    )
+    mocked_send_campaign = mocker.patch(
+        "portal.views.dotmailer.send_dotmailer_consent_confirmation_email_to_user"
+    )
 
     get_consent_form_response = c.get(consent_form_url)
 
@@ -244,7 +294,10 @@ def test_dotmailer_consent_form(mocker, monkeypatch):
     mocked_add_consent.assert_called_once()
     mocked_send_campaign.assert_called_once()
 
-    mocker.patch("portal.views.dotmailer.add_consent_record_to_dotmailer_user", side_effect=KeyError)
+    mocker.patch(
+        "portal.views.dotmailer.add_consent_record_to_dotmailer_user",
+        side_effect=KeyError,
+    )
 
     wrong_email_response = c.post(consent_form_url, data=good_request_data)
 
@@ -255,4 +308,7 @@ def test_dotmailer_consent_form(mocker, monkeypatch):
 
 def _is_warning_message_showing(response):
     messages = list(response.wsgi_request._messages)
-    assert messages[0].message == "Valid email address and consent required. Please try again."
+    assert (
+        messages[0].message
+        == "Valid email address and consent required. Please try again."
+    )