monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-10-17 11:06:17 +08:00
Code Issues Projects Releases Packages Wiki Activity

commented depracated code

Browse source
This commit is contained in:
Miodec 2021-07-07 14:32:01 +01:00
parent af15d3c5ae
commit e59b76834e
2 changed files with 73 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/js/popups/edit-tags-popup.js
View file

@ -145,27 +145,28 @@ function apply() {
});
} else if (action === "clearPb") {
//TODO: rewrite to axios
Loader.show();
CloudFunctions.clearTagPb({
uid: firebase.auth().currentUser.uid,
tagid: tagid,
}).then((e) => {
Loader.hide();
let status = e.data.resultCode;
if (status === 1) {
Notifications.add("PB cleared", 1);
DB.getSnapshot().tags.forEach((tag, index) => {
if (tag.id === tagid) {
tag.personalBests = {};
}
});
ResultTagsPopup.updateButtons();
Settings.update();
ResultFilters.updateTags();
} else if (status < -1) {
Notifications.add("Unknown error: " + e.data.message, -1);
}
});
// Loader.show();
// CloudFunctions.clearTagPb({
// uid: firebase.auth().currentUser.uid,
// tagid: tagid,
// }).then((e) => {
// Loader.hide();
// let status = e.data.resultCode;
// if (status === 1) {
// Notifications.add("PB cleared", 1);
// DB.getSnapshot().tags.forEach((tag, index) => {
// if (tag.id === tagid) {
// tag.personalBests = {};
// }
// });
// ResultTagsPopup.updateButtons();
// Settings.update();
// ResultFilters.updateTags();
// } else if (status < -1) {
// Notifications.add("Unknown error: " + e.data.message, -1);
// }
// });
}
}
$("#tagsWrapper").click((e) => {

101
src/js/simple-popups.js
View file

@ -64,11 +64,11 @@ class SimplePopup {
});
} else if (this.type === "text") {
this.inputs.forEach((input) => {
if(input.type){
if (input.type) {
el.find(".inputs").append(`
<input type="${input.type}" val="${input.initVal}" placeholder="${input.placeholder}" required autocomplete="off">
`);
}else{
} else {
el.find(".inputs").append(`
<input type="text" val="${input.initVal}" placeholder="${input.placeholder}" required autocomplete="off">
`);
@ -160,42 +160,44 @@ list.updateEmail = new SimplePopup(
],
"",
"Update",
(pass,previousEmail, newEmail) => {
(pass, previousEmail, newEmail) => {
try {
const user = firebase.auth().currentUser;
const credential = firebase.auth.EmailAuthProvider.credential(
user.email,
pass
user.email,
pass
);
Loader.show();
user.reauthenticateWithCredential(credential).then(() => {
axiosInstance
.post("/updateEmail", {
uid: user.uid,
previousEmail: previousEmail,
newEmail: newEmail,
user
.reauthenticateWithCredential(credential)
.then(() => {
axiosInstance
.post("/updateEmail", {
uid: user.uid,
previousEmail: previousEmail,
newEmail: newEmail,
})
.then((data) => {
Loader.hide();
if (data.data.resultCode === 1) {
Notifications.add("Email updated", 0);
setTimeout(() => {
AccountController.signOut();
}, 1000);
} else if (data.data.resultCode === -1) {
Notifications.add("Current email doesn't match", 0);
} else {
Notifications.add(
"Something went wrong: " + JSON.stringify(data.data),
-1
);
}
});
})
.then((data) => {
.catch((e) => {
Loader.hide();
if (data.data.resultCode === 1) {
Notifications.add("Email updated", 0);
setTimeout(() => {
AccountController.signOut();
}, 1000);
} else if (data.data.resultCode === -1) {
Notifications.add("Current email doesn't match", 0);
} else {
Notifications.add(
"Something went wrong: " + JSON.stringify(data.data),
-1
);
}
Notifications.add("Incorrect current password", -1);
});
}).catch(e => {
Loader.hide();
Notifications.add("Incorrect current password", -1);
})
} catch (e) {
Notifications.add("Something went wrong: " + e, -1);
}
@ -203,7 +205,6 @@ list.updateEmail = new SimplePopup(
() => {}
);
list.updatePassword = new SimplePopup(
"updatePassword",
"text",
@ -231,11 +232,11 @@ list.updatePassword = new SimplePopup(
try {
const user = firebase.auth().currentUser;
const credential = firebase.auth.EmailAuthProvider.credential(
user.email,
previousPass
user.email,
previousPass
);
if(newPass !== newPassConfirm){
Notifications.add("New passwords don't match",0);
if (newPass !== newPassConfirm) {
Notifications.add("New passwords don't match", 0);
return;
}
Loader.show();
@ -251,7 +252,6 @@ list.updatePassword = new SimplePopup(
() => {}
);
list.clearTagPb = new SimplePopup(
"clearTagPb",
"text",
@ -368,20 +368,21 @@ list.unlinkDiscord = new SimplePopup(
"Unlink",
() => {
Loader.show();
CloudFunctions.unlinkDiscord({
uid: firebase.auth().currentUser.uid,
}).then((ret) => {
Loader.hide();
console.log(ret);
if (ret.data.status === 1) {
DB.getSnapshot().discordId = null;
Notifications.add("Accounts unlinked", 0);
Settings.updateDiscordSection();
} else {
Notifications.add("Something went wrong: " + ret.data.message, -1);
Settings.updateDiscordSection();
}
});
//todo rewrite to axios
// CloudFunctions.unlinkDiscord({
// uid: firebase.auth().currentUser.uid,
// }).then((ret) => {
// Loader.hide();
// console.log(ret);
// if (ret.data.status === 1) {
// DB.getSnapshot().discordId = null;
// Notifications.add("Accounts unlinked", 0);
// Settings.updateDiscordSection();
// } else {
// Notifications.add("Something went wrong: " + ret.data.message, -1);
// Settings.updateDiscordSection();
// }
// });
},
() => {}
);