diff options
| author | sijanec <anton@sijanec.eu> | 2021-03-25 18:09:50 +0100 |
|---|---|---|
| committer | sijanec <anton@sijanec.eu> | 2021-03-25 18:09:50 +0100 |
| commit | 1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd (patch) | |
| tree | 65a06f833dc64878cbca0188b28e88d1d5cb243b | |
| parent | Merge branch 'master' into dev (diff) | |
| download | beziapp-1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd.tar beziapp-1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd.tar.gz beziapp-1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd.tar.bz2 beziapp-1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd.tar.lz beziapp-1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd.tar.xz beziapp-1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd.tar.zst beziapp-1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd.zip | |
| -rw-r--r-- | assets/js/app.js.bvr | 6 | ||||
| -rw-r--r-- | assets/js/initialize.js | 6 | ||||
| -rw-r--r-- | assets/root/index.html | 35 | ||||
| -rwxr-xr-x | dist/cache_name.txt | 2 | ||||
| -rwxr-xr-x | dist/index.html | 35 | ||||
| -rwxr-xr-x | dist/js/app.js | 8 | ||||
| -rwxr-xr-x | dist/js/initialize.js | 1 | ||||
| -rwxr-xr-x | dist/pages/about.html | 2 | ||||
| -rwxr-xr-x | dist/sw.js | 4 |
9 files changed, 93 insertions, 6 deletions
diff --git a/assets/js/app.js.bvr b/assets/js/app.js.bvr index c99124b..7375b61 100644 --- a/assets/js/app.js.bvr +++ b/assets/js/app.js.bvr @@ -4,10 +4,16 @@ const app_version = "<@?g app_version@>"; const previous_commit = "<@?g latest_commit@>"; const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund +if (location.protocol !== 'https:') { + location.replace(`https:${location.href.substring(location.protocol.length)}`); +} + if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") .then(() => { }) .catch((err) => console.log("Service worker registration failed", err)); +} else { + alert("Vaša naprava ne podpira BežiAppa. Your device does not support BežiApp."); } // Listen to messages from service workers. diff --git a/assets/js/initialize.js b/assets/js/initialize.js index cb5d210..219bc57 100644 --- a/assets/js/initialize.js +++ b/assets/js/initialize.js @@ -4,7 +4,11 @@ function getUrlParameter(sParam) { return found_param === null ? "" : found_param; } - +try { + localforage.getItem("logged_in").then(console.log); +} catch { + alert("Vaša naprava ne podpira BežiAppa. Your device does not support BežiApp."); +} localforage.getItem("logged_in") .then( function (value) { diff --git a/assets/root/index.html b/assets/root/index.html index 2a861a1..f2309ad 100644 --- a/assets/root/index.html +++ b/assets/root/index.html @@ -22,6 +22,41 @@ </head> <body> + <noscript> + <h1> + BežiApp za delovanje potrebuje Javascript, trenutno pa ni omogočen. Preglejte nastavitve brskalnika in omogočite Javascript. + </h1> + <h1> + BežiApp needs Javascript to operate, but it's currently not accessible. Check your browser's settings and enable Javascript. + </h1> + </noscript> + <div id=nepodpira> + <h1> + BežiApp se ni mogel zagnati ): + </h1> + <h2> + Mogoče gre za napako, pišite nam na Instagram (@beziapp). + </h2> + <h3> + Bolj verjetno pa je, da vaša naprava ni podprta. To velja predvsem za stare iPhone telefone, saj Apple ne posodablja brskalnikov. + </h3> + <hr> + <h1> + BežiApp could not start ): + </h1> + <h2> + This may happen due to an error, write to us on Instagram (@beziapp). + </h2> + <h3> + There's a higher chance that your device is not supported. This applies in particular to old iPhone phones, as Apple does not upgrade browsers. + </h3> + <hr> + <i>BežiApp ver. <span id=beziappver></span><br>BežiApp previous commit: <span id=beziappcommit></span></i> + </div> + <script> + document.getElementById("beziappver").innerText = app_version; + document.getElementById("beziappcommit").innerText = previous_commit; + </script> </body> </html> diff --git a/dist/cache_name.txt b/dist/cache_name.txt index 3dbfd08..6f5c5ff 100755 --- a/dist/cache_name.txt +++ b/dist/cache_name.txt @@ -3,4 +3,4 @@ -///site-static-1.0.16.3-beta-5376b61||| +///site-static-1.0.16.3-beta-ec8292f||| diff --git a/dist/index.html b/dist/index.html index 2a861a1..f2309ad 100755 --- a/dist/index.html +++ b/dist/index.html @@ -22,6 +22,41 @@ </head> <body> + <noscript> + <h1> + BežiApp za delovanje potrebuje Javascript, trenutno pa ni omogočen. Preglejte nastavitve brskalnika in omogočite Javascript. + </h1> + <h1> + BežiApp needs Javascript to operate, but it's currently not accessible. Check your browser's settings and enable Javascript. + </h1> + </noscript> + <div id=nepodpira> + <h1> + BežiApp se ni mogel zagnati ): + </h1> + <h2> + Mogoče gre za napako, pišite nam na Instagram (@beziapp). + </h2> + <h3> + Bolj verjetno pa je, da vaša naprava ni podprta. To velja predvsem za stare iPhone telefone, saj Apple ne posodablja brskalnikov. + </h3> + <hr> + <h1> + BežiApp could not start ): + </h1> + <h2> + This may happen due to an error, write to us on Instagram (@beziapp). + </h2> + <h3> + There's a higher chance that your device is not supported. This applies in particular to old iPhone phones, as Apple does not upgrade browsers. + </h3> + <hr> + <i>BežiApp ver. <span id=beziappver></span><br>BežiApp previous commit: <span id=beziappcommit></span></i> + </div> + <script> + document.getElementById("beziappver").innerText = app_version; + document.getElementById("beziappcommit").innerText = previous_commit; + </script> </body> </html> diff --git a/dist/js/app.js b/dist/js/app.js index 816250f..c0d2c6f 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -5,13 +5,19 @@ // @begin=js@ const app_version = "1.0.16.3-beta"; -const previous_commit = "5376b618e88d85b3fc16561176478c104af1a01b"; +const previous_commit = "ec8292f44fd0040145c1643ff871a98e3a41fcd0"; const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund +if (location.protocol !== 'https:') { + location.replace(`https:${location.href.substring(location.protocol.length)}`); +} + if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") .then(() => { }) .catch((err) => console.log("Service worker registration failed", err)); +} else { + alert("Vaša naprava ne podpira BežiAppa. Your device does not support BežiApp."); } // Listen to messages from service workers. diff --git a/dist/js/initialize.js b/dist/js/initialize.js index 1d9a5f6..7330461 100755 --- a/dist/js/initialize.js +++ b/dist/js/initialize.js @@ -1,3 +1,4 @@ function getUrlParameter(sParam){const url_params=new URLSearchParams(window.location.search);const found_param=url_params.get(sParam);return found_param===null?"":found_param;} +try{localforage.getItem("logged_in").then(console.log);}catch{alert("Vaša naprava ne podpira BežiAppa. Your device does not support BežiApp.");} localforage.getItem("logged_in").then(function(value){if(value==null){setupStorage(true);window.location.replace("/login.html");}else if(value===false){window.location.replace("/login.html");}else{if(getUrlParameter("m")!==""){window.location.replace("/pages/messaging.html#"+getUrlParameter("m"));}else{window.location.replace("/pages/timetable.html");}}}).catch(function(err){console.log(err);});
\ No newline at end of file diff --git a/dist/pages/about.html b/dist/pages/about.html index 6653b09..e073999 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -163,7 +163,7 @@ <div class="row"> <p> <small> - ^HEAD 5376b618e88d85b3fc16561176478c104af1a01b + ^HEAD ec8292f44fd0040145c1643ff871a98e3a41fcd0 </small> </p> </div> @@ -5,8 +5,8 @@ // @begin=js@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.16.3-beta-5376b61"; -// commit before the latest is 5376b618e88d85b3fc16561176478c104af1a01b +const static_cache_name = "site-static-1.0.16.3-beta-ec8292f"; +// commit before the latest is ec8292f44fd0040145c1643ff871a98e3a41fcd0 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! |