codeforlife-portal 8.1.1__py2.py3-none-any.whl → 8.1.2__py2.py3-none-any.whl

cfl_common/setup.py

@@ -17,7 +17,7 @@ setup(
     version=version,
     include_package_data=True,
     install_requires=[
-        "django==4.2.17",
+        "django==4.2.18",
         "django-countries==7.6.1",
         "django-csp==3.8",
         "django-import-export==4.2.0",

{codeforlife_portal-8.1.1.dist-info → codeforlife_portal-8.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 8.1.1
+Version: 8.1.2
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -9,7 +9,7 @@ License-File: LICENSE.md
 Requires-Dist: django-recaptcha==4.0.0
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: importlib-metadata==4.13.0
-Requires-Dist: reportlab==3.6.13
+Requires-Dist: reportlab==4.2.5
 Requires-Dist: django-formtools==2.5.1
 Requires-Dist: django-otp==1.5.4
 Requires-Dist: requests==2.32.2

{codeforlife_portal-8.1.1.dist-info → codeforlife_portal-8.1.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cfl_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cfl_common/setup.py,sha256=0Bbnt2gvlq6PnI5wMZ3hPuccY-CtdKQIy5RSSmbja4U,978
+cfl_common/setup.py,sha256=T8DMxXoniOYHNZpgks4TvYvAt4lDnZxDHAwVBH-02iM,978
 cfl_common/common/__init__.py,sha256=XlncBOpKp_gekbKH7Y_i6yu1qy5tJc3Y8sn8cDy-Vgk,48
 cfl_common/common/app_settings.py,sha256=Bw1DXkZpNIdwUJ-cIOjZnngH5_NbMXC0koW7NgQ0pKY,2495
 cfl_common/common/apps.py,sha256=49UXZ3bSkFKvIEOL4zM7y1sAhccQJyRtsoOg5XVd_8Y,129
@@ -110,7 +110,7 @@ example_project/portal_test_settings.py,sha256=7Q7SdosA0Ba85qz-xkAe3EHyMPpSIQ61C
 example_project/settings.py,sha256=NjFhtDNLwdY5vhUAtqk9a9m3GRfcuWRVqIqnJ3u0o6E,5658
 example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=8YlEPKK1Cm5T4dPa2BQPpPwVVTzjPLnmqAeNcTb5nOw,22
+portal/__init__.py,sha256=EsLdncrDNNSYcAkb6bacgIFA7Oh4EZnzpp9alKokT5A,22
 portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -118,7 +118,7 @@ portal/beta.py,sha256=0TCC-9_KZoM1nuzJ9FiuKR5n9JITdMYenHGQtRvn9UU,255
 portal/context_processors.py,sha256=Q68UhmArLPRchS2KmfVR4hKrijllXal3sO5cHYWC2Fc,222
 portal/handlers.py,sha256=gF99OfQrGcIGDnUyONhvylZNU8sl6XHYEurwu0fuiss,422
 portal/models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-portal/urls.py,sha256=_EJQ7XNVzeqN6g9pbtKg7DHZHlz31-HgWgft6_kOwXw,18415
+portal/urls.py,sha256=9d7cV2O8CTMT_Y2Nlkfxxfw8NHa0bw_RKgQw4ddqsgk,18194
 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
@@ -437,7 +437,7 @@ portal/templates/django_recaptcha/includes/js_v2_invisible.html,sha256=QQnBzZBqd
 portal/templates/portal/about.html,sha256=_iD0GCP6q3-XuZ2LC-9O0KYY-mKL6c9qk3O-NRRqsRM,10321
 portal/templates/portal/base.html,sha256=4xLACNgKmRQTdEsdNNGYhLzMozzYzWIIzk31HrLGBf0,12109
 portal/templates/portal/base_no_userprofile.html,sha256=PlRufyYmUUGWBZ6CvbYhJWOMTqKqdcee4xnO5--AogA,447
-portal/templates/portal/coding_club.html,sha256=CJS1dEKMQ70AQ9U05wTctmvXYJngs18qxbyzNJmkfHk,5449
+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/dotmailer_consent_form.html,sha256=UDdizPoKYZGybr6z9nzDV4WPhJPa-S3bIKywvVgFrxg,918
 portal/templates/portal/email_invitation_sent.html,sha256=hAMzQXE3NFGnOsQlCGuo3Aps-vazSJb5BhAN7bWT48M,641
@@ -611,7 +611,7 @@ portal/views/admin.py,sha256=4Xt3zEyQH7sUwQSrwuRtoCodWidjOzd7gJUwWU96pXY,957
 portal/views/api.py,sha256=mdWmFkV5mxmR-mvj6ttIe8uwW9tbcx9-5ykk5dpX0LI,7047
 portal/views/dotmailer.py,sha256=x49p89TtwA1MLysRLtq5yRRzVtIpzGoU__Xb5hPuHak,3208
 portal/views/email.py,sha256=V3wXRxIjeZ4OJBVqGCQrPn-GQWKZK1PCXbR1f2Zpa_4,2174
-portal/views/home.py,sha256=cKCby5xDYImMeJqNnrnfkDbb3tAcQX-lw6IgBS7RmR4,10050
+portal/views/home.py,sha256=8leK4ADxRg-gK-bm7D08CR44bhV3I8lt5pCV59HXMkk,9619
 portal/views/legal.py,sha256=nUunsTHnhMcXBcDlg1GmUal86k9Vhinne4A2FWfq78M,342
 portal/views/organisation.py,sha256=sPDbiM7hdtpF8GKyh_4n4VPl2a-WnAgnF4q9aSvQCVI,3341
 portal/views/play_landing_page.py,sha256=FFmjUFub3ZdlbMqkB8yX3jAImCzqrUqgb8AZcpKywZ4,308
@@ -633,8 +633,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.1.1.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-8.1.1.dist-info/METADATA,sha256=e4FNA5qvh6-VVZ05ztRGRDfdcZARBc_U0XYDh1J3Pws,3078
-codeforlife_portal-8.1.1.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-codeforlife_portal-8.1.1.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.1.1.dist-info/RECORD,,
+codeforlife_portal-8.1.2.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.1.2.dist-info/METADATA,sha256=8CmqSD1WWVfvsulf47gxjkpy2HNBNZvXZyycu_0anTI,3077
+codeforlife_portal-8.1.2.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+codeforlife_portal-8.1.2.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.1.2.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.1.1"
+__version__ = "8.1.2"

portal/templates/portal/coding_club.html

@@ -46,12 +46,9 @@
                     </p>
                 </div>
                 <div>
-                    <form method="post", action="{% url 'download_student_pack' 3 %}" class="non-styled--form">
-                        {% csrf_token %}
-                        <button id="primary_pack" href="" type="submit" class="button button--primary button--icon">
-                            Download the Primary coding club pack<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
-                        </button>
-                    </form>
+                    <a id="primary_pack" download type="submit" class="button button--primary button--icon" href="https://code-for-life.gitbook.io/code-for-life-primary-club-resources">
+                        Download the Primary coding club pack<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
+                    </a>
                 </div>
             </div>
             <div class="col-sm-6 d-flex flex-column">
@@ -77,7 +74,7 @@
                     <h4 class="mt-0">Python coding club</h4>
                     <p>
                         Download your FREE coding club pack for students aged 12 and above.
-                        This pack is a fast paced introduction to Python. It is aimed at students already interested
+                        This pack is a fast-paced introduction to Python. It is aimed at students already interested
                         in learning coding, individuals looking to learn and run their own club, or adults wanting to
                         try coding out. It is designed to be used in face-to-face or online clubs.
                     </p>

portal/urls.py

@@ -5,7 +5,6 @@ from django.views.generic import RedirectView
 from django.views.generic.base import TemplateView
 from django.views.i18n import JavaScriptCatalog
 from game.views.level import play_default_level
-from two_factor.urls import urlpatterns as tf_urls
 from two_factor.views import (
     BackupTokensView,
     ProfileView,
@@ -44,7 +43,6 @@ from portal.views.dotmailer import (
 from portal.views.email import verify_email
 from portal.views.home import (
     coding_club,
-    download_student_pack,
     home,
     home_learning,
     logout_view,
@@ -527,11 +525,6 @@ urlpatterns = [
         ),
     ),
     re_path(r"^codingClub/$", coding_club, name="codingClub"),
-    re_path(
-        r"^codingClub/(?P<student_pack_type>[3-4])/",
-        download_student_pack,
-        name="download_student_pack",
-    ),
     re_path(
         r"^removeFakeAccounts/",
         RemoveFakeAccounts.as_view(),

portal/views/home.py

@@ -2,8 +2,6 @@ import logging
 import math
 
 from common.helpers.emails import (
-    NOTIFICATION_EMAIL,
-    send_email,
     send_verification_email,
 )
 from common.mail import campaign_ids, send_dotdigital_email
@@ -16,7 +14,7 @@ from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import F
 from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import redirect, render
+from django.shortcuts import render
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.html import format_html
@@ -37,8 +35,6 @@ from portal.strings.ten_year_map import (
     TEN_YEAR_MAP_BANNER,
     TEN_YEAR_MAP_HEADLINE,
 )
-from portal.templatetags.app_tags import cloud_storage
-from portal.views.teacher.teach import count_student_pack_downloads_click
 
 LOGGER = logging.getLogger(__name__)
 
@@ -281,13 +277,6 @@ def coding_club(request):
     )
 
 
-def download_student_pack(request, student_pack_type):
-    if request.method == "POST":
-        count_student_pack_downloads_click(int(student_pack_type))
-        link = cloud_storage("club_packs/PrimaryCodingClub.zip")
-        return redirect(link)
-
-
 def home_learning(request):
     return render(
         request,