codeforlife-portal 8.3.8__py2.py3-none-any.whl → 8.4.1__py2.py3-none-any.whl

cfl_common/common/csp_config.py

@@ -49,6 +49,7 @@ 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://www.recaptcha.net/",
     "https://www.google.com/recaptcha/",

{codeforlife_portal-8.3.8.dist-info → codeforlife_portal-8.4.1.dist-info}/METADATA

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

{codeforlife_portal-8.3.8.dist-info → codeforlife_portal-8.4.1.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=ex0--OwvUAEbrdI37p8FSlDhB8IVyl_XWbCPVVF9MY8,2790
+cfl_common/common/csp_config.py,sha256=oOXxEh0LqGl89HBn8VHa1nFGTGIhEBqRTo-CzVCsdsw,2873
 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=830gX8muYFc22AmswN648u89HvKPUixSiF0sI1T7I1g,22
+portal/__init__.py,sha256=6yCd3vhnQem22chqsom8x3AUg4DeTLyaMeAcm2HpMtk,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
@@ -419,7 +419,7 @@ portal/static/portal/sass/partials/_ui-dialog.scss,sha256=gaXrY_uGqT6SyxYsCJmEiw
 portal/static/portal/sass/partials/_utils.scss,sha256=v0rzXvmkmA4sex_DdZ0LPYQybP8HXqDAE4q-kQKkPgk,3468
 portal/static/portal/video/code for life .pdf,sha256=0dVvxGFmCOhIzdMBjGhZJLhIoUX4vPll3_vFnZQqeAc,277957
 portal/strings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-portal/strings/about.py,sha256=noSrUV6c4gLvg4Cm7xpeE7cGbWTixi7_HJcw6EXdvqY,644
+portal/strings/about.py,sha256=ROt_UFX9eBzTJRkBTFF0591EO4_6WM4_kEy-vRrlPlk,962
 portal/strings/coding_club.py,sha256=fMQt829owRrqsH7CWTxo_TUrTOx70ll92XciRgqhlUw,312
 portal/strings/help_and_support.py,sha256=S6lQU6y0WhwBl33KDPlFA48NGQpuuBUGOY9WsB_ys0U,386
 portal/strings/home_learning.py,sha256=ZZ9rLupgBGrawxQ1kovCyYId6mK3w5LHchX8Ct8J2Lc,273
@@ -466,13 +466,13 @@ portal/templates/portal/login/independent_student.html,sha256=G4u82m0lko4yQvqRDM
 portal/templates/portal/login/student.html,sha256=s5rUyT-u7gei2xWQ-Ba35ePC5WbtwReEzUZAKwUoZVY,1261
 portal/templates/portal/login/student_class_code.html,sha256=rJr6NB4Oz7XjZXDOUHpwzT6r6yxh7nZ5joca-z2bK-s,966
 portal/templates/portal/login/teacher.html,sha256=s-8s55_D0jCf7ejEDIN2Vexpde0BljojRAz9QODLSUk,2671
-portal/templates/portal/partials/banner.html,sha256=HV6XG99ZEuN8Njlx-bGenZMTUI69-1NsxX3YfccX2CA,1531
+portal/templates/portal/partials/banner.html,sha256=5MzRKCZWFPDzcRzHPqG5MeED_KsmvAcKoA74YYXmlPY,2101
 portal/templates/portal/partials/benefits.html,sha256=TZm4U_XimgivkPMjDXxxkV7PLfRyi2PAwkH8Y4sFDps,2363
 portal/templates/portal/partials/card_list.html,sha256=yHcp4oc0WRG9H6Ek871VCHbwYkDRcwQYbZ320gtsFn8,1550
 portal/templates/portal/partials/character_list.html,sha256=SnNFHzbIkOSaiRPIvSdplEf_B87UYgJ1pOvMltNDxLE,415
 portal/templates/portal/partials/delete_popup.html,sha256=nEhnwgnmKoFzb6LlCwdX973Em9bVOFh6MON36RPteYs,1275
-portal/templates/portal/partials/footer.html,sha256=mJFsBJY1jfDUdujuceh0Y1bIXccIEWzbvEfsmNGl6D4,5036
-portal/templates/portal/partials/header.html,sha256=aRFgTy5JSQTqXSGUo7XQWd3a4Ia4auvJl3D3iNgJhm0,20250
+portal/templates/portal/partials/footer.html,sha256=IKEUmghaiiuQs5g9JfE97oNzjRTzBTu3SoFgJhRMyi8,5533
+portal/templates/portal/partials/header.html,sha256=xorEsPYzbmZGXHBOKm_6SHXQJxkCFKEWfMJbADG3k3I,20816
 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
@@ -611,6 +611,7 @@ 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/organisation.py,sha256=sPDbiM7hdtpF8GKyh_4n4VPl2a-WnAgnF4q9aSvQCVI,3341
@@ -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.3.8.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-8.3.8.dist-info/METADATA,sha256=dErvdzhb1YJeLyK8zaMuy9llsy1GEi6VzzbRC_zkjS0,3077
-codeforlife_portal-8.3.8.dist-info/WHEEL,sha256=WDDPHYzpiOIm6GP1C2_8y8W6q16ICddAgOHlhTje9Qc,109
-codeforlife_portal-8.3.8.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.3.8.dist-info/RECORD,,
+codeforlife_portal-8.4.1.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.4.1.dist-info/METADATA,sha256=bU_r6aXVNL0xdvKY25Bd42t6lWnJuswz2NejKBwUb9w,3077
+codeforlife_portal-8.4.1.dist-info/WHEEL,sha256=WDDPHYzpiOIm6GP1C2_8y8W6q16ICddAgOHlhTje9Qc,109
+codeforlife_portal-8.4.1.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.4.1.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.3.8"
+__version__ = "8.4.1"

portal/strings/about.py

@@ -9,6 +9,11 @@ GETINVOLVED_BANNER = {
     "title": "Get involved",
     "subtitle": "How you can get involved with the creation of Code for Life products and resources",
     "image_class": "banner--picture--getinvolved",
+    "button": {
+        "external": True,
+        "text": "Opportunities with Code for Life",
+        "link": "https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FPavvCifcuUeZZZLkV01C%2FOpportunities%20with%20Code%20for%20Life.pdf?alt=media",
+    },
 }
 
 CONTRIBUTE_BANNER = {

portal/templates/portal/partials/banner.html

@@ -12,10 +12,18 @@
                     {% endif %}
                     <div class="button-group">
                         {% if button %}
-                            <a href="{% url button.link %}" class="button button--primary button-right-arrow">{{ button.text}}</a>
+                            {% if button.external %}
+                                <a href="{{ button.link }}" target="_blank" class="button button--primary button-right-arrow">{{ button.text }}</a>
+                            {% else %}
+                                <a href="{% url button.link %}" class="button button--primary button-right-arrow">{{ button.text}}</a>
+                            {% endif %}
                         {% endif %}
                         {% if button2 %}
-                            <a href="{% url button2.link %}" class="button button--primary button-right-arrow">{{ button2.text}}</a>
+                            {% if button.external %}
+                                <a href="{{ button2.link }}" target="_blank" class="button button--primary button-right-arrow">{{ button2.text }}</a>
+                            {% else %}
+                                <a href="{% url button2.link %}" class="button button--primary button-right-arrow">{{ button2.text}}</a>
+                            {% endif %}
                         {% endif %}
                     </div>
                 </div>

portal/templates/portal/partials/footer.html

@@ -9,9 +9,9 @@
                     <div class="col-sm-4 col-xs-12">
                         <p><a href="{% url 'about' %}">About us</a></p>
                         <p><a class="freshdesk__contact-us">Help and support</a></p>
-                        <p><a href="https://storage.googleapis.com/codeforlife-assets/impact_reports/impact_report_2023.pdf"
+                        <p><a href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FHx2kJLPwUER9Ez7gdQFp%2F2023_Impact_Report_Final.pdf?alt=media"
                               target="_blank">Impact Report 2023</a></p>
-                        <p><a href="https://storage.googleapis.com/codeforlife-assets/impact_reports/impact_report_2024.pdf"
+                        <p><a href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FzLy8JN9TSFpzunetkWET%2FImpact_Report_24.V.10.pdf?alt=media"
                               target="_blank">Impact Report 2024</a></p>
                     </div>
                     <div class="col-sm-4 col-xs-12">
@@ -23,6 +23,8 @@
                         <p><a href="{% url 'home-learning' %}">Home learning</a></p>
                         <p><a href="{% url 'getinvolved' %}">Get involved</a></p>
                         <p><a href="{% url 'codingClub' %}">Coding clubs</a></p>
+                        <p><a href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FPavvCifcuUeZZZLkV01C%2FOpportunities%20with%20Code%20for%20Life.pdf?alt=media"
+                              target="_blank">Opportunities with CFL</a></p>
                     </div>
                 </div>
             </div>

portal/templates/portal/partials/header.html

@@ -259,10 +259,10 @@
         <a class="button button--menu__item freshdesk__contact-us">Help and support
             <span class="material-icons-outlined md-32">chevron_right</span></a>
         <a class="button button--menu__item" target="_blank"
-              href="https://storage.googleapis.com/codeforlife-assets/impact_reports/impact_report_2023.pdf">
+              href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FHx2kJLPwUER9Ez7gdQFp%2F2023_Impact_Report_Final.pdf?alt=media">
             Impact Report 2023<span class="material-icons-outlined md-32">chevron_right</span></a>
         <a class="button button--menu__item" target="_blank"
-              href="https://storage.googleapis.com/codeforlife-assets/impact_reports/impact_report_2024.pdf">
+              href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FzLy8JN9TSFpzunetkWET%2FImpact_Report_24.V.10.pdf?alt=media">
             Impact Report 2024<span class="material-icons-outlined md-32">chevron_right</span></a>
         <a class="button button--menu__item optanon-toggle-display">Cookie settings
             <span class="material-icons-outlined md-32">chevron_right</span></a>
@@ -274,6 +274,9 @@
             <span class="material-icons-outlined md-32">chevron_right</span></a>
         <a class="button button--menu__item" href="{% url 'getinvolved' %}">Get involved
             <span class="material-icons-outlined md-32">chevron_right</span></a>
+        <a class="button button--menu__item" target="_blank"
+           href="https://2662351606-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-M_6UDUiGoJDhr_OXetO%2Fuploads%2FPavvCifcuUeZZZLkV01C%2FOpportunities%20with%20Code%20for%20Life.pdf?alt=media">Opportunities with CFL
+            <span class="material-icons-outlined md-32">chevron_right</span></a>
         {% if user|is_logged_in %}
             {% if user|is_logged_in_as_teacher %}
                 {% if user|has_teacher_finished_onboarding %}

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,
+    )