From bef372e37844720242dc4288847acb06effa524a Mon Sep 17 00:00:00 2001 From: elrumo Date: Sun, 21 Mar 2021 17:14:57 +0000 Subject: [PATCH] Fixed bug where if session token was deleted the page did not work. --- .../src/assets/icons/Discord.svg | 1 + .../src/components/Header.vue | 5 ++- .../src/components/Home.vue | 41 +++++++++++++------ .../src/views/Dashboard.vue | 26 +++++++++++- 4 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 website/macos-big-sur-icons/src/assets/icons/Discord.svg diff --git a/website/macos-big-sur-icons/src/assets/icons/Discord.svg b/website/macos-big-sur-icons/src/assets/icons/Discord.svg new file mode 100644 index 00000000..fa4629d9 --- /dev/null +++ b/website/macos-big-sur-icons/src/assets/icons/Discord.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/website/macos-big-sur-icons/src/components/Header.vue b/website/macos-big-sur-icons/src/components/Header.vue index f2e0f953..b7b50f51 100644 --- a/website/macos-big-sur-icons/src/components/Header.vue +++ b/website/macos-big-sur-icons/src/components/Header.vue @@ -138,8 +138,8 @@ Twitter logo - - + + Discord Logo @@ -225,6 +225,7 @@ export default { darkMode: false, icons:{ twitter: require("../assets/icons/twitter.svg"), + discord: require("../assets/icons/Discord.svg"), burgerMenu: require("../assets/icons/burgerMenu.svg"), }, isMenu: false, diff --git a/website/macos-big-sur-icons/src/components/Home.vue b/website/macos-big-sur-icons/src/components/Home.vue index 0618a10a..0644a7fc 100644 --- a/website/macos-big-sur-icons/src/components/Home.vue +++ b/website/macos-big-sur-icons/src/components/Home.vue @@ -97,6 +97,7 @@
+
@@ -423,21 +424,35 @@ export default { } // Parse.User.enableUnsafeCurrentUser() + function handleParseError(err){ + switch (err.code) { + case Parse.Error.INVALID_SESSION_TOKEN: + Parse.User.logOut(); + loginParse() + break; + + default: + break; + } + } - if(Parse.User.current()){ - if (Parse.User.current().attributes.isAdmin) { - parent.getIconsArray(); - parent.isAuth = true - }else{ - parent.getIconsArray(); + function loginParse(){ + if(Parse.User.current()){ + if (Parse.User.current().attributes.isAdmin) { + parent.getIconsArray(); + parent.isAuth = true + }else{ + parent.getIconsArray(); + } + } else{ + Parse.User.logIn(parseUser, parsePass).then(()=>{ + console.log("Signed Insss"); + parent.getIconsArray(); + }).catch((e)=>{ + console.log("login: ", e); + handleParseError(e) + }) } - } else{ - Parse.User.logIn(parseUser, parsePass).then(()=>{ - console.log("Signed Insss"); - parent.getIconsArray(); - }).catch((e)=>{ - console.log("login: ", e); - }) } }, diff --git a/website/macos-big-sur-icons/src/views/Dashboard.vue b/website/macos-big-sur-icons/src/views/Dashboard.vue index 91c09736..7d7f1d05 100644 --- a/website/macos-big-sur-icons/src/views/Dashboard.vue +++ b/website/macos-big-sur-icons/src/views/Dashboard.vue @@ -478,17 +478,41 @@ export default { document.getElementById(id).style.display = "none" } + function handleParseError(err){ + switch (err.code) { + case Parse.Error.INVALID_SESSION_TOKEN: + Parse.User.logOut(); + window.location.reload() + break; + + default: + break; + } + } + if (currentUser) { if (!Parse.User.current().attributes.isAdmin) { + parent.$router.push({ path: '/' }) + Parse.User.logOut(); + console.log("Hiii"); return } + parent.isAuth = true + async function getParseData(){ const query = new Parse.Query(Icons); query.equalTo("approved", false) query.ascending("usersName"); query.limit(docLimit); - const results = await query.find() + + + try{ + var results = await query.find() + } catch (error) { + console.log(error); + handleParseError(error) + } parent.getIconListLen(query); // Get how many icons to approve.