codeforlife-portal 8.4.0__py2.py3-none-any.whl → 8.4.2__py2.py3-none-any.whl

cfl_common/common/csp_config.py

@@ -49,8 +49,8 @@ CSP_STYLE_SRC = (
 )
 CSP_FRAME_SRC = (
     "https://storage.googleapis.com/",
-    "https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/"
-    "https://www.youtube-nocookie.com/",
+    "https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/",
+    "https://files.gitbook.com/v0/b/gitbook-x-prod.appspot.com/",
     "https://www.recaptcha.net/",
     "https://www.google.com/recaptcha/",
     "https://crowdin.com/",

{codeforlife_portal-8.4.0.dist-info → codeforlife_portal-8.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 8.4.0
+Version: 8.4.2
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django

{codeforlife_portal-8.4.0.dist-info → codeforlife_portal-8.4.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ cfl_common/common/__init__.py,sha256=XlncBOpKp_gekbKH7Y_i6yu1qy5tJc3Y8sn8cDy-Vgk
 cfl_common/common/app_settings.py,sha256=Bw1DXkZpNIdwUJ-cIOjZnngH5_NbMXC0koW7NgQ0pKY,2495
 cfl_common/common/apps.py,sha256=49UXZ3bSkFKvIEOL4zM7y1sAhccQJyRtsoOg5XVd_8Y,129
 cfl_common/common/context_processors.py,sha256=X0iuX5qu9kMWa7q8osE9CJ2LgM7pPOYQFGdjm8X3rk0,236
-cfl_common/common/csp_config.py,sha256=oOXxEh0LqGl89HBn8VHa1nFGTGIhEBqRTo-CzVCsdsw,2873
+cfl_common/common/csp_config.py,sha256=SacWzX7Mo2saS8_GwYKulFK0A8gngd12QL15I2jwdco,2899
 cfl_common/common/mail.py,sha256=pIRfUMVoJWxdv74UqToj_0_pTVTC51z6QlFVLI3QBOw,6874
 cfl_common/common/models.py,sha256=_uD8pIO5fGVbOD8NydJVIzpiEDAaR2hIfpOhDT6jB34,16106
 cfl_common/common/permissions.py,sha256=gC6RQGZI2QDBbglx-xr_V4Hl2C2nf1V2_uPmEuoEcJo,2416
@@ -111,7 +111,7 @@ example_project/portal_test_settings.py,sha256=mTyObCGkZEI0IQSZkqCjb1WZ7ebjQLwui
 example_project/settings.py,sha256=pHQDI_A_yXV3u1efj689tc-vPI6nBFma4gMMPBzj0aI,5652
 example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=ewV4OXfRKUnA7PPA-m0T-EIAUCBmvPUrtesvVXFrkWA,22
+portal/__init__.py,sha256=Vu2hvtSa_7OgifMH6YJWUWpnqSrh4JTb4Rb2mzFy0vo,22
 portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -119,7 +119,7 @@ portal/beta.py,sha256=0TCC-9_KZoM1nuzJ9FiuKR5n9JITdMYenHGQtRvn9UU,255
 portal/context_processors.py,sha256=1TrUZqnMqGa5f7ERph9EpBqojSMJvOrcpnJzTdeCLDI,133
 portal/handlers.py,sha256=gF99OfQrGcIGDnUyONhvylZNU8sl6XHYEurwu0fuiss,422
 portal/models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-portal/urls.py,sha256=LFSumASmTGjFciMcc6OEFvJ1MWgFUS5wNRugGWON40E,18211
+portal/urls.py,sha256=BWhRI-9rGEydbasI0UCtYYASqHbyUXokfepNWty7cQg,18218
 portal/wsgi.py,sha256=3yRcNxBQG30NhzrVi93bX-DrbXtsIQBc70HiW5wbOyE,401
 portal/forms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/forms/admin.py,sha256=Cdl8-wvasAzvMfgUlFYzQjYeuyC7gIsSiy8V_-jMp7w,2080
@@ -452,14 +452,14 @@ portal/templates/portal/home.html,sha256=J10xWo7opn_BjQrdxpn0wg1bo6w4DwjpTEOJ-pk
 portal/templates/portal/home_learning.html,sha256=U1_AYrTNLqCjla7-vdVkC6SOigGBAmu3kscuiYNH4rw,10070
 portal/templates/portal/locked_out.html,sha256=JeiFHFyueFX03D54k82swjxvKY78cFG8Vre-bKKv_7Y,894
 portal/templates/portal/locked_out_school_student.html,sha256=bcpLtu4mkHR-zILLuArtHH2OfUSjHiqntcdbTMlx5Kg,684
-portal/templates/portal/play.html,sha256=QNoJfCMy9Ogz7AiVQmfCFmiF8qN6OTaFXkFx6uoxyhw,5601
-portal/templates/portal/privacy_notice.html,sha256=78KsMVUvZi_nQUG12k-zGiMjN_bT0R4X_K-scaUNcJQ,54662
+portal/templates/portal/play.html,sha256=35dsR5jMavX5YvHZCwsoGdbCjEWJG-vPyqIeUAkgbLI,5724
+portal/templates/portal/privacy_notice.html,sha256=qKInJE4fS82EIfpJEmHMsa_raA7YxYP4hyXWMekkCCk,53600
 portal/templates/portal/register.html,sha256=4RqUxRiQOvd-oHAM5x6U01zdlYRfy-h8NUGl8UIiBC0,12531
 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
 portal/templates/portal/reset_password_email_sent.html,sha256=kwNvoH_M-Qd5s-g0HiULwfQt_SD12WEMgPRSnLmldTQ,914
-portal/templates/portal/teach.html,sha256=2qOWzA00evHYlwSvXDOz8VQo1yXB-95Db7KgqpOItm0,9006
+portal/templates/portal/teach.html,sha256=dD96PpZFdpYUMhkQxlf5luU56rePe4mZRGSkwyfkkRU,9342
 portal/templates/portal/ten_year_map.html,sha256=_NxEXDJMGdtguuZ3vYl00yBgYo12wv1w8QJ-LMhw8fg,8390
 portal/templates/portal/terms.html,sha256=ekhBnhJVHcr5BE5W4PZ-YNzGsmhvRTrj1gdpdNdSYRk,29314
 portal/templates/portal/login/independent_student.html,sha256=G4u82m0lko4yQvqRDMger5p63A6KtFI_bsEOsQWlyJw,1777
@@ -611,8 +611,9 @@ portal/views/admin.py,sha256=4Xt3zEyQH7sUwQSrwuRtoCodWidjOzd7gJUwWU96pXY,957
 portal/views/api.py,sha256=mdWmFkV5mxmR-mvj6ttIe8uwW9tbcx9-5ykk5dpX0LI,7047
 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/legal.py,sha256=yarJgxmr0q2Bn5TAKfBdVdxc964YIJN2ByG2SvY6IP0,348
+portal/views/legal.py,sha256=cSvnW_HtyEWlklg-BiF3iKl_xKhx-IHp-J2CcyJwI_w,348
 portal/views/organisation.py,sha256=sPDbiM7hdtpF8GKyh_4n4VPl2a-WnAgnF4q9aSvQCVI,3341
 portal/views/play_landing_page.py,sha256=FFmjUFub3ZdlbMqkB8yX3jAImCzqrUqgb8AZcpKywZ4,308
 portal/views/registration.py,sha256=9cDKFVXVyJcMJBVZLwHoucMI4UwsOhbUxMdcxIEOixs,10889
@@ -633,8 +634,8 @@ 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.4.0.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-8.4.0.dist-info/METADATA,sha256=RgNIvNFEU6FeacWj4ytgtwoQ9ewiLbCg89uuCN2lJ_k,3077
-codeforlife_portal-8.4.0.dist-info/WHEEL,sha256=WDDPHYzpiOIm6GP1C2_8y8W6q16ICddAgOHlhTje9Qc,109
-codeforlife_portal-8.4.0.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.4.0.dist-info/RECORD,,
+codeforlife_portal-8.4.2.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.4.2.dist-info/METADATA,sha256=M6S_qIEDgS_J2O62FFjOgGsXNgUTs8gBj2xp60jpWBA,3077
+codeforlife_portal-8.4.2.dist-info/WHEEL,sha256=WDDPHYzpiOIm6GP1C2_8y8W6q16ICddAgOHlhTje9Qc,109
+codeforlife_portal-8.4.2.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.4.2.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.4.0"
+__version__ = "8.4.2"

portal/templates/portal/play.html

@@ -44,7 +44,7 @@
             </div>
         </div>
         <div class="col-sm-6">
-            <a href="https://www.youtube-nocookie.com/embed/w0Pw_XikQSs?rel=0&amp;autoplay=1"
+            <a href="https://files.gitbook.com/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FdCZE3FuBgH5fHsGocKGv%2Fuploads%2FSEr3nRjqHATuyL3c4Zdt%2FCode%20for%20Life%20-%20Rapid%20Router%20for%20students.mp4?alt=media"
                class="youtube">
                 <img src="{% static 'portal/img/thumbnail_play_rapid_router.png' %}"
                      alt="Image of Rapid Router game with try button in bottom right corner">

portal/templates/portal/privacy_notice.html

@@ -327,11 +327,6 @@
                                                           target="_blank">here</a>.
             By accepting analytics / performance cookies on our portal, you consent to the processing of data about you
             by Google in the manner and for the purposes set out above.</p>
-        <p><strong>YouTube</strong>. While embedded YouTube videos on our website do not use cookies, your browser's
-            Local Storage may be used by the video platform provider to enhance your viewing experience and collect
-            analytics data. This data enables the platform to track your interaction with the video content and may
-            gather information about your device and browsing behavior. The use of Local Storage by embedded video
-            providers is subject to their respective policies.</p>
 
         <h6>6.4 Managing and disabling cookies</h6>
         <p>We make available a cookie management platform on our portal (provided by
@@ -655,11 +650,6 @@
             organisations who help them to interpret this information. They may also pass the information to other
             organisations if the law says they have to do so. If you choose to allow analytics / performance cookies on
             our site, you are consenting to Google using your data for the reasons above.</p>
-        <p><strong>YouTube</strong>. While embedded YouTube videos on our website do not use cookies, your browser's
-            Local Storage may be used by the video platform provider to enhance your viewing experience and collect
-            analytics data. This data enables the platform to track your interaction with the video content and may
-            gather information about your device and browsing behavior. The use of Local Storage by embedded video
-            providers is subject to their respective policies.</p>
 
         <h6>Managing and disabling cookies</h6>
 

portal/templates/portal/teach.html

@@ -94,7 +94,7 @@
                 </div>
             </div>
             <div class="col-sm-6">
-                <a href="https://www.youtube-nocookie.com/embed/tM5nKPYlz74?rel=0&amp;autoplay=1" class="youtube">
+                <a href="https://files.gitbook.com/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FdCZE3FuBgH5fHsGocKGv%2Fuploads%2FpNFqak7cyoAenDK1PEOZ%2FCode%20for%20Life%20-%20Programming%20teaching%20resources.mp4?alt=media" class="youtube">
                     <img src="{% static 'portal/img/thumbnail_educate_resources.png' %}"
                          alt="Image of Code for Life Resources on Gitbook with play button in bottom right corner">
                 </a>
@@ -107,7 +107,7 @@
     <div class="container">
         <div class="row d-flex">
             <div class="col-sm-6">
-                <a href="https://www.youtube-nocookie.com/embed/hv0fM0twrOE?rel=0&amp;autoplay=1"
+                <a href="https://files.gitbook.com/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FdCZE3FuBgH5fHsGocKGv%2Fuploads%2FrCbonCJjzNYlDTmvrPOA%2FCode%20for%20Life%20-%20Rapid%20Router%20for%20teachers.mp4?alt=media"
                    class="youtube">
                     <img src="{% static 'portal/img/thumbnail_educate_rapid_router.png' %}"
                          alt="Image of Rapid Router logo and game with play button in bottom right corner">
@@ -175,7 +175,7 @@
                 </div>
             </div>
             <div class="col-sm-6">
-                <a href="https://www.youtube-nocookie.com/embed/xMmcg-LOc3I?rel=0&amp;autoplay=1" class="youtube">
+                <a href="https://files.gitbook.com/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FdCZE3FuBgH5fHsGocKGv%2Fuploads%2FB1XFzZC63IEYvYBzLFfC%2FPython_Den_teachers.mp4?alt=media" class="youtube">
                     <img src="{% static 'portal/img/thumbnail_python_den.png' %}"
                          alt="Python Den logo">
                 </a>

portal/urls.py

@@ -21,12 +21,9 @@ from portal.helpers.ratelimit import (
     school_student_key,
 )
 from portal.helpers.regexes import ACCESS_CODE_REGEX, JWT_REGEX
-from portal.views import cron
+from portal.views import cron, google_analytics
 from portal.views.about import about, contribute, getinvolved
-from portal.views.admin import (
-    AdminChangePasswordDoneView,
-    AdminChangePasswordView,
-)
+from portal.views.admin import AdminChangePasswordDoneView, AdminChangePasswordView
 from portal.views.api import (
     AnonymiseOrphanSchoolsView,
     InactiveUsersView,
@@ -35,10 +32,7 @@ from portal.views.api import (
     number_users_per_country,
     registered_users,
 )
-from portal.views.dotmailer import (
-    dotmailer_consent_form,
-    process_newsletter_form,
-)
+from portal.views.dotmailer import dotmailer_consent_form, process_newsletter_form
 from portal.views.email import verify_email
 from portal.views.home import (
     coding_club,
@@ -111,12 +105,8 @@ from portal.views.two_factor.profile import CustomDisableView
 js_info_dict = {"packages": ("conf.locale",)}
 
 two_factor_patterns = [
-    re_path(
-        r"^account/two_factor/setup/$", CustomSetupView.as_view(), name="setup"
-    ),
-    re_path(
-        r"^account/two_factor/qrcode/$", QRGeneratorView.as_view(), name="qr"
-    ),
+    re_path(r"^account/two_factor/setup/$", CustomSetupView.as_view(), name="setup"),
+    re_path(r"^account/two_factor/qrcode/$", QRGeneratorView.as_view(), name="qr"),
     re_path(
         r"^account/two_factor/setup/complete/$",
         SetupCompleteView.as_view(),
@@ -141,6 +131,11 @@ two_factor_patterns = [
 
 
 urlpatterns = [
+    path(
+        "google-analytics/collect/",
+        google_analytics.collect,
+        name="collect-google-analytics",
+    ),
     path(
         "cron/",
         include(
@@ -187,9 +182,7 @@ urlpatterns = [
     ),
     re_path(
         r"^favicon\.ico$",
-        RedirectView.as_view(
-            url="/static/portal/img/favicon.ico", permanent=True
-        ),
+        RedirectView.as_view(url="/static/portal/img/favicon.ico", permanent=True),
     ),
     re_path(
         r"^administration/password_change/$",
@@ -201,9 +194,7 @@ urlpatterns = [
         AdminChangePasswordDoneView.as_view(),
         name="administration_password_change_done",
     ),
-    re_path(
-        r"^users/inactive/", InactiveUsersView.as_view(), name="inactive_users"
-    ),
+    re_path(r"^users/inactive/", InactiveUsersView.as_view(), name="inactive_users"),
     re_path(
         r"^locked_out/$",
         TemplateView.as_view(template_name="portal/locked_out.html"),
@@ -281,9 +272,7 @@ urlpatterns = [
     re_path(r"^consent_form/$", dotmailer_consent_form, name="consent_form"),
     re_path(
         r"^verify_email/$",
-        TemplateView.as_view(
-            template_name="portal/email_verification_needed.html"
-        ),
+        TemplateView.as_view(template_name="portal/email_verification_needed.html"),
         name="email_verification",
     ),
     re_path(
@@ -368,9 +357,7 @@ urlpatterns = [
         IndependentStudentDashboard.as_view(),
         name="independent_student_details",
     ),
-    re_path(
-        r"^play/account/$", student_edit_account, name="student_edit_account"
-    ),
+    re_path(r"^play/account/$", student_edit_account, name="student_edit_account"),
     re_path(
         r"^play/account/independent/$",
         ratelimit(
@@ -398,9 +385,7 @@ urlpatterns = [
     re_path(r"^contribute", contribute, name="contribute"),
     re_path(r"^terms", terms, name="terms"),
     re_path(r"^privacy-notice/$", privacy_notice, name="privacy_notice"),
-    re_path(
-        r"^privacy-policy/$", privacy_notice, name="privacy_policy"
-    ),  # Keeping this to route from old URL
+    re_path(r"^privacy-policy/$", privacy_notice, name="privacy_policy"),  # Keeping this to route from old URL
     re_path(r"^teach/dashboard/$", dashboard_manage, name="dashboard"),
     re_path(
         r"^teach/dashboard/kick/(?P<pk>[0-9]+)/$",

portal/views/google_analytics.py

@@ -0,0 +1,28 @@
+import json
+
+import requests
+from django.http import HttpRequest, JsonResponse
+from django.views.decorators.csrf import csrf_exempt
+
+
+@csrf_exempt
+def collect(request: HttpRequest):
+    body: dict = json.loads(request.body)
+    measurement_id = body["measurement_id"]
+    api_secret = body["api_secret"]
+    debug = body.get("debug", False)
+
+    response = requests.post(
+        url=(
+            "https://www.google-analytics.com/debug/mp/collect"
+            if debug
+            else "https://www.google-analytics.com/mp/collect"
+        )
+        + f"?measurement_id=${measurement_id}&api_secret=${api_secret}",
+        json=body["payload"],
+    )
+
+    return JsonResponse(
+        data=response.json() if debug else {},
+        status=response.status_code,
+    )

portal/views/legal.py

@@ -5,7 +5,7 @@ def privacy_notice(request):
     return render(
         request,
         "portal/privacy_notice.html",
-        {"last_updated": "27th February 2025", "last_updated_children": "27th February 2025"},
+        {"last_updated": "28th February 2025", "last_updated_children": "28th February 2025"},
     )