automatic deploy

cfg/webapp_log_config.ini

@@ -12,7 +12,7 @@ level=INFO
 handlers=stream_handler,file_handler
 
 [logger_webapp]
-level=DEBUG
+level=INFO
 handlers=stream_handler,file_handler
 qualname=webapp
 propagate=0

scripts/build.sh

@@ -274,13 +274,26 @@ echo Build ok
 if [ "$2" == "-p" ]; then
 	if [ "$1" == "-r" ]; then
 		echo '*** SPIDERWEB  deploying process ***'
-		git tag ${ver}
+		if ! git add * ; then
+			echo 'Error on adding files'
+			exit 7
+		fi		
+		
+		if ! git tag ${ver}; then
+			echo 'Error on tagging'
+			exit 8
+		fi			
+
 		echo 'Please, add comment for commit on tag ' ${ver}
-		git commit 
+		if ! git commit; then
+			echo 'Error on tagging'
+			exit 9
+		fi			
+
 		echo Commit ok
 	else
 		echo 'Error: You can make a commit only if the first option is -r = release!!!'
-		exit 8
+		exit 10
 	fi
 fi
 

static/pwa/service-worker.js

@@ -4,7 +4,7 @@ const CACHE_NAME = 'pwa-spiderweb_2.4.5.3'
 // Dichiarazione della costante per gli URL da mettere in cache
 const URLS_TO_CACHE = [
 	'/static/images/background.webp',
-	'/static/css/dev/style.css',
+	'/static/css/rel/style.min.css',
 	'/static/images/icons/favicon.ico',
 	'/static/images/icons/icon-144x144.png',
 	'/static/images/icons/icon-152x152.png',
@@ -18,9 +18,9 @@ const URLS_TO_CACHE = [
 	'/static/images/icons/icon-96x96.png',
 	'/static/images/icons/icon-apple.png',
 	'/static/images/icons/spider_ico_master.svg',
-	'/static/js/dev/callsign_inline.js',
+	'/static/js/rel/callsign_inline.min.js',
-	'/static/js/dev/callsign_search.js',
+	'/static/js/rel/callsign_search.min.js',
-	'/static/js/dev/common.js',
+	'/static/js/rel/common.min.js',
 	'/index.html',	
 	'/plots.html',		
 	'/privacy.html',

templates/_base.html

@@ -14,7 +14,7 @@
 	<link rel="icon" href="/static/images/icons/spider_ico_master.svg" type="image/svg+xml">
 	<link rel="apple-touch-icon" href="/static/images/icons/icon-apple.png">
 	<link rel="manifest" href="/static/pwa/manifest.webmanifest">
-	<link rel="stylesheet" href="/static/css/dev/style.css">
+	<link rel="stylesheet" href="/static/css/rel/style.min.css">
 	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
 		integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/6.15.0/css/flag-icons.min.css"
@@ -94,20 +94,20 @@
 			<span id="version">2.4.5.3</span>
 		</div>
 	</footer>
-	<script async src="static/js/dev/load-sw.js"></script>
+	<script async src="static/js/rel/load-sw.min.js"></script>
 	<script nonce="{{ inline_script_nonce }}">
 		{% block app_data %}
 		var my_callsign = '{{mycallsign}}';
 		{% endblock app_data %}
 	</script>
-	<script defer src="static/js/dev/common.js"></script>
+	<script defer src="static/js/rel/common.min.js"></script>
 	<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"
 		integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4"
 		crossorigin="anonymous"></script>
 
 	</body>
 	{% block app_scripts %}
-	<script async src="static/js/dev/callsign_search.js"></script>
+	<script async src="static/js/rel/callsign_search.min.js"></script>
 	{% endblock app_scripts %}
 	{% block inline_scripts %}
 	{% endblock inline_scripts %}
@@ -137,7 +137,7 @@
 		</div>
 	</div>
 
-	<script defer src="static/js/dev/cookie_consent.js"></script>
+	<script defer src="static/js/rel/cookie_consent.min.js"></script>
 	{% endif %}
 	{% endblock cookie %}
 	<!-- Back to top button -->

templates/callsign.html

@@ -16,5 +16,5 @@
 	var callsign = '{{callsign}}';
 {% endblock app_data %}
 {% block inline_scripts %}
-	<script defer src="static/js/dev/callsign_inline.js"></script>
+	<script defer src="static/js/rel/callsign_inline.min.js"></script>
 {% endblock %}

templates/index.html

@@ -311,8 +311,8 @@ var band_frequencies={{bands["bands"]|tojson|safe}};
 {% endblock app_data %}
 {% block app_scripts %}
 {{ super() }}
-<script defer src="static/js/dev/table.js"></script>
+<script defer src="static/js/rel/table.min.js"></script>
 {% endblock %}
 {% block inline_scripts %}
-<script defer src="static/js/dev/index_inline.js"></script>
+<script defer src="static/js/rel/index_inline.min.js"></script>
 {% endblock %}

templates/plots.html

@@ -89,5 +89,5 @@ var band_frequencies={{bands["bands"]|tojson|safe}};
 <script defer src="https://cdnjs.cloudflare.com/ajax/libs/echarts/5.4.3/echarts.min.js"
 integrity="sha512-EmNxF3E6bM0Xg1zvmkeYD3HDBeGxtsG92IxFt1myNZhXdCav9MzvuH/zNMBU1DmIPN6njrhX1VTbqdJxQ2wHDg=="
 crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script defer src="static/js/dev/plot.js"></script>
+<script defer src="static/js/rel/plot.min.js"></script>
 {% endblock app_scripts %}