From 01ed82c4ee5c9555f6676fdc34226a923f243887 Mon Sep 17 00:00:00 2001 From: coulisse Date: Fri, 27 Jan 2023 11:03:43 +0100 Subject: [PATCH] cache control, layout scrolling, no cyan --- docs/CHANGELOG.md | 10 ++- scripts/build.sh | 1 + scripts/dxcluster_schema_for_test.sh | 8 ++- scripts/lh.sh | 2 + static/html/rel/offline.html | 2 +- static/js/dev/table.js | 18 ++--- static/js/rel/table.min.js | 2 +- templates/_base.html | 2 +- templates/index.html | 101 +++++++++++++++++++++++++++ webapp.py | 2 +- 10 files changed, 128 insertions(+), 20 deletions(-) create mode 100755 scripts/lh.sh diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 5ced20a..49aa614 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,13 @@ ### Change log -Date: 23/01/2023 +Date: 27/01/2023 +Release: v2.4.1.2 +- Changed cache-control header +- Fixed Layout scrolling (SEO) +- First time spot load: not show cyan background + +___ + +Date: 25/01/2023 Release: v2.4.1.2 - fixed issue #30 bug on callsign search diff --git a/scripts/build.sh b/scripts/build.sh index 938f10a..a0096dd 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -121,6 +121,7 @@ if [ "$1" == "-r" ]; then echo 'remove some packages from requirements...' sed -i '/certifi==/d' ../requirements.txt sed -i '/staticjinja==/d' ../requirements.txt + sed -i '/lighthouse==/d' ../requirements.txt if ! sed -i '13,20s/level=DEBUG/level=INFO/g' ${app_ini}; then echo 'ERROR settimg loglevel=INFO ' diff --git a/scripts/dxcluster_schema_for_test.sh b/scripts/dxcluster_schema_for_test.sh index 2682e10..2b9c3fe 100755 --- a/scripts/dxcluster_schema_for_test.sh +++ b/scripts/dxcluster_schema_for_test.sh @@ -20,7 +20,13 @@ db_insert () { spotteritu=$(shuf -i 1-90 -n 1) spottercq=$(shuf -i 1-40 -n 1) #for epoc use https://www.epochconverter.com/ - timestamp=$(shuf -i 1673759569-1673763169 -n 1) + + curr_epoch_time=$(date +%s) + #timestamp=$(shuf -i 1673759569-1673763169 -n 1) + epoch_start=$((${curr_epoch_time}-3600)) + echo ${curr_epoch_time} + echo ${epoch_start} + timestamp=$(shuf -i ${epoch_start}-${curr_epoch_time} -n 1) cs_letter_1=$(chr $(shuf -i 65-90 -n1)) cs_letter_2=$(chr $(shuf -i 65-90 -n1)) diff --git a/scripts/lh.sh b/scripts/lh.sh new file mode 100755 index 0000000..591a9c2 --- /dev/null +++ b/scripts/lh.sh @@ -0,0 +1,2 @@ +lighthouse ${1} --chrome-flags=”--headless” --quiet --view + diff --git a/static/html/rel/offline.html b/static/html/rel/offline.html index e583eb0..f6d309c 100644 --- a/static/html/rel/offline.html +++ b/static/html/rel/offline.html @@ -129,7 +129,7 @@
- + We use cookies

We use only technical cookies.

diff --git a/static/js/dev/table.js b/static/js/dev/table.js index db8cfe4..38aae64 100644 --- a/static/js/dev/table.js +++ b/static/js/dev/table.js @@ -6,6 +6,7 @@ class table_builder { constructor(selector) { this.selector = selector; this.current_data = []; + this.first_time = true; } /** * @return last_rowid {integer} the last rowid @@ -36,25 +37,12 @@ class table_builder { */ #buildRow(line, isnew, dt_current, callsign = '') { const row = document.createElement('tr'); -/* - row.id = line.rowid; - - if (callsign.length > 0) { - if (callsign == line.de) { - row.id = line.rowid; - } else if (callsign == line.dx) { - row.id = line.rowid; - } - } else if (isnew) { - row.className = 'table-info'; - } -*/ if (callsign.length > 0) { /* do not check new lines */ - } else if (isnew) { + } else if (isnew && !this.first_time) { row.className = 'table-info'; } @@ -256,6 +244,8 @@ class table_builder { var popoverList = popoverTriggerList.map(function (popoverTriggerEl) { return new bootstrap.Popover(popoverTriggerEl); }); + + this.first_time=false; } } } //end class diff --git a/static/js/rel/table.min.js b/static/js/rel/table.min.js index 024af84..e1a1e69 100644 --- a/static/js/rel/table.min.js +++ b/static/js/rel/table.min.js @@ -1 +1 @@ -class table_builder{constructor(e){this.selector=e,this.current_data=[]}getLastRowId(){let e;return e=null==this.current_data||this.current_data.length<1?0:this.current_data[0].rowid}resetData(){this.current_data=[]}#buildRow(e,t,n,a=""){var l=document.createElement("tr"),t=(0NG3K Website",r=document.createElement("i"),d=(r.className="bi-search",r.role="button",r.ariaLabel=e.dx,document.createElement("a")),c=(d.href=qrz_url+e.dx,d.target="_blank",d.rel="noopener",document.createElement("span")),s=document.createElement("mark"),s=(s.textContent=e.dx,e.dx==a?c.appendChild(s):c.textContent=" "+e.dx,null!=o&&((a=document.createElement("i")).tabIndex=0,a.className="bi-megaphone-fill",a.style="color: cornflowerblue;",a.role="button",a.ariaLabel="dx_operations",a.setAttribute("data-bs-container","body"),a.setAttribute("data-bs-toggle","popover"),a.setAttribute("data-bs-trigger","focus"),a.setAttribute("data-bs-sanitizer","true"),a.setAttribute("data-bs-placement","auto"),a.setAttribute("data-bs-html","true"),a.setAttribute("data-bs-title","Announced DX Op.: "+o.summary),a.setAttribute("data-bs-content",o.description+"data from "+t),c.appendChild(a)),document.createElement("td"));d.appendChild(r),s.appendChild(d),s.append(c),l.appendChild(s);try{var i=document.createElement("span"),u=(i.className="img-flag fi fi-"+e.iso,i.setAttribute("data-bs-container","body"),i.setAttribute("data-bs-toggle","popover"),i.setAttribute("data-bs-trigger","hover"),i.setAttribute("data-bs-placement","left"),i.setAttribute("data-bs-content",e.country),document.createElement("td"));u.appendChild(i),l.appendChild(u)}catch(e){console.log(e),console.log("error creating flag");o=document.createElement("td");l.appendChild(o)}t=document.createElement("td"),t.className="d-none d-lg-table-cell d-xl-table-cell",t.textContent=e.country,l.appendChild(t),a=document.createElement("td");a.className="d-none d-lg-table-cell d-xl-table-cell";try{a.textContent=e.comm.substring(0,100)}catch(e){a.textContent=""}l.appendChild(a);let m=new Date(1e3*e.time),p="00"+m.getUTCHours(),b=(p=p.substring(p.length-2,p.length),"00"+m.getMinutes()),g=(b=b.substring(b.length-2,b.length),"00"+m.getUTCDate()),h=(g=g.substring(g.length-2,g.length),"00"+(Number(m.getUTCMonth())+1));h=h.substring(h.length-2,h.length);r=m.getUTCFullYear(),d=p+":"+b,m=g+"/"+h+"/"+r,c=document.createElement("div"),c.className="d-flex flex-column",s=document.createElement("div");return s.textContent=d,c.appendChild(s),m!=n&&((i=document.createElement("div")).textContent=m,c.appendChild(i)),l.appendChild(c),l}build(n,a){if(null!=n){var l=new Date;let e="00"+l.getUTCDate(),t=(e=e.substring(e.length-2,e.length),"00"+(Number(l.getUTCMonth())+1));t=t.substring(t.length-2,t.length);var l=l.getUTCFullYear(),r=e+"/"+t+"/"+l,d=(document.getElementById(this.selector).replaceChildren(),[]);for(let e=0;ee.value);(r.lengthe.json()).then(t=>{try{tb.build(t)}catch(e){console.log(e),console.log(e.stack),console.log(t)}})} +class table_builder{constructor(e){this.selector=e,this.current_data=[],this.first_time=!0}getLastRowId(){let e;return e=null==this.current_data||this.current_data.length<1?0:this.current_data[0].rowid}resetData(){this.current_data=[]}#buildRow(e,t,n,a=""){var r=document.createElement("tr"),t=(0NG3K Website",l=document.createElement("i"),d=(l.className="bi-search",l.role="button",l.ariaLabel=e.dx,document.createElement("a")),c=(d.href=qrz_url+e.dx,d.target="_blank",d.rel="noopener",document.createElement("span")),s=document.createElement("mark"),s=(s.textContent=e.dx,e.dx==a?c.appendChild(s):c.textContent=" "+e.dx,null!=o&&((a=document.createElement("i")).tabIndex=0,a.className="bi-megaphone-fill",a.style="color: cornflowerblue;",a.role="button",a.ariaLabel="dx_operations",a.setAttribute("data-bs-container","body"),a.setAttribute("data-bs-toggle","popover"),a.setAttribute("data-bs-trigger","focus"),a.setAttribute("data-bs-sanitizer","true"),a.setAttribute("data-bs-placement","auto"),a.setAttribute("data-bs-html","true"),a.setAttribute("data-bs-title","Announced DX Op.: "+o.summary),a.setAttribute("data-bs-content",o.description+"data from "+t),c.appendChild(a)),document.createElement("td"));d.appendChild(l),s.appendChild(d),s.append(c),r.appendChild(s);try{var i=document.createElement("span"),u=(i.className="img-flag fi fi-"+e.iso,i.setAttribute("data-bs-container","body"),i.setAttribute("data-bs-toggle","popover"),i.setAttribute("data-bs-trigger","hover"),i.setAttribute("data-bs-placement","left"),i.setAttribute("data-bs-content",e.country),document.createElement("td"));u.appendChild(i),r.appendChild(u)}catch(e){console.log(e),console.log("error creating flag");o=document.createElement("td");r.appendChild(o)}t=document.createElement("td"),t.className="d-none d-lg-table-cell d-xl-table-cell",t.textContent=e.country,r.appendChild(t),a=document.createElement("td");a.className="d-none d-lg-table-cell d-xl-table-cell";try{a.textContent=e.comm.substring(0,100)}catch(e){a.textContent=""}r.appendChild(a);let m=new Date(1e3*e.time),h="00"+m.getUTCHours(),p=(h=h.substring(h.length-2,h.length),"00"+m.getMinutes()),b=(p=p.substring(p.length-2,p.length),"00"+m.getUTCDate()),g=(b=b.substring(b.length-2,b.length),"00"+(Number(m.getUTCMonth())+1));g=g.substring(g.length-2,g.length);l=m.getUTCFullYear(),d=h+":"+p,m=b+"/"+g+"/"+l,c=document.createElement("div"),c.className="d-flex flex-column",s=document.createElement("div");return s.textContent=d,c.appendChild(s),m!=n&&((i=document.createElement("div")).textContent=m,c.appendChild(i)),r.appendChild(c),r}build(n,a){if(null!=n){var r=new Date;let e="00"+r.getUTCDate(),t=(e=e.substring(e.length-2,e.length),"00"+(Number(r.getUTCMonth())+1));t=t.substring(t.length-2,t.length);var r=r.getUTCFullYear(),l=e+"/"+t+"/"+r,d=(document.getElementById(this.selector).replaceChildren(),[]);for(let e=0;ee.value);(l.lengthe.json()).then(t=>{try{tb.build(t)}catch(e){console.log(e),console.log(e.stack),console.log(t)}})} diff --git a/templates/_base.html b/templates/_base.html index 0fb2128..428f20f 100644 --- a/templates/_base.html +++ b/templates/_base.html @@ -129,7 +129,7 @@
- + We use cookies

We use only technical cookies.

diff --git a/templates/index.html b/templates/index.html index 699ca2a..edc0f2b 100644 --- a/templates/index.html +++ b/templates/index.html @@ -188,6 +188,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/webapp.py b/webapp.py index 9f99a2a..b85b815 100644 --- a/webapp.py +++ b/webapp.py @@ -471,7 +471,7 @@ def add_security_headers(resp): resp.headers["X-Frame-Options"] = "SAMEORIGIN" resp.headers["X-Content-Type-Options"] = "nosniff" resp.headers["Referrer-Policy"] = "strict-origin-when-cross-origin" - resp.headers["Cache-Control"] = "public, no-cache" + resp.headers["Cache-Control"] = "public, no-cache, no-store, must-revalidate" resp.headers["Pragma"] = "no-cache" resp.headers["Content-Security-Policy"] = "\