From fc66b376cb3a2c73843cc882d500cfd743c0790e Mon Sep 17 00:00:00 2001 From: sijanec Date: Sun, 17 May 2020 00:13:40 +0200 Subject: dist should work, TODO: minify and bundle --- dist/js/setup-storage.js | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 dist/js/setup-storage.js (limited to 'dist/js/setup-storage.js') diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js new file mode 100644 index 0000000..a37fc8f --- /dev/null +++ b/dist/js/setup-storage.js @@ -0,0 +1,37 @@ +async function setupStorage(force = false) { + let logged_in; + promises_check_if_already_installed = [ + localforage.getItem("logged_in").then( function(val) { + console.log("[setupStorage] logged in status: "+val); + logged_in = val; + }) + ]; + await Promise.all(promises_check_if_already_installed); + + let promises_update = [ + localforage.setItem("profile", {}), + localforage.setItem("timetable", []), + localforage.setItem("teachers", []), + localforage.setItem("gradings", []), + localforage.setItem("grades", []), + localforage.setItem("absences", {}), + localforage.setItem("messages", { "0": [], "1": [], "2": []}), // see messages.js:129, commit 8eb9ca9caca30fbbe023243657535ab4088be377 + localforage.setItem("directory", {}), //\\ well I could remember my own code but I didn't. + localforage.setItem("meals", {}) + ]; + + if (logged_in && force == false) { // torej, če je že bila prijava narejena, ne posodobi backwards-compatible vrednosti (username, password,...) + await Promise.all(promises_update); + console.log("[setupStorage] user logged in: only updated"); + } else { + let promises_first_install = [ + localforage.setItem("logged_in", false), + localforage.setItem("username", ""), + localforage.setItem("password", ""), + localforage.setItem("chosenLang", "en") + ]; + await localforage.clear(); + await Promise.all(promises_first_install); + console.log("[setupStorage] user not logged in: set up whole database"); + } +} -- cgit v1.2.3 From 831563c8ecb2854ceba73c284719b7579c0a3bbc Mon Sep 17 00:00:00 2001 From: rstular Date: Sun, 17 May 2020 16:14:07 +0200 Subject: Experimental theme support --- dist/js/setup-storage.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'dist/js/setup-storage.js') diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js index a37fc8f..ad45ec7 100644 --- a/dist/js/setup-storage.js +++ b/dist/js/setup-storage.js @@ -17,13 +17,15 @@ async function setupStorage(force = false) { localforage.setItem("absences", {}), localforage.setItem("messages", { "0": [], "1": [], "2": []}), // 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("meals", {}), + localforage.setItem("chosenLang", "en") ]; if (logged_in && force == false) { // torej, če je že bila prijava narejena, ne posodobi backwards-compatible vrednosti (username, password,...) await Promise.all(promises_update); console.log("[setupStorage] user logged in: only updated"); } else { + let promises_first_install = [ localforage.setItem("logged_in", false), localforage.setItem("username", ""), -- cgit v1.2.3 From de95a6b78788da7472850dad13ed9b7de9e5b9b1 Mon Sep 17 00:00:00 2001 From: rstular Date: Sun, 17 May 2020 19:21:00 +0200 Subject: Merge --- dist/js/setup-storage.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dist/js/setup-storage.js') diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js index ad45ec7..f9fa656 100644 --- a/dist/js/setup-storage.js +++ b/dist/js/setup-storage.js @@ -18,7 +18,8 @@ async function setupStorage(force = false) { localforage.setItem("messages", { "0": [], "1": [], "2": []}), // 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("chosenLang", "en"), + localforage.setItem("theme", "light") ]; if (logged_in && force == false) { // torej, če je že bila prijava narejena, ne posodobi backwards-compatible vrednosti (username, password,...) @@ -30,7 +31,8 @@ async function setupStorage(force = false) { localforage.setItem("logged_in", false), localforage.setItem("username", ""), localforage.setItem("password", ""), - localforage.setItem("chosenLang", "en") + localforage.setItem("chosenLang", "en"), + localforage.setItem("theme", "light") ]; await localforage.clear(); await Promise.all(promises_first_install); -- cgit v1.2.3 From cfedc91453b67e79202730e7cf4197df24631379 Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 20 May 2020 13:33:51 +0200 Subject: fixed install script --- dist/js/setup-storage.js | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 dist/js/setup-storage.js (limited to 'dist/js/setup-storage.js') diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js deleted file mode 100644 index f9fa656..0000000 --- a/dist/js/setup-storage.js +++ /dev/null @@ -1,41 +0,0 @@ -async function setupStorage(force = false) { - let logged_in; - promises_check_if_already_installed = [ - localforage.getItem("logged_in").then( function(val) { - console.log("[setupStorage] logged in status: "+val); - logged_in = val; - }) - ]; - await Promise.all(promises_check_if_already_installed); - - let promises_update = [ - localforage.setItem("profile", {}), - localforage.setItem("timetable", []), - localforage.setItem("teachers", []), - localforage.setItem("gradings", []), - localforage.setItem("grades", []), - localforage.setItem("absences", {}), - localforage.setItem("messages", { "0": [], "1": [], "2": []}), // 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") - ]; - - if (logged_in && force == false) { // torej, če je že bila prijava narejena, ne posodobi backwards-compatible vrednosti (username, password,...) - await Promise.all(promises_update); - console.log("[setupStorage] user logged in: only updated"); - } else { - - let promises_first_install = [ - localforage.setItem("logged_in", false), - localforage.setItem("username", ""), - localforage.setItem("password", ""), - localforage.setItem("chosenLang", "en"), - localforage.setItem("theme", "light") - ]; - await localforage.clear(); - await Promise.all(promises_first_install); - console.log("[setupStorage] user not logged in: set up whole database"); - } -} -- cgit v1.2.3 From 7820ea23532aa6ffa3611d8379681aa44a3f3864 Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 20 May 2020 14:12:06 +0200 Subject: # --- dist/js/setup-storage.js | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 dist/js/setup-storage.js (limited to 'dist/js/setup-storage.js') diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js new file mode 100644 index 0000000..f9fa656 --- /dev/null +++ b/dist/js/setup-storage.js @@ -0,0 +1,41 @@ +async function setupStorage(force = false) { + let logged_in; + promises_check_if_already_installed = [ + localforage.getItem("logged_in").then( function(val) { + console.log("[setupStorage] logged in status: "+val); + logged_in = val; + }) + ]; + await Promise.all(promises_check_if_already_installed); + + let promises_update = [ + localforage.setItem("profile", {}), + localforage.setItem("timetable", []), + localforage.setItem("teachers", []), + localforage.setItem("gradings", []), + localforage.setItem("grades", []), + localforage.setItem("absences", {}), + localforage.setItem("messages", { "0": [], "1": [], "2": []}), // 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") + ]; + + if (logged_in && force == false) { // torej, če je že bila prijava narejena, ne posodobi backwards-compatible vrednosti (username, password,...) + await Promise.all(promises_update); + console.log("[setupStorage] user logged in: only updated"); + } else { + + let promises_first_install = [ + localforage.setItem("logged_in", false), + localforage.setItem("username", ""), + localforage.setItem("password", ""), + localforage.setItem("chosenLang", "en"), + localforage.setItem("theme", "light") + ]; + await localforage.clear(); + await Promise.all(promises_first_install); + console.log("[setupStorage] user not logged in: set up whole database"); + } +} -- cgit v1.2.3 From 448708182490d551721767bffc34ef35375f5082 Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 20 May 2020 19:21:31 +0200 Subject: DO_NOT_MERGE; still testing error reporting optout --- dist/js/setup-storage.js | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/js/setup-storage.js') diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js index f9fa656..ce66bba 100644 --- a/dist/js/setup-storage.js +++ b/dist/js/setup-storage.js @@ -20,6 +20,7 @@ async function setupStorage(force = false) { localforage.setItem("meals", {}), localforage.setItem("chosenLang", "en"), localforage.setItem("theme", "light") + localforage.setItem("errorReporting", "on") ]; if (logged_in && force == false) { // torej, če je že bila prijava narejena, ne posodobi backwards-compatible vrednosti (username, password,...) -- cgit v1.2.3 From 6def94865615d5bccba3bae278ea54932643db9a Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 20 May 2020 19:33:31 +0200 Subject: should be ok to merge --- dist/js/setup-storage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/js/setup-storage.js') diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js index ce66bba..7aaa089 100644 --- a/dist/js/setup-storage.js +++ b/dist/js/setup-storage.js @@ -19,7 +19,7 @@ async function setupStorage(force = false) { 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("theme", "light"), localforage.setItem("errorReporting", "on") ]; -- cgit v1.2.3 From 8e8a1ece2e95e3817739b0ded93eac5214ba49b6 Mon Sep 17 00:00:00 2001 From: rstular Date: Wed, 20 May 2020 20:47:22 +0200 Subject: New themes --- dist/js/setup-storage.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'dist/js/setup-storage.js') diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js index 7aaa089..0d2552a 100644 --- a/dist/js/setup-storage.js +++ b/dist/js/setup-storage.js @@ -2,7 +2,7 @@ async function setupStorage(force = false) { let logged_in; promises_check_if_already_installed = [ localforage.getItem("logged_in").then( function(val) { - console.log("[setupStorage] logged in status: "+val); + console.log("[setupStorage] logged in status: " + val); logged_in = val; }) ]; @@ -20,7 +20,8 @@ async function setupStorage(force = false) { localforage.setItem("meals", {}), localforage.setItem("chosenLang", "en"), localforage.setItem("theme", "light"), - localforage.setItem("errorReporting", "on") + localforage.setItem("errorReporting", "on"), + localforage.setItem("triggerWarningAccepted", false) ]; if (logged_in && force == false) { // torej, če je že bila prijava narejena, ne posodobi backwards-compatible vrednosti (username, password,...) @@ -33,7 +34,8 @@ async function setupStorage(force = false) { localforage.setItem("username", ""), localforage.setItem("password", ""), localforage.setItem("chosenLang", "en"), - localforage.setItem("theme", "light") + localforage.setItem("theme", "light"), + localforage.setItem("triggerWarningAccepted", false) ]; await localforage.clear(); await Promise.all(promises_first_install); -- cgit v1.2.3 From 8cc2b856a47f7b1881171914147e6ddca7a8a02b Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 20 May 2020 21:17:06 +0200 Subject: testing minification with jsmin --- dist/js/setup-storage.js | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) (limited to 'dist/js/setup-storage.js') diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js index 0d2552a..bf28f61 100644 --- a/dist/js/setup-storage.js +++ b/dist/js/setup-storage.js @@ -1,44 +1,2 @@ -async function setupStorage(force = false) { - let logged_in; - promises_check_if_already_installed = [ - localforage.getItem("logged_in").then( function(val) { - console.log("[setupStorage] logged in status: " + val); - logged_in = val; - }) - ]; - await Promise.all(promises_check_if_already_installed); - let promises_update = [ - localforage.setItem("profile", {}), - localforage.setItem("timetable", []), - localforage.setItem("teachers", []), - localforage.setItem("gradings", []), - localforage.setItem("grades", []), - localforage.setItem("absences", {}), - localforage.setItem("messages", { "0": [], "1": [], "2": []}), // 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("triggerWarningAccepted", false) - ]; - - if (logged_in && force == false) { // torej, če je že bila prijava narejena, ne posodobi backwards-compatible vrednosti (username, password,...) - await Promise.all(promises_update); - console.log("[setupStorage] user logged in: only updated"); - } else { - - let promises_first_install = [ - localforage.setItem("logged_in", false), - localforage.setItem("username", ""), - localforage.setItem("password", ""), - localforage.setItem("chosenLang", "en"), - localforage.setItem("theme", "light"), - localforage.setItem("triggerWarningAccepted", false) - ]; - await localforage.clear(); - await Promise.all(promises_first_install); - console.log("[setupStorage] user not logged in: set up whole database"); - } -} +async function setupStorage(force=false){let logged_in;promises_check_if_already_installed=[localforage.getItem("logged_in").then(function(val){console.log("[setupStorage] logged in status: "+val);logged_in=val;})];await Promise.all(promises_check_if_already_installed);let promises_update=[localforage.setItem("profile",{}),localforage.setItem("timetable",[]),localforage.setItem("teachers",[]),localforage.setItem("gradings",[]),localforage.setItem("grades",[]),localforage.setItem("absences",{}),localforage.setItem("messages",{"0":[],"1":[],"2":[]}),localforage.setItem("directory",{}),localforage.setItem("meals",{}),localforage.setItem("chosenLang","en"),localforage.setItem("theme","light"),localforage.setItem("errorReporting","on"),localforage.setItem("triggerWarningAccepted",false)];if(logged_in&&force==false){await Promise.all(promises_update);console.log("[setupStorage] user logged in: only updated");}else{let promises_first_install=[localforage.setItem("logged_in",false),localforage.setItem("username",""),localforage.setItem("password",""),localforage.setItem("chosenLang","en"),localforage.setItem("theme","light"),localforage.setItem("triggerWarningAccepted",false)];await localforage.clear();await Promise.all(promises_first_install);console.log("[setupStorage] user not logged in: set up whole database");}} \ No newline at end of file -- cgit v1.2.3