hamradio/spiderweb
1
0
Fork 0
mirror of https://github.com/coulisse/spiderweb.git synced 2024-09-21 07:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
coulisse 2023-02-18 08:41:19 +01:00
parent 9f3d5d009c
commit f000bba226
12 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CITATION.cff
View File

@ -25,4 +25,4 @@ keywords:
- spiderweb
license: GPL-3.0
version: v2.4.2
date-released: 2023-02-11
date-released: 2023-02-18

2
cfg/webapp_log_config.ini
View File

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

6
docs/CHANGELOG.md
View File

@ -1,4 +1,10 @@
### Change log
Date: 18/02/2023
Release: v2.4.2
- replaced multipart form post with url encoded for security reasons
- fixed bands and continents in band activity chart
- upgraded Werkzeug to 2.2.3
Date: 11/02/2023
Release: v2.4.2
- changed cache-control header

2
requirements.txt
View File

@ -32,7 +32,7 @@ six==1.16.0
tomlkit==0.11.6
urllib3==1.26.13
watchdog==2.2.0
Werkzeug==2.2.2
Werkzeug==2.2.3
wrapt==1.14.1
WTForms==3.0.1
xxhash==3.1.0

10
static/html/offline.html
View File

@ -16,7 +16,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/rel/style.min.css">
<link rel="stylesheet" href="/static/css/dev/style.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
@ -50,7 +50,7 @@
<div id="MyClockDisplay" class="text-white-50 d-none d-lg-block"></div>
<div class="text-white-50 d-none d-lg-block">&nbsp;(UTC)&nbsp;&nbsp;</div>
<form method="POST" class="d-flex" id="form-callsign" enctype="multipart/form-data">
<form method="POST" class="d-flex" id="form-callsign" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="csrf_token" value="none" />
<div class="input-group" id='input-group-callsign'>
<input type="text" class="form-control" placeholder="callsign" aria-label="callsign"
@ -102,17 +102,17 @@
-->
</div>
</footer>
<script async src="static/js/rel/load-sw.min.js"></script>
<script async src="static/js/dev/load-sw.js"></script>
<script nonce="">
</script>
<script defer src="static/js/rel/common.min.js"></script>
<script defer src="static/js/dev/common.js"></script>
<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js"
integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa"
crossorigin="anonymous"></script>
<script async src="static/js/rel/callsign_search.min.js"></script>
<script async src="static/js/dev/callsign_search.js"></script>

6
static/js/dev/plot.js
View File

@ -164,16 +164,18 @@ class band_activity extends plot_base {
super(chart_id,end_point);
//populate continents array
var continents=[];
let continents=[];
cont_cq.forEach(function myFunction(item, index) {
continents[index]=item['id'];
});
this.continents=continents;
//populate bands array
var bands=[];
let bands=[];
band_freq.forEach(function myFunction(item, index) {
bands[index]=item['id'];
});
this.bands=bands;
//managing region
var selectedContinent=getCookie('user_region');

2
static/js/rel/plot.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
static/pwa/service-worker.js
View File

@ -4,7 +4,7 @@ const CACHE_NAME = 'pwa-spiderweb_v2.4.2'
// Dichiarazione della costante per gli URL da mettere in cache
const URLS_TO_CACHE = [
'/static/images/background.webp',
'/static/css/rel/style.min.css',
'/static/css/dev/style.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/rel/callsign_inline.min.js',
'/static/js/rel/callsign_search.min.js',
'/static/js/rel/common.min.js',
'/static/js/dev/callsign_inline.js',
'/static/js/dev/callsign_search.js',
'/static/js/dev/common.js',
'/privacy.html',
'/cookies.html',
'/offline.html',

12
templates/_base.html
View File

@ -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/rel/style.min.css">
<link rel="stylesheet" href="/static/css/dev/style.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
@ -55,7 +55,7 @@
<div id="MyClockDisplay" class="text-white-50 d-none d-lg-block"></div>
<div class="text-white-50 d-none d-lg-block">&nbsp;(UTC)&nbsp;&nbsp;</div>
{% block callsign %}
<form method="POST" class="d-flex" id="form-callsign" enctype="multipart/form-data">
<form method="POST" class="d-flex" id="form-callsign" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<div class="input-group" id='input-group-callsign'>
<input type="text" class="form-control" placeholder="callsign" aria-label="callsign"
@ -98,18 +98,18 @@
-->
</div>
</footer>
<script async src="static/js/rel/load-sw.min.js"></script>
<script async src="static/js/dev/load-sw.js"></script>
<script nonce="{{ inline_script_nonce }}">
{% block app_data %}
var my_callsign = '{{mycallsign}}';
{% endblock app_data %}
</script>
<script defer src="static/js/rel/common.min.js"></script>
<script defer src="static/js/dev/common.js"></script>
<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js"
integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa"
crossorigin="anonymous"></script>
{% block app_scripts %}
<script async src="static/js/rel/callsign_search.min.js"></script>
<script async src="static/js/dev/callsign_search.js"></script>
{% endblock app_scripts %}
{% block inline_scripts %}
{% endblock inline_scripts %}
@ -140,7 +140,7 @@
</div>
</div>
<script defer src="static/js/rel/cookie_consent.min.js"></script>
<script defer src="static/js/dev/cookie_consent.js"></script>
{% endif %}
{% endblock cookie %}
</body>

2
templates/callsign.html
View File

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

6
templates/index.html
View File

@ -24,7 +24,7 @@
<div class="row mx-auto">
<!--Sidebar content-->
<div class="col-md-auto ml-2 collapse rounded-sm shadow mb-5 bg-body" id="collapseFilters">
<form method="POST" id="form-filters" enctype="multipart/form-data">
<form method="POST" id="form-filters" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<strong>Band</strong>
<select class="form-select overflow-hidden" id="band" size="14" multiple>
@ -305,8 +305,8 @@ var band_frequencies={{bands["bands"]|tojson|safe}};
{% endblock app_data %}
{% block app_scripts %}
{{ super() }}
<script defer src="static/js/rel/table.min.js"></script>
<script defer src="static/js/dev/table.js"></script>
{% endblock %}
{% block inline_scripts %}
<script defer src="static/js/rel/index_inline.min.js"></script>
<script defer src="static/js/dev/index_inline.js"></script>
{% endblock %}

4
templates/plots.html
View File

@ -20,7 +20,7 @@
<div id="dashboard" class="d-flex flex-wrap justify-content-around">
<div class="shadow-lg mb-5 rounded spider_chart" id="form-band_activity">
<div class="d-flex flex-column">
<form method="POST" id="form-continents" enctype="multipart/form-data">
<form method="POST" id="form-continents" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<div class="container">
Your continent is:
@ -89,5 +89,5 @@ var band_frequencies={{bands["bands"]|tojson|safe}};
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/echarts/5.4.1/echarts.min.js"
integrity="sha512-OTbGFYPLe3jhy4bUwbB8nls0TFgz10kn0TLkmyA+l3FyivDs31zsXCjOis7YGDtE2Jsy0+fzW+3/OVoPVujPmQ=="
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script defer src="static/js/rel/plot.min.js"></script>
<script defer src="static/js/dev/plot.js"></script>
{% endblock app_scripts %}