From 0cea777616bea6afc26c69e6f49fe989424630b4 Mon Sep 17 00:00:00 2001
From: Ian Renton <ian@ianrenton.com>
Date: Sat, 25 Jul 2026 16:51:52 +0100
Subject: [PATCH] Put static assets in a separate directory so they can be
 delivered directly by nginx

---
 templates/add_spot.html                                |  2 +-
 templates/alerts.html                                  |  2 +-
 templates/bands.html                                   |  4 ++--
 templates/base.html                                    | 10 +++++-----
 templates/conditions.html                              |  2 +-
 templates/map.html                                     |  4 ++--
 templates/spots.html                                   |  4 ++--
 templates/status.html                                  |  2 +-
 webassets/img/flags/generate.py                        |  4 ++--
 .../vendor/css/leaflet-extra-markers-1.2.2.min.css     |  2 +-
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/templates/add_spot.html b/templates/add_spot.html
index c164a6b..683a68f 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1784994589"></script>
+<script src="/static/js/add-spot.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 832345b..8b93c5a 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -75,7 +75,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1784994589"></script>
+<script src="/static/js/alerts.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 5ee8472..2d18a3a 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -75,8 +75,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784994589"></script>
-<script src="/static/js/bands.js?v=1784994589"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784994712"></script>
+<script src="/static/js/bands.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 8e27dd3..22e6348 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1784994589" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1784994712" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/static/js/utils.js?v=1784994589"></script>
-<script src="/static/js/ui-ham.js?v=1784994589"></script>
-<script src="/static/js/geo.js?v=1784994589"></script>
-<script src="/static/js/common.js?v=1784994589"></script>
+<script src="/static/js/utils.js?v=1784994712"></script>
+<script src="/static/js/ui-ham.js?v=1784994712"></script>
+<script src="/static/js/geo.js?v=1784994712"></script>
+<script src="/static/js/common.js?v=1784994712"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index f260457..c047940 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1784994589"></script>
+<script src="/static/js/conditions.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index f0d6b19..05546b4 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -108,8 +108,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784994589"></script>
-<script src="/static/js/map.js?v=1784994589"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784994712"></script>
+<script src="/static/js/map.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 37cdc48..92a7434 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -116,8 +116,8 @@
 <script>
     let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
 </script>
-<script src="/static/js/spotsbandsandmap.js?v=1784994589"></script>
-<script src="/static/js/spots.js?v=1784994589"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1784994712"></script>
+<script src="/static/js/spots.js?v=1784994712"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 9dfe3c5..d7ea03b 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -59,7 +59,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1784994589"></script>
+<script src="/static/js/status.js?v=1784994712"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");
diff --git a/webassets/img/flags/generate.py b/webassets/img/flags/generate.py
index a31fa35..2d90252 100644
--- a/webassets/img/flags/generate.py
+++ b/webassets/img/flags/generate.py
@@ -4,10 +4,10 @@ from datetime import timedelta
 from PIL import Image, ImageDraw, ImageFont
 from requests_cache import CachedSession
 
-test = os.listdir("/")
+test = os.listdir("./")
 for item in test:
     if item.endswith(".png"):
-        os.remove(os.path.join("/", item))
+        os.remove(os.path.join("./", item))
 
 cache = CachedSession("/tmp/cache", expire_after=timedelta(days=30))
 data = cache.get("https://raw.githubusercontent.com/k0swe/dxcc-json/refs/heads/main/dxcc.json").json()
diff --git a/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css b/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css
index d4fd797..d682791 100644
--- a/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css
+++ b/webassets/vendor/css/leaflet-extra-markers-1.2.2.min.css
@@ -5,4 +5,4 @@
  * https://github.com/coryasilva/Leaflet.ExtraMarkers/
  * @author coryasilva <https://github.com/coryasilva>
  * @version 1.2.1
- */.extra-marker{background:url("../img/markers_default.png") no-repeat 0 0;width:35px;height:46px;position:absolute;left:0;top:0;display:block;text-align:center}  .extra-marker-shadow{background:url("../img/markers_shadow.png") no-repeat 0 0;width:36px;height:16px}@media (min--moz-device-pixel-ratio:1.5),(-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){.extra-marker{background-image:url("../img/markers_default@2x.png");background-size:540px 184px}  .extra-marker-shadow{background-image:url("../img/markers_shadow@2x.png");background-size:35px 16px}}  .extra-marker.extra-marker-svg{background:none}  .extra-marker.extra-marker-svg .svg-inline--fa,.extra-marker.extra-marker-svg i{position:absolute;left:0;width:35px}  .extra-marker .svg-inline--fa,.extra-marker i{color:#fff;margin-top:7px;display:inline-block;font-size:14px}  .extra-marker .svg-inline--fa{margin-top:10px;background:none}  .extra-marker .svg-inline--fa,.extra-marker i.fa,.extra-marker i.fab,.extra-marker i.fas,.extra-marker i.far,.extra-marker i.fal{margin-top:10px}  .extra-marker .svg-inline--fa.fa-2x,.extra-marker i.fa.fa-2x,.extra-marker i.fab.fa-2x,.extra-marker i.fas.fa-2x,.extra-marker i.far.fa-2x,.extra-marker i.fal.fa-2x{font-size:16px;margin-top:9px}  .extra-marker .svg-inline--fa.fa-3x,.extra-marker i.fa.fa-3x,.extra-marker i.fab.fa-3x,.extra-marker i.fas.fa-3x,.extra-marker i.far.fa-3x,.extra-marker i.fal.fa-3x{font-size:18px;margin-top:9px}  .extra-marker .svg-inline--fa.fa-4x,.extra-marker i.fa.fa-4x,.extra-marker i.fab.fa-4x,.extra-marker i.fas.fa-4x,.extra-marker i.far.fa-4x,.extra-marker i.fal.fa-4x{font-size:20px;margin-top:8px}  .extra-marker .svg-inline--fa.fa-5x,.extra-marker i.fa.fa-5x,.extra-marker i.fab.fa-5x,.extra-marker i.fas.fa-5x,.extra-marker i.far.fa-5x,.extra-marker i.fal.fa-5x{font-size:24px;margin-top:6px}  .extra-marker .fa-number:before{content:attr(number)}  .extra-marker i.glyphicon{margin-top:10px}  .extra-marker i.icon{margin-right:0;opacity:1}  .extra-marker-circle-red{background-position:0 0}  .extra-marker-circle-orange-dark{background-position:-36px 0}  .extra-marker-circle-orange{background-position:-72px 0}  .extra-marker-circle-yellow{background-position:-108px 0}  .extra-marker-circle-blue-dark{background-position:-144px 0}  .extra-marker-circle-blue{background-position:-180px 0}  .extra-marker-circle-cyan{background-position:-216px 0}  .extra-marker-circle-purple{background-position:-252px 0}  .extra-marker-circle-violet{background-position:-288px 0}  .extra-marker-circle-pink{background-position:-324px 0}  .extra-marker-circle-green-dark{background-position:-360px 0}  .extra-marker-circle-green{background-position:-396px 0}  .extra-marker-circle-green-light{background-position:-432px 0}  .extra-marker-circle-black{background-position:-468px 0}  .extra-marker-circle-white{background-position:-504px 0}  .extra-marker-square-red{background-position:0 -46px}  .extra-marker-square-orange-dark{background-position:-36px -46px}  .extra-marker-square-orange{background-position:-72px -46px}  .extra-marker-square-yellow{background-position:-108px -46px}  .extra-marker-square-blue-dark{background-position:-144px -46px}  .extra-marker-square-blue{background-position:-180px -46px}  .extra-marker-square-cyan{background-position:-216px -46px}  .extra-marker-square-purple{background-position:-252px -46px}  .extra-marker-square-violet{background-position:-288px -46px}  .extra-marker-square-pink{background-position:-324px -46px}  .extra-marker-square-green-dark{background-position:-360px -46px}  .extra-marker-square-green{background-position:-396px -46px}  .extra-marker-square-green-light{background-position:-432px -46px}  .extra-marker-square-black{background-position:-468px -46px}  .extra-marker-square-white{background-position:-504px -46px}  .extra-marker-star-red{background-position:0 -92px}  .extra-marker-star-orange-dark{background-position:-36px -92px}  .extra-marker-star-orange{background-position:-72px -92px}  .extra-marker-star-yellow{background-position:-108px -92px}  .extra-marker-star-blue-dark{background-position:-144px -92px}  .extra-marker-star-blue{background-position:-180px -92px}  .extra-marker-star-cyan{background-position:-216px -92px}  .extra-marker-star-purple{background-position:-252px -92px}  .extra-marker-star-violet{background-position:-288px -92px}  .extra-marker-star-pink{background-position:-324px -92px}  .extra-marker-star-green-dark{background-position:-360px -92px}  .extra-marker-star-green{background-position:-396px -92px}  .extra-marker-star-green-light{background-position:-432px -92px}  .extra-marker-star-black{background-position:-468px -92px}  .extra-marker-star-white{background-position:-504px -92px}  .extra-marker-penta-red{background-position:0 -138px}  .extra-marker-penta-orange-dark{background-position:-36px -138px}  .extra-marker-penta-orange{background-position:-72px -138px}  .extra-marker-penta-yellow{background-position:-108px -138px}  .extra-marker-penta-blue-dark{background-position:-144px -138px}  .extra-marker-penta-blue{background-position:-180px -138px}  .extra-marker-penta-cyan{background-position:-216px -138px}  .extra-marker-penta-purple{background-position:-252px -138px}  .extra-marker-penta-violet{background-position:-288px -138px}  .extra-marker-penta-pink{background-position:-324px -138px}  .extra-marker-penta-green-dark{background-position:-360px -138px}  .extra-marker-penta-green{background-position:-396px -138px}  .extra-marker-penta-green-light{background-position:-432px -138px}  .extra-marker-penta-black{background-position:-468px -138px}  .extra-marker-penta-white{background-position:-504px -138px}
\ No newline at end of file
+ */.extra-marker{background:url("../img/markers_default.png") no-repeat 0 0;width:35px;height:46px;position:absolute;left:0;top:0;display:block;text-align:center}.extra-marker-shadow{background:url("../img/markers_shadow.png") no-repeat 0 0;width:36px;height:16px}@media (min--moz-device-pixel-ratio:1.5),(-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){.extra-marker{background-image:url("../img/markers_default@2x.png");background-size:540px 184px}.extra-marker-shadow{background-image:url("../img/markers_shadow@2x.png");background-size:35px 16px}}.extra-marker.extra-marker-svg{background:none}.extra-marker.extra-marker-svg .svg-inline--fa,.extra-marker.extra-marker-svg i{position:absolute;left:0;width:35px}.extra-marker .svg-inline--fa,.extra-marker i{color:#fff;margin-top:7px;display:inline-block;font-size:14px}.extra-marker .svg-inline--fa{margin-top:10px;background:none}.extra-marker .svg-inline--fa,.extra-marker i.fa,.extra-marker i.fab,.extra-marker i.fas,.extra-marker i.far,.extra-marker i.fal{margin-top:10px}.extra-marker .svg-inline--fa.fa-2x,.extra-marker i.fa.fa-2x,.extra-marker i.fab.fa-2x,.extra-marker i.fas.fa-2x,.extra-marker i.far.fa-2x,.extra-marker i.fal.fa-2x{font-size:16px;margin-top:9px}.extra-marker .svg-inline--fa.fa-3x,.extra-marker i.fa.fa-3x,.extra-marker i.fab.fa-3x,.extra-marker i.fas.fa-3x,.extra-marker i.far.fa-3x,.extra-marker i.fal.fa-3x{font-size:18px;margin-top:9px}.extra-marker .svg-inline--fa.fa-4x,.extra-marker i.fa.fa-4x,.extra-marker i.fab.fa-4x,.extra-marker i.fas.fa-4x,.extra-marker i.far.fa-4x,.extra-marker i.fal.fa-4x{font-size:20px;margin-top:8px}.extra-marker .svg-inline--fa.fa-5x,.extra-marker i.fa.fa-5x,.extra-marker i.fab.fa-5x,.extra-marker i.fas.fa-5x,.extra-marker i.far.fa-5x,.extra-marker i.fal.fa-5x{font-size:24px;margin-top:6px}.extra-marker .fa-number:before{content:attr(number)}.extra-marker i.glyphicon{margin-top:10px}.extra-marker i.icon{margin-right:0;opacity:1}.extra-marker-circle-red{background-position:0 0}.extra-marker-circle-orange-dark{background-position:-36px 0}.extra-marker-circle-orange{background-position:-72px 0}.extra-marker-circle-yellow{background-position:-108px 0}.extra-marker-circle-blue-dark{background-position:-144px 0}.extra-marker-circle-blue{background-position:-180px 0}.extra-marker-circle-cyan{background-position:-216px 0}.extra-marker-circle-purple{background-position:-252px 0}.extra-marker-circle-violet{background-position:-288px 0}.extra-marker-circle-pink{background-position:-324px 0}.extra-marker-circle-green-dark{background-position:-360px 0}.extra-marker-circle-green{background-position:-396px 0}.extra-marker-circle-green-light{background-position:-432px 0}.extra-marker-circle-black{background-position:-468px 0}.extra-marker-circle-white{background-position:-504px 0}.extra-marker-square-red{background-position:0 -46px}.extra-marker-square-orange-dark{background-position:-36px -46px}.extra-marker-square-orange{background-position:-72px -46px}.extra-marker-square-yellow{background-position:-108px -46px}.extra-marker-square-blue-dark{background-position:-144px -46px}.extra-marker-square-blue{background-position:-180px -46px}.extra-marker-square-cyan{background-position:-216px -46px}.extra-marker-square-purple{background-position:-252px -46px}.extra-marker-square-violet{background-position:-288px -46px}.extra-marker-square-pink{background-position:-324px -46px}.extra-marker-square-green-dark{background-position:-360px -46px}.extra-marker-square-green{background-position:-396px -46px}.extra-marker-square-green-light{background-position:-432px -46px}.extra-marker-square-black{background-position:-468px -46px}.extra-marker-square-white{background-position:-504px -46px}.extra-marker-star-red{background-position:0 -92px}.extra-marker-star-orange-dark{background-position:-36px -92px}.extra-marker-star-orange{background-position:-72px -92px}.extra-marker-star-yellow{background-position:-108px -92px}.extra-marker-star-blue-dark{background-position:-144px -92px}.extra-marker-star-blue{background-position:-180px -92px}.extra-marker-star-cyan{background-position:-216px -92px}.extra-marker-star-purple{background-position:-252px -92px}.extra-marker-star-violet{background-position:-288px -92px}.extra-marker-star-pink{background-position:-324px -92px}.extra-marker-star-green-dark{background-position:-360px -92px}.extra-marker-star-green{background-position:-396px -92px}.extra-marker-star-green-light{background-position:-432px -92px}.extra-marker-star-black{background-position:-468px -92px}.extra-marker-star-white{background-position:-504px -92px}.extra-marker-penta-red{background-position:0 -138px}.extra-marker-penta-orange-dark{background-position:-36px -138px}.extra-marker-penta-orange{background-position:-72px -138px}.extra-marker-penta-yellow{background-position:-108px -138px}.extra-marker-penta-blue-dark{background-position:-144px -138px}.extra-marker-penta-blue{background-position:-180px -138px}.extra-marker-penta-cyan{background-position:-216px -138px}.extra-marker-penta-purple{background-position:-252px -138px}.extra-marker-penta-violet{background-position:-288px -138px}.extra-marker-penta-pink{background-position:-324px -138px}.extra-marker-penta-green-dark{background-position:-360px -138px}.extra-marker-penta-green{background-position:-396px -138px}.extra-marker-penta-green-light{background-position:-432px -138px}.extra-marker-penta-black{background-position:-468px -138px}.extra-marker-penta-white{background-position:-504px -138px}
\ No newline at end of file