From 1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd Mon Sep 17 00:00:00 2001 From: sijanec Date: Thu, 25 Mar 2021 18:09:50 +0100 Subject: added not supported text --- assets/js/app.js.bvr | 6 ++++++ assets/js/initialize.js | 6 +++++- assets/root/index.html | 35 +++++++++++++++++++++++++++++++++++ dist/cache_name.txt | 2 +- dist/index.html | 35 +++++++++++++++++++++++++++++++++++ dist/js/app.js | 8 +++++++- dist/js/initialize.js | 1 + dist/pages/about.html | 2 +- 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 @@ + +
+

+ BežiApp se ni mogel zagnati ): +

+

+ Mogoče gre za napako, pišite nam na Instagram (@beziapp). +

+

+ Bolj verjetno pa je, da vaša naprava ni podprta. To velja predvsem za stare iPhone telefone, saj Apple ne posodablja brskalnikov. +

+
+

+ BežiApp could not start ): +

+

+ This may happen due to an error, write to us on Instagram (@beziapp). +

+

+ 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. +

+
+ BežiApp ver.
BežiApp previous commit: +
+ 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 @@ + +
+

+ BežiApp se ni mogel zagnati ): +

+

+ Mogoče gre za napako, pišite nam na Instagram (@beziapp). +

+

+ Bolj verjetno pa je, da vaša naprava ni podprta. To velja predvsem za stare iPhone telefone, saj Apple ne posodablja brskalnikov. +

+
+

+ BežiApp could not start ): +

+

+ This may happen due to an error, write to us on Instagram (@beziapp). +

+

+ 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. +

+
+ BežiApp ver.
BežiApp previous commit: +
+ 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 @@

- ^HEAD 5376b618e88d85b3fc16561176478c104af1a01b + ^HEAD ec8292f44fd0040145c1643ff871a98e3a41fcd0

diff --git a/dist/sw.js b/dist/sw.js index 73d5c5f..edeec9d 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -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! -- cgit v1.2.3 From 80550d8cad189982bf607549b6b5d3977602b91b Mon Sep 17 00:00:00 2001 From: sijanec Date: Thu, 25 Mar 2021 18:27:02 +0100 Subject: update not supported screen --- assets/js/app.js.bvr | 2 -- assets/root/index.html | 5 ++--- dist/cache_name.txt | 2 +- dist/index.html | 5 ++--- dist/js/app.js | 4 +--- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- 7 files changed, 9 insertions(+), 15 deletions(-) diff --git a/assets/js/app.js.bvr b/assets/js/app.js.bvr index 7375b61..17d7555 100644 --- a/assets/js/app.js.bvr +++ b/assets/js/app.js.bvr @@ -12,8 +12,6 @@ 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/root/index.html b/assets/root/index.html index f2309ad..90a1a95 100644 --- a/assets/root/index.html +++ b/assets/root/index.html @@ -30,7 +30,7 @@ BežiApp needs Javascript to operate, but it's currently not accessible. Check your browser's settings and enable Javascript. -
+ diff --git a/dist/cache_name.txt b/dist/cache_name.txt index 6f5c5ff..4680f96 100755 --- a/dist/cache_name.txt +++ b/dist/cache_name.txt @@ -3,4 +3,4 @@ -///site-static-1.0.16.3-beta-ec8292f||| +///site-static-1.0.16.3-beta-1f9f384||| diff --git a/dist/index.html b/dist/index.html index f2309ad..90a1a95 100755 --- a/dist/index.html +++ b/dist/index.html @@ -30,7 +30,7 @@ BežiApp needs Javascript to operate, but it's currently not accessible. Check your browser's settings and enable Javascript. -
+ diff --git a/dist/js/app.js b/dist/js/app.js index c0d2c6f..ddb1a7b 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -5,7 +5,7 @@ // @begin=js@ const app_version = "1.0.16.3-beta"; -const previous_commit = "ec8292f44fd0040145c1643ff871a98e3a41fcd0"; +const previous_commit = "1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd"; const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund if (location.protocol !== 'https:') { @@ -16,8 +16,6 @@ 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/pages/about.html b/dist/pages/about.html index e073999..afe81cf 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -163,7 +163,7 @@

- ^HEAD ec8292f44fd0040145c1643ff871a98e3a41fcd0 + ^HEAD 1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd

diff --git a/dist/sw.js b/dist/sw.js index edeec9d..2c43aaa 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -5,8 +5,8 @@ // @begin=js@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.16.3-beta-ec8292f"; -// commit before the latest is ec8292f44fd0040145c1643ff871a98e3a41fcd0 +const static_cache_name = "site-static-1.0.16.3-beta-1f9f384"; +// commit before the latest is 1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3 From 83118f9ededc43dac363814e0358dfeed7d1e62d Mon Sep 17 00:00:00 2001 From: sijanec Date: Thu, 25 Mar 2021 20:17:08 +0100 Subject: upgrade to 1.0.16.3-beta --- dist/cache_name.txt | 2 +- dist/js/app.js | 4 ++-- dist/pages/about.html | 4 ++-- dist/sw.js | 4 ++-- global.bvr | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dist/cache_name.txt b/dist/cache_name.txt index 4680f96..5466678 100755 --- a/dist/cache_name.txt +++ b/dist/cache_name.txt @@ -3,4 +3,4 @@ -///site-static-1.0.16.3-beta-1f9f384||| +///site-static-1.0.16.4-beta-80550d8||| diff --git a/dist/js/app.js b/dist/js/app.js index ddb1a7b..623213f 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -4,8 +4,8 @@ // @begin=js@ -const app_version = "1.0.16.3-beta"; -const previous_commit = "1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd"; +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:') { diff --git a/dist/pages/about.html b/dist/pages/about.html index afe81cf..989f5e9 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -79,7 +79,7 @@
version - 1.0.16.3-beta + 1.0.16.4-beta
@@ -163,7 +163,7 @@

- ^HEAD 1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd + ^HEAD 80550d8cad189982bf607549b6b5d3977602b91b

diff --git a/dist/sw.js b/dist/sw.js index 2c43aaa..cb0428d 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -5,8 +5,8 @@ // @begin=js@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.16.3-beta-1f9f384"; -// commit before the latest is 1f9f384933ac7afa5bca8a2a465f6f1ae6f02edd +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! diff --git a/global.bvr b/global.bvr index 7f10871..d4ab6b5 100644 --- a/global.bvr +++ b/global.bvr @@ -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@> -- cgit v1.2.3