lint + fixes for registration
This commit is contained in:
parent
3799983d4f
commit
5bbc0e0bb5
@ -11,7 +11,7 @@
|
|||||||
</label>
|
</label>
|
||||||
<Checkbox
|
<Checkbox
|
||||||
v-if="typeof fallback !== 'undefined' && showOptionalTickbox"
|
v-if="typeof fallback !== 'undefined' && showOptionalTickbox"
|
||||||
:modelValue="present"
|
:model-value="present"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
class="opt"
|
class="opt"
|
||||||
@update:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
|
@update:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
|
||||||
|
@ -112,7 +112,10 @@
|
|||||||
</span>
|
</span>
|
||||||
<span v-if="notification.type === 'pleroma:emoji_reaction'">
|
<span v-if="notification.type === 'pleroma:emoji_reaction'">
|
||||||
<small>
|
<small>
|
||||||
<i18n-t scope="global" keypath="notifications.reacted_with">
|
<i18n-t
|
||||||
|
scope="global"
|
||||||
|
keypath="notifications.reacted_with"
|
||||||
|
>
|
||||||
<span class="emoji-reaction-emoji">{{ notification.emoji }}</span>
|
<span class="emoji-reaction-emoji">{{ notification.emoji }}</span>
|
||||||
</i18n-t>
|
</i18n-t>
|
||||||
</small>
|
</small>
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
</label>
|
</label>
|
||||||
<Checkbox
|
<Checkbox
|
||||||
v-if="typeof fallback !== 'undefined'"
|
v-if="typeof fallback !== 'undefined'"
|
||||||
:modelValue="present"
|
:model-value="present"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
class="opt"
|
class="opt"
|
||||||
@update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)"
|
@update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)"
|
||||||
|
@ -71,7 +71,10 @@
|
|||||||
{{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }} ·
|
{{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }} ·
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<i18n-t scope="global" :keypath="expired ? 'polls.expired' : 'polls.expires_in'">
|
<i18n-t
|
||||||
|
scope="global"
|
||||||
|
:keypath="expired ? 'polls.expired' : 'polls.expires_in'"
|
||||||
|
>
|
||||||
<Timeago
|
<Timeago
|
||||||
:time="expiresAt"
|
:time="expiresAt"
|
||||||
:auto-update="60"
|
:auto-update="60"
|
||||||
|
@ -24,7 +24,7 @@ const registration = {
|
|||||||
password: { required },
|
password: { required },
|
||||||
confirm: {
|
confirm: {
|
||||||
required,
|
required,
|
||||||
sameAsPassword: sameAs('password')
|
sameAs: sameAs(this.password)
|
||||||
},
|
},
|
||||||
reason: { required: requiredIf(() => this.accountApprovalRequired) }
|
reason: { required: requiredIf(() => this.accountApprovalRequired) }
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<div class="text-fields">
|
<div class="text-fields">
|
||||||
<div
|
<div
|
||||||
class="form-group"
|
class="form-group"
|
||||||
:class="{ 'form-group--error': $v.user.username.$error }"
|
:class="{ 'form-group--error': v$.user.username.$error }"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
class="form--label"
|
class="form--label"
|
||||||
@ -20,18 +20,18 @@
|
|||||||
>{{ $t('login.username') }}</label>
|
>{{ $t('login.username') }}</label>
|
||||||
<input
|
<input
|
||||||
id="sign-up-username"
|
id="sign-up-username"
|
||||||
v-model.trim="$v.user.username.$model"
|
v-model.trim="v$.user.username.$model"
|
||||||
:disabled="isPending"
|
:disabled="isPending"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
:placeholder="$t('registration.username_placeholder')"
|
:placeholder="$t('registration.username_placeholder')"
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="$v.user.username.$dirty"
|
v-if="v$.user.username.$dirty"
|
||||||
class="form-error"
|
class="form-error"
|
||||||
>
|
>
|
||||||
<ul>
|
<ul>
|
||||||
<li v-if="!$v.user.username.required">
|
<li v-if="!v$.user.username.required">
|
||||||
<span>{{ $t('registration.validations.username_required') }}</span>
|
<span>{{ $t('registration.validations.username_required') }}</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
<div
|
<div
|
||||||
class="form-group"
|
class="form-group"
|
||||||
:class="{ 'form-group--error': $v.user.fullname.$error }"
|
:class="{ 'form-group--error': v$.user.fullname.$error }"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
class="form--label"
|
class="form--label"
|
||||||
@ -47,18 +47,18 @@
|
|||||||
>{{ $t('registration.fullname') }}</label>
|
>{{ $t('registration.fullname') }}</label>
|
||||||
<input
|
<input
|
||||||
id="sign-up-fullname"
|
id="sign-up-fullname"
|
||||||
v-model.trim="$v.user.fullname.$model"
|
v-model.trim="v$.user.fullname.$model"
|
||||||
:disabled="isPending"
|
:disabled="isPending"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
:placeholder="$t('registration.fullname_placeholder')"
|
:placeholder="$t('registration.fullname_placeholder')"
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="$v.user.fullname.$dirty"
|
v-if="v$.user.fullname.$dirty"
|
||||||
class="form-error"
|
class="form-error"
|
||||||
>
|
>
|
||||||
<ul>
|
<ul>
|
||||||
<li v-if="!$v.user.fullname.required">
|
<li v-if="!v$.user.fullname.required">
|
||||||
<span>{{ $t('registration.validations.fullname_required') }}</span>
|
<span>{{ $t('registration.validations.fullname_required') }}</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@ -66,7 +66,7 @@
|
|||||||
|
|
||||||
<div
|
<div
|
||||||
class="form-group"
|
class="form-group"
|
||||||
:class="{ 'form-group--error': $v.user.email.$error }"
|
:class="{ 'form-group--error': v$.user.email.$error }"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
class="form--label"
|
class="form--label"
|
||||||
@ -74,18 +74,18 @@
|
|||||||
>{{ $t('registration.email') }}</label>
|
>{{ $t('registration.email') }}</label>
|
||||||
<input
|
<input
|
||||||
id="email"
|
id="email"
|
||||||
v-model="$v.user.email.$model"
|
v-model="v$.user.email.$model"
|
||||||
:disabled="isPending"
|
:disabled="isPending"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
type="email"
|
type="email"
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="$v.user.email.$dirty"
|
v-if="v$.user.email.$dirty"
|
||||||
class="form-error"
|
class="form-error"
|
||||||
>
|
>
|
||||||
<ul>
|
<ul>
|
||||||
<li v-if="!$v.user.email.required">
|
<li v-if="!v$.user.email.required">
|
||||||
<span>{{ $t('registration.validations.email_required') }}</span>
|
<span>{{ $t('registration.validations.email_required') }}</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@ -107,7 +107,7 @@
|
|||||||
|
|
||||||
<div
|
<div
|
||||||
class="form-group"
|
class="form-group"
|
||||||
:class="{ 'form-group--error': $v.user.password.$error }"
|
:class="{ 'form-group--error': v$.user.password.$error }"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
class="form--label"
|
class="form--label"
|
||||||
@ -122,11 +122,11 @@
|
|||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="$v.user.password.$dirty"
|
v-if="v$.user.password.$dirty"
|
||||||
class="form-error"
|
class="form-error"
|
||||||
>
|
>
|
||||||
<ul>
|
<ul>
|
||||||
<li v-if="!$v.user.password.required">
|
<li v-if="!v$.user.password.required">
|
||||||
<span>{{ $t('registration.validations.password_required') }}</span>
|
<span>{{ $t('registration.validations.password_required') }}</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@ -134,7 +134,7 @@
|
|||||||
|
|
||||||
<div
|
<div
|
||||||
class="form-group"
|
class="form-group"
|
||||||
:class="{ 'form-group--error': $v.user.confirm.$error }"
|
:class="{ 'form-group--error': v$.user.confirm.$error }"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
class="form--label"
|
class="form--label"
|
||||||
@ -149,14 +149,14 @@
|
|||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="$v.user.confirm.$dirty"
|
v-if="v$.user.confirm.$dirty"
|
||||||
class="form-error"
|
class="form-error"
|
||||||
>
|
>
|
||||||
<ul>
|
<ul>
|
||||||
<li v-if="!$v.user.confirm.required">
|
<li v-if="!v$.user.confirm.required">
|
||||||
<span>{{ $t('registration.validations.password_confirmation_required') }}</span>
|
<span>{{ $t('registration.validations.password_confirmation_required') }}</span>
|
||||||
</li>
|
</li>
|
||||||
<li v-if="!$v.user.confirm.sameAsPassword">
|
<li v-if="!v$.user.confirm.sameAsPassword">
|
||||||
<span>{{ $t('registration.validations.password_confirmation_match') }}</span>
|
<span>{{ $t('registration.validations.password_confirmation_match') }}</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
>
|
>
|
||||||
<div class="selectable-list-checkbox-wrapper">
|
<div class="selectable-list-checkbox-wrapper">
|
||||||
<Checkbox
|
<Checkbox
|
||||||
:modelValue="allSelected"
|
:model-value="allSelected"
|
||||||
:indeterminate="someSelected"
|
:indeterminate="someSelected"
|
||||||
@change="toggleAll"
|
@change="toggleAll"
|
||||||
>
|
>
|
||||||
@ -31,7 +31,7 @@
|
|||||||
>
|
>
|
||||||
<div class="selectable-list-checkbox-wrapper">
|
<div class="selectable-list-checkbox-wrapper">
|
||||||
<Checkbox
|
<Checkbox
|
||||||
:modelValue="isSelected(item)"
|
:model-value="isSelected(item)"
|
||||||
@change="checked => toggle(checked, item)"
|
@change="checked => toggle(checked, item)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
class="BooleanSetting"
|
class="BooleanSetting"
|
||||||
>
|
>
|
||||||
<Checkbox
|
<Checkbox
|
||||||
:modelValue="state"
|
:model-value="state"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
@update:modelValue="update"
|
@update:modelValue="update"
|
||||||
>
|
>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<slot />
|
<slot />
|
||||||
{{ ' ' }}
|
{{ ' ' }}
|
||||||
<Select
|
<Select
|
||||||
:modelValue="state"
|
:model-value="state"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
@update:modelValue="update"
|
@update:modelValue="update"
|
||||||
>
|
>
|
||||||
|
@ -110,12 +110,15 @@
|
|||||||
</template>
|
</template>
|
||||||
</Popover>
|
</Popover>
|
||||||
|
|
||||||
<Checkbox :modelValue="!!expertLevel" @update:modelValue="expertLevel = Number($event)">
|
<Checkbox
|
||||||
|
:model-value="!!expertLevel"
|
||||||
|
@update:modelValue="expertLevel = Number($event)"
|
||||||
|
>
|
||||||
{{ $t("settings.expert_mode") }}
|
{{ $t("settings.expert_mode") }}
|
||||||
</Checkbox>
|
</Checkbox>
|
||||||
<span
|
<span
|
||||||
class="extra-content"
|
|
||||||
id="unscrolled-content"
|
id="unscrolled-content"
|
||||||
|
class="extra-content"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -184,8 +184,8 @@
|
|||||||
<button
|
<button
|
||||||
v-if="!isDefaultBackground"
|
v-if="!isDefaultBackground"
|
||||||
class="button-unstyled"
|
class="button-unstyled"
|
||||||
@click="resetBackground"
|
|
||||||
:title="$t('settings.reset_profile_background')"
|
:title="$t('settings.reset_profile_background')"
|
||||||
|
@click="resetBackground"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
class="reset-button"
|
class="reset-button"
|
||||||
|
@ -75,8 +75,8 @@
|
|||||||
class="thread-tree-replies thread-tree-replies-hidden"
|
class="thread-tree-replies thread-tree-replies-hidden"
|
||||||
>
|
>
|
||||||
<i18n-t
|
<i18n-t
|
||||||
scope="global"
|
|
||||||
v-if="simple"
|
v-if="simple"
|
||||||
|
scope="global"
|
||||||
tag="button"
|
tag="button"
|
||||||
keypath="status.thread_follow_with_icon"
|
keypath="status.thread_follow_with_icon"
|
||||||
class="button-unstyled -link thread-tree-show-replies-button"
|
class="button-unstyled -link thread-tree-show-replies-button"
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
:statusoid="item"
|
:statusoid="item"
|
||||||
/>
|
/>
|
||||||
<Checkbox
|
<Checkbox
|
||||||
:modelValue="isChecked(item.id)"
|
:model-value="isChecked(item.id)"
|
||||||
@change="checked => toggleStatus(checked, item.id)"
|
@change="checked => toggleStatus(checked, item.id)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user