diff options
| author | Anton Luka Šijanec <anton@sijanec.eu> | 2021-03-25 20:22:29 +0100 |
|---|---|---|
| committer | Anton Luka Šijanec <anton@sijanec.eu> | 2021-03-25 20:22:29 +0100 |
| commit | c9a6ddd6e1c0c7434a95d670fddf3f5b7da4c885 (patch) | |
| tree | 93ee0c21226fa260e51b0ec451e3f62d1b4672b8 | |
| parent | Merge pull request 'dev' (#1) from dev into master (diff) | |
| parent | Merge branch 'master' into dev (diff) | |
| download | beziapp-c9a6ddd6e1c0c7434a95d670fddf3f5b7da4c885.tar beziapp-c9a6ddd6e1c0c7434a95d670fddf3f5b7da4c885.tar.gz beziapp-c9a6ddd6e1c0c7434a95d670fddf3f5b7da4c885.tar.bz2 beziapp-c9a6ddd6e1c0c7434a95d670fddf3f5b7da4c885.tar.lz beziapp-c9a6ddd6e1c0c7434a95d670fddf3f5b7da4c885.tar.xz beziapp-c9a6ddd6e1c0c7434a95d670fddf3f5b7da4c885.tar.zst beziapp-c9a6ddd6e1c0c7434a95d670fddf3f5b7da4c885.zip | |
| -rw-r--r-- | assets/js/app.js.bvr | 4 | ||||
| -rw-r--r-- | assets/js/initialize.js | 6 | ||||
| -rw-r--r-- | assets/root/index.html | 34 | ||||
| -rwxr-xr-x | dist/cache_name.txt | 2 | ||||
| -rwxr-xr-x | dist/index.html | 34 | ||||
| -rwxr-xr-x | dist/js/app.js | 8 | ||||
| -rwxr-xr-x | dist/js/initialize.js | 1 | ||||
| -rwxr-xr-x | dist/pages/about.html | 4 | ||||
| -rwxr-xr-x | dist/sw.js | 4 | ||||
| -rw-r--r-- | global.bvr | 2 |
10 files changed, 90 insertions, 9 deletions
diff --git a/assets/js/app.js.bvr b/assets/js/app.js.bvr index c99124b..17d7555 100644 --- a/assets/js/app.js.bvr +++ b/assets/js/app.js.bvr @@ -4,6 +4,10 @@ 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(() => { }) 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..90a1a95 100644 --- a/assets/root/index.html +++ b/assets/root/index.html @@ -22,6 +22,40 @@ </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 hidden=hidden> + <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> + setTimeout(function() {document.getElementsByTagName("div")[0].hidden=false}, 1000); + </script> </body> </html> diff --git a/dist/cache_name.txt b/dist/cache_name.txt index 3dbfd08..5466678 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.4-beta-80550d8||| diff --git a/dist/index.html b/dist/index.html index 2a861a1..90a1a95 100755 --- a/dist/index.html +++ b/dist/index.html @@ -22,6 +22,40 @@ </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 hidden=hidden> + <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> + setTimeout(function() {document.getElementsByTagName("div")[0].hidden=false}, 1000); + </script> </body> </html> diff --git a/dist/js/app.js b/dist/js/app.js index 816250f..623213f 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -4,10 +4,14 @@ // @begin=js@ -const app_version = "1.0.16.3-beta"; -const previous_commit = "5376b618e88d85b3fc16561176478c104af1a01b"; +const app_version = "1.0.16.4-beta"; +const previous_commit = "80550d8cad189982bf607549b6b5d3977602b91b"; 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(() => { }) 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..989f5e9 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -79,7 +79,7 @@ <!-- One day in the future we may have sw cache version covered by this as well --> <h5 class="subheader"> <x-su>version</x-su> - 1.0.16.3-beta + 1.0.16.4-beta </h5> </div> </div> @@ -163,7 +163,7 @@ <div class="row"> <p> <small> - ^HEAD 5376b618e88d85b3fc16561176478c104af1a01b + ^HEAD 80550d8cad189982bf607549b6b5d3977602b91b </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.4-beta-80550d8"; +// commit before the latest is 80550d8cad189982bf607549b6b5d3977602b91b // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! @@ -1,4 +1,4 @@ <@?s bvr_include_path assets/pages-src/ assets/pages-src/misc/@> <@?s latest_commit ?u 0 -1 ?i .git/refs/heads/dev@> -<@?s app_version 1.0.16.3-beta@> +<@?s app_version 1.0.16.4-beta@> <@?s app_default_language sl@> |