Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ls-arq' into ls-arq

Browse source
This commit is contained in:
DJ2LS 2023-02-26 12:15:41 +01:00
parent bc99933795 3db50d48ed
commit 1011bf6128
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gui/preload-chat.js
View file

@ -159,18 +159,15 @@ window.addEventListener("DOMContentLoaded", () => {
}, },
}) })
.then(function (result) { .then(function (result) {
console.log(result) console.log(result);
if (typeof result.docs[0] !== "undefined") { if (typeof result.docs[0] !== "undefined") {
// handle result // handle result
userInfoFields.forEach(function (elem) { userInfoFields.forEach(function (elem) {
if(elem !== 'user_info_image'){ if (elem !== "user_info_image") {
document.getElementById(elem).value = result.docs[0][elem]; document.getElementById(elem).value = result.docs[0][elem];
} else { } else {
document.getElementById(elem).src = result.docs[0][elem]; document.getElementById(elem).src = result.docs[0][elem];
} }
}); });
} else { } else {
console.log( console.log(
@ -190,21 +187,19 @@ document.getElementById(elem).src = result.docs[0][elem];
console.log(err); console.log(err);
}); });
//save user info //save user info
document.getElementById("userInfoSave").addEventListener("click", () => { document.getElementById("userInfoSave").addEventListener("click", () => {
let obj = new Object(); let obj = new Object();
userInfoFields.forEach(function (subelem) { userInfoFields.forEach(function (subelem) {
if(subelem !== 'user_info_image'){ if (subelem !== "user_info_image") {
obj[subelem] = document.getElementById(subelem).value; obj[subelem] = document.getElementById(subelem).value;
} else { } else {
obj[subelem] = document.getElementById(subelem).src obj[subelem] = document.getElementById(subelem).src;
} }
}); });
addUserToDatabaseIfNotExists(obj); addUserToDatabaseIfNotExists(obj);
}); });
//Add event listener for filter apply button //Add event listener for filter apply button
document.getElementById("btnFilter").addEventListener("click", () => { document.getElementById("btnFilter").addEventListener("click", () => {
chatFilter = [{ type: "newchat" }]; chatFilter = [{ type: "newchat" }];
@ -530,13 +525,10 @@ ipcRenderer.on("return-select-user-image", (event, arg) => {
document.getElementById("user_info_image").src = document.getElementById("user_info_image").src =
"data:" + imageFiletype + ";base64," + base64String; "data:" + imageFiletype + ";base64," + base64String;
}) })
.catch(function (err) { .catch(function (err) {
document.getElementById("user_info_image").src = "img/icon.png"; document.getElementById("user_info_image").src = "img/icon.png";
}); });
}) })
.catch(function (error) { .catch(function (error) {
console.log(error.message); console.log(error.message);
@ -1381,7 +1373,6 @@ addUserToDatabaseIfNotExists = function (obj) {
user_info_website: obj.user_info_website, user_info_website: obj.user_info_website,
user_info_comments: obj.user_info_comments, user_info_comments: obj.user_info_comments,
user_info_image: obj.user_info_image, user_info_image: obj.user_info_image,
}) })
.then(function (response) { .then(function (response) {
console.log("UPDATED USER"); console.log("UPDATED USER");