mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-13 03:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
ChrisLolz 2025-03-17 00:21:59 -04:00
parent 88c6e93e2c
commit 081920a58d
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ui/login-form-ui-handler.ts
View File

@ -160,15 +160,16 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
return onFail(i18next.t("menu:emptyUsername")); return onFail(i18next.t("menu:emptyUsername"));
} }
const [usernameInput, passwordInput] = this.inputs; const [usernameInput, passwordInput] = this.inputs;
pokerogueApi.account.login({ username: usernameInput.text, password: passwordInput.text }).then(error => { pokerogueApi.account.login({ username: usernameInput.text, password: passwordInput.text }).then(error => {
if (!error && originalLoginAction) { if (!error && originalLoginAction) {
originalLoginAction(); originalLoginAction();
} else { } else {
onFail(error); onFail(error);
} }
}); });
}
}; };
return true; return true;

16
src/ui/registration-form-ui-handler.ts
View File

@ -122,17 +122,17 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler {
} }
const [usernameInput, passwordInput] = this.inputs; const [usernameInput, passwordInput] = this.inputs;
pokerogueApi.account pokerogueApi.account
.register({ .register({
username: usernameInput.text, username: usernameInput.text,
password: passwordInput.text, password: passwordInput.text,
}) })
.then(registerError => { .then(registerError => {
if (!registerError) { if (!registerError) {
pokerogueApi.account pokerogueApi.account
.login({ .login({
username: usernameInput.text, username: usernameInput.text,
password: passwordInput.text, password: passwordInput.text,
}) })
.then(loginError => { .then(loginError => {
if (!loginError) { if (!loginError) {
originalRegistrationAction?.(); originalRegistrationAction?.();