fix: Clean autoconfig

.codecov.yml

@@ -19,7 +19,6 @@ ignore:
   - "aimmo_runner/**/*"
   - "test_utils/*"
   - "setup.py"
-  - "aimmo/csp_config.py"
 
 comment:
   layout: "reach, diff, flags, files"

.gitignore

@@ -71,7 +71,7 @@ db.sqlite3
 *.iml
 
 # static folder
-example_project/example_project/static/
+static/
 
 # Created during minikube testing
 test-bin/

aimmo_runner/runner.py

@@ -100,7 +100,7 @@ def run(
             capture_output=capture_output,
         )
         run_command(
-            ["python", _MANAGE_PY, "collectstatic", "--noinput"],
+            ["python", _MANAGE_PY, "collectstatic", "--noinput",  "--clear"],
             capture_output=capture_output,
         )
 

example_project/manage.py

@@ -5,7 +5,7 @@
 from kubernetes.config import load_kube_config
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example_project.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
     from django.core.management import execute_from_command_line
 

example_project/example_project/settings.py → example_project/settings.py

@@ -1,12 +1,12 @@
 """Django settings for example_project project."""
-import os
 import mimetypes
+import os
 
 from django.http import Http404
 from kubernetes.client.api.custom_objects_api import CustomObjectsApi
 from kubernetes.client.api_client import ApiClient
 
-from aimmo.csp_config import *  # Still keeping the config file, seems cleaner?
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 ALLOWED_HOSTS = ["*"]
 
@@ -29,36 +29,37 @@
 
 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/"
-SECRET_KEY = "not-a-secret"
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "aimmo/static")]
 
 mimetypes.add_type("application/wasm", ".wasm", True)
 
-ROOT_URLCONF = "example_project.urls"
+SECRET_KEY = "not-a-secret"
+ROOT_URLCONF = "urls"
 
 WSGI_APPLICATION = "example_project.wsgi.application"
 
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
 INSTALLED_APPS = [
+    "game",
+    "pipeline",
+    "portal",
+    "aimmo",
+    "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",
-    "aimmo",
-    "game",
-    "portal",
-    "common",
     "django_js_reverse",
-    "rest_framework",
     "django_otp",
     "django_otp.plugins.otp_static",
     "django_otp.plugins.otp_totp",
+    "rest_framework",
     "sekizai",  # for javascript and css management
 ]
 
@@ -99,6 +100,37 @@
     "django.contrib.messages.middleware.MessageMiddleware",
 ]
 
+PIPELINE = {
+    "SASS_ARGUMENTS": "--quiet",
+    "COMPILERS": ("game.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",
+        },
+        "popup": {
+            "source_filenames": (os.path.join(BASE_DIR, "static/portal/sass/partials/_popup.scss"),),
+            "output_filename": "popup.css",
+        },
+        "game-scss": {
+            "source_filenames": (os.path.join(BASE_DIR, "static/game/sass/game.scss"),),
+            "output_filename": "game.css",
+        },
+    },
+    "CSS_COMPRESSOR": None,
+}
+
+STATICFILES_FINDERS = [
+    "pipeline.finders.PipelineFinder",
+    "django.contrib.staticfiles.finders.FileSystemFinder",
+    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
+]
+STATICFILES_STORAGE = "pipeline.storage.PipelineStorage"
+
 # This is used in common to enable/disable the OneTrust cookie management script
 COOKIE_MANAGEMENT_ENABLED = False
 
@@ -138,3 +170,5 @@ def get_game_url_base_and_path(game_id: int) -> str:
     from example_project.local_settings import *  # pylint: disable=E0611
 except ImportError:
     pass
+
+from common.csp_config import *

test_settings.py → example_project/test_settings.py

@@ -1,3 +1,7 @@
+import os
+
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
 DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3"}}
 
 TEMPLATES = [
@@ -17,33 +21,34 @@
 ]
 
 INSTALLED_APPS = [
+    "game",
+    "pipeline",
+    "portal",
+    "aimmo",
+    "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",
-    "aimmo",
-    "game",
-    "portal",
-    "common",
     "django_js_reverse",
-    "rest_framework",
     "django_otp",
     "django_otp.plugins.otp_static",
     "django_otp.plugins.otp_totp",
+    "rest_framework",
     "sekizai",  # for javascript and css management
 ]
 
 PIPELINE_ENABLED = False
-ROOT_URLCONF = "example_project.example_project.urls"
-STATIC_ROOT = "example_project/example_project/static"
+ROOT_URLCONF = "example_project.urls"
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_URL = "/static/"
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "aimmo/static")]
 SECRET_KEY = "bad_test_secret"
 
-WSGI_APPLICATION = "example_project.wsgi.application"
+WSGI_APPLICATION = "wsgi.application"
 
 MIDDLEWARE = [
     "django.contrib.sessions.middleware.SessionMiddleware",
@@ -54,6 +59,37 @@
     "django.contrib.messages.middleware.MessageMiddleware",
 ]
 
+PIPELINE = {
+    "SASS_ARGUMENTS": "--quiet",
+    "COMPILERS": ("game.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",
+        },
+        "popup": {
+            "source_filenames": (os.path.join(BASE_DIR, "static/portal/sass/partials/_popup.scss"),),
+            "output_filename": "popup.css",
+        },
+        "game-scss": {
+            "source_filenames": (os.path.join(BASE_DIR, "static/game/sass/game.scss"),),
+            "output_filename": "game.css",
+        },
+    },
+    "CSS_COMPRESSOR": None,
+}
+
+STATICFILES_FINDERS = [
+    "pipeline.finders.PipelineFinder",
+    "django.contrib.staticfiles.finders.FileSystemFinder",
+    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
+]
+STATICFILES_STORAGE = "pipeline.storage.PipelineStorage"
+
 GAME_SERVER_URL_FUNCTION = lambda game_id: ("base %s" % game_id, "path %s" % game_id)
 GAME_SERVER_PORT_FUNCTION = lambda game_id: 8001
 GAME_SERVER_SSL_FLAG = False

example_project/example_project/wsgi.py → example_project/wsgi.py

@@ -15,7 +15,7 @@
 """
 import os
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example_project.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
 from django.core.wsgi import get_wsgi_application