refactor(front): replace password-input with input; set label prop
This commit is contained in:
parent
77090134d5
commit
fe8c7aa564
|
@ -7,7 +7,6 @@ import { useEventListener } from '@vueuse/core'
|
||||||
import { useI18n } from 'vue-i18n'
|
import { useI18n } from 'vue-i18n'
|
||||||
import { useStore } from '~/store'
|
import { useStore } from '~/store'
|
||||||
|
|
||||||
import PasswordInput from '~/components/forms/PasswordInput.vue'
|
|
||||||
import Alert from '~/components/ui/Alert.vue'
|
import Alert from '~/components/ui/Alert.vue'
|
||||||
import Input from '~/components/ui/Input.vue'
|
import Input from '~/components/ui/Input.vue'
|
||||||
import Button from '~/components/ui/Button.vue'
|
import Button from '~/components/ui/Button.vue'
|
||||||
|
@ -140,7 +139,7 @@ const submit = async () => {
|
||||||
{{ t('components.auth.LoginForm.link.resetPassword') }}
|
{{ t('components.auth.LoginForm.link.resetPassword') }}
|
||||||
</router-link>
|
</router-link>
|
||||||
</label>
|
</label>
|
||||||
<password-input
|
<Input password
|
||||||
v-model="credentials.password"
|
v-model="credentials.password"
|
||||||
field-id="password-field"
|
field-id="password-field"
|
||||||
required
|
required
|
||||||
|
|
|
@ -9,7 +9,6 @@ import { useStore } from '~/store'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
|
|
||||||
import LoginForm from '~/components/auth/LoginForm.vue'
|
import LoginForm from '~/components/auth/LoginForm.vue'
|
||||||
import PasswordInput from '~/components/forms/PasswordInput.vue'
|
|
||||||
import Alert from '~/components/ui/Alert.vue'
|
import Alert from '~/components/ui/Alert.vue'
|
||||||
import Input from '~/components/ui/Input.vue'
|
import Input from '~/components/ui/Input.vue'
|
||||||
import Textarea from '~/components/ui/Textarea.vue'
|
import Textarea from '~/components/ui/Textarea.vue'
|
||||||
|
@ -148,9 +147,9 @@ fetchInstanceSettings()
|
||||||
</ul>
|
</ul>
|
||||||
</Alert>
|
</Alert>
|
||||||
<div class="required field">
|
<div class="required field">
|
||||||
<label for="username-field">{{ t('components.auth.SignupForm.label.username') }}</label>
|
|
||||||
<Input
|
<Input
|
||||||
id="username-field"
|
id="username-field"
|
||||||
|
label = "t('components.auth.SignupForm.label.username')"
|
||||||
ref="username"
|
ref="username"
|
||||||
v-model="payload.username"
|
v-model="payload.username"
|
||||||
name="username"
|
name="username"
|
||||||
|
@ -161,8 +160,8 @@ fetchInstanceSettings()
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="required field">
|
<div class="required field">
|
||||||
<label for="email-field">{{ t('components.auth.SignupForm.label.email') }}</label>
|
|
||||||
<Input
|
<Input
|
||||||
|
label="t('components.auth.SignupForm.label.email')"
|
||||||
id="email-field"
|
id="email-field"
|
||||||
ref="email"
|
ref="email"
|
||||||
v-model="payload.email"
|
v-model="payload.email"
|
||||||
|
@ -173,8 +172,8 @@ fetchInstanceSettings()
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="required field">
|
<div class="required field">
|
||||||
<label for="password-field">{{ t('components.auth.SignupForm.label.password') }}</label>
|
<Input password
|
||||||
<password-input
|
label="t('components.auth.SignupForm.label.password')"
|
||||||
v-model="payload.password1"
|
v-model="payload.password1"
|
||||||
field-id="password-field"
|
field-id="password-field"
|
||||||
/>
|
/>
|
||||||
|
@ -183,8 +182,8 @@ fetchInstanceSettings()
|
||||||
v-if="!store.state.instance.settings.users.registration_enabled.value"
|
v-if="!store.state.instance.settings.users.registration_enabled.value"
|
||||||
class="required field"
|
class="required field"
|
||||||
>
|
>
|
||||||
<label for="invitation-code">{{ t('components.auth.SignupForm.label.invitation') }}</label>
|
|
||||||
<Input
|
<Input
|
||||||
|
label="t('components.auth.SignupForm.label.invitation')"
|
||||||
id="invitation-code"
|
id="invitation-code"
|
||||||
v-model="payload.invitation"
|
v-model="payload.invitation"
|
||||||
required
|
required
|
||||||
|
@ -199,8 +198,8 @@ fetchInstanceSettings()
|
||||||
:key="idx"
|
:key="idx"
|
||||||
:class="[{required: field.required}, 'field']"
|
:class="[{required: field.required}, 'field']"
|
||||||
>
|
>
|
||||||
<label :for="`custom-field-${idx}`">{{ field.label }}</label>
|
|
||||||
<Textarea
|
<Textarea
|
||||||
|
label="field.label"
|
||||||
v-if="field.input_type === 'long_text'"
|
v-if="field.input_type === 'long_text'"
|
||||||
:id="`custom-field-${idx}`"
|
:id="`custom-field-${idx}`"
|
||||||
v-model="payload.request_fields[field.label]"
|
v-model="payload.request_fields[field.label]"
|
||||||
|
@ -210,6 +209,7 @@ fetchInstanceSettings()
|
||||||
<Input
|
<Input
|
||||||
v-else
|
v-else
|
||||||
:id="`custom-field-${idx}`"
|
:id="`custom-field-${idx}`"
|
||||||
|
label="field.label"
|
||||||
v-model="payload.request_fields[field.label]"
|
v-model="payload.request_fields[field.label]"
|
||||||
type="text"
|
type="text"
|
||||||
:required="field.required"
|
:required="field.required"
|
||||||
|
|
|
@ -80,8 +80,8 @@ onMounted(() => emailInput.value.focus())
|
||||||
{{ t('views.auth.PasswordReset.help.form') }}
|
{{ t('views.auth.PasswordReset.help.form') }}
|
||||||
</p>
|
</p>
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label for="account-email">{{ t('views.auth.PasswordReset.label.email') }}</label>
|
|
||||||
<Input
|
<Input
|
||||||
|
label="t('views.auth.PasswordReset.label.email')"
|
||||||
id="account-email"
|
id="account-email"
|
||||||
ref="emailInput"
|
ref="emailInput"
|
||||||
v-model="email"
|
v-model="email"
|
||||||
|
|
|
@ -6,7 +6,6 @@ import { computed, ref } from 'vue'
|
||||||
|
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
|
|
||||||
import PasswordInput from '~/components/forms/PasswordInput.vue'
|
|
||||||
import Alert from '~/components/ui/Alert.vue'
|
import Alert from '~/components/ui/Alert.vue'
|
||||||
import Button from '~/components/ui/Button.vue'
|
import Button from '~/components/ui/Button.vue'
|
||||||
|
|
||||||
|
@ -81,10 +80,9 @@ const submit = async () => {
|
||||||
</Alert>
|
</Alert>
|
||||||
<template v-if="token && uid">
|
<template v-if="token && uid">
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label for="password-field">{{ t('views.auth.PasswordResetConfirm.label.newPassword') }}</label>
|
<Input password
|
||||||
<password-input
|
label = "t('views.auth.PasswordResetConfirm.label.newPassword')"
|
||||||
v-model="newPassword"
|
v-model="newPassword"
|
||||||
field-id="password-field"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<router-link :to="{path: '/login'}">
|
<router-link :to="{path: '/login'}">
|
||||||
|
|
Loading…
Reference in New Issue