diff options
author | sijanec <sijanecantonluka@gmail.com> | 2020-08-25 23:24:12 +0200 |
---|---|---|
committer | sijanec <sijanecantonluka@gmail.com> | 2020-08-25 23:24:12 +0200 |
commit | a814ef4e939fe42c49955d920201eb34ba8ca3d0 (patch) | |
tree | a05097472183bfe337ec5b1f7e3b6a6cff8dcd4a | |
parent | fixed help screens and notices for make generate != make install (diff) | |
download | beziapp-a814ef4e939fe42c49955d920201eb34ba8ca3d0.tar beziapp-a814ef4e939fe42c49955d920201eb34ba8ca3d0.tar.gz beziapp-a814ef4e939fe42c49955d920201eb34ba8ca3d0.tar.bz2 beziapp-a814ef4e939fe42c49955d920201eb34ba8ca3d0.tar.lz beziapp-a814ef4e939fe42c49955d920201eb34ba8ca3d0.tar.xz beziapp-a814ef4e939fe42c49955d920201eb34ba8ca3d0.tar.zst beziapp-a814ef4e939fe42c49955d920201eb34ba8ca3d0.zip |
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | assets/js/login.js | 21 | ||||
-rw-r--r-- | assets/root/login.html | 3 | ||||
-rw-r--r-- | assets/root/server-message-at-login.html | 11 | ||||
-rwxr-xr-x | bin/bvr-compose-html | bin | 31984 -> 31664 bytes | |||
-rwxr-xr-x | bin/bvr-compose-single | bin | 31840 -> 27416 bytes | |||
-rwxr-xr-x | bin/bvr-jsbundle | bin | 17576 -> 13296 bytes | |||
-rwxr-xr-x | bin/bvr-jsmin | bin | 17904 -> 13664 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/.well-known/assetlinks.json | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/_config.yml | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/assetlinks.json | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/cache_name.txt | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/css/bubbles.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/css/fontawesome.min.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/css/fullcalendar/core/main.min.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/css/fullcalendar/custom.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/css/fullcalendar/daygrid/main.min.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/css/fullcalendar/timegrid/main.min.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/css/materialicons.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/css/materialize.min.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/css/styles.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/directory.json | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/favicon.png | bin | 8311 -> 8311 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/fonts/fa-brands-400.eot | bin | 131930 -> 131930 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/fonts/fa-brands-400.woff2 | bin | 75936 -> 75936 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/fonts/fa-regular-400.eot | bin | 34390 -> 34390 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/fonts/fa-regular-400.woff2 | bin | 13576 -> 13576 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/fonts/fa-solid-900.eot | bin | 194066 -> 194066 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/fonts/fa-solid-900.woff2 | bin | 76084 -> 76084 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/fonts/materialicons.woff2 | bin | 60832 -> 60832 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/img/avatars/asijanec.png | bin | 82 -> 82 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/img/avatars/rstular.png | bin | 39077 -> 39077 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/img/flags/en.svg | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/img/flags/sl.svg | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/img/icons/icon_144.png | bin | 15341 -> 15341 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/img/icons/icon_192.png | bin | 19637 -> 19637 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/img/icons/icon_384.png | bin | 66357 -> 66357 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/img/icons/icon_48.png | bin | 3324 -> 3324 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/img/icons/icon_512.png | bin | 73720 -> 73720 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/img/icons/icon_72.png | bin | 6357 -> 6357 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/img/icons/icon_96.png | bin | 8311 -> 8311 bytes | |||
-rwxr-xr-x[-rw-r--r--] | dist/index.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/about.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/absences.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/app.js | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/changelog.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/chats.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/grades.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/gradings.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/gsec.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/initialize.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/jitsi.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lang/bundle.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/fullcalendar/core/main.min.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/fullcalendar/daygrid/main.min.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/fullcalendar/timegrid/main.min.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/he.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/jquery.min.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/localforage.min.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/materialize.min.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/mergedeep.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/sjcl.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/themes.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/lib/xss.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/login.js | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/logout.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/meals.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/messaging.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/privacypolicy.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/settings.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/setup-storage.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/teachers.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/timetable.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/js/tos.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/login.html | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/logout.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/manifest.json | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/about.html | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/absences.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/changelog.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/chats.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/grades.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/gradings.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/jitsi.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/meals.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/messaging.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/privacypolicy.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/settings.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/teachers.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/timetable.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/pages/tos.html | 0 | ||||
-rwxr-xr-x | dist/server-message-at-login.html | 11 | ||||
-rwxr-xr-x[-rw-r--r--] | dist/sw.js | 4 |
93 files changed, 57 insertions, 10 deletions
@@ -1,8 +1,10 @@ default: @echo "*** BežiApp Makefile ***" @echo "targets:" - @echo " make prepare installs dependencies, cleans after itself, requires sudo permissions and debian/ubuntu for apt" + @echo " make prepare installs dependencies, uses \`sudo apt\`." @echo " make generate installs BežiApp to dist/" + @echo "notes and hacks:" + @echo " \`cp /bin/cp bin/bvr-jsmin\` if you don't want jsmin (before generate)" @echo "no target specified, exiting ..." prepare: @@ -29,4 +31,4 @@ generate: -find assets/js/ -name "*.bvr" -printf "%f\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/js/\$${FILE/.bvr/}"; ./bin/bvr-compose-single \"assets/js/\$$FILE\" \"\$$FILE_DST\"" -find assets/js/ -name "*.js" -printf "%P\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/js/\$${FILE/.bvr/}"; ./bin/bvr-jsmin assets/js/\"\$$FILE\" \"\$$FILE_DST\"" cp -r assets/root/.well-known dist/ - + chmod 0775 dist -R diff --git a/assets/js/login.js b/assets/js/login.js index cdecf38..88bf501 100644 --- a/assets/js/login.js +++ b/assets/js/login.js @@ -1,7 +1,24 @@ // const API_ENDPOINT = "https://gimb.tk/test.php"; // deprecated document.addEventListener("DOMContentLoaded", () => { - setupEventListeners(); -}) + setupEventListeners(); + try { + load_server_message_at_login(); + } catch (e) { + console.log("login.js: load_server-message-at-login: silently failed."); + } +}); + +function load_server_message_at_login() { + $.ajax({ + url: "/server-message-at-login.html", + success: (data) => { + $("#server-message-at-login").html(data); + }, + error: () => { + $("#server-message-at-login").html(""); + } + }); +} function setupEventListeners() { // Setup login button listener diff --git a/assets/root/login.html b/assets/root/login.html index 542b157..95bcc2e 100644 --- a/assets/root/login.html +++ b/assets/root/login.html @@ -60,6 +60,9 @@ <a href="/pages/privacypolicy.html"><x-dl>thePrivacyPolicy</x-dl></a> </p> </div> + <div class="row" id="server-message-at-login"> + + </div> </div> </div> </body> diff --git a/assets/root/server-message-at-login.html b/assets/root/server-message-at-login.html new file mode 100644 index 0000000..ce28176 --- /dev/null +++ b/assets/root/server-message-at-login.html @@ -0,0 +1,11 @@ +<h5> + Opozorilo razvijalcev / developer's note: +</h5> +<p> + Aplikacija do 28. avgusta 2020 do predvidoma 9. ure ne bo dostopna, ker je + gimnazijski sistem nedelujoč. +</p> +<p> + The application will not be accessible until 28th of August 2020 due to + school system malfunction. +</p> diff --git a/bin/bvr-compose-html b/bin/bvr-compose-html Binary files differindex 2970376..4c7dc70 100755 --- a/bin/bvr-compose-html +++ b/bin/bvr-compose-html diff --git a/bin/bvr-compose-single b/bin/bvr-compose-single Binary files differindex d31f97f..5fe2fb6 100755 --- a/bin/bvr-compose-single +++ b/bin/bvr-compose-single diff --git a/bin/bvr-jsbundle b/bin/bvr-jsbundle Binary files differindex a617bbf..d1bc0dc 100755 --- a/bin/bvr-jsbundle +++ b/bin/bvr-jsbundle diff --git a/bin/bvr-jsmin b/bin/bvr-jsmin Binary files differindex 88924b6..34d72a2 100755 --- a/bin/bvr-jsmin +++ b/bin/bvr-jsmin diff --git a/dist/.well-known/assetlinks.json b/dist/.well-known/assetlinks.json index feac8aa..feac8aa 100644..100755 --- a/dist/.well-known/assetlinks.json +++ b/dist/.well-known/assetlinks.json diff --git a/dist/_config.yml b/dist/_config.yml index 68730c9..68730c9 100644..100755 --- a/dist/_config.yml +++ b/dist/_config.yml diff --git a/dist/assetlinks.json b/dist/assetlinks.json index feac8aa..feac8aa 100644..100755 --- a/dist/assetlinks.json +++ b/dist/assetlinks.json diff --git a/dist/cache_name.txt b/dist/cache_name.txt index 7b41b55..09e2bfc 100644..100755 --- a/dist/cache_name.txt +++ b/dist/cache_name.txt @@ -2,4 +2,4 @@ -///site-static-1.0.14.3-beta-7b41388||| +///site-static-1.0.14.3-beta-4cb2560||| diff --git a/dist/css/bubbles.css b/dist/css/bubbles.css index 8a19ff1..8a19ff1 100644..100755 --- a/dist/css/bubbles.css +++ b/dist/css/bubbles.css diff --git a/dist/css/fontawesome.min.css b/dist/css/fontawesome.min.css index c197345..c197345 100644..100755 --- a/dist/css/fontawesome.min.css +++ b/dist/css/fontawesome.min.css diff --git a/dist/css/fullcalendar/core/main.min.css b/dist/css/fullcalendar/core/main.min.css index 8948b53..8948b53 100644..100755 --- a/dist/css/fullcalendar/core/main.min.css +++ b/dist/css/fullcalendar/core/main.min.css diff --git a/dist/css/fullcalendar/custom.css b/dist/css/fullcalendar/custom.css index 7b38b49..7b38b49 100644..100755 --- a/dist/css/fullcalendar/custom.css +++ b/dist/css/fullcalendar/custom.css diff --git a/dist/css/fullcalendar/daygrid/main.min.css b/dist/css/fullcalendar/daygrid/main.min.css index 55a5724..55a5724 100644..100755 --- a/dist/css/fullcalendar/daygrid/main.min.css +++ b/dist/css/fullcalendar/daygrid/main.min.css diff --git a/dist/css/fullcalendar/timegrid/main.min.css b/dist/css/fullcalendar/timegrid/main.min.css index a1abf91..a1abf91 100644..100755 --- a/dist/css/fullcalendar/timegrid/main.min.css +++ b/dist/css/fullcalendar/timegrid/main.min.css diff --git a/dist/css/materialicons.css b/dist/css/materialicons.css index 6e24fe0..6e24fe0 100644..100755 --- a/dist/css/materialicons.css +++ b/dist/css/materialicons.css diff --git a/dist/css/materialize.min.css b/dist/css/materialize.min.css index 74b1741..74b1741 100644..100755 --- a/dist/css/materialize.min.css +++ b/dist/css/materialize.min.css diff --git a/dist/css/styles.css b/dist/css/styles.css index 0e11125..0e11125 100644..100755 --- a/dist/css/styles.css +++ b/dist/css/styles.css diff --git a/dist/directory.json b/dist/directory.json index 6a50675..6a50675 100644..100755 --- a/dist/directory.json +++ b/dist/directory.json diff --git a/dist/favicon.png b/dist/favicon.png Binary files differindex 5c1f4b1..5c1f4b1 100644..100755 --- a/dist/favicon.png +++ b/dist/favicon.png diff --git a/dist/fonts/fa-brands-400.eot b/dist/fonts/fa-brands-400.eot Binary files differindex baf4057..baf4057 100644..100755 --- a/dist/fonts/fa-brands-400.eot +++ b/dist/fonts/fa-brands-400.eot diff --git a/dist/fonts/fa-brands-400.woff2 b/dist/fonts/fa-brands-400.woff2 Binary files differindex 51c07ae..51c07ae 100644..100755 --- a/dist/fonts/fa-brands-400.woff2 +++ b/dist/fonts/fa-brands-400.woff2 diff --git a/dist/fonts/fa-regular-400.eot b/dist/fonts/fa-regular-400.eot Binary files differindex 04e25cb..04e25cb 100644..100755 --- a/dist/fonts/fa-regular-400.eot +++ b/dist/fonts/fa-regular-400.eot diff --git a/dist/fonts/fa-regular-400.woff2 b/dist/fonts/fa-regular-400.woff2 Binary files differindex a34bd65..a34bd65 100644..100755 --- a/dist/fonts/fa-regular-400.woff2 +++ b/dist/fonts/fa-regular-400.woff2 diff --git a/dist/fonts/fa-solid-900.eot b/dist/fonts/fa-solid-900.eot Binary files differindex 39716a7..39716a7 100644..100755 --- a/dist/fonts/fa-solid-900.eot +++ b/dist/fonts/fa-solid-900.eot diff --git a/dist/fonts/fa-solid-900.woff2 b/dist/fonts/fa-solid-900.woff2 Binary files differindex b37f209..b37f209 100644..100755 --- a/dist/fonts/fa-solid-900.woff2 +++ b/dist/fonts/fa-solid-900.woff2 diff --git a/dist/fonts/materialicons.woff2 b/dist/fonts/materialicons.woff2 Binary files differindex d9c6038..d9c6038 100644..100755 --- a/dist/fonts/materialicons.woff2 +++ b/dist/fonts/materialicons.woff2 diff --git a/dist/img/avatars/asijanec.png b/dist/img/avatars/asijanec.png Binary files differindex ccae7d0..ccae7d0 100644..100755 --- a/dist/img/avatars/asijanec.png +++ b/dist/img/avatars/asijanec.png diff --git a/dist/img/avatars/rstular.png b/dist/img/avatars/rstular.png Binary files differindex ff63a4f..ff63a4f 100644..100755 --- a/dist/img/avatars/rstular.png +++ b/dist/img/avatars/rstular.png diff --git a/dist/img/flags/en.svg b/dist/img/flags/en.svg index cd7d8a0..cd7d8a0 100644..100755 --- a/dist/img/flags/en.svg +++ b/dist/img/flags/en.svg diff --git a/dist/img/flags/sl.svg b/dist/img/flags/sl.svg index e56ea1d..e56ea1d 100644..100755 --- a/dist/img/flags/sl.svg +++ b/dist/img/flags/sl.svg diff --git a/dist/img/icons/icon_144.png b/dist/img/icons/icon_144.png Binary files differindex f575ac5..f575ac5 100644..100755 --- a/dist/img/icons/icon_144.png +++ b/dist/img/icons/icon_144.png diff --git a/dist/img/icons/icon_192.png b/dist/img/icons/icon_192.png Binary files differindex 8eaec9a..8eaec9a 100644..100755 --- a/dist/img/icons/icon_192.png +++ b/dist/img/icons/icon_192.png diff --git a/dist/img/icons/icon_384.png b/dist/img/icons/icon_384.png Binary files differindex 43bba8e..43bba8e 100644..100755 --- a/dist/img/icons/icon_384.png +++ b/dist/img/icons/icon_384.png diff --git a/dist/img/icons/icon_48.png b/dist/img/icons/icon_48.png Binary files differindex bedfa73..bedfa73 100644..100755 --- a/dist/img/icons/icon_48.png +++ b/dist/img/icons/icon_48.png diff --git a/dist/img/icons/icon_512.png b/dist/img/icons/icon_512.png Binary files differindex 65a4c48..65a4c48 100644..100755 --- a/dist/img/icons/icon_512.png +++ b/dist/img/icons/icon_512.png diff --git a/dist/img/icons/icon_72.png b/dist/img/icons/icon_72.png Binary files differindex 62280d6..62280d6 100644..100755 --- a/dist/img/icons/icon_72.png +++ b/dist/img/icons/icon_72.png diff --git a/dist/img/icons/icon_96.png b/dist/img/icons/icon_96.png Binary files differindex 5c1f4b1..5c1f4b1 100644..100755 --- a/dist/img/icons/icon_96.png +++ b/dist/img/icons/icon_96.png diff --git a/dist/index.html b/dist/index.html index 2a861a1..2a861a1 100644..100755 --- a/dist/index.html +++ b/dist/index.html diff --git a/dist/js/about.js b/dist/js/about.js index cc12495..cc12495 100644..100755 --- a/dist/js/about.js +++ b/dist/js/about.js diff --git a/dist/js/absences.js b/dist/js/absences.js index f6f4f7d..f6f4f7d 100644..100755 --- a/dist/js/absences.js +++ b/dist/js/absences.js diff --git a/dist/js/app.js b/dist/js/app.js index d5eca86..573d7fa 100644..100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.14.3-beta"; -const previous_commit = "7b41388f8eb7be4e8250fe9f69194cf70f1a103b"; +const previous_commit = "4cb2560ef806194ab31a7bb7deb0d4606b0d89b2"; const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund if ("serviceWorker" in navigator) { diff --git a/dist/js/changelog.js b/dist/js/changelog.js index d01d3b5..d01d3b5 100644..100755 --- a/dist/js/changelog.js +++ b/dist/js/changelog.js diff --git a/dist/js/chats.js b/dist/js/chats.js index 7403d0c..7403d0c 100644..100755 --- a/dist/js/chats.js +++ b/dist/js/chats.js diff --git a/dist/js/grades.js b/dist/js/grades.js index 5f9f9be..5f9f9be 100644..100755 --- a/dist/js/grades.js +++ b/dist/js/grades.js diff --git a/dist/js/gradings.js b/dist/js/gradings.js index 713ea20..713ea20 100644..100755 --- a/dist/js/gradings.js +++ b/dist/js/gradings.js diff --git a/dist/js/gsec.js b/dist/js/gsec.js index 59d95bf..59d95bf 100644..100755 --- a/dist/js/gsec.js +++ b/dist/js/gsec.js diff --git a/dist/js/initialize.js b/dist/js/initialize.js index 1d9a5f6..1d9a5f6 100644..100755 --- a/dist/js/initialize.js +++ b/dist/js/initialize.js diff --git a/dist/js/jitsi.js b/dist/js/jitsi.js index cc12495..cc12495 100644..100755 --- a/dist/js/jitsi.js +++ b/dist/js/jitsi.js diff --git a/dist/js/lang/bundle.js b/dist/js/lang/bundle.js index adb8d97..adb8d97 100644..100755 --- a/dist/js/lang/bundle.js +++ b/dist/js/lang/bundle.js diff --git a/dist/js/lib/fullcalendar/core/main.min.js b/dist/js/lib/fullcalendar/core/main.min.js index 042058b..042058b 100644..100755 --- a/dist/js/lib/fullcalendar/core/main.min.js +++ b/dist/js/lib/fullcalendar/core/main.min.js diff --git a/dist/js/lib/fullcalendar/daygrid/main.min.js b/dist/js/lib/fullcalendar/daygrid/main.min.js index 1567738..1567738 100644..100755 --- a/dist/js/lib/fullcalendar/daygrid/main.min.js +++ b/dist/js/lib/fullcalendar/daygrid/main.min.js diff --git a/dist/js/lib/fullcalendar/timegrid/main.min.js b/dist/js/lib/fullcalendar/timegrid/main.min.js index e7e2643..e7e2643 100644..100755 --- a/dist/js/lib/fullcalendar/timegrid/main.min.js +++ b/dist/js/lib/fullcalendar/timegrid/main.min.js diff --git a/dist/js/lib/he.js b/dist/js/lib/he.js index 5a210a8..5a210a8 100644..100755 --- a/dist/js/lib/he.js +++ b/dist/js/lib/he.js diff --git a/dist/js/lib/jquery.min.js b/dist/js/lib/jquery.min.js index bd9216d..bd9216d 100644..100755 --- a/dist/js/lib/jquery.min.js +++ b/dist/js/lib/jquery.min.js diff --git a/dist/js/lib/localforage.min.js b/dist/js/lib/localforage.min.js index 2268df4..2268df4 100644..100755 --- a/dist/js/lib/localforage.min.js +++ b/dist/js/lib/localforage.min.js diff --git a/dist/js/lib/materialize.min.js b/dist/js/lib/materialize.min.js index d396693..d396693 100644..100755 --- a/dist/js/lib/materialize.min.js +++ b/dist/js/lib/materialize.min.js diff --git a/dist/js/lib/mergedeep.js b/dist/js/lib/mergedeep.js index fa2403d..fa2403d 100644..100755 --- a/dist/js/lib/mergedeep.js +++ b/dist/js/lib/mergedeep.js diff --git a/dist/js/lib/sjcl.js b/dist/js/lib/sjcl.js index d3d908d..d3d908d 100644..100755 --- a/dist/js/lib/sjcl.js +++ b/dist/js/lib/sjcl.js diff --git a/dist/js/lib/themes.js b/dist/js/lib/themes.js index 1996b9f..1996b9f 100644..100755 --- a/dist/js/lib/themes.js +++ b/dist/js/lib/themes.js diff --git a/dist/js/lib/xss.js b/dist/js/lib/xss.js index f2030f0..f2030f0 100644..100755 --- a/dist/js/lib/xss.js +++ b/dist/js/lib/xss.js diff --git a/dist/js/login.js b/dist/js/login.js index 88cf081..0e8187a 100644..100755 --- a/dist/js/login.js +++ b/dist/js/login.js @@ -1,5 +1,5 @@ -document.addEventListener("DOMContentLoaded",()=>{setupEventListeners();}) +document.addEventListener("DOMContentLoaded",()=>{setupEventListeners();try{load_server_message_at_login();}catch(e){console.log("login.js: load_server-message-at-login: silently failed.");}});function load_server_message_at_login(){$.ajax({url:"/server-message-at-login.html",success:(data)=>{$("#server-message-at-login").html(data);},error:()=>{$("#server-message-at-login").html("");}});} function setupEventListeners(){$("#login-button").click(()=>{login();});window.addEventListener("keyup",(event)=>{if(event.keyCode===13){event.preventDefault();login();}});} function login(){let username=$("#username").val();let password=$("#password").val();var gsecInstance;try{gsecInstance=new gsec();}catch(error){$.ajax({url:'js/gsec.js?ajaxload',async:false,dataType:"script",});try{gsecInstance=new gsec();}catch(error){alert(D("browserNotSupported"));}} gsecInstance.login(username,password).then((value)=>{if(typeof value=="string"){let promises_to_run=[localforage.setItem("logged_in",true),localforage.setItem("username",username),localforage.setItem("password",password)];Promise.all(promises_to_run).then(function(){window.location.replace("/pages/timetable.html");});}else{UIAlert("loginFailed");$("#password").val("");}}).catch((err)=>{gsecErrorHandlerUI(err);$("#password").val("");});}
\ No newline at end of file diff --git a/dist/js/logout.js b/dist/js/logout.js index 3f9f7ed..3f9f7ed 100644..100755 --- a/dist/js/logout.js +++ b/dist/js/logout.js diff --git a/dist/js/meals.js b/dist/js/meals.js index e014f5a..e014f5a 100644..100755 --- a/dist/js/meals.js +++ b/dist/js/meals.js diff --git a/dist/js/messaging.js b/dist/js/messaging.js index 1650563..1650563 100644..100755 --- a/dist/js/messaging.js +++ b/dist/js/messaging.js diff --git a/dist/js/privacypolicy.js b/dist/js/privacypolicy.js index 84635e9..84635e9 100644..100755 --- a/dist/js/privacypolicy.js +++ b/dist/js/privacypolicy.js diff --git a/dist/js/settings.js b/dist/js/settings.js index 9e52861..9e52861 100644..100755 --- a/dist/js/settings.js +++ b/dist/js/settings.js diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js index be05650..be05650 100644..100755 --- a/dist/js/setup-storage.js +++ b/dist/js/setup-storage.js diff --git a/dist/js/teachers.js b/dist/js/teachers.js index 03ae948..03ae948 100644..100755 --- a/dist/js/teachers.js +++ b/dist/js/teachers.js diff --git a/dist/js/timetable.js b/dist/js/timetable.js index 79539f6..79539f6 100644..100755 --- a/dist/js/timetable.js +++ b/dist/js/timetable.js diff --git a/dist/js/tos.js b/dist/js/tos.js index 84635e9..84635e9 100644..100755 --- a/dist/js/tos.js +++ b/dist/js/tos.js diff --git a/dist/login.html b/dist/login.html index 542b157..95bcc2e 100644..100755 --- a/dist/login.html +++ b/dist/login.html @@ -60,6 +60,9 @@ <a href="/pages/privacypolicy.html"><x-dl>thePrivacyPolicy</x-dl></a> </p> </div> + <div class="row" id="server-message-at-login"> + + </div> </div> </div> </body> diff --git a/dist/logout.html b/dist/logout.html index c3f9b41..c3f9b41 100644..100755 --- a/dist/logout.html +++ b/dist/logout.html diff --git a/dist/manifest.json b/dist/manifest.json index b8bf5da..b8bf5da 100644..100755 --- a/dist/manifest.json +++ b/dist/manifest.json diff --git a/dist/pages/about.html b/dist/pages/about.html index 0d67d38..1d6c4be 100644..100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -160,7 +160,7 @@ <div class="row"> <p> <small> - ^HEAD 7b41388f8eb7be4e8250fe9f69194cf70f1a103b + ^HEAD 4cb2560ef806194ab31a7bb7deb0d4606b0d89b2 </small> </p> </div> diff --git a/dist/pages/absences.html b/dist/pages/absences.html index d50e546..d50e546 100644..100755 --- a/dist/pages/absences.html +++ b/dist/pages/absences.html diff --git a/dist/pages/changelog.html b/dist/pages/changelog.html index 2fbf933..2fbf933 100644..100755 --- a/dist/pages/changelog.html +++ b/dist/pages/changelog.html diff --git a/dist/pages/chats.html b/dist/pages/chats.html index e1cb37c..e1cb37c 100644..100755 --- a/dist/pages/chats.html +++ b/dist/pages/chats.html diff --git a/dist/pages/grades.html b/dist/pages/grades.html index 0a8e5ec..0a8e5ec 100644..100755 --- a/dist/pages/grades.html +++ b/dist/pages/grades.html diff --git a/dist/pages/gradings.html b/dist/pages/gradings.html index ce30046..ce30046 100644..100755 --- a/dist/pages/gradings.html +++ b/dist/pages/gradings.html diff --git a/dist/pages/jitsi.html b/dist/pages/jitsi.html index 678ad9d..678ad9d 100644..100755 --- a/dist/pages/jitsi.html +++ b/dist/pages/jitsi.html diff --git a/dist/pages/meals.html b/dist/pages/meals.html index 590e761..590e761 100644..100755 --- a/dist/pages/meals.html +++ b/dist/pages/meals.html diff --git a/dist/pages/messaging.html b/dist/pages/messaging.html index 5c9fb32..5c9fb32 100644..100755 --- a/dist/pages/messaging.html +++ b/dist/pages/messaging.html diff --git a/dist/pages/privacypolicy.html b/dist/pages/privacypolicy.html index 4876d6b..4876d6b 100644..100755 --- a/dist/pages/privacypolicy.html +++ b/dist/pages/privacypolicy.html diff --git a/dist/pages/settings.html b/dist/pages/settings.html index 5e96b77..5e96b77 100644..100755 --- a/dist/pages/settings.html +++ b/dist/pages/settings.html diff --git a/dist/pages/teachers.html b/dist/pages/teachers.html index b346762..b346762 100644..100755 --- a/dist/pages/teachers.html +++ b/dist/pages/teachers.html diff --git a/dist/pages/timetable.html b/dist/pages/timetable.html index efc6e35..efc6e35 100644..100755 --- a/dist/pages/timetable.html +++ b/dist/pages/timetable.html diff --git a/dist/pages/tos.html b/dist/pages/tos.html index 384b2d3..384b2d3 100644..100755 --- a/dist/pages/tos.html +++ b/dist/pages/tos.html diff --git a/dist/server-message-at-login.html b/dist/server-message-at-login.html new file mode 100755 index 0000000..ce28176 --- /dev/null +++ b/dist/server-message-at-login.html @@ -0,0 +1,11 @@ +<h5> + Opozorilo razvijalcev / developer's note: +</h5> +<p> + Aplikacija do 28. avgusta 2020 do predvidoma 9. ure ne bo dostopna, ker je + gimnazijski sistem nedelujoč. +</p> +<p> + The application will not be accessible until 28th of August 2020 due to + school system malfunction. +</p> diff --git a/dist/sw.js b/dist/sw.js index bd4562c..471a7b4 100644..100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.14.3-beta-7b41388"; -// commit before the latest is 7b41388f8eb7be4e8250fe9f69194cf70f1a103b +const static_cache_name = "site-static-1.0.14.3-beta-4cb2560"; +// commit before the latest is 4cb2560ef806194ab31a7bb7deb0d4606b0d89b2 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! |