Home

mint @main - refs - log -
- 
https://git.jolheiser.com/mint.git
Budget
tree log patch
make static configurable Signed-off-by: jolheiser <git@jolheiser.com>
Signature
-----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgBTEvCQk6VqUAdN2RuH6bj1dNkY oOpbPWj+jw4ua1B1cAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQJE89nVQ5P7UzB+VMyDN2tTOxgnASsOnWsxdW8ISMYLh/gs0SKhp8542cEV5itPkiv p0c52T3cdJh2ZNxE/wGws= -----END SSH SIGNATURE-----
jolheiser <git@jolheiser.com>
2 weeks ago
7 changed files, 12 additions(+), 5 deletions(-)
.gitignorebudget/templates/budget/index.htmlmint/settings.pynix/module.nixnix/pkg.nixbudget/static/budget/css/budget.cssbudget/static/budget/js/budget.js
M .gitignore -> .gitignore
 1
 2
 3
 4
 5
 6
 7
 8
 9
10

diff --git a/.gitignore b/.gitignore
index 046d6e95a0520ecd4d58f2c34851b941efc38b6b..c0ce5dde95c1fbbd9176fbfcc21a8ff17dc3cbb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .env
 *.pyc
 *.sqlite3
+/static
\ No newline at end of file
M budget/templates/budget/index.html -> budget/templates/budget/index.html
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15

diff --git a/budget/templates/budget/index.html b/budget/templates/budget/index.html
index 4bcd3916a6f27ec3f9f1c4a7fe5004348642400b..e3bc411ca00fad79634d460b99fc0b85e7b7961b 100644
--- a/budget/templates/budget/index.html
+++ b/budget/templates/budget/index.html
@@ -9,8 +9,8 @@     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
     {{ json_ctx|json_script:"ctx-data" }}
     <script>const ctxData = JSON.parse(document.getElementById("ctx-data").textContent);</script>
-    <script src="{% static 'js/mint.js' %}"></script>
-    <link href="{% static 'css/mint.css' %}" rel="stylesheet"/>
+    <script src="{% static 'budget/js/budget.js' %}"></script>
+    <link href="{% static 'budget/css/budget.css' %}" rel="stylesheet"/>
 </head>
 
 <body>
M mint/settings.py -> mint/settings.py
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15

diff --git a/mint/settings.py b/mint/settings.py
index 8b035da64e3c3082ae92993de8a0df425699076e..722a005e3896f5275c4b959e6fe0c7b2390e142f 100644
--- a/mint/settings.py
+++ b/mint/settings.py
@@ -87,9 +87,7 @@
 USE_TZ = True
 
 STATIC_URL = "static/"
-STATICFILES_DIRS = [
-    BASE_DIR / "static",
-]
+STATIC_ROOT = env.str("STATIC", BASE_DIR / "static")
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
M nix/module.nix -> nix/module.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12

diff --git a/nix/module.nix b/nix/module.nix
index f89011a6e7493034d04eb6ced6a5cb3a83c9ddef..81ae3636433d17e4147a75d74cda0560a5263eec 100644
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -88,6 +88,7 @@       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;
M nix/pkg.nix -> nix/pkg.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18

diff --git a/nix/pkg.nix b/nix/pkg.nix
index 14d336ea373cfa61e1ae5ea1bc8629f5171672d6..6b4a6d251edcf41c874e9be3ab76c7e43ec6f22d 100644
--- a/nix/pkg.nix
+++ b/nix/pkg.nix
@@ -34,6 +34,13 @@     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
M static/css/mint.css -> budget/static/budget/css/budget.css
1
2
3

diff --git a/static/css/mint.css b/budget/static/budget/css/budget.css
rename from static/css/mint.css
rename to budget/static/budget/css/budget.css
M static/js/mint.js -> budget/static/budget/js/budget.js
1
2
3

diff --git a/static/js/mint.js b/budget/static/budget/js/budget.js
rename from static/js/mint.js
rename to budget/static/budget/js/budget.js