codeforlife-portal 8.4.0__tar.gz → 8.4.2__tar.gz

{codeforlife_portal-8.4.0/codeforlife_portal.egg-info → codeforlife_portal-8.4.2}/PKG-INFO

@@ -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 → codeforlife_portal-8.4.2/codeforlife_portal.egg-info}/PKG-INFO

@@ -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 → codeforlife_portal-8.4.2}/codeforlife_portal.egg-info/SOURCES.txt

@@ -528,6 +528,7 @@ portal/views/admin.py
 portal/views/api.py
 portal/views/dotmailer.py
 portal/views/email.py
+portal/views/google_analytics.py
 portal/views/home.py
 portal/views/legal.py
 portal/views/organisation.py

codeforlife_portal-8.4.2/portal/__init__.py

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

{codeforlife_portal-8.4.0 → codeforlife_portal-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">

{codeforlife_portal-8.4.0 → codeforlife_portal-8.4.2}/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>
 

{codeforlife_portal-8.4.0 → codeforlife_portal-8.4.2}/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>

{codeforlife_portal-8.4.0 → codeforlife_portal-8.4.2}/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]+)/$",

codeforlife_portal-8.4.2/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,
+    )

{codeforlife_portal-8.4.0 → codeforlife_portal-8.4.2}/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"},
     )
 
 

codeforlife_portal-8.4.0/portal/__init__.py

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