esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Merged in bugfix/MAPG-149-fix-new-client-side-bugs (pull request #119)

Browse Source 
Bugfix/MAPG-149 fix new client side bugs
This commit is contained in:
Bence Pőcze 2020-06-18 14:28:44 +00:00
commit 5814620b4f
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/static/js/login.js
View File

@ -29,8 +29,6 @@
loginFormError.style.display = 'block'; loginFormError.style.display = 'block';
loginFormError.innerHTML = errorText; loginFormError.innerHTML = errorText;
form.elements.email.select();
return; return;
} }

3
public/static/js/profile.js
View File

@ -37,15 +37,12 @@
profileFormError.style.display = 'block'; profileFormError.style.display = 'block';
profileFormError.innerHTML = errorText; profileFormError.innerHTML = errorText;
form.elements.password_new.select();
return; return;
} }
document.getElementById('profileFormError').style.display = 'none'; document.getElementById('profileFormError').style.display = 'none';
form.reset(); form.reset();
form.elements.save.disabled = true; form.elements.save.disabled = true;
form.elements.password_new.focus();
}, formData); }, formData);
}; };
})(); })();

3
public/static/js/signup.js
View File

@ -35,14 +35,11 @@
signupFormError.style.display = 'block'; signupFormError.style.display = 'block';
signupFormError.innerHTML = errorText; signupFormError.innerHTML = errorText;
form.elements.email.select();
return; return;
} }
document.getElementById('signupFormError').style.display = 'none'; document.getElementById('signupFormError').style.display = 'none';
form.reset(); form.reset();
form.elements.email.focus();
MapGuesser.showModalWithContent('Sign up successful', 'Sign up was successful. Please check your email and click on the activation link to activate your account!'); MapGuesser.showModalWithContent('Sign up successful', 'Sign up was successful. Please check your email and click on the activation link to activate your account!');
}, formData); }, formData);

6
views/profile.php
View File

@ -9,12 +9,12 @@ $jsFiles = [
<h2>Profile</h2> <h2>Profile</h2>
<div class="box"> <div class="box">
<form id="profileForm" action="/profile" method="post"> <form id="profileForm" action="/profile" method="post">
<input class="big fullWidth" type="password" name="password" placeholder="Current password" autofocus>
<hr>
<?php /* TODO: disabled for the time being, email modification should be implemented */ ?> <?php /* TODO: disabled for the time being, email modification should be implemented */ ?>
<input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled> <input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
<input class="big fullWidth marginTop" type="password" name="password_new" placeholder="New password" minlength="6" autofocus> <input class="big fullWidth marginTop" type="password" name="password_new" placeholder="New password" minlength="6">
<input class="big fullWidth marginTop" type="password" name="password_new_confirm" placeholder="New password confirmation" minlength="6"> <input class="big fullWidth marginTop" type="password" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
<hr>
<input class="big fullWidth" type="password" name="password" placeholder="Current password">
<p id="profileFormError" class="formError justify marginTop"></p> <p id="profileFormError" class="formError justify marginTop"></p>
<div class="right marginTop"> <div class="right marginTop">
<button type="submit" name="save" disabled>Save</button> <button type="submit" name="save" disabled>Save</button>