Merge pull request #347 from alercebroker/fix/htmx-response

Change HTMX to a lower version
alercebroker · Jan 7, 2025 · 261c700 · 261c700
2 parents 91b3d8f + 1ee0096
commit 261c700
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 7 deletions.
diff --git a/lightcurve/src/crossmatch_api/templates/crossmatch.html.jinja b/lightcurve/src/crossmatch_api/templates/crossmatch.html.jinja
@@ -1,4 +1,4 @@
-<script id="htmx-script" src="https://unpkg.com/htmx.[email protected]"></script>
+<script src="{{API_URL}}/htmx/htmx.min.js"></script>
 <meta name="htmx-config" content='{"selfRequestsOnly": false}'>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0">
 <link rel="stylesheet" href="{{API_URL}}/static/crossmatch.css"> 

diff --git a/lightcurve/src/htmx/README.MD b/lightcurve/src/htmx/README.MD
@@ -0,0 +1 @@
+The HTMX version is the 1.9.12
diff --git a/lightcurve/src/htmx/htmx.min.js b/lightcurve/src/htmx/htmx.min.js
diff --git a/lightcurve/src/lightcurve_api/api.py b/lightcurve/src/lightcurve_api/api.py
@@ -47,6 +47,9 @@
     name="static",
 )
 
+app.mount(
+    "/htmx", StaticFiles(directory="src/htmx"), name="htmx"
+)
 
 @app.get("/openapi.json")
 def custom_swagger_route():

diff --git a/lightcurve/src/lightcurve_api/templates/lightcurve_app.html.jinja b/lightcurve/src/lightcurve_api/templates/lightcurve_app.html.jinja
@@ -1,4 +1,4 @@
-<script id="htmx-script" src="https://unpkg.com/htmx.[email protected]"></script>
+<script src="{{API_URL}}/htmx/htmx.min.js"></script>
 <meta name="htmx-config" content='{"selfRequestsOnly": false}'>
 <link rel="stylesheet" href="{{ API_URL }}/static/main.css">
 <script>

diff --git a/lightcurve/src/magstats_api/api.py b/lightcurve/src/magstats_api/api.py
@@ -30,6 +30,9 @@
     "/static", StaticFiles(directory="src/magstats_api/static"), name="static"
 )
 
+app.mount(
+    "/htmx", StaticFiles(directory="src/htmx"), name="htmx"
+)
 
 @app.get("/openapi.json")
 def custom_swagger_route():

diff --git a/lightcurve/src/magstats_api/templates/magstatRebuild.html.jinja b/lightcurve/src/magstats_api/templates/magstatRebuild.html.jinja
@@ -1,4 +1,4 @@
-<script id="htmx-script" src="https://unpkg.com/htmx.[email protected]"></script>
+<script src="{{API_URL}}/htmx/htmx.min.js"></script>
 <meta name="htmx-config" content='{"selfRequestsOnly": false}'>
 <script type="module" src="{{API_URL}}/static/magstats.js"></script>
 <link rel="stylesheet"

diff --git a/lightcurve/src/object_api/api.py b/lightcurve/src/object_api/api.py
@@ -30,6 +30,9 @@
     "/static", StaticFiles(directory="src/object_api/static"), name="static"
 )
 
+app.mount(
+    "/htmx", StaticFiles(directory="src/htmx"), name="htmx"
+)
 
 @app.get("/openapi.json")
 def custom_swagger_route():

diff --git a/lightcurve/src/object_api/templates/basicInformationPreview.html.jinja b/lightcurve/src/object_api/templates/basicInformationPreview.html.jinja
@@ -1,5 +1,5 @@
-<script id="htmx-script" src="https://unpkg.com/htmx.[email protected]"></script>
-<meta name="htmx-config" content='{"selfRequestsOnly": false}'
+<script src="{{API_URL}}/htmx/htmx.min.js"></script>
+<meta name="htmx-config" content='{"selfRequestsOnly": false}'>
 <script type="module" src="{{API_URL}}/static/object.js"></script>
 <link rel="stylesheet"
       href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0">

diff --git a/lightcurve/src/probability_api/api.py b/lightcurve/src/probability_api/api.py
@@ -27,7 +27,9 @@
 app.include_router(prefix="/htmx", router=htmx.router)
 
 app.mount("/static", StaticFiles(directory="src/probability_api/static"), name="static")
-
+app.mount(
+    "/htmx", StaticFiles(directory="src/htmx"), name="htmx"
+)
 
 @app.get("/openapi.json")
 def custom_swagger_route():

diff --git a/lightcurve/src/probability_api/templates/prob.html.jinja b/lightcurve/src/probability_api/templates/prob.html.jinja
@@ -1,4 +1,5 @@
-<script id="htmx-script" src="https://unpkg.com/[email protected]"></script>
+<script src="{{API_URL}}/htmx/htmx.min.js"></script>
+<meta name="htmx-config" content='{"selfRequestsOnly": false}'>
 <script  type="module" src="{{API_URL}}/static/probability.js"></script>
 <link rel="stylesheet" href="{{API_URL}}/static/probability.css">