codeforlife-portal 7.4.3__py2.py3-none-any.whl → 7.4.5__py2.py3-none-any.whl

{codeforlife_portal-7.4.3.dist-info → codeforlife_portal-7.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.4.3
+Version: 7.4.5
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -21,7 +21,7 @@ Requires-Dist: django-classy-tags==2.0.0
 Requires-Dist: libsass==0.23.0
 Requires-Dist: phonenumbers==8.12.12
 Requires-Dist: more-itertools==8.7.0
-Requires-Dist: cfl-common==7.4.3
+Requires-Dist: cfl-common==7.4.5
 Requires-Dist: django-ratelimit==3.0.1
 Requires-Dist: django-preventconcurrentlogins==0.8.2
 Requires-Dist: django-csp==3.7

{codeforlife_portal-7.4.3.dist-info → codeforlife_portal-7.4.5.dist-info}/RECORD

@@ -108,7 +108,7 @@ example_project/portal_test_settings.py,sha256=_gI7-HMoPJ-cDGO6n5UlEIHKHuTR5SC_X
 example_project/settings.py,sha256=HgGSG0n6Xggd0NieFVoJgn8vKGqyRbCddoB3CRuoT-Y,5640
 example_project/urls.py,sha256=3SsP5jvPAXV5xmduka4zbSZB5PbXggjsalu1ojY5KIo,434
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=olYEIni3LYPkdTYbQN19dX_D-AAeoyTsiUuVAO9gQPQ,22
+portal/__init__.py,sha256=ERwVBgQCBJgucxhtakk-dQufB6Ee4T6nwO2NL91sBGg,22
 portal/admin.py,sha256=on1-zNRnZvf2cwBN6GVRVYRhkaksrCgfzX8XPWtkvz8,6062
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -116,7 +116,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=4bGQQWiQI9zSG1oceVjQctUnDKggzzZsbYAxuBvijpY,18002
+portal/urls.py,sha256=AoreM8d6hjGgeZBbxiGVK-o6kYrfpfUVO72tPK55uMo,18239
 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
@@ -435,7 +435,7 @@ portal/templates/captcha/includes/js_v2_invisible.html,sha256=FUyDf1RDyS7whzW2B_
 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=A9_hiD-ChBRnictFvAaQiSgSANfrnQ_zFY6hqBtK2rg,5767
+portal/templates/portal/coding_club.html,sha256=CJS1dEKMQ70AQ9U05wTctmvXYJngs18qxbyzNJmkfHk,5449
 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
@@ -609,14 +609,14 @@ portal/views/admin.py,sha256=4Xt3zEyQH7sUwQSrwuRtoCodWidjOzd7gJUwWU96pXY,957
 portal/views/api.py,sha256=lCwiclR98G-yTgK55u8IjkueIH8iremeiZSa3jAvO-M,6990
 portal/views/dotmailer.py,sha256=x49p89TtwA1MLysRLtq5yRRzVtIpzGoU__Xb5hPuHak,3208
 portal/views/email.py,sha256=V3wXRxIjeZ4OJBVqGCQrPn-GQWKZK1PCXbR1f2Zpa_4,2174
-portal/views/home.py,sha256=qt5kW7TAaRFXz7BA2BrnHe5oYc69jjoLksEbfr0Aa3c,9715
+portal/views/home.py,sha256=eqtjyvZ8oQGCnQ5Y91jOc1KBDKJ77kZFouI32klotho,9717
 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
 portal/views/registration.py,sha256=L9AzIG2nOU946cSOXmUMQRtDo3uxApHX-0ceXopbOCw,10888
 portal/views/teach.py,sha256=nzlyTcgq9ImAjnqrF3esqi212qBLH5Ww1LKE2gSjoRY,210
 portal/views/cron/__init__.py,sha256=5rxXyhJmLOExRdrYZ1VJttTsyRIPRybzdftbUDwFByI,20
-portal/views/cron/user.py,sha256=iKM_FOcSQvrXtRSZUtxSiMFD3M869JP5jvEfRWHLpvM,10731
+portal/views/cron/user.py,sha256=U4PfsLbUnGUB_s9h6gdRba3y6c9rexjxK-hk1ptumQk,10845
 portal/views/login/__init__.py,sha256=xSCtyFPSI87BRUybBgqa86ekFEolX5gUDbBSfBUMTyI,399
 portal/views/login/independent_student.py,sha256=3dFULhwMAlX4VDrJl-Znril6a9M5xKBSHO1eWvujfS0,2662
 portal/views/login/student.py,sha256=dt6cMfWepBJsVCRcADltfYSHVpyeP1WGLKSogMJ22E0,5539
@@ -631,8 +631,8 @@ portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 portal/views/two_factor/core.py,sha256=O_wcBeFqdPYSGNGv-pT_vbs5-Dj1Z-Jfkd6f9-E5yZI,760
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=tkl_ludo8arMtd5LKNmohM66vpC_YQiP-0nspTSJiJ4,383
-codeforlife_portal-7.4.3.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-7.4.3.dist-info/METADATA,sha256=UWFujJxxfaXyqmfcwg4-DYbkouqg-eSRo3i0SWVNCTo,3317
-codeforlife_portal-7.4.3.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-codeforlife_portal-7.4.3.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-7.4.3.dist-info/RECORD,,
+codeforlife_portal-7.4.5.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-7.4.5.dist-info/METADATA,sha256=23UXanFqJpSCw-eMUQ4dYO4uuaksgG9Hpq3x8M_0BYc,3317
+codeforlife_portal-7.4.5.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+codeforlife_portal-7.4.5.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-7.4.5.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "7.4.3"
+__version__ = "7.4.5"

portal/templates/portal/coding_club.html

@@ -42,7 +42,7 @@
                         at home or in school, on or offline.
                     </p>
                     <p>
-                        View the resources <a target="_blank" href="https://code-for-life.gitbook.io/code-club-resources/">online here</a>.
+                        View the resources <a target="_blank" href="https://code-for-life.gitbook.io/code-for-life-primary-club-resources">online here</a>.
                     </p>
                 </div>
                 <div>
@@ -82,23 +82,23 @@
                         try coding out. It is designed to be used in face-to-face or online clubs.
                     </p>
                     <p>
-                        View the resources <a target="_blank" href="https://code-for-life.gitbook.io/code-club-resources-intermediate/">online here</a>.
+                        View the resources <a target="_blank" href="https://code-for-life.gitbook.io/code-for-life-python-club-resources">online here</a>.
                     </p>
                 </div>
                 <div>
                     <!-- TODO: improve responsiveness -->
                     <div style="margin-bottom: 10px;">
-                        <a id="grass_snakes_pack" download class="button button--primary button--icon" href="https://3289537671-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FS5kw31UTGL8CPHU9skBS%2Fuploads%2FKsC7tdyT6htj5JX1ig28%2FGrass%20Snakes%20Club.zip?alt=media&token=1f6e6f0e-1a10-4bef-a8f8-a20b0a59e4c0">
+                        <a id="grass_snakes_pack" download class="button button--primary button--icon" href="https://content.gitbook.com/content/5508uzXa7roQPZikv2aI/blobs/kpNf9JheYqpbfjVWILfG/Grass%20Snakes%20Club.zip">
                             Lvl 1: Grass Snakes<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
                         </a>
                     </div>
                     <div style="margin-bottom: 10px;">
-                        <a id="tiger_snakes_pack" download type="submit" class="button button--primary button--icon" href="https://3289537671-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FS5kw31UTGL8CPHU9skBS%2Fuploads%2FSIeSsvz348nXjNMcVPxx%2FTiger%20Snakes%20Club.zip?alt=media&token=872b383f-a209-4864-a0e0-26d7ba3a8d74">
+                        <a id="tiger_snakes_pack" download type="submit" class="button button--primary button--icon" href="https://content.gitbook.com/content/5508uzXa7roQPZikv2aI/blobs/AwIiOPatP90PeCOwzaPX/Tiger%20Snakes%20Club.zip">
                             Lvl 2: Tiger Snakes<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
                         </a>
                     </div>
                     <div>
-                        <a id="cobra_snakes_pack" download type="submit" class="button button--primary button--icon" href="https://3289537671-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FS5kw31UTGL8CPHU9skBS%2Fuploads%2FITTbTC8DVwr8LdCkN82d%2FCobra%20Club.zip?alt=media&token=bfd94842-cba9-45c7-892b-331bc82c33e9">
+                        <a id="cobra_snakes_pack" download type="submit" class="button button--primary button--icon" href="https://content.gitbook.com/content/5508uzXa7roQPZikv2aI/blobs/KLfkfRtnmPBaexhhtrPO/Cobra%20Club.zip">
                             Lvl 3: Cobra Snakes<span class="iconify" data-icon="mdi:tray-arrow-down"></span>
                         </a>
                     </div>

portal/urls.py

@@ -223,53 +223,63 @@ urlpatterns = [
     ),
     url(r"^$", home, name="home"),
     url(r"^home-learning", home_learning, name="home-learning"),
-    url(r"^register_form", register_view, name="register"),
+    url(
+        r"^register_form",
+        # register_view,
+        home,
+        name="register",
+    ),
     url(
         r"^login/teacher/$",
-        # The ratelimit decorator checks how often a POST request is performed on that view.
-        # It checks against the username value specifically. If the number of requests
-        # exceeds the specified rate, then the user will be blocked (if block = True).
-        ratelimit(
-            group=RATELIMIT_LOGIN_GROUP,
-            key="post:auth-username",
-            method=RATELIMIT_METHOD,
-            rate=RATELIMIT_LOGIN_RATE,
-            block=True,
-        )(TeacherLoginView.as_view()),
+        # # The ratelimit decorator checks how often a POST request is performed on that view.
+        # # It checks against the username value specifically. If the number of requests
+        # # exceeds the specified rate, then the user will be blocked (if block = True).
+        # ratelimit(
+        #     group=RATELIMIT_LOGIN_GROUP,
+        #     key="post:auth-username",
+        #     method=RATELIMIT_METHOD,
+        #     rate=RATELIMIT_LOGIN_RATE,
+        #     block=True,
+        # )(TeacherLoginView.as_view()),
+        home,
         name="teacher_login",
     ),
     url(
         rf"^login/student/(?P<access_code>{ACCESS_CODE_REGEX})/(?:(?P<login_type>classform)/)?$",
-        ratelimit(
-            group=RATELIMIT_LOGIN_GROUP,
-            key=school_student_key,
-            method=RATELIMIT_METHOD,
-            rate=RATELIMIT_LOGIN_RATE_SCHOOL_STUDENT,
-            block=True,
-            is_teacher=False,
-        )(StudentLoginView.as_view()),
+        # ratelimit(
+        #     group=RATELIMIT_LOGIN_GROUP,
+        #     key=school_student_key,
+        #     method=RATELIMIT_METHOD,
+        #     rate=RATELIMIT_LOGIN_RATE_SCHOOL_STUDENT,
+        #     block=True,
+        #     is_teacher=False,
+        # )(StudentLoginView.as_view()),
+        home,
         name="student_login",
     ),
     url(
         r"^login/student/$",
-        StudentClassCodeView.as_view(),
+        # StudentClassCodeView.as_view(),
+        home,
         name="student_login_access_code",
     ),
     url(
         r"^u/(?P<user_id>[0-9]+)/(?P<login_id>[a-z0-9]+)/$",
-        student_direct_login,
+        # student_direct_login,
+        home,
         name="student_direct_login",
     ),
     url(
         r"^login/independent/$",
-        ratelimit(
-            group=RATELIMIT_LOGIN_GROUP,
-            key="post:username",
-            method=RATELIMIT_METHOD,
-            rate=RATELIMIT_LOGIN_RATE,
-            block=True,
-            is_teacher=False,
-        )(IndependentStudentLoginView.as_view()),
+        # ratelimit(
+        #     group=RATELIMIT_LOGIN_GROUP,
+        #     key="post:username",
+        #     method=RATELIMIT_METHOD,
+        #     rate=RATELIMIT_LOGIN_RATE,
+        #     block=True,
+        #     is_teacher=False,
+        # )(IndependentStudentLoginView.as_view()),
+        home,
         name="independent_student_login",
     ),
     url(r"^login_form", old_login_form_redirect, name="old_login_form"),
@@ -290,17 +300,20 @@ urlpatterns = [
     ),
     url(
         rf"^verify_email/(?P<token>{JWT_REGEX})/$",
-        verify_email,
+        # verify_email,
+        home,
         name="verify_email",
     ),
     url(
         r"^user/password/reset/student/$",
-        student_password_reset,
+        # student_password_reset,
+        home,
         name="student_password_reset",
     ),
     url(
         r"^user/password/reset/teacher/$",
-        teacher_password_reset,
+        # teacher_password_reset,
+        home,
         name="teacher_password_reset",
     ),
     url(
@@ -310,7 +323,8 @@ urlpatterns = [
     ),
     url(
         r"^user/password/reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$",
-        password_reset_check_and_confirm,
+        # password_reset_check_and_confirm,
+        home,
         name="password_reset_check_and_confirm",
     ),
     url(

portal/views/cron/user.py

@@ -172,42 +172,42 @@ class SecondVerifyEmailReminderView(CronMixin, APIView):
 
 class AnonymiseUnverifiedAccounts(CronMixin, APIView):
     def get(self, request):
-        user_count = User.objects.filter(is_active=True).count()
-
-        teacher_queryset, independent_student_queryset = get_unverified_users(
-            USER_DELETE_UNVERIFIED_ACCOUNT_DAYS,
-            same_day=False,
-        )
-        teacher_count = teacher_queryset.count()
-        indy_count = independent_student_queryset.count()
-
-        user_queryset = teacher_queryset.union(independent_student_queryset)
-
-        for user in user_queryset.iterator(chunk_size=100):
-            try:
-                anonymise(user)
-            except Exception as ex:
-                logging.error(f"Failed to anonymise user with id: {user.id}")
-                logging.exception(ex)
-
-        user_count -= User.objects.filter(is_active=True).count()
-        logging.info(f"{user_count} unverified users anonymised.")
-
-        activity_today = DailyActivity.objects.get_or_create(
-            date=datetime.now().date()
-        )[0]
-        activity_today.anonymised_unverified_teachers = teacher_count
-        activity_today.anonymised_unverified_independents = indy_count
-        activity_today.save()
-
-        TotalActivity.objects.update(
-            anonymised_unverified_teachers=F("anonymised_unverified_teachers")
-            + teacher_count,
-            anonymised_unverified_independents=F(
-                "anonymised_unverified_independents"
-            )
-            + indy_count,
-        )
+        # user_count = User.objects.filter(is_active=True).count()
+        #
+        # teacher_queryset, independent_student_queryset = get_unverified_users(
+        #     USER_DELETE_UNVERIFIED_ACCOUNT_DAYS,
+        #     same_day=False,
+        # )
+        # teacher_count = teacher_queryset.count()
+        # indy_count = independent_student_queryset.count()
+        #
+        # user_queryset = teacher_queryset.union(independent_student_queryset)
+        #
+        # for user in user_queryset.iterator(chunk_size=100):
+        #     try:
+        #         anonymise(user)
+        #     except Exception as ex:
+        #         logging.error(f"Failed to anonymise user with id: {user.id}")
+        #         logging.exception(ex)
+        #
+        # user_count -= User.objects.filter(is_active=True).count()
+        # logging.info(f"{user_count} unverified users anonymised.")
+        #
+        # activity_today = DailyActivity.objects.get_or_create(
+        #     date=datetime.now().date()
+        # )[0]
+        # activity_today.anonymised_unverified_teachers = teacher_count
+        # activity_today.anonymised_unverified_independents = indy_count
+        # activity_today.save()
+        #
+        # TotalActivity.objects.update(
+        #     anonymised_unverified_teachers=F("anonymised_unverified_teachers")
+        #     + teacher_count,
+        #     anonymised_unverified_independents=F(
+        #         "anonymised_unverified_independents"
+        #     )
+        #     + indy_count,
+        # )
 
         return Response()
 

portal/views/home.py

@@ -255,7 +255,7 @@ 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))
+        # count_student_pack_downloads_click(int(student_pack_type))
         link = cloud_storage("club_packs/PrimaryCodingClub.zip")
         return redirect(link)