new py package

Pipfile

@@ -23,7 +23,7 @@ name = "pypi"
 # 5. Run `pipenv install --dev` in your terminal.
 
 [packages]
-codeforlife = {ref = "v0.17.1", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
+codeforlife = {ref = "backend_template", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
 # 🚫 Don't add [packages] below that are inherited from the CFL package.
 pyjwt = "==2.6.0" # TODO: upgrade to latest version
 # TODO: Needed by RR. Remove when RR has moved to new system.
@@ -32,7 +32,7 @@ django-sekizai = "==2.0.0"
 django-classy-tags = "==2.0.0"
 
 [dev-packages]
-codeforlife = {ref = "v0.17.1", git = "https://github.com/ocadotechnology/codeforlife-package-python.git", extras = ["dev"]}
+codeforlife = {ref = "backend_template", git = "https://github.com/ocadotechnology/codeforlife-package-python.git", extras = ["dev"]}
 # codeforlife = {file = "../codeforlife-package-python", editable = true, extras = ["dev"]}
 # 🚫 Don't add [dev-packages] below that are inherited from the CFL package.
 

settings.py

@@ -60,32 +60,9 @@
 """RAPID ROUTER SETTINGS"""
 # TODO: The settings in this section are needed for the old Rapid Router
 #  package. Remove once RR has moved to the new system.
-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",
-                # TODO: replace in new system and remove here
-                # "common.context_processors.module_name",
-                # "common.context_processors.cookie_management_enabled",
-                # TODO: use when integrating dotmailer
-                # "portal.context_processors.process_newsletter_form",
-            ]
-        },
-    }
-]
-
 MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
-STATIC_URL = "/static/"
-STATIC_ROOT = os.path.join(BASE_DIR, "static")
-
 PIPELINE_ENABLED = False  # True if assets should be compressed, False if not.
 PIPELINE = {}
 
@@ -262,6 +239,8 @@ def domain():
 from codeforlife.settings import *
 
 DATABASES = get_databases(BASE_DIR)
+ROOT_URLCONF = "src.urls"
+STATIC_ROOT = get_static_root(BASE_DIR)
 
 # TODO: Go through the commented out middleware and decide if we still need them
 MIDDLEWARE = [
@@ -277,30 +256,43 @@ def domain():
 ]
 
 INSTALLED_APPS = [
+    "src.api",
     "src.sso",
     "src.rapid_router",
-    "aimmo",
-    "game",
     "pipeline",
-    "portal",
     "captcha",
-    "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",
     "import_export",
     "sekizai",  # for javascript and css management
     "treebeard",
     *INSTALLED_APPS,
 ]
+INSTALLED_APPS.remove("api")
 
 # Frontend pages.
 PAGE_TEACHER_LOGIN = f"{SERVICE_SITE_URL}/login/teacher"
 PAGE_INDY_LOGIN = f"{SERVICE_SITE_URL}/login/independent"
 PAGE_TEACHER_DASHBOARD_SCHOOL = f"{SERVICE_SITE_URL}/teacher/dashboard/school"
 PAGE_REGISTER = f"{SERVICE_SITE_URL}/register"
+
+"""RAPID ROUTER SETTINGS"""
+# TODO: The settings in this section are needed for the old Rapid Router
+#  package. Remove once RR has moved to the new system.
+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",
+                # TODO: replace in new system and remove here
+                # "common.context_processors.module_name",
+                # "common.context_processors.cookie_management_enabled",
+                # TODO: use when integrating dotmailer
+                # "portal.context_processors.process_newsletter_form",
+            ]
+        },
+    }
+]

src/urls.py

@@ -22,6 +22,8 @@
     TeacherAimmoDashboard,
 )
 
+from .api.urls import urlpatterns
+
 urlpatterns = [
     path(
         "rapidrouter/",
@@ -43,7 +45,7 @@
         include(aimmo_urls),
         name="kurono",
     ),
-    *get_urlpatterns(include_user_urls=False),
+    *get_urlpatterns(urlpatterns, include_user_urls=False),
     path(
         "api/sso/",
         include("src.sso.urls"),