summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--assets/pages-src/misc/matomo.bvr65
-rwxr-xr-xdist/cache_name.txt2
-rwxr-xr-xdist/js/app.js67
-rwxr-xr-xdist/pages/about.html2
-rwxr-xr-xdist/sw.js4
5 files changed, 135 insertions, 5 deletions
diff --git a/assets/pages-src/misc/matomo.bvr b/assets/pages-src/misc/matomo.bvr
index ad6cdd2..50cabc2 100644
--- a/assets/pages-src/misc/matomo.bvr
+++ b/assets/pages-src/misc/matomo.bvr
@@ -1,7 +1,70 @@
+// @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(() => {
+
+if (BEZIAPP_USERNAME == null || BEZIAPP_USERNAME == "") {
+ var username_report = "neprijavljen.uporabnik";
+} else {
+ var username_report = BEZIAPP_USERNAME;
+}
+if (BEZIAPP_LOPOLIS_USERNAME == null || BEZIAPP_LOPOLIS_USERNAME == "") {
+ var lopolis_username_report = "NEPRIJAVLJENUPORABNIK";
+} else {
+ var lopolis_username_report = BEZIAPP_LOPOLIS_USERNAME;
+}
+if (BEZIAPP_LANGUAGE == null || BEZIAPP_LANGUAGE == "") {
+ var language_report = "unspecified_language";
+} else {
+ var language_report = BEZIAPP_LANGUAGE
+}
+if (BEZIAPP_THEME == null || BEZIAPP_THEME == "") {
+ var theme_report = "unspecified_theme";
+} else {
+ var theme_report = BEZIAPP_THEME;
+}
+if (BEZIAPP_ERRORREPORTING == null || BEZIAPP_ERRORREPORTING == "") {
+ var errorreporting_report = "unspecified-errorreporting";
+} else {
+ var errorreporting_report = BEZIAPP_ERRORREPORTING;
+}
+
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]);
+ _paq.push(['setUserId', username_report]);
+ _paq.push(['enableHeartBeatTimer', 30]);
+ _paq.push(['setCustomVariable', 1, 'lopolis-username', lopolis_username_report, 'visit']);
+ _paq.push(['setCustomVariable', 2, 'language', language_report, 'visit']);
+ _paq.push(['setCustomVariable', 3, 'theme', theme_report, 'visit']);
+ _paq.push(['setCustomVariable', 4, 'errorreporting', errorreporting_report, 'visit']);
+ _paq.push(['setCustomVariable', 5, 'domain', window.location.host, 'visit']);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
@@ -11,3 +74,5 @@ var _paq = window._paq = window._paq || [];
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);
})();
+
+});
diff --git a/dist/cache_name.txt b/dist/cache_name.txt
index 40bace1..b65739a 100755
--- a/dist/cache_name.txt
+++ b/dist/cache_name.txt
@@ -2,4 +2,4 @@
-///site-static-1.0.15.0-beta-9887173|||
+///site-static-1.0.15.0-beta-9f73d14|||
diff --git a/dist/js/app.js b/dist/js/app.js
index ec9ac25..14fc2bf 100755
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -3,7 +3,7 @@
const app_version = "1.0.15.0-beta";
-const previous_commit = "9887173427b46fc860438440c7f0139e1f68419f";
+const previous_commit = "9f73d145b6aadb506143b0a3ec1b1d3697f24a04";
const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund
if ("serviceWorker" in navigator) {
@@ -126,10 +126,73 @@ document.addEventListener("DOMContentLoaded", () => {
}, 1000 * BEZIAPP_UPDATE_INTERVAL);
});
+// @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(() => {
+
+if (BEZIAPP_USERNAME == null || BEZIAPP_USERNAME == "") {
+ var username_report = "neprijavljen.uporabnik";
+} else {
+ var username_report = BEZIAPP_USERNAME;
+}
+if (BEZIAPP_LOPOLIS_USERNAME == null || BEZIAPP_LOPOLIS_USERNAME == "") {
+ var lopolis_username_report = "NEPRIJAVLJENUPORABNIK";
+} else {
+ var lopolis_username_report = BEZIAPP_LOPOLIS_USERNAME;
+}
+if (BEZIAPP_LANGUAGE == null || BEZIAPP_LANGUAGE == "") {
+ var language_report = "unspecified_language";
+} else {
+ var language_report = BEZIAPP_LANGUAGE
+}
+if (BEZIAPP_THEME == null || BEZIAPP_THEME == "") {
+ var theme_report = "unspecified_theme";
+} else {
+ var theme_report = BEZIAPP_THEME;
+}
+if (BEZIAPP_ERRORREPORTING == null || BEZIAPP_ERRORREPORTING == "") {
+ var errorreporting_report = "unspecified-errorreporting";
+} else {
+ var errorreporting_report = BEZIAPP_ERRORREPORTING;
+}
+
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]);
+ _paq.push(['setUserId', username_report]);
+ _paq.push(['enableHeartBeatTimer', 30]);
+ _paq.push(['setCustomVariable', 1, 'lopolis-username', lopolis_username_report, 'visit']);
+ _paq.push(['setCustomVariable', 2, 'language', language_report, 'visit']);
+ _paq.push(['setCustomVariable', 3, 'theme', theme_report, 'visit']);
+ _paq.push(['setCustomVariable', 4, 'errorreporting', errorreporting_report, 'visit']);
+ _paq.push(['setCustomVariable', 5, 'domain', window.location.host, 'visit']);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
@@ -140,3 +203,5 @@ var _paq = window._paq = window._paq || [];
g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
+});
+
diff --git a/dist/pages/about.html b/dist/pages/about.html
index 3694a28..f79bc58 100755
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -160,7 +160,7 @@
<div class="row">
<p>
<small>
- ^HEAD 9887173427b46fc860438440c7f0139e1f68419f
+ ^HEAD 9f73d145b6aadb506143b0a3ec1b1d3697f24a04
</small>
</p>
</div>
diff --git a/dist/sw.js b/dist/sw.js
index d119c52..1381ded 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.15.0-beta-9887173";
-// commit before the latest is 9887173427b46fc860438440c7f0139e1f68419f
+const static_cache_name = "site-static-1.0.15.0-beta-9f73d14";
+// commit before the latest is 9f73d145b6aadb506143b0a3ec1b1d3697f24a04
// Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
// sw.js NE SME BITI CACHAN, ker vsebuje verzijo!