codeforlife-portal 8.6.3__py2.py3-none-any.whl → 8.6.5__py2.py3-none-any.whl

{codeforlife_portal-8.6.3.dist-info → codeforlife_portal-8.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeforlife-portal
-Version: 8.6.3
+Version: 8.6.5
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -8,7 +8,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: asgiref==3.8.1; python_version >= "3.8"
 Requires-Dist: certifi==2025.1.31; python_version >= "3.6"
-Requires-Dist: cfl-common==8.6.3
+Requires-Dist: cfl-common==8.6.5
 Requires-Dist: chardet==5.2.0; python_version >= "3.7"
 Requires-Dist: charset-normalizer==3.4.1; python_version >= "3.7"
 Requires-Dist: diff-match-patch==20241021; python_version >= "3.7"
@@ -60,7 +60,7 @@ Requires-Dist: asttokens==3.0.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: attrs==25.3.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: black==25.1.0; python_version >= "3.9" and extra == "dev"
 Requires-Dist: certifi==2025.1.31; python_version >= "3.6" and extra == "dev"
-Requires-Dist: cfl-common==8.6.3; extra == "dev"
+Requires-Dist: cfl-common==8.6.5; extra == "dev"
 Requires-Dist: charset-normalizer==3.4.1; python_version >= "3.7" and extra == "dev"
 Requires-Dist: click==8.1.8; python_version >= "3.7" and extra == "dev"
 Requires-Dist: coverage[toml]==7.8.0; python_version >= "3.9" and extra == "dev"
@@ -113,7 +113,7 @@ Requires-Dist: pypdf==5.1.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pypng==0.20220715.0; extra == "dev"
 Requires-Dist: pysocks==1.7.1; extra == "dev"
 Requires-Dist: pytest==8.3.5; python_version >= "3.8" and extra == "dev"
-Requires-Dist: pytest-cov==6.1.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: pytest-cov==6.1.1; python_version >= "3.9" and extra == "dev"
 Requires-Dist: pytest-django==4.8.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pytest-mock==3.14.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pytest-order==1.3.0; python_version >= "3.7" and extra == "dev"
@@ -122,7 +122,7 @@ Requires-Dist: python-dateutil==2.9.0.post0; (python_version >= "2.7" and python
 Requires-Dist: pytz==2025.2; extra == "dev"
 Requires-Dist: pyvirtualdisplay==3.0; extra == "dev"
 Requires-Dist: qrcode==7.4.2; python_version >= "3.7" and extra == "dev"
-Requires-Dist: rapid-router==7.5.0; extra == "dev"
+Requires-Dist: rapid-router==7.5.2; extra == "dev"
 Requires-Dist: requests==2.32.3; python_version >= "3.8" and extra == "dev"
 Requires-Dist: responses==0.18.0; python_version >= "3.7" and extra == "dev"
 Requires-Dist: selenium==4.29.0; python_version >= "3.9" and extra == "dev"

{codeforlife_portal-8.6.3.dist-info → codeforlife_portal-8.6.5.dist-info}/RECORD

@@ -87,7 +87,7 @@ cfl_common/common/tests/utils/organisation.py,sha256=vNgKFtU3VPcWRnZfh82yCS90PLA
 cfl_common/common/tests/utils/student.py,sha256=PLd980iSlxmMoB8J3C2pVjNC5xHdVxfAkJXzhv_dRhg,3814
 cfl_common/common/tests/utils/teacher.py,sha256=KQ_NAl4yQqiX_zwcULQjkovc29JPhnkLR5Nk3Ljzbpg,2661
 cfl_common/common/tests/utils/user.py,sha256=NvLzZLVP4jy5Hn1iztOYF_BTQ9WsbSmuWMEzGzhAsRU,919
-codeforlife_portal-8.6.3.dist-info/licenses/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.6.5.dist-info/licenses/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
 deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deploy/captcha.py,sha256=MbOBuGnbT_SOIltSjP1XMOLrfo1DldCilaVAEim0vM4,23
 deploy/views.py,sha256=7mY2zNPkaBFrlWGByJHp2zFqHIHSMc0YArjE_sFWMMU,131
@@ -111,7 +111,7 @@ example_project/portal_test_settings.py,sha256=1eTweQoCt1okixE5eoEg-f9iX7idSLNdJ
 example_project/settings.py,sha256=YS-8YYtH8hZMUhZALA3eHJ1bdM2VJfpD1v3ItjBMGaQ,5936
 example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=s9_fcsg-pm5UVMlpeSxXL1P0erPal9Usg7wno2WG5q4,22
+portal/__init__.py,sha256=Hwt0_KnspQjRN_MrDldwtdXvtsUwNgjCvFcJFELW9mY,22
 portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -440,7 +440,7 @@ portal/templates/portal/about.html,sha256=_iD0GCP6q3-XuZ2LC-9O0KYY-mKL6c9qk3O-NR
 portal/templates/portal/base.html,sha256=lAY0DO-OpW-O81tqZxnEmGAnXiJomzj2xsi5L8hTEls,11644
 portal/templates/portal/base_no_userprofile.html,sha256=PlRufyYmUUGWBZ6CvbYhJWOMTqKqdcee4xnO5--AogA,447
 portal/templates/portal/coding_club.html,sha256=DhPSIhxxzo6w0v80jXKVo_fjZ_TKnv7_u5cQq0woW8Q,5324
-portal/templates/portal/contribute.html,sha256=UIC_N3Lun9wB_6jEra0wvlT9fDiiIeMby7_onXYo6k0,4176
+portal/templates/portal/contribute.html,sha256=kJLQpha9uqJipiwJdEEZVk-VBOYzSBkNiuoXtIeo0Yc,4269
 portal/templates/portal/dotmailer_consent_form.html,sha256=UDdizPoKYZGybr6z9nzDV4WPhJPa-S3bIKywvVgFrxg,918
 portal/templates/portal/email_invitation_sent.html,sha256=hAMzQXE3NFGnOsQlCGuo3Aps-vazSJb5BhAN7bWT48M,641
 portal/templates/portal/email_style_template.html,sha256=lIlpiEC7-mO9tx3Ra9jtBjdXYxh5HKGZU8uqbvKdEbk,11893
@@ -454,7 +454,7 @@ portal/templates/portal/locked_out.html,sha256=JeiFHFyueFX03D54k82swjxvKY78cFG8V
 portal/templates/portal/locked_out_school_student.html,sha256=bcpLtu4mkHR-zILLuArtHH2OfUSjHiqntcdbTMlx5Kg,684
 portal/templates/portal/play.html,sha256=35dsR5jMavX5YvHZCwsoGdbCjEWJG-vPyqIeUAkgbLI,5724
 portal/templates/portal/privacy_notice.html,sha256=JexPB9Xgvlymv-TCzpWoViuZ2R-xalScCsueMW66-fA,49247
-portal/templates/portal/register.html,sha256=4RqUxRiQOvd-oHAM5x6U01zdlYRfy-h8NUGl8UIiBC0,12531
+portal/templates/portal/register.html,sha256=Vf2L4VMPuNQWgK2CWYBgBEYDkfUJ5YjXMaDY0C-Fp-E,12465
 portal/templates/portal/reset_password.html,sha256=YzsREz5D2OwhicMLahVOVDXiNDxoHlPqU5iu96i36W0,1373
 portal/templates/portal/reset_password_confirm.html,sha256=jPHSDatezRXzCG4zH_5BQPWAxLblidqro0hzvsH54ho,3499
 portal/templates/portal/reset_password_done.html,sha256=rpzN3svZne5H2FS3TJaGnHypRj2KX-SRS6DbFQkgLf0,667
@@ -473,7 +473,7 @@ portal/templates/portal/partials/character_list.html,sha256=SnNFHzbIkOSaiRPIvSdp
 portal/templates/portal/partials/cookie_list.html,sha256=MrQ6lqae_X-LSxQjlLhZzKESt_cqJ2HJYsjKqTQ9W0A,6303
 portal/templates/portal/partials/delete_popup.html,sha256=nEhnwgnmKoFzb6LlCwdX973Em9bVOFh6MON36RPteYs,1275
 portal/templates/portal/partials/footer.html,sha256=IKEUmghaiiuQs5g9JfE97oNzjRTzBTu3SoFgJhRMyi8,5533
-portal/templates/portal/partials/header.html,sha256=xorEsPYzbmZGXHBOKm_6SHXQJxkCFKEWfMJbADG3k3I,20816
+portal/templates/portal/partials/header.html,sha256=LJ8L_BV3DPAfpxAZlhH35MHNd5_bC3NhSVW2zAeonGU,20834
 portal/templates/portal/partials/headline.html,sha256=xKb-WtkT0FyQqT0smyNSKkXFvU7KQ5Czad8ca6YKQg4,89
 portal/templates/portal/partials/hero_card.html,sha256=UN5hyxrw-McuXFsDzPBIECB9yGrv9VjsFf8SEBowwXc,786
 portal/templates/portal/partials/info_popup.html,sha256=gzffd5MBVb7p2hGQuZMNDudThrRgs847hCu9ziT9uLE,566
@@ -609,11 +609,11 @@ portal/tests/utils/messages.py,sha256=tUGzJzhZwvzmO9H3CPxpWUfi2aXTpAWfkDQ2u2T3Lb
 portal/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/about.py,sha256=-muXy17UhxCSKkjnMAkSLXiCvT_pBPlf2ykTYr794dI,443
 portal/views/admin.py,sha256=4Xt3zEyQH7sUwQSrwuRtoCodWidjOzd7gJUwWU96pXY,957
-portal/views/api.py,sha256=mdWmFkV5mxmR-mvj6ttIe8uwW9tbcx9-5ykk5dpX0LI,7047
+portal/views/api.py,sha256=ZCRApdZi2F6Pqo9p3V6cctzeeskxyrlFZn2AcHGpGdQ,6932
 portal/views/dotmailer.py,sha256=OH06IXuqqjhQbEie8g8y2ZY1oZvsCtNHhkQRLa-julg,2467
 portal/views/email.py,sha256=V3wXRxIjeZ4OJBVqGCQrPn-GQWKZK1PCXbR1f2Zpa_4,2174
 portal/views/google_analytics.py,sha256=cbNq9apCVpjoXCdovjrwo2jshWu5tUOItB-fTr-losw,769
-portal/views/home.py,sha256=8leK4ADxRg-gK-bm7D08CR44bhV3I8lt5pCV59HXMkk,9619
+portal/views/home.py,sha256=puQesHCyV1jMXNjgflf_QhJl7hoV2Y4z9UlkGtEiqTo,9266
 portal/views/legal.py,sha256=USOEJy0Ry73cKReglKfMxgM3qWoKORUfVl_RkwPewQ4,342
 portal/views/organisation.py,sha256=sPDbiM7hdtpF8GKyh_4n4VPl2a-WnAgnF4q9aSvQCVI,3341
 portal/views/play_landing_page.py,sha256=FFmjUFub3ZdlbMqkB8yX3jAImCzqrUqgb8AZcpKywZ4,308
@@ -623,7 +623,7 @@ portal/views/cron/__init__.py,sha256=5rxXyhJmLOExRdrYZ1VJttTsyRIPRybzdftbUDwFByI
 portal/views/cron/user.py,sha256=iKM_FOcSQvrXtRSZUtxSiMFD3M869JP5jvEfRWHLpvM,10731
 portal/views/login/__init__.py,sha256=xSCtyFPSI87BRUybBgqa86ekFEolX5gUDbBSfBUMTyI,399
 portal/views/login/independent_student.py,sha256=3dFULhwMAlX4VDrJl-Znril6a9M5xKBSHO1eWvujfS0,2662
-portal/views/login/student.py,sha256=dt6cMfWepBJsVCRcADltfYSHVpyeP1WGLKSogMJ22E0,5539
+portal/views/login/student.py,sha256=7UbJpjA4BsDY8bxGTFSdloNo50GbLiukaMr5rKvG6uo,5306
 portal/views/login/teacher.py,sha256=kRugP7TPbZIb_BmYMYxFeugxZy8UbCry_q0_jJDJ_Mw,1975
 portal/views/student/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/student/edit_account_details.py,sha256=Ba-3D_zzKbX5N01NG5qqBS0ud10B8D5SN8hOpLiGa9U,8468
@@ -635,7 +635,7 @@ portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 portal/views/two_factor/core.py,sha256=Lk32z2SN2Pg0rRkK-N-LXMvXC1kKKsH3l692kiSDQ4E,964
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=SHSg_xHccE5PtD-OfuOkYhREYz_er4bj5ro1RjJ88Yw,393
-codeforlife_portal-8.6.3.dist-info/METADATA,sha256=jooWCko0KcUo_u3IaV6KSZlvRUA_so9lAiEuO0u9kVA,12345
-codeforlife_portal-8.6.3.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
-codeforlife_portal-8.6.3.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.6.3.dist-info/RECORD,,
+codeforlife_portal-8.6.5.dist-info/METADATA,sha256=p-IAHP6zbem2GfuXxlfjVKJHSGPLlEegHasBuUwcLkk,12345
+codeforlife_portal-8.6.5.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
+codeforlife_portal-8.6.5.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.6.5.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.6.3"
+__version__ = "8.6.5"

portal/templates/portal/contribute.html

@@ -38,9 +38,9 @@
 </div>
 
 <div class="background background--primary">
-    <div class="row">
-        <div class="container d-flex flex-row">
-            <div class="col-sm-6">
+    <div class="container">
+        <div class="row d-flex flex-column-reverse flex-md-row">
+            <div class="col-12 col-md-6 order-1 order-md-0">
                 <h4>Our products</h4>
 
                 <p><b>The website</b></p>
@@ -61,9 +61,9 @@
                     Python experience to a foundation in Python, helping
                     prepare them for GCSE and beyond.</p>
             </div>
-            <div class="col-sm-6">
+            <div class="col-12 col-md-6 order-0 order-md-1">
                 <img title="Rapid Router" alt="Rapid Router"
-                     src="{% static 'portal/img/rapidrouter.png' %}">
+                     src="{% static 'portal/img/rapidrouter.png' %}" class="img-fluid">
             </div>
         </div>
     </div>

portal/templates/portal/partials/header.html

@@ -147,7 +147,7 @@
             </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>
+            <a href="{% url 'register' %}" id="signup_button" class="button button--primary button--register register">Register for FREE</a>
             <div class="dropdown">
                 <button id="login_dropdown" class="button--regular button--secondary button--header--login button--dropdown"
                         data-toggle="dropdown">
@@ -238,7 +238,7 @@
             {% endif %}
         {% else %}
             <a class="button button--menu__item button--register"
-              href="{% url 'register' %}">Register now</a>
+              href="{% url 'register' %}">Register now for FREE</a>
             <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/templates/portal/register.html

@@ -9,11 +9,11 @@
             <div id="teacher-register-form" class="form-div form">
                 <h4>Teacher/Tutor</h4>
                 <div class="row form--row">
-                    <p class="semi-bold">Register below to create your school or club.</p>
+                    <p class="semi-bold">Register below to create your free account.</p>
                     <small class="semi-bold">You will have access to teaching resources, progress tracking and lesson plans
                     for Rapid Router.</small>
                 </div>
-                <form class="d-flex flex-column"
+                <form class="d-flex flex-column" 
                       method="post"
                       id="form-reg-teacher"
                       autocomplete="off">
@@ -87,10 +87,7 @@
             <div id="independent-student-register-form" class="form-div">
                 <h4>Independent learner</h4>
                 <div class="row form--row">
-                    <p class="semi-bold">
-                        Register below if you are not part of a school or club and wish to set up a home
-                        learning account.
-                    </p>
+                    <p class="semi-bold">Register below if you are not part of a school or club and wish to set up a free home learning account.</p>
                     <small class="semi-bold">You will have access to learning resources for Rapid Router.</small>
                 </div>
                 <form id="form-signup-independent-student"

portal/views/api.py

@@ -1,5 +1,4 @@
 import datetime
-import logging
 import uuid
 
 from common.models import Class, School, Student, Teacher, UserProfile
@@ -15,7 +14,6 @@ from rest_framework.reverse import reverse_lazy
 
 from portal.app_settings import IS_CLOUD_SCHEDULER_FUNCTION
 
-LOGGER = logging.getLogger(__name__)
 THREE_YEARS_IN_DAYS = 1095
 
 
@@ -199,7 +197,6 @@ class AnonymiseOrphanSchoolsView(generics.ListAPIView):
             pk__gte=start_id, new_user__is_active=False
         ):
             anonymise(teacher.new_user)
-            LOGGER.info(f"Anonymised teacher ID {teacher.pk}")
 
         # Anonymise schools without any teachers
         for school in School.objects.filter(teacher_school__isnull=True):

portal/views/home.py

@@ -1,4 +1,3 @@
-import logging
 import math
 
 from common.helpers.emails import (
@@ -36,8 +35,6 @@ from portal.strings.ten_year_map import (
     TEN_YEAR_MAP_HEADLINE,
 )
 
-LOGGER = logging.getLogger(__name__)
-
 
 def register_view(request):
     if request.user.is_authenticated:
@@ -131,10 +128,6 @@ def process_signup_form(request, data):
                     ),
                 },
             )
-        else:
-            LOGGER.warn(
-                f"Ratelimit teacher {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}"
-            )
     else:
         teacher = Teacher.objects.factory(
             first_name=data["teacher_first_name"],
@@ -180,10 +173,7 @@ def process_independent_student_signup_form(request, data):
                     ),
                 },
             )
-        else:
-            LOGGER.warning(
-                f"Ratelimit independent {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}"
-            )
+
         return render(
             request,
             "portal/email_verification_needed.html",

portal/views/login/student.py

@@ -1,5 +1,3 @@
-import logging
-
 from common.models import UserSession, Student, Class
 from django.contrib import messages
 from django.contrib.auth import authenticate, login
@@ -14,8 +12,6 @@ from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
 from portal.helpers.request_handlers import get_access_code_from_request
 from portal.views.login import has_user_lockout_expired
 
-LOGGER = logging.getLogger(__name__)
-
 
 class StudentClassCodeView(FormView):
     template_name = "portal/login/student_class_code.html"
@@ -76,12 +72,7 @@ class StudentLoginView(LoginView):
         students = Student.objects.filter(
             new_user__first_name__iexact=name, class_field=klass
         )
-        try:
-            student = students[0]
-        except IndexError:
-            msg = f"Student {name} in class {class_code} is not found!"
-            LOGGER.error(msg)
-            raise Exception(msg)
+        student = students[0]
 
         # Log the login time, class, and login type
         session = UserSession(