From b20761c7fd387dc27257639899034de40f6c7afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Sat, 3 Sep 2022 21:42:37 +0200 Subject: =?UTF-8?q?odstranil=20matomo,=20je=20delal=20te=C5=BEave=20pri=20?= =?UTF-8?q?nalaganju=20vsebine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + Makefile | 5 ++- assets/pages-src/misc/matomo.bvr | 35 +++++++++--------- bin/bvr-compose-html | Bin 31664 -> 35052 bytes bin/bvr-compose-single | Bin 27416 -> 34908 bytes bin/bvr-jsbundle | Bin 13296 -> 16188 bytes bin/bvr-jsmin | Bin 13664 -> 16584 bytes dist/cache_name.txt | 4 +-- dist/js/app.js | 76 +++------------------------------------ dist/js/lang/bundle.js | 4 +-- dist/js/setup-storage.js | 4 +-- dist/pages/about.html | 11 +++--- dist/pages/absences.html | 7 ++-- dist/pages/changelog.html | 4 +-- dist/pages/chats.html | 7 ++-- dist/pages/grades.html | 7 ++-- dist/pages/gradings.html | 10 +++--- dist/pages/jitsi.html | 7 ++-- dist/pages/meals.html | 7 ++-- dist/pages/messaging.html | 10 +++--- dist/pages/privacypolicy.html | 4 +-- dist/pages/settings.html | 7 ++-- dist/pages/teachers.html | 7 ++-- dist/pages/timetable.html | 7 ++-- dist/pages/tos.html | 4 +-- dist/sw.js | 8 ++--- global.bvr | 3 +- 27 files changed, 80 insertions(+), 159 deletions(-) diff --git a/.gitignore b/.gitignore index fe1db7c..1e8186d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ **/.commit +tmp/bverbose diff --git a/Makefile b/Makefile index e415395..92544bb 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,9 @@ prepare: sudo apt install git -y mkdir -p tmp rm -rf tmp/bverbose - cd tmp && git clone https://github.com/sijanec/bverbose && cd bverbose && \ - make prepare && make install + cd tmp && git clone https://ni.sijanec.eu/sijanec/bverbose && cd bverbose && \ + make install mv tmp/bverbose/bin/* bin/ - rm -rf tmp/bverbose generate: #!/bin/bash diff --git a/assets/pages-src/misc/matomo.bvr b/assets/pages-src/misc/matomo.bvr index 614e210..57622be 100644 --- a/assets/pages-src/misc/matomo.bvr +++ b/assets/pages-src/misc/matomo.bvr @@ -1,27 +1,27 @@ // @begin=js@ - +<@?f matomo <@?g ?" var BEZIAPP_USERNAME, BEZIAPP_PASSWORD, BEZIAPP_LOPOLIS_USERNAME, BEZIAPP_LOPOLIS_PASSWORD, BEZIAPP_LANGUAGE, BEZIAPP_THEME, BEZIAPP_ERRORREPORTING; let promises_to_run_app = [ - localforage.getItem("username").then((value) => { + localforage.getItem('username').then((value) => { BEZIAPP_USERNAME = value; }), - localforage.getItem("password").then((value) => { + localforage.getItem('password').then((value) => { BEZIAPP_PASSWORD = value; }), - localforage.getItem("lopolis_username").then((value) => { + localforage.getItem('lopolis_username').then((value) => { BEZIAPP_LOPOLIS_USERNAME = value; }), - localforage.getItem("lopolis_password").then((value) => { + localforage.getItem('lopolis_password').then((value) => { BEZIAPP_LOPOLIS_PASSWORD = value; }), - localforage.getItem("chosenLang").then((value) => { + localforage.getItem('chosenLang').then((value) => { BEZIAPP_LANGUAGE = value; }), - localforage.getItem("theme").then((value) => { + localforage.getItem('theme').then((value) => { BEZIAPP_THEME = value; }), - localforage.getItem("errorReporting").then((value) => { + localforage.getItem('errorReporting').then((value) => { BEZIAPP_ERRORREPORTING = value; }) ]; @@ -29,27 +29,27 @@ let promises_to_run_app = [ Promise.all(promises_to_run_app).then(() => { var _paq = window._paq = window._paq || []; - /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ - _paq.push(["setDocumentTitle", document.domain + "/" + document.title]); - _paq.push(["setDoNotTrack", true]); + /* tracker methods like 'setCustomDimension' should be called before 'trackPageView' */ + _paq.push(['setDocumentTitle', document.domain + '/' + document.title]); + _paq.push(['setDoNotTrack', true]); - if (BEZIAPP_USERNAME == null || BEZIAPP_USERNAME == "") { + if (BEZIAPP_USERNAME == null || BEZIAPP_USERNAME == '') { } else { _paq.push(['setUserId', BEZIAPP_USERNAME]); } - if (BEZIAPP_LOPOLIS_USERNAME == null || BEZIAPP_LOPOLIS_USERNAME == "") { + if (BEZIAPP_LOPOLIS_USERNAME == null || BEZIAPP_LOPOLIS_USERNAME == '') { } else { _paq.push(['setCustomVariable', 1, 'lopolis-username', BEZIAPP_LOPOLIS_USERNAME, 'visit']); } - if (BEZIAPP_LANGUAGE == null || BEZIAPP_LANGUAGE == "") { + if (BEZIAPP_LANGUAGE == null || BEZIAPP_LANGUAGE == '') { } else { _paq.push(['setCustomVariable', 2, 'language', BEZIAPP_LANGUAGE, 'visit']); } - if (BEZIAPP_THEME == null || BEZIAPP_THEME == "") { + if (BEZIAPP_THEME == null || BEZIAPP_THEME == '') { } else { _paq.push(['setCustomVariable', 3, 'theme', BEZIAPP_THEME, 'visit']); } - if (BEZIAPP_ERRORREPORTING == null || BEZIAPP_ERRORREPORTING == "") { + if (BEZIAPP_ERRORREPORTING == null || BEZIAPP_ERRORREPORTING == '') { } else { _paq.push(['setCustomVariable', 4, 'errorreporting', BEZIAPP_ERRORREPORTING, 'visit']); } @@ -59,7 +59,7 @@ var _paq = window._paq = window._paq || []; _paq.push(['trackAllContentImpressions']); _paq.push(['enableLinkTracking']); (function() { - var u="//matomo.gimb.tk/"; + var u='//matomo.gimb.tk/'; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; @@ -67,3 +67,4 @@ var _paq = window._paq = window._paq || []; })(); }); +"@>@> diff --git a/bin/bvr-compose-html b/bin/bvr-compose-html index 4c7dc70..d5bd7ee 100755 Binary files a/bin/bvr-compose-html and b/bin/bvr-compose-html differ diff --git a/bin/bvr-compose-single b/bin/bvr-compose-single index 5fe2fb6..e3a6862 100755 Binary files a/bin/bvr-compose-single and b/bin/bvr-compose-single differ diff --git a/bin/bvr-jsbundle b/bin/bvr-jsbundle index d1bc0dc..e506376 100755 Binary files a/bin/bvr-jsbundle and b/bin/bvr-jsbundle differ diff --git a/bin/bvr-jsmin b/bin/bvr-jsmin index 34d72a2..e96b45b 100755 Binary files a/bin/bvr-jsmin and b/bin/bvr-jsmin differ diff --git a/dist/cache_name.txt b/dist/cache_name.txt index 2cc6cc9..1cebaa7 100755 --- a/dist/cache_name.txt +++ b/dist/cache_name.txt @@ -2,5 +2,5 @@ - -///site-static-1.0.17.0-beta-93d4479||| + +///site-static-1.0.17.1-beta-abd9011||| \ No newline at end of file diff --git a/dist/js/app.js b/dist/js/app.js index c50b72d..817147d 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -2,10 +2,10 @@ - + // @begin=js@ -const app_version = "1.0.17.0-beta"; -const previous_commit = "93d44790e9175f898c2f50b5bfe8e1d3a197ee53"; +const app_version = "1.0.17.1-beta"; +const previous_commit = "abd9011fa84bdc1f6ee583e387d0ec686c3dc3ab"; const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund if (location.protocol !== 'https:') { @@ -133,72 +133,4 @@ document.addEventListener("DOMContentLoaded", () => { }); // @begin=js@ - -var BEZIAPP_USERNAME, BEZIAPP_PASSWORD, BEZIAPP_LOPOLIS_USERNAME, BEZIAPP_LOPOLIS_PASSWORD, BEZIAPP_LANGUAGE, BEZIAPP_THEME, BEZIAPP_ERRORREPORTING; - -let promises_to_run_app = [ - localforage.getItem("username").then((value) => { - BEZIAPP_USERNAME = value; - }), - localforage.getItem("password").then((value) => { - BEZIAPP_PASSWORD = value; - }), - localforage.getItem("lopolis_username").then((value) => { - BEZIAPP_LOPOLIS_USERNAME = value; - }), - localforage.getItem("lopolis_password").then((value) => { - BEZIAPP_LOPOLIS_PASSWORD = value; - }), - localforage.getItem("chosenLang").then((value) => { - BEZIAPP_LANGUAGE = value; - }), - localforage.getItem("theme").then((value) => { - BEZIAPP_THEME = value; - }), - localforage.getItem("errorReporting").then((value) => { - BEZIAPP_ERRORREPORTING = value; - }) -]; - -Promise.all(promises_to_run_app).then(() => { - -var _paq = window._paq = window._paq || []; - /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ - _paq.push(["setDocumentTitle", document.domain + "/" + document.title]); - _paq.push(["setDoNotTrack", true]); - - if (BEZIAPP_USERNAME == null || BEZIAPP_USERNAME == "") { - } else { - _paq.push(['setUserId', BEZIAPP_USERNAME]); - } - if (BEZIAPP_LOPOLIS_USERNAME == null || BEZIAPP_LOPOLIS_USERNAME == "") { - } else { - _paq.push(['setCustomVariable', 1, 'lopolis-username', BEZIAPP_LOPOLIS_USERNAME, 'visit']); - } - if (BEZIAPP_LANGUAGE == null || BEZIAPP_LANGUAGE == "") { - } else { - _paq.push(['setCustomVariable', 2, 'language', BEZIAPP_LANGUAGE, 'visit']); - } - if (BEZIAPP_THEME == null || BEZIAPP_THEME == "") { - } else { - _paq.push(['setCustomVariable', 3, 'theme', BEZIAPP_THEME, 'visit']); - } - if (BEZIAPP_ERRORREPORTING == null || BEZIAPP_ERRORREPORTING == "") { - } else { - _paq.push(['setCustomVariable', 4, 'errorreporting', BEZIAPP_ERRORREPORTING, 'visit']); - } - _paq.push(['enableHeartBeatTimer', 30]); - _paq.push(['setCustomVariable', 5, 'domain', window.location.host, 'visit']); - _paq.push(['trackPageView']); - _paq.push(['trackAllContentImpressions']); - _paq.push(['enableLinkTracking']); - (function() { - var u="//matomo.gimb.tk/"; - _paq.push(['setTrackerUrl', u+'matomo.php']); - _paq.push(['setSiteId', '1']); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; - g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); - })(); - -}); - + \ No newline at end of file diff --git a/dist/js/lang/bundle.js b/dist/js/lang/bundle.js index 6b99566..5fa2e42 100755 --- a/dist/js/lang/bundle.js +++ b/dist/js/lang/bundle.js @@ -2,7 +2,7 @@ - + // @begin=js@ // there's an DoS backdoor in BežiApp because of this (-:< var chosenLang; @@ -543,4 +543,4 @@ var langstrings = { // videoconferences videoconferences: "GimB konference" } -} +} \ No newline at end of file diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js index 635253f..2fb4a57 100755 --- a/dist/js/setup-storage.js +++ b/dist/js/setup-storage.js @@ -2,7 +2,7 @@ - + // @begin=js@ async function setupStorage(force = false) { let logged_in; @@ -47,4 +47,4 @@ async function setupStorage(force = false) { await Promise.all(promises_update); console.log("[setupStorage] user not logged in: set up whole database"); } -} +} \ No newline at end of file diff --git a/dist/pages/about.html b/dist/pages/about.html index d51a448..4c9046d 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -2,7 +2,7 @@ - + @@ -68,8 +68,7 @@
  • infoabout
  • exit_to_applogout
  • settingssettings
    • - - +
    @@ -79,7 +78,7 @@
    version - 1.0.17.0-beta + 1.0.17.1-beta
    @@ -163,11 +162,11 @@

    - ^HEAD 93d44790e9175f898c2f50b5bfe8e1d3a197ee53 + ^HEAD abd9011fa84bdc1f6ee583e387d0ec686c3dc3ab

    - + \ No newline at end of file diff --git a/dist/pages/absences.html b/dist/pages/absences.html index 69ca7f0..75b66ab 100755 --- a/dist/pages/absences.html +++ b/dist/pages/absences.html @@ -2,7 +2,7 @@ - + @@ -69,8 +69,7 @@
  • infoabout
  • exit_to_applogout
  • settingssettings
    • - - +
    @@ -93,4 +92,4 @@ - + \ No newline at end of file diff --git a/dist/pages/changelog.html b/dist/pages/changelog.html index 4821a2b..3a81345 100755 --- a/dist/pages/changelog.html +++ b/dist/pages/changelog.html @@ -2,7 +2,7 @@ - + @@ -188,4 +188,4 @@ - + \ No newline at end of file diff --git a/dist/pages/chats.html b/dist/pages/chats.html index 83c66b0..0b6ad89 100755 --- a/dist/pages/chats.html +++ b/dist/pages/chats.html @@ -2,7 +2,7 @@ - + @@ -75,8 +75,7 @@
  • infoabout
  • exit_to_applogout
  • settingssettings
    • - - +
    - + \ No newline at end of file diff --git a/dist/pages/grades.html b/dist/pages/grades.html index 0d8e736..714db4c 100755 --- a/dist/pages/grades.html +++ b/dist/pages/grades.html @@ -2,7 +2,7 @@ - + @@ -69,8 +69,7 @@
  • infoabout
  • exit_to_applogout
  • settingssettings
    • - - + - + - +
    - + \ No newline at end of file diff --git a/dist/pages/meals.html b/dist/pages/meals.html index a071e21..4bfa364 100755 --- a/dist/pages/meals.html +++ b/dist/pages/meals.html @@ -2,7 +2,7 @@ - + @@ -84,8 +84,7 @@
  • infoabout
  • exit_to_applogout
  • settingssettings
    • - - + - +
    @@ -175,7 +174,6 @@
    - - + - + \ No newline at end of file diff --git a/dist/pages/privacypolicy.html b/dist/pages/privacypolicy.html index 62ef319..9f3235c 100755 --- a/dist/pages/privacypolicy.html +++ b/dist/pages/privacypolicy.html @@ -2,7 +2,7 @@ - + @@ -57,4 +57,4 @@

    privacyEffectiveAsOf 29 January 2020.

    - + \ No newline at end of file diff --git a/dist/pages/settings.html b/dist/pages/settings.html index 03543b2..0614a8d 100755 --- a/dist/pages/settings.html +++ b/dist/pages/settings.html @@ -2,7 +2,7 @@ - + @@ -66,8 +66,7 @@
  • infoabout
  • exit_to_applogout
  • settingssettings
    • - - +
    @@ -151,4 +150,4 @@
    - + \ No newline at end of file diff --git a/dist/pages/teachers.html b/dist/pages/teachers.html index 50038dc..cba37eb 100755 --- a/dist/pages/teachers.html +++ b/dist/pages/teachers.html @@ -2,7 +2,7 @@ - + @@ -69,8 +69,7 @@
  • infoabout
  • exit_to_applogout
  • settingssettings
    • - - + - +
    - + \ No newline at end of file diff --git a/dist/sw.js b/dist/sw.js index fb2e541..336dde6 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -2,11 +2,11 @@ - + // @begin=js@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.17.0-beta-93d4479"; -// commit before the latest is 93d44790e9175f898c2f50b5bfe8e1d3a197ee53 +const static_cache_name = "site-static-1.0.17.1-beta-abd9011"; +// commit before the latest is abd9011fa84bdc1f6ee583e387d0ec686c3dc3ab // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! @@ -179,4 +179,4 @@ self.addEventListener("fetch", (evt) => { evt.respondWith(caches.match(evt.request).then((cache_res) => { return cache_res || fetch(evt.request); })) -}); +}); \ No newline at end of file diff --git a/global.bvr b/global.bvr index 13820ff..77dbac9 100644 --- a/global.bvr +++ b/global.bvr @@ -1,4 +1,5 @@ <@?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.17.0-beta@> +<@?s app_version 1.0.17.1-beta@> <@?s app_default_language sl@> +<@?s matomo 0@> -- cgit v1.2.3