From c8b3d9b8858e8432016d66a0b2d06bdbca865af9 Mon Sep 17 00:00:00 2001 From: ION606 Date: Fri, 12 Aug 2022 20:01:29 -0700 Subject: [PATCH] Changed most data storage to server-side --- calEvent.html | 43 +++--- calendar.html | 21 ++- dashboard.html | 35 +++-- index.html | 58 ++++---- main.js | 47 ++++++- myGuilds.html | 141 +++++++++++-------- newCalEvent.html | 67 +++++---- package-lock.json | 348 ++++++++++++++++++++++++---------------------- package.json | 3 +- premium.html | 11 +- 10 files changed, 457 insertions(+), 317 deletions(-) diff --git a/calEvent.html b/calEvent.html index 086780b..2b1b137 100644 --- a/calEvent.html +++ b/calEvent.html @@ -221,22 +221,33 @@ window.opener.location.reload(); if (inp.inp == 'cal') { - const userId = JSON.parse(window.localStorage.getItem('Id')); - const delObjKeys = sessionStorage.getItem('delObjKeys'); - - //Send the data to the server - var xhr = new XMLHttpRequest(); - xhr.open('post', 'http://www.selmerbot.com/sendData/', true); - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8'); - xhr.setRequestHeader(`reminders`, true); - xhr.setRequestHeader(`delObjKeys`, delObjKeys); - - xhr.onloadend = (e) => { - console.log(e); - alert("Saved!"); - window.close(); - }; - xhr.send(); + // const userId = JSON.parse(window.localStorage.getItem('Id')); + + var xhrsess = new XMLHttpRequest(); + xhrsess.open('post', 'http://www.selmerbot.com/getSessionInfo/', true); + xhrsess.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8'); + xhrsess.setRequestHeader('session', window.localStorage.getItem('sessionId')); + + xhrsess.onloadend = (e) => { + const sessionData = JSON.parse(xhrsess.response); + const userId = JSON.parse(sessionData.userId); + const delObjKeys = sessionStorage.getItem('delObjKeys'); + + //Send the data to the server + var xhr = new XMLHttpRequest(); + xhr.open('post', 'http://www.selmerbot.com/sendData/', true); + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8'); + xhr.setRequestHeader(`reminders`, true); + xhr.setRequestHeader(`delObjKeys`, delObjKeys); + + xhr.onloadend = (e) => { + console.log(e); + alert("Saved!"); + window.close(); + }; + xhr.send(); + } + xhrsess.send(); } } diff --git a/calendar.html b/calendar.html index b53541a..9c98458 100644 --- a/calendar.html +++ b/calendar.html @@ -371,11 +371,28 @@ calSpacing.cellPadding = 1; } - document.getElementById('calHeader').style.display = "block"; + // document.getElementById('calHeader').style.display = "block"; //Breaks the calendar } @@ -691,7 +704,7 @@
-
+