From a814ef4e939fe42c49955d920201eb34ba8ca3d0 Mon Sep 17 00:00:00 2001 From: sijanec Date: Tue, 25 Aug 2020 23:24:12 +0200 Subject: added developer's note to the login screen --- dist/js/initialize.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 dist/js/initialize.js (limited to 'dist/js/initialize.js') diff --git a/dist/js/initialize.js b/dist/js/initialize.js old mode 100644 new mode 100755 -- cgit v1.2.3 From d9969379798e23b2a62f8bf6eab3967d0497b1a8 Mon Sep 17 00:00:00 2001 From: sijanec Date: Sun, 30 Aug 2020 20:14:01 +0200 Subject: popravil meal selection --- dist/js/initialize.js | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'dist/js/initialize.js') diff --git a/dist/js/initialize.js b/dist/js/initialize.js index 1d9a5f6..cb5d210 100755 --- a/dist/js/initialize.js +++ b/dist/js/initialize.js @@ -1,3 +1,35 @@ +function getUrlParameter(sParam) { + const url_params = new URLSearchParams(window.location.search); + const found_param = url_params.get(sParam); + return found_param === null ? "" : found_param; +} -function getUrlParameter(sParam){const url_params=new URLSearchParams(window.location.search);const found_param=url_params.get(sParam);return found_param===null?"":found_param;} -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 + +localforage.getItem("logged_in") + .then( + function (value) { + // This code runs once the value has been loaded + // from the offline store. + if (value == null) { + // Setup the storage if it doesn't exist + setupStorage(true); + window.location.replace("/login.html"); + } else if (value === false) { + // If storage exists, but user isn't logged in, redirect to login + window.location.replace("/login.html"); + } else { + // User is logged in, execute appropriate action + + if (getUrlParameter("m") !== "") { + window.location.replace("/pages/messaging.html#" + getUrlParameter("m")); + } else { + window.location.replace("/pages/timetable.html"); + } + + } + } + ).catch( + function (err) { + console.log(err); + } + ); -- cgit v1.2.3 From 78f4cb39ab3753cef0a6d16d9b3d842e8c3c78a1 Mon Sep 17 00:00:00 2001 From: sijanec Date: Sun, 30 Aug 2020 20:15:23 +0200 Subject: minified after dev on meals --- dist/js/initialize.js | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) (limited to 'dist/js/initialize.js') diff --git a/dist/js/initialize.js b/dist/js/initialize.js index cb5d210..1d9a5f6 100755 --- a/dist/js/initialize.js +++ b/dist/js/initialize.js @@ -1,35 +1,3 @@ -function getUrlParameter(sParam) { - const url_params = new URLSearchParams(window.location.search); - const found_param = url_params.get(sParam); - return found_param === null ? "" : found_param; -} - -localforage.getItem("logged_in") - .then( - function (value) { - // This code runs once the value has been loaded - // from the offline store. - if (value == null) { - // Setup the storage if it doesn't exist - setupStorage(true); - window.location.replace("/login.html"); - } else if (value === false) { - // If storage exists, but user isn't logged in, redirect to login - window.location.replace("/login.html"); - } else { - // User is logged in, execute appropriate action - - if (getUrlParameter("m") !== "") { - window.location.replace("/pages/messaging.html#" + getUrlParameter("m")); - } else { - window.location.replace("/pages/timetable.html"); - } - - } - } - ).catch( - function (err) { - console.log(err); - } - ); +function getUrlParameter(sParam){const url_params=new URLSearchParams(window.location.search);const found_param=url_params.get(sParam);return found_param===null?"":found_param;} +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 -- cgit v1.2.3