From 37ff58fed3509e68d343223818ff1eebf308b4c2 Mon Sep 17 00:00:00 2001 From: avi123nash Date: Tue, 19 Jan 2021 16:09:47 +0530 Subject: [PATCH 1/7] duration was not specified for error notification on failure getLeaderBoard API and would persist for infinite time --- src/js/leaderboards.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/leaderboards.js b/src/js/leaderboards.js index 2a7feb6a9..cb7115692 100644 --- a/src/js/leaderboards.js +++ b/src/js/leaderboards.js @@ -218,7 +218,7 @@ function updateLeaderboards() { }) .catch((e) => { hideBackgroundLoader(); - Notifications.add("Something went wrong: " + e.message, -1); + Notifications.add("Something went wrong: " + e.message, -1, 3); }); } From 21b741c780c39dc14e4efc89b7ab484f138321e5 Mon Sep 17 00:00:00 2001 From: avi123nash Date: Tue, 19 Jan 2021 16:45:44 +0530 Subject: [PATCH 2/7] reverted changes --- src/js/leaderboards.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/leaderboards.js b/src/js/leaderboards.js index cb7115692..2a7feb6a9 100644 --- a/src/js/leaderboards.js +++ b/src/js/leaderboards.js @@ -218,7 +218,7 @@ function updateLeaderboards() { }) .catch((e) => { hideBackgroundLoader(); - Notifications.add("Something went wrong: " + e.message, -1, 3); + Notifications.add("Something went wrong: " + e.message, -1); }); } From 17e25c1a8d7f7b25e099a9dacbd154b0c0ef8ca0 Mon Sep 17 00:00:00 2001 From: avi123nash Date: Tue, 19 Jan 2021 16:46:46 +0530 Subject: [PATCH 3/7] duration was not specified for error notification on failure getLeaderBoard API and would persist for infinite time --- src/js/leaderboards.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/leaderboards.js b/src/js/leaderboards.js index 2a7feb6a9..cb7115692 100644 --- a/src/js/leaderboards.js +++ b/src/js/leaderboards.js @@ -218,7 +218,7 @@ function updateLeaderboards() { }) .catch((e) => { hideBackgroundLoader(); - Notifications.add("Something went wrong: " + e.message, -1); + Notifications.add("Something went wrong: " + e.message, -1, 3); }); } From 4e815bdec5a9d95206566671fc6657f2daa7efd9 Mon Sep 17 00:00:00 2001 From: avi123nash Date: Wed, 20 Jan 2021 16:49:26 +0530 Subject: [PATCH 4/7] Register error message was not visible on screen. hidden class was not being added to loader on registration due to which it goes to infinite loading --- src/js/script.js | 6 +++++- src/sass/style.scss | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/js/script.js b/src/js/script.js index d75467280..a6bc5b4a6 100644 --- a/src/js/script.js +++ b/src/js/script.js @@ -3211,7 +3211,11 @@ function changePage(page) { showSignOutButton(); } } else if (page == "login") { - if (firebase.auth().currentUser != null) { + /*if (firebase.auth().currentUser == null) { + changePage("login"); + } else */ if ( + firebase.auth().currentUser != null + ) { changePage("account"); } else { pageTransition = true; diff --git a/src/sass/style.scss b/src/sass/style.scss index e5a812fba..901957f92 100644 --- a/src/sass/style.scss +++ b/src/sass/style.scss @@ -710,7 +710,7 @@ a:hover { display: grid; gap: 1rem; position: fixed; - right: 1rem; + right: 12rem; top: 1rem; .history { display: grid; From 6c6294619ca0a1e97edc0b123cf1a366ce2b7ae5 Mon Sep 17 00:00:00 2001 From: avi123nash Date: Wed, 20 Jan 2021 16:54:01 +0530 Subject: [PATCH 5/7] Register error message was not visible on screen. hidden class was not being added to loader on registration due to which it goes to infinite loading --- src/js/account.js | 1 + src/js/script.js | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/js/account.js b/src/js/account.js index c646a1ff9..efe2493ca 100644 --- a/src/js/account.js +++ b/src/js/account.js @@ -168,6 +168,7 @@ function signUp() { $(".pageLogin .preloader").addClass("hidden"); }); } else { + $(".pageLogin .preloader").addClass("hidden"); Notifications.add( "Something went wrong when checking name: " + d.data.message, -1 diff --git a/src/js/script.js b/src/js/script.js index a6bc5b4a6..d75467280 100644 --- a/src/js/script.js +++ b/src/js/script.js @@ -3211,11 +3211,7 @@ function changePage(page) { showSignOutButton(); } } else if (page == "login") { - /*if (firebase.auth().currentUser == null) { - changePage("login"); - } else */ if ( - firebase.auth().currentUser != null - ) { + if (firebase.auth().currentUser != null) { changePage("account"); } else { pageTransition = true; From 91fab391c40e1f51154d31a745c51db6548a88f9 Mon Sep 17 00:00:00 2001 From: avi123nash Date: Thu, 21 Jan 2021 11:36:25 +0530 Subject: [PATCH 6/7] Reverted css change --- src/sass/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/style.scss b/src/sass/style.scss index 901957f92..e5a812fba 100644 --- a/src/sass/style.scss +++ b/src/sass/style.scss @@ -710,7 +710,7 @@ a:hover { display: grid; gap: 1rem; position: fixed; - right: 12rem; + right: 1rem; top: 1rem; .history { display: grid; From 512b9ba8b8f0be9f32a0ee95b3911ee63b0a1223 Mon Sep 17 00:00:00 2001 From: avi123nash Date: Thu, 21 Jan 2021 11:44:02 +0530 Subject: [PATCH 7/7] Reverted duration change added to error notification --- src/js/leaderboards.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/leaderboards.js b/src/js/leaderboards.js index cb7115692..2a7feb6a9 100644 --- a/src/js/leaderboards.js +++ b/src/js/leaderboards.js @@ -218,7 +218,7 @@ function updateLeaderboards() { }) .catch((e) => { hideBackgroundLoader(); - Notifications.add("Something went wrong: " + e.message, -1, 3); + Notifications.add("Something went wrong: " + e.message, -1); }); }