diff --git a/.gitignore b/.gitignore
index c0ce5dde95c1fbbd9176fbfcc21a8ff17dc3cbb2..046d6e95a0520ecd4d58f2c34851b941efc38b6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
.env
*.pyc
*.sqlite3
-/static
\ No newline at end of file
diff --git a/budget/static/budget/css/budget.css b/static/css/mint.css
rename from budget/static/budget/css/budget.css
rename to static/css/mint.css
diff --git a/budget/static/budget/js/budget.js b/static/js/mint.js
rename from budget/static/budget/js/budget.js
rename to static/js/mint.js
diff --git a/budget/templates/budget/index.html b/budget/templates/budget/index.html
index e3bc411ca00fad79634d460b99fc0b85e7b7961b..4bcd3916a6f27ec3f9f1c4a7fe5004348642400b 100644
--- a/budget/templates/budget/index.html
+++ b/budget/templates/budget/index.html
@@ -9,8 +9,8 @@
{{ json_ctx|json_script:"ctx-data" }}
-
-
+
+
diff --git a/mint/settings.py b/mint/settings.py
index 722a005e3896f5275c4b959e6fe0c7b2390e142f..8b035da64e3c3082ae92993de8a0df425699076e 100644
--- a/mint/settings.py
+++ b/mint/settings.py
@@ -87,7 +87,9 @@
USE_TZ = True
STATIC_URL = "static/"
-STATIC_ROOT = env.str("STATIC", BASE_DIR / "static")
+STATICFILES_DIRS = [
+ BASE_DIR / "static",
+]
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
diff --git a/nix/module.nix b/nix/module.nix
index 81ae3636433d17e4147a75d74cda0560a5263eec..f89011a6e7493034d04eb6ced6a5cb3a83c9ddef 100644
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -88,7 +88,6 @@ environment = {
PYTHONPATH = "${cfg.package.python.pkgs.makePythonPath cfg.package.propagatedBuildInputs}:${cfg.package}/lib/mint";
GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}";
MINT_DATABASE = cfg.database;
- MINT_STATIC = "${cfg.package}/lib/mint/static";
} // (pkgs.lib.mapAttrs (_: toString) cfg.settings);
serviceConfig = {
User = cfg.user;
diff --git a/nix/pkg.nix b/nix/pkg.nix
index 6b4a6d251edcf41c874e9be3ab76c7e43ec6f22d..14d336ea373cfa61e1ae5ea1bc8629f5171672d6 100644
--- a/nix/pkg.nix
+++ b/nix/pkg.nix
@@ -34,13 +34,6 @@ django
django-debug-toolbar
mozilla-django-oidc
];
- postBuild = ''
- export MINT_OIDC_CONFIG_URL=
- export MINT_OIDC_CLIENT_ID=
- export MINT_SECRET_KEY=super-secret-key-do-not-use-me
- export MINT_OIDC_CLIENT_SECRET=
- ${python.pythonOnBuildForHost.interpreter} manage.py collectstatic
- '';
postInstall = ''
mkdir -p $out/lib
cp -r . $out/lib/mint