codeforlife-portal 5.33.5__py2.py3-none-any.whl → 8.9.9__py2.py3-none-any.whl

{codeforlife_portal-5.33.5.dist-info → codeforlife_portal-8.9.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

codeforlife_portal-8.9.9.dist-info/licenses/LICENSE.md

@@ -0,0 +1,3 @@
+# License
+
+Find our license [here](https://github.com/ocadotechnology/codeforlife-workspace/blob/main/LICENSE.md).

{codeforlife_portal-5.33.5.dist-info → codeforlife_portal-8.9.9.dist-info}/top_level.txt

@@ -1,3 +1,4 @@
+cfl_common
 deploy
 example_project
 portal

deploy/middleware/maintenance.py

@@ -0,0 +1,25 @@
+from django.http import HttpResponseRedirect
+from django.urls import reverse, reverse_lazy
+
+
+class MaintenanceMiddleware(object):
+    """
+    This middleware allows us to turn on "Maintenance Mode". Toggle `MAINTENANCE_MODE` to True in
+    `process_view` to redirect all requests in the app to the maintenance holding page.
+    """
+
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        response = self.get_response(request)
+        return response
+
+    def process_view(self, request, callback, callback_args, callback_kwargs):
+        MAINTENANCE_MODE = False
+
+        if MAINTENANCE_MODE and not request.path.startswith(reverse("maintenance")):
+            return HttpResponseRedirect(reverse_lazy("maintenance"))
+
+        if not MAINTENANCE_MODE and request.path.startswith(reverse("maintenance")):
+            return HttpResponseRedirect(reverse_lazy("home"))

deploy/middleware/screentime_warning.py

@@ -0,0 +1,29 @@
+from django.utils import timezone
+
+from portal.app_settings import SCREENTIME_WARNING_EXPIRY_TIME
+
+
+class ScreentimeWarningMiddleware:
+    """Middleware used to set the milliseconds until the user will see the screentime warning"""
+
+    def __init__(self, get_response):
+        self.get_response = get_response
+        # One-time configuration and initialization.
+
+    def __call__(self, request):
+        # Code to be executed for each request before
+        # the view (and later middleware) are called.
+        if request.user.is_authenticated:
+            if "last_screentime_warning" not in request.session:
+                request.session["last_screentime_warning"] = request.user.last_login.timestamp()
+
+            screentime_warning_time = request.session["last_screentime_warning"] + SCREENTIME_WARNING_EXPIRY_TIME
+
+            # Subtract the current time from the screentime warning time and convert to milliseconds
+            request.session["screentime_warning_timeout"] = (
+                screentime_warning_time - timezone.now().timestamp()
+            ) * 1000
+
+        response = self.get_response(request)
+
+        return response

deploy/middleware/security.py

@@ -4,19 +4,18 @@ from django.middleware.security import SecurityMiddleware
 class CustomSecurityMiddleware(SecurityMiddleware):
     """
     Extends Django's Security Middleware.
-    See https://docs.djangoproject.com/en/2.2/_modules/django/middleware/security/ for
-    the source code, as well as https://docs.djangoproject.com/en/2.2/ref/middleware/#module-django.middleware.security
+    See https://docs.djangoproject.com/en/4.2/_modules/django/middleware/security/ for
+    the source code, as well as https://docs.djangoproject.com/en/4.2/ref/middleware/#module-django.middleware.security
     for docs on security middleware.
     """
 
     def process_response(self, request, response):
         """
         Extends the original security middleware to ensure the X-XSS-Protection header
-        is set to 0.
+        is set to 1.
+        https://docs.djangoproject.com/en/5.1/releases/4.0/#securitymiddleware-no-longer-sets-the-x-xss-protection-header
         """
         super().process_response(request, response)
-
-        if self.xss_filter:
-            response["X-XSS-Protection"] = "0"
+        response.headers.setdefault("X-XSS-Protection", "1; mode=block")
 
         return response

deploy/middleware/session_timeout.py

@@ -1,5 +1,6 @@
 import time
 
+from django.contrib import messages
 from django.contrib.auth import logout
 from portal.app_settings import SESSION_EXPIRY_TIME
 
@@ -15,10 +16,11 @@ class SessionTimeoutMiddleware:
     def __call__(self, request):
         if request.user.is_authenticated:
             if "last_request" in request.session:
-                elapsed = time.time() - request.session["last_request"]
-                if elapsed > SESSION_EXPIRY_TIME:
+                elapsed_seconds = time.time() - request.session["last_request"]
+                if elapsed_seconds > SESSION_EXPIRY_TIME:
                     del request.session["last_request"]
                     logout(request)
+                    messages.info(request, "You have been logged out due to inactivity.")
             request.session["last_request"] = time.time()
         else:
             if "last_request" in request.session:

deploy/middleware/tmp_basic_auth.py

@@ -0,0 +1,41 @@
+from django.shortcuts import redirect
+
+from portal.app_settings import TMP_AUTH_TOKEN
+
+
+class TempBasicAuthMiddleware:
+    """
+    Middleware used as a basic auth for the new OTP app until we switch to the main domain.
+    Only meant for use in OTP, so include this in MIDDLEWARES only in OTP settings, not GCP.
+    Remove this middleware once the switch is done.
+    """
+
+    def __init__(self, get_response):
+        self.get_response = get_response
+        # One-time configuration and initialization.
+
+    def __call__(self, request):
+        # Code to be executed on each request.
+        url = request.build_absolute_uri()
+        token_in_url = f"/{TMP_AUTH_TOKEN}"
+
+        # If the user inputs the token in the URL correctly, set a cookie to the token's value
+        if url.endswith(token_in_url):
+            response = redirect(url.replace(token_in_url, ""))
+            response.set_cookie(
+                key="TMP_AUTH_TOKEN",
+                value=TMP_AUTH_TOKEN,
+            )
+            return response
+        # For any other request in the domain (except the health check), check that a cookie with the token's value
+        # exists. Redirect to the main site if it doesn't.
+        else:
+            value = request.COOKIES.get("TMP_AUTH_TOKEN")
+            if (
+                (value is not None and value == TMP_AUTH_TOKEN)
+                or url.endswith("/health-check/")
+                or url.endswith("/health-check")
+            ):
+                return self.get_response(request)
+
+        return redirect("https://www.codeforlife.education")

example_project/portal_test_settings.py

@@ -0,0 +1,239 @@
+"""Django settings for example_project project."""
+
+import os
+
+from selenium import webdriver
+
+DEBUG = True
+
+headless_firefox_options = webdriver.FirefoxOptions()
+headless_firefox_options.add_argument("--headless")
+headless_firefox_options.add_argument("--window-size=1920,1080")
+headless_firefox_options.add_argument("--start-maximized")
+headless_firefox_options.add_argument("--disable-gpu")
+headless_firefox_options.add_argument("--no-sandbox")
+headless_firefox_options.add_argument("--disable-extensions")
+headless_firefox_options.add_argument("--disable-dev-shm-usage")
+
+SELENIUM_WEBDRIVERS = {
+    "default": {"callable": webdriver.Firefox, "args": (), "kwargs": {}},
+    "chrome": {"callable": webdriver.Chrome, "args": (), "kwargs": {}},
+    "firefox-headless": {
+        "callable": webdriver.Firefox,
+        "args": (),
+        "kwargs": {"options": headless_firefox_options},
+    },
+}
+
+SELENIUM_WIDTHS = [1624]
+
+if os.environ.get("SELENIUM_HEADLESS", None):
+    from pyvirtualdisplay import Display
+
+    display = Display(visible=False, size=(1920, 1080))
+    display.start()
+    import atexit
+
+    atexit.register(lambda: display.stop())
+
+ROOT_URLCONF = "example_project.urls"
+SECRET_KEY = "bad_test_secret"
+
+DOTDIGITAL_AUTH = "dummy_dotdigital_auth"
+
+DOTMAILER_CREATE_CONTACT_URL = "https://test-create-contact/"
+DOTMAILER_DELETE_USER_BY_ID_URL = "https://test-delete-contact/"
+DOTMAILER_MAIN_ADDRESS_BOOK_URL = "https://test-main-address-book/"
+DOTMAILER_TEACHER_ADDRESS_BOOK_URL = "https://test-teacher-address-book/"
+DOTMAILER_STUDENT_ADDRESS_BOOK_URL = "https://test-student-address-book/"
+DOTMAILER_NO_ACCOUNT_ADDRESS_BOOK_URL = "https://test-no-account-address-book/"
+DOTMAILER_GET_USER_BY_EMAIL_URL = "https://test-get-user/"
+DOTMAILER_PUT_CONSENT_DATA_URL = "https://test-consent-data/"
+DOTMAILER_SEND_CAMPAIGN_URL = "https://test-send-campaign/"
+DOTMAILER_THANKS_FOR_STAYING_CAMPAIGN_ID = "1"
+DOTMAILER_USER = "username_here"
+DOTMAILER_PASSWORD = "password_here"
+DOTMAILER_DEFAULT_PREFERENCES = [{"trout": True}]
+
+
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+        "NAME": os.path.join(
+            os.path.abspath(os.path.dirname(__file__)), "db.sqlite3"
+        ),  # Or path to database file if using sqlite3.
+        "ATOMIC_REQUESTS": True,
+    }
+}
+
+USE_I18N = True
+USE_L10N = True
+TIME_ZONE = "Europe/London"
+
+LANGUAGE_CODE = "en-gb"
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
+STATIC_URL = "/static/"
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "portal/static")]
+MEDIA_ROOT = os.path.join(STATIC_ROOT, "email_media/")
+
+WSGI_APPLICATION = "example_project.wsgi.application"
+
+LOGIN_REDIRECT_URL = "/teach/dashboard/"
+
+EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
+
+SILENCED_SYSTEM_CHECKS = ["captcha.recaptcha_test_key_error"]
+
+INSTALLED_APPS = [
+    "game",
+    "pipeline",
+    "portal",
+    "django_recaptcha",
+    "common",
+    "django.contrib.admin",
+    "django.contrib.admindocs",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.sites",
+    "django.contrib.staticfiles",
+    "rest_framework",
+    "import_export",
+    "django_otp",
+    "django_otp.plugins.otp_static",
+    "django_otp.plugins.otp_totp",
+    "sekizai",  # for javascript and css management
+    "treebeard",
+    "two_factor",
+    "preventconcurrentlogins",
+]
+
+PIPELINE = {
+    "COMPILERS": ("portal.pipeline_compilers.LibSassCompiler",),
+    "STYLESHEETS": {
+        "css": {
+            "source_filenames": (
+                os.path.join(BASE_DIR, "static/portal/sass/bootstrap.scss"),
+                os.path.join(BASE_DIR, "static/portal/sass/colorbox.scss"),
+                os.path.join(BASE_DIR, "static/portal/sass/styles.scss"),
+            ),
+            "output_filename": "portal/css/portal.css",
+        },
+        "popup": {
+            "source_filenames": (
+                os.path.join(
+                    BASE_DIR, "static/portal/sass/partials/_popup.scss"
+                ),
+            ),
+            "output_filename": "portal/css/popup.css",
+        },
+        "game-scss": {
+            "source_filenames": (
+                os.path.join(BASE_DIR, "static/game/sass/game.scss"),
+            ),
+            "output_filename": "game/css/gamestyles.css",
+        },
+    },
+    "CSS_COMPRESSOR": None,
+    "SASS_ARGUMENTS": "--quiet",
+}
+
+
+STATICFILES_FINDERS = [
+    "pipeline.finders.PipelineFinder",
+    "django.contrib.staticfiles.finders.FileSystemFinder",
+    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
+]
+
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
+STORAGES = {
+    "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
+    "staticfiles": {
+        "BACKEND": "pipeline.storage.PipelineManifestStorage",
+    },
+}
+
+LANGUAGES = [("en-gb", "English")]
+MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
+MIDDLEWARE = [
+    "deploy.middleware.admin_access.AdminAccessMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "deploy.middleware.security.CustomSecurityMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "deploy.middleware.session_timeout.SessionTimeoutMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "deploy.middleware.exceptionlogging.ExceptionLoggingMiddleware",
+    "django_otp.middleware.OTPMiddleware",
+    "preventconcurrentlogins.middleware.PreventConcurrentLoginsMiddleware",
+    "csp.middleware.CSPMiddleware",
+    "deploy.middleware.screentime_warning.ScreentimeWarningMiddleware",
+    "deploy.middleware.maintenance.MaintenanceMiddleware",
+]
+
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.contrib.auth.context_processors.auth",
+                "django.template.context_processors.request",
+                "django.contrib.messages.context_processors.messages",
+                "sekizai.context_processors.sekizai",
+                "common.context_processors.module_name",
+                "common.context_processors.cookie_management_enabled",
+                "portal.context_processors.process_newsletter_form",
+            ]
+        },
+    }
+]
+
+CODEFORLIFE_WEBSITE = "www.codeforlife.education"
+CLOUD_STORAGE_PREFIX = "https://storage.googleapis.com/codeforlife-assets/"
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "handlers": {
+        "console": {"level": "DEBUG", "class": "logging.StreamHandler"}
+    },
+    "loggers": {"two_factor": {"handlers": ["console"], "level": "INFO"}},
+}
+RAPID_ROUTER_EARLY_ACCESS_FUNCTION_NAME = "portal.beta.has_beta_access"
+SECURE_CONTENT_TYPE_NOSNIFF = True
+SECURE_BROWSER_XSS_FILTER = True
+SECURE_REFERRER_POLICY = "strict-origin-when-cross-origin"
+CSRF_USE_SESSIONS = (
+    False  # Setting to False to allow CSRF token to work in Cypress
+)
+RECAPTCHA_DOMAIN = "www.recaptcha.net"
+AUTHENTICATION_BACKENDS = [
+    "django.contrib.auth.backends.ModelBackend",
+    "portal.backends.StudentLoginBackend",
+]
+USE_TZ = True
+PASSWORD_RESET_TIMEOUT_DAYS = 1
+
+PIPELINE_ENABLED = False
+
+COOKIE_MANAGEMENT_ENABLED = False
+
+AUTOCONFIG_INDEX_VIEW = "home"
+SITE_ID = 1
+
+from common.csp_config import *
+
+if MODULE_NAME == "local":
+    # NOTE: This is only used locally for testing purposes.
+    os.environ.setdefault(
+        "ENCRYPTION_KEY", "XTgWqMlZCMI_E5BvCArkif9nrJIIhe_6Ic6Q_UcWJDk="
+    )
+
+ENCRYPTION_KEY = os.environ["ENCRYPTION_KEY"]

example_project/settings.py

@@ -1,14 +1,10 @@
 """Django settings for example_project project."""
+
 import os
 
 DEBUG = True
 
-TEMPLATES = [
-    {
-        "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "OPTIONS": {"debug": DEBUG},
-    }
-]
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 DATABASES = {
     "default": {
@@ -16,6 +12,7 @@ DATABASES = {
         "NAME": os.path.join(
             os.path.abspath(os.path.dirname(__file__)), "db.sqlite3"
         ),  # Or path to database file if using sqlite3.
+        "ATOMIC_REQUESTS": True,
     }
 }
 
@@ -24,32 +21,174 @@ USE_L10N = True
 TIME_ZONE = "Europe/London"
 
 LANGUAGE_CODE = "en-gb"
-STATIC_ROOT = os.path.join(os.path.dirname(__file__), "static")
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_URL = "/static/"
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "portal/static")]
 MEDIA_ROOT = os.path.join(STATIC_ROOT, "email_media/")
 SECRET_KEY = "not-a-secret"
 
-ROOT_URLCONF = "urls"
+ROOT_URLCONF = "example_project.urls"
+
+ALLOWED_HOSTS = ["*"]
 
-WSGI_APPLICATION = "wsgi.application"
+WSGI_APPLICATION = "example_project.wsgi.application"
 
 LOGIN_REDIRECT_URL = "/teach/dashboard/"
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
-SILENCED_SYSTEM_CHECKS = ["captcha.recaptcha_test_key_error"]
+SILENCED_SYSTEM_CHECKS = ["django_recaptcha.recaptcha_test_key_error"]
+
+INSTALLED_APPS = [
+    "game",
+    "pipeline",
+    "portal",
+    "django_recaptcha",
+    "common",
+    "django.contrib.admin",
+    "django.contrib.admindocs",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.sites",
+    "django.contrib.staticfiles",
+    "rest_framework",
+    "import_export",
+    "django_otp",
+    "django_otp.plugins.otp_static",
+    "django_otp.plugins.otp_totp",
+    "sekizai",  # for javascript and css management
+    "treebeard",
+    "two_factor",
+    "preventconcurrentlogins",
+]
+
+PIPELINE = {
+    "COMPILERS": ("portal.pipeline_compilers.LibSassCompiler",),
+    "STYLESHEETS": {
+        "css": {
+            "source_filenames": (
+                os.path.join(BASE_DIR, "static/portal/sass/bootstrap.scss"),
+                os.path.join(BASE_DIR, "static/portal/sass/colorbox.scss"),
+                os.path.join(BASE_DIR, "static/portal/sass/styles.scss"),
+                os.path.join(BASE_DIR, "static/game/css/level_selection.css"),
+                os.path.join(BASE_DIR, "static/game/css/backgrounds.css"),
+            ),
+            "output_filename": "portal/css/portal.css",
+        },
+        "popup": {
+            "source_filenames": (
+                os.path.join(
+                    BASE_DIR, "static/portal/sass/partials/_popup.scss"
+                ),
+            ),
+            "output_filename": "portal/css/popup.css",
+        },
+        "game-scss": {
+            "source_filenames": (
+                os.path.join(BASE_DIR, "static/game/sass/game.scss"),
+            ),
+            "output_filename": "game/css/gamestyles.css",
+        },
+    },
+    "CSS_COMPRESSOR": None,
+    "SASS_ARGUMENTS": "--quiet",
+}
+
+STATICFILES_FINDERS = [
+    "pipeline.finders.PipelineFinder",
+    "django.contrib.staticfiles.finders.FileSystemFinder",
+    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
+]
+
+STORAGES = {
+    "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
+    "staticfiles": {
+        "BACKEND": "pipeline.storage.PipelineManifestStorage",
+    },
+}
+
 
-INSTALLED_APPS = ("portal", "captcha")
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
+LANGUAGES = [("en-gb", "English")]
+MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
+MIDDLEWARE = [
+    "deploy.middleware.admin_access.AdminAccessMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "deploy.middleware.tmp_basic_auth.TempBasicAuthMiddleware",
+    "deploy.middleware.security.CustomSecurityMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "deploy.middleware.session_timeout.SessionTimeoutMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "deploy.middleware.exceptionlogging.ExceptionLoggingMiddleware",
+    "django_otp.middleware.OTPMiddleware",
+    "preventconcurrentlogins.middleware.PreventConcurrentLoginsMiddleware",
+    "csp.middleware.CSPMiddleware",
+    "deploy.middleware.screentime_warning.ScreentimeWarningMiddleware",
+    "deploy.middleware.maintenance.MaintenanceMiddleware",
+]
+
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.contrib.auth.context_processors.auth",
+                "django.template.context_processors.request",
+                "django.contrib.messages.context_processors.messages",
+                "sekizai.context_processors.sekizai",
+                "common.context_processors.module_name",
+                "common.context_processors.cookie_management_enabled",
+                "portal.context_processors.process_newsletter_form",
+            ]
+        },
+    }
+]
+
+CODEFORLIFE_WEBSITE = "www.codeforlife.education"
+CLOUD_STORAGE_PREFIX = "https://storage.googleapis.com/codeforlife-assets/"
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "handlers": {
+        "console": {"level": "DEBUG", "class": "logging.StreamHandler"}
+    },
+    "loggers": {"two_factor": {"handlers": ["console"], "level": "INFO"}},
+}
+RAPID_ROUTER_EARLY_ACCESS_FUNCTION_NAME = "portal.beta.has_beta_access"
+SECURE_CONTENT_TYPE_NOSNIFF = True
+SECURE_BROWSER_XSS_FILTER = True
+SECURE_REFERRER_POLICY = "strict-origin-when-cross-origin"
+CSRF_USE_SESSIONS = True
+RECAPTCHA_DOMAIN = "www.recaptcha.net"
+AUTHENTICATION_BACKENDS = [
+    "django.contrib.auth.backends.ModelBackend",
+    "portal.backends.StudentLoginBackend",
+]
+USE_TZ = True
+PASSWORD_RESET_TIMEOUT_DAYS = 1
 
 PIPELINE_ENABLED = False
 
+# This is used in common to enable/disable the OneTrust cookie management script
 COOKIE_MANAGEMENT_ENABLED = False
 
-from django_autoconfig import autoconfig
+AUTOCONFIG_INDEX_VIEW = "home"
+SITE_ID = 1
+
+from common.csp_config import *
 
-autoconfig.configure_settings(globals())
+if MODULE_NAME == "local":
+    # NOTE: This is only used locally for testing purposes.
+    os.environ.setdefault(
+        "ENCRYPTION_KEY", "XTgWqMlZCMI_E5BvCArkif9nrJIIhe_6Ic6Q_UcWJDk="
+    )
 
-try:
-    from example_project.local_settings import *  # pylint: disable=E0611
-except ImportError:
-    pass
+ENCRYPTION_KEY = os.environ["ENCRYPTION_KEY"]

example_project/urls.py

@@ -1,7 +1,6 @@
-from aimmo import urls as aimmo_urls
-from django.conf.urls import include, url
 from django.contrib import admin
-from django.urls import path
+from django.urls import include, path, re_path
+from game import python_den_urls
 from game import urls as game_urls
 
 from portal import urls as portal_urls
@@ -9,8 +8,8 @@ from portal import urls as portal_urls
 admin.autodiscover()
 
 urlpatterns = [
-    url(r"^", include(portal_urls)),
+    re_path(r"^", include(portal_urls)),
     path("administration/", admin.site.urls),
-    url(r"^rapidrouter/", include(game_urls)),
-    url(r"^kurono/", include(aimmo_urls)),
+    re_path(r"^rapidrouter/", include(game_urls)),
+    re_path(r"^pythonden/", include(python_den_urls)),
 ]

portal/__init__.py

@@ -1 +1 @@
-__version__ = "5.33.5"
+__version__ = "8.9.9"