diff options
Diffstat (limited to 'src/views')
-rw-r--r-- | src/views/ChangePassword/ChangePassword.vue | 130 | ||||
-rw-r--r-- | src/views/Login/Login.vue | 41 |
2 files changed, 84 insertions, 87 deletions
diff --git a/src/views/ChangePassword/ChangePassword.vue b/src/views/ChangePassword/ChangePassword.vue index e4319303..2440ace1 100644 --- a/src/views/ChangePassword/ChangePassword.vue +++ b/src/views/ChangePassword/ChangePassword.vue @@ -1,71 +1,73 @@ <template> - <div class="change-password-container mx-auto ml-md-5 mb-3"> + <div class="change-password-container"> <alert variant="danger" class="mb-4"> <p v-if="changePasswordError"> {{ $t('pageChangePassword.changePasswordError') }} </p> <p v-else>{{ $t('pageChangePassword.changePasswordAlertMessage') }}</p> </alert> - <dl> - <dt>{{ $t('pageChangePassword.username') }}</dt> - <dd>{{ username }}</dd> - </dl> - <b-form novalidate @submit.prevent="changePassword"> - <b-form-group - label-for="password" - :label="$t('pageChangePassword.newPassword')" - > - <input-password-toggle> - <b-form-input - id="password" - v-model="form.password" - autofocus="autofocus" - type="password" - :state="getValidationState($v.form.password)" - class="form-control-with-button" - @change="$v.form.password.$touch()" - > - </b-form-input> - <b-form-invalid-feedback role="alert"> - <template v-if="!$v.form.password.required"> - {{ $t('global.form.fieldRequired') }} - </template> - </b-form-invalid-feedback> - </input-password-toggle> - </b-form-group> - <b-form-group - label-for="password-confirm" - :label="$t('pageChangePassword.confirmNewPassword')" - > - <input-password-toggle> - <b-form-input - id="password-confirm" - v-model="form.passwordConfirm" - type="password" - :state="getValidationState($v.form.passwordConfirm)" - class="form-control-with-button" - @change="$v.form.passwordConfirm.$touch()" - > - </b-form-input> - <b-form-invalid-feedback role="alert"> - <template v-if="!$v.form.passwordConfirm.required"> - {{ $t('global.form.fieldRequired') }} - </template> - <template v-else-if="!$v.form.passwordConfirm.sameAsPassword"> - {{ $t('global.form.passwordsDoNotMatch') }} - </template> - </b-form-invalid-feedback> - </input-password-toggle> - </b-form-group> - <div class="text-right"> - <b-button type="button" variant="link" @click="goBack"> - {{ $t('pageChangePassword.goBack') }} - </b-button> - <b-button type="submit" variant="primary"> - {{ $t('pageChangePassword.changePassword') }} - </b-button> - </div> - </b-form> + <div class="change-password__form-container"> + <dl> + <dt>{{ $t('pageChangePassword.username') }}</dt> + <dd>{{ username }}</dd> + </dl> + <b-form novalidate @submit.prevent="changePassword"> + <b-form-group + label-for="password" + :label="$t('pageChangePassword.newPassword')" + > + <input-password-toggle> + <b-form-input + id="password" + v-model="form.password" + autofocus="autofocus" + type="password" + :state="getValidationState($v.form.password)" + class="form-control-with-button" + @change="$v.form.password.$touch()" + > + </b-form-input> + <b-form-invalid-feedback role="alert"> + <template v-if="!$v.form.password.required"> + {{ $t('global.form.fieldRequired') }} + </template> + </b-form-invalid-feedback> + </input-password-toggle> + </b-form-group> + <b-form-group + label-for="password-confirm" + :label="$t('pageChangePassword.confirmNewPassword')" + > + <input-password-toggle> + <b-form-input + id="password-confirm" + v-model="form.passwordConfirm" + type="password" + :state="getValidationState($v.form.passwordConfirm)" + class="form-control-with-button" + @change="$v.form.passwordConfirm.$touch()" + > + </b-form-input> + <b-form-invalid-feedback role="alert"> + <template v-if="!$v.form.passwordConfirm.required"> + {{ $t('global.form.fieldRequired') }} + </template> + <template v-else-if="!$v.form.passwordConfirm.sameAsPassword"> + {{ $t('global.form.passwordsDoNotMatch') }} + </template> + </b-form-invalid-feedback> + </input-password-toggle> + </b-form-group> + <div class="text-right"> + <b-button type="button" variant="link" @click="goBack"> + {{ $t('pageChangePassword.goBack') }} + </b-button> + <b-button type="submit" variant="primary"> + {{ $t('pageChangePassword.changePassword') }} + </b-button> + </div> + </b-form> + </div> </div> </template> @@ -124,7 +126,9 @@ export default { </script> <style lang="scss" scoped> -.change-password-container { - max-width: 360px; +.change-password__form-container { + @include media-breakpoint-up('md') { + max-width: 360px; + } } </style> diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index fc679361..8d96573a 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -1,9 +1,5 @@ <template> - <b-form - class="login-form mx-auto ml-md-5 mb-3" - novalidate - @submit.prevent="login" - > + <b-form class="login-form" novalidate @submit.prevent="login"> <alert class="login-error mb-4" :show="authError" variant="danger"> <p id="login-error-alert"> {{ $t('pageLogin.alert.message') }} @@ -37,16 +33,19 @@ </b-form-group> <div class="login-form__section mb-3"> <label for="password">{{ $t('pageLogin.password') }}</label> - <b-form-input - id="password" - v-model="userInfo.password" - aria-describedby="login-error-alert password-required" - :state="getValidationState($v.userInfo.password)" - type="password" - data-test-id="login-input-password" - @input="$v.userInfo.password.$touch()" - > - </b-form-input> + <input-password-toggle> + <b-form-input + id="password" + v-model="userInfo.password" + aria-describedby="login-error-alert password-required" + :state="getValidationState($v.userInfo.password)" + type="password" + data-test-id="login-input-password" + class="form-control-with-button" + @input="$v.userInfo.password.$touch()" + > + </b-form-input> + </input-password-toggle> <b-form-invalid-feedback id="password-required" role="alert"> <template v-if="!$v.userInfo.password.required"> {{ $t('global.form.fieldRequired') }} @@ -54,8 +53,7 @@ </b-form-invalid-feedback> </div> <b-button - block - class="mt-5" + class="mt-3" type="submit" variant="primary" data-test-id="login-button-submit" @@ -70,10 +68,11 @@ import { required } from 'vuelidate/lib/validators'; import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js'; import i18n from '@/i18n'; import Alert from '@/components/Global/Alert'; +import InputPasswordToggle from '@/components/Global/InputPasswordToggle'; export default { name: 'Login', - components: { Alert }, + components: { Alert, InputPasswordToggle }, mixins: [VuelidateMixin], data() { return { @@ -145,9 +144,3 @@ export default { }, }; </script> - -<style lang="scss" scoped> -.login-form { - max-width: 360px; -} -</style> |