krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(usernames): various

Browse Source 
Better modal positioning
Correct text colors for input field
Don't show "already taken" if username has other errors
This commit is contained in:
Sabe Jones
2018-10-15 11:27:49 -05:00
parent 0897ab5dc9
commit cfd19ac694
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
website/client/components/settings/verifyUsername.vue
View File

@@ -20,7 +20,7 @@
:placeholder="$t('newDisplayName')",
v-model='temporaryDisplayName',
@blur='restoreEmptyDisplayName()',
:class='{"is-invalid input-invalid": displayNameInvalid, "input-valid": displayNameValid}')
:class='{"is-invalid input-invalid": displayNameInvalid, "input-valid": displayNameValid, "text-darker": temporaryDisplayName.length > 0}')
.mb-3(v-if="displayNameIssues.length > 0")
.input-error.text-center(v-for="issue in displayNameIssues") {{ issue }}
.form-group
@@ -34,7 +34,7 @@
:placeholder="$t('newUsername')",
v-model='temporaryUsername',
@blur='restoreEmptyUsername()',
:class='{"is-invalid input-invalid": usernameInvalid, "input-valid": usernameValid}')
:class='{"is-invalid input-invalid": usernameInvalid, "input-valid": usernameValid, "text-darker": temporaryUsername.length > 0}')
.mb-3(v-if="usernameIssues.length > 0")
.input-error.text-center(v-for="issue in usernameIssues") {{ issue }}
.small.text-center {{ $t('usernameLimitations') }}
@@ -44,10 +44,19 @@
</template>
<style lang="scss">
#verify-username___BV_modal_outer_ .modal-content {
width: 566px;
padding-left: 2rem;
padding-right: 2rem;
#verify-username___BV_modal_outer_ {
.modal-content {
height: 620px;
width: 566px;
padding-left: 2rem;
padding-right: 2rem;
}
.modal-dialog {
-webkit-transform: translate(-5%, calc(50vh - 60%));
-ms-transform: translate(0, 50vh) translate(-5%, -60%);
-o-transform: translate(-5%, calc(50vh - 60%));
transform: translate(0, 50vh) translate(-5%, -60%);
}
}
</style>
@@ -95,6 +104,7 @@
}
label {
color: $gray-100;
font-weight: bold;
margin-bottom: 0rem;
margin-left: 1rem;
@@ -116,6 +126,10 @@
color: $gray-200;
}
.text-darker {
color: $gray-50;
}
.tos-footer {
background-color: $gray-700;
border-radius: 0rem 0rem 0.3rem 0.3rem;

12
website/server/controllers/api-v4/auth.js
View File

@@ -90,12 +90,14 @@ api.verifyUsername = {
const issues = verifyUsername(chosenUsername, res);
const existingUser = await User.findOne({
'auth.local.lowerCaseUsername': chosenUsername.toLowerCase(),
}, {auth: 1}).exec();
if (issues.length < 1) {
const existingUser = await User.findOne({
'auth.local.lowerCaseUsername': chosenUsername.toLowerCase(),
}, {auth: 1}).exec();
if (existingUser) {
if (!user || existingUser._id !== user._id) issues.push(res.t('usernameTaken'));
if (existingUser) {
if (!user || existingUser._id !== user._id) issues.push(res.t('usernameTaken'));
}
}
if (issues.length > 0) {