From 5d7e5d1cc7ef23b59a6386744cdb308bc0551e26 Mon Sep 17 00:00:00 2001 From: Kosh Date: Thu, 26 Oct 2023 21:27:55 +0530 Subject: [PATCH 1/2] Changed delays to await --- frontend/scripts/dashboard.js | 56 ++++++++++++++++------------------- frontend/scripts/index.js | 4 +-- frontend/scripts/register.js | 8 ++--- 3 files changed, 31 insertions(+), 37 deletions(-) diff --git a/frontend/scripts/dashboard.js b/frontend/scripts/dashboard.js index d4e2e34..5f65ab7 100644 --- a/frontend/scripts/dashboard.js +++ b/frontend/scripts/dashboard.js @@ -113,10 +113,10 @@ function getDisplayList(fieldnames,userdata){ const search = document.getElementById('search'); -search.addEventListener('keyup', function() { +search.addEventListener('keyup', async function() { let result = search.value; if(result == ""){ - getData() + await getData() } else { getFilterList(result,JSON.parse(localStorage.getItem("userdata"))) } @@ -194,13 +194,13 @@ function addFieldLogic() { //----------------------------------------------------------------------------------------- Form Data Logic -function submitForm() { +async function submitForm() { const form = document.getElementById('formdata') const formdata = new FormData(form) - formatData(formdata) + await formatData(formdata) } -function formatData(userdata) { +async function formatData(userdata) { const formData = new FormData() const objData = {} let sitename; @@ -214,7 +214,7 @@ function formatData(userdata) { formData.append("entry_name", sitename) formData.append("fields", JSON.stringify(objData)) // console.log(sitename) - sendData(formData) + await sendData(formData) } //----------------------------------------------------------------------------------------- Post Entry Data to API @@ -233,7 +233,7 @@ async function sendData(formData){ entrywindow.style.display = "none" localStorage.removeItem("editVal") }, 1000); - getData() + await getData() } if(!response.ok){ const errorMessage = await response.text(); @@ -250,9 +250,9 @@ async function sendData(formData){ //----------------------------------------------------------------------------------------- Form Data Validation Logic -function validateData() { +async function validateData() { if(validateSitename() && validateUrl()) - submitForm(); + await submitForm(); return; } @@ -356,9 +356,9 @@ function addFieldEditLogic(field){ //----------------------------------------------------------------------------------------- Edit Data Validation -function validateDataEdit() { +async function validateDataEdit() { if(validateEditSitename() && validateEditUrl()) - editData(); + await editData(); return; } @@ -408,9 +408,8 @@ async function deleteEntry() { if(response.ok){ console.log(`Deleted ${localStorage.getItem("editVal")}`) localStorage.removeItem("editVal") - getData() + await getData() confirmation() - await delay(1000) const infobox = document.querySelector('.infobox') const infopanel = document.querySelector('.infopanel') const popupdivparent = document.querySelector('.popupdivparent') @@ -441,7 +440,7 @@ function deleteEntryConfirm() { const popupdivparent = document.querySelector('.popupdivparent') const popupdiv = document.querySelector('.popupdivchild') popupdivparent.style.display = "flex" - popupdiv.innerHTML = "
\n
" + popupdiv.innerHTML = "
\n
" } //----------------------------------------------------------------------------------------- Change Pass Entry Popup @@ -450,10 +449,10 @@ function changePassConfirm() { const popupdivparent = document.querySelector('.popupdivparent') const popupdiv = document.querySelector('.popupdivchild') popupdivparent.style.display = "flex" - popupdiv.innerHTML = "
" + popupdiv.innerHTML = "
" } -function changePass() { +async function changePass() { const password = document.getElementById('c2i1').value const confirmpassword = document.getElementById('c2i2').value const errlabel = document.getElementById('passerrlabel') @@ -470,7 +469,7 @@ function changePass() { },3000) } else if(password == confirmpassword){ - sendPass(password) + await sendPass(password) } } @@ -486,7 +485,6 @@ async function sendPass(password) { if(response.ok){ console.log(`Password Changed!`) confirmation() - await delay(1000) const popupdivparent = document.querySelector('.popupdivparent') const popupdiv = document.querySelector('.popupdivchild') popupdivparent.style.display = "none" @@ -508,7 +506,7 @@ async function sendPass(password) { //----------------------------------------------------------------------------------------- Edit Data Submission Logic -function editData() { +async function editData() { const backbtn = document.getElementById('backbtn') const submitbtn = document.getElementById('submiteditdatabtn') const binbutton = document.getElementById('deletedata') @@ -517,7 +515,7 @@ function editData() { submitbtn.disabled = true const form = document.getElementById('formdata') const formeditdata = new FormData(form) - editDataHandler(formeditdata) + await editDataHandler(formeditdata) } let isError; @@ -551,23 +549,19 @@ async function editDataHandler(editdata) { let value = objData[field] if(!(field in userdata[entryname])){ - addNewField(entryname, field, value) - await delay(500) + await addNewField(entryname, field, value) } else if(value != userdata[entryname][field]){ - editFieldValue(entryname, field, value ) - await delay(500) + await editFieldValue(entryname, field, value ) } } } if(sitename != entryname){ - changeEntryName(entryname, sitename) - await delay(500) + await changeEntryName(entryname, sitename) } - getData() - await delay(100) + await getData() if(!isError){ updateInfoGui(localStorage.getItem("editVal")) confirmation() @@ -821,7 +815,7 @@ logoutbtn.addEventListener('click', () => { -window.onload = function() { - getData(); +window.onload = async function() { + await getData(); greet() -}; \ No newline at end of file +}; diff --git a/frontend/scripts/index.js b/frontend/scripts/index.js index eca2ca1..085fb8c 100644 --- a/frontend/scripts/index.js +++ b/frontend/scripts/index.js @@ -28,9 +28,9 @@ function validatePass() { } } -function validateLogin() { +async function validateLogin() { if(validateName() && validatePass()) { - getAuth(); + await getAuth(); return; } } diff --git a/frontend/scripts/register.js b/frontend/scripts/register.js index bd6d844..adc0361 100644 --- a/frontend/scripts/register.js +++ b/frontend/scripts/register.js @@ -1,7 +1,7 @@ const errlabel = document.getElementById('errlabel') -function validateRegister() { +async function validateRegister() { const username = document.getElementById('username').value const password = document.getElementById('password').value const confirmpassword = document.getElementById('conpassword').value @@ -19,7 +19,7 @@ function validateRegister() { }, 3000); } else if(password == confirmpassword && username!=''){ - createUser(username,password) + await createUser(username,password) } } @@ -35,7 +35,7 @@ async function createUser(username,password) { }); if(response.ok) { console.log("User Created!") - Login(username,password) + await Login(username,password) } else if(!response.ok) { const errorMessage = await response.text(); errlabel.textContentL = errorMessage; @@ -75,4 +75,4 @@ async function Login(username,password){ } catch (error) { console.error('Error:', error.message); } -} \ No newline at end of file +} From 2a54553dc25ed80f9c144f9f29bba89a9a1252ea Mon Sep 17 00:00:00 2001 From: Modo Date: Thu, 26 Oct 2023 21:38:18 +0530 Subject: [PATCH 2/2] Add await --- frontend/html/dashboard.html | 10 +++++----- frontend/html/register.html | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/html/dashboard.html b/frontend/html/dashboard.html index a3c5173..fe96811 100644 --- a/frontend/html/dashboard.html +++ b/frontend/html/dashboard.html @@ -81,7 +81,7 @@
- Change Password + Change Password
@@ -114,9 +114,9 @@ - - - + + +
@@ -146,7 +146,7 @@
- +
diff --git a/frontend/html/register.html b/frontend/html/register.html index f743d65..a468cd5 100644 --- a/frontend/html/register.html +++ b/frontend/html/register.html @@ -29,7 +29,7 @@
- +