diff options
author | Anton Luka Šijanec <sijanecantonluka@gmail.com> | 2020-11-09 15:06:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-09 15:06:18 +0100 |
commit | 05042924c5797d1bcf61794aad1a4965b7fb0e65 (patch) | |
tree | 32d9e014b24c76514be83467693a334872cdd6ab /assets | |
parent | Merge pull request #28 from beziapp/dev 🤞 (diff) | |
parent | added nginx config file for bežiapp html host (diff) | |
download | beziapp-05042924c5797d1bcf61794aad1a4965b7fb0e65.tar beziapp-05042924c5797d1bcf61794aad1a4965b7fb0e65.tar.gz beziapp-05042924c5797d1bcf61794aad1a4965b7fb0e65.tar.bz2 beziapp-05042924c5797d1bcf61794aad1a4965b7fb0e65.tar.lz beziapp-05042924c5797d1bcf61794aad1a4965b7fb0e65.tar.xz beziapp-05042924c5797d1bcf61794aad1a4965b7fb0e65.tar.zst beziapp-05042924c5797d1bcf61794aad1a4965b7fb0e65.zip |
Diffstat (limited to '')
-rw-r--r-- | assets/js/app.js.bvr | 2 | ||||
-rw-r--r-- | assets/js/lang/bundle.js.bvr (renamed from assets/js/lang/bundle.js) | 6 | ||||
-rw-r--r-- | assets/js/setup-storage.js.bvr (renamed from assets/js/setup-storage.js) | 8 | ||||
-rw-r--r-- | assets/js/timetable.js | 2 | ||||
-rw-r--r-- | assets/root/login.html | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/assets/js/app.js.bvr b/assets/js/app.js.bvr index a96ea88..c99124b 100644 --- a/assets/js/app.js.bvr +++ b/assets/js/app.js.bvr @@ -1,5 +1,5 @@ <@?i global@> -// @begin=html@ +// @begin=js@ const app_version = "<@?g app_version@>"; const previous_commit = "<@?g latest_commit@>"; const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund diff --git a/assets/js/lang/bundle.js b/assets/js/lang/bundle.js.bvr index bd0335c..125d3c6 100644 --- a/assets/js/lang/bundle.js +++ b/assets/js/lang/bundle.js.bvr @@ -1,3 +1,5 @@ +<@?i global@> +// @begin=js@ // there's an DoS backdoor in BežiApp because of this (-:< var chosenLang; var dateString = { @@ -49,7 +51,7 @@ async function refreshLangDOM() { async function setLangConfigAndReload() { let promises_to_run = [ /* localforage.setItem("chosenCapitalize", true), */ // F for unused code - localforage.setItem("chosenLang", "en") + localforage.setItem("chosenLang", "<@?g app_default_language@>") ]; await Promise.all(promises_to_run); window.location.reload(); @@ -141,6 +143,7 @@ var langstrings = { theToS: "the terms and conditions", and: "and", thePrivacyPolicy: "the privacy policy", + thePrivacyPolicy_rodilnik: "the privacy policy", loginFailed: "login failed", browserNotSupported: "bežiapp won't work on your device, unless you update your Internet browser", // index @@ -353,6 +356,7 @@ var langstrings = { theToS: "pogoji uporabe (v angleščini)", and: "in", thePrivacyPolicy: "politika zasebnosti (v angleščini)", + thePrivacyPolicy_rodilnik: "politiko zasebnosti (v angleščini)", loginFailed: "prijava je spodletela", browserNotSupported: "BežiApp ne bo deloval na vaši napravi, če ne posodobite vašega Internetnega brskalnika", // timetable diff --git a/assets/js/setup-storage.js b/assets/js/setup-storage.js.bvr index b29c959..3d3b554 100644 --- a/assets/js/setup-storage.js +++ b/assets/js/setup-storage.js.bvr @@ -1,3 +1,5 @@ +<@?i global@> +// @begin=js@ async function setupStorage(force = false) { let logged_in; promises_check_if_already_installed = [ @@ -18,9 +20,6 @@ async function setupStorage(force = false) { localforage.setItem("messages", [[], [], []]), // see messages.js:129, commit 8eb9ca9caca30fbbe023243657535ab4088be377 localforage.setItem("directory", {}), //\\ well I could remember my own code but I didn't. localforage.setItem("meals", {}), - localforage.setItem("chosenLang", "en"), - localforage.setItem("theme", "light"), - localforage.setItem("errorReporting", "on"), localforage.setItem("lastUpdate", 0), localforage.setItem("triggerWarningAccepted", false) ]; @@ -34,6 +33,9 @@ async function setupStorage(force = false) { localforage.setItem("logged_in", false), localforage.setItem("username", ""), localforage.setItem("password", ""), + localforage.setItem("chosenLang", "<@?g app_default_language@>"), + localforage.setItem("theme", "light"), + localforage.setItem("errorReporting", "on"), ]; await localforage.clear(); await Promise.all(promises_first_install); diff --git a/assets/js/timetable.js b/assets/js/timetable.js index 290b748..85c555a 100644 --- a/assets/js/timetable.js +++ b/assets/js/timetable.js @@ -274,7 +274,7 @@ document.addEventListener("DOMContentLoaded", () => { nowIndicator: true, firstDay: 1, weekends: false, - + timeFormat: 'H(:mm)', // 24 urni urnik - evropa style minTime: "07:10:00", maxTime: "19:10:00" }); diff --git a/assets/root/login.html b/assets/root/login.html index 95bcc2e..8a2c532 100644 --- a/assets/root/login.html +++ b/assets/root/login.html @@ -57,7 +57,7 @@ </div> <div class="row"> <p class="grey-text text-darken-2"><x-su>bySigningInYouAgreeTo</x-su> <a href="/pages/tos.html"><x-sl>theToS</x-sl></a> <x-sl>and</x-sl> - <a href="/pages/privacypolicy.html"><x-dl>thePrivacyPolicy</x-dl></a> + <a href="/pages/privacypolicy.html"><x-dl>thePrivacyPolicy_rodilnik</x-dl></a> </p> </div> <div class="row" id="server-message-at-login"> |