codeforlife-portal 8.3.8__tar.gz → 8.4.1__tar.gz

{codeforlife_portal-8.3.8/codeforlife_portal.egg-info → codeforlife_portal-8.4.1}/PKG-INFO

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

@@ -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 → codeforlife_portal-8.4.1}/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.1/portal/__init__.py

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

{codeforlife_portal-8.3.8 → codeforlife_portal-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 = {

{codeforlife_portal-8.3.8 → codeforlife_portal-8.4.1}/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>

{codeforlife_portal-8.3.8 → codeforlife_portal-8.4.1}/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>

{codeforlife_portal-8.3.8 → codeforlife_portal-8.4.1}/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 %}

{codeforlife_portal-8.3.8 → codeforlife_portal-8.4.1}/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.1/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.3.8/portal/__init__.py

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