Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

lint + fixes for registration

Browse source
This commit is contained in:
Henry Jameson 2022-03-29 15:35:18 +03:00
parent 3799983d4f
commit 5bbc0e0bb5
14 changed files with 43 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/color_input/color_input.vue
View file

@ -11,7 +11,7 @@
</label>
<Checkbox
v-if="typeof fallback !== 'undefined' && showOptionalTickbox"
:modelValue="present"
:model-value="present"
:disabled="disabled"
class="opt"
@update:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"

5
src/components/notification/notification.vue
View file

@ -112,7 +112,10 @@
</span>
<span v-if="notification.type === 'pleroma:emoji_reaction'">
<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>
</i18n-t>
</small>

2
src/components/opacity_input/opacity_input.vue
View file

@ -11,7 +11,7 @@
</label>
<Checkbox
v-if="typeof fallback !== 'undefined'"
:modelValue="present"
:model-value="present"
:disabled="disabled"
class="opt"
@update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)"

5
src/components/poll/poll.vue
View file

@ -71,7 +71,10 @@
{{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;·&nbsp;
</template>
</div>
<i18n-t scope="global" :keypath="expired ? 'polls.expired' : 'polls.expires_in'">
<i18n-t
scope="global"
:keypath="expired ? 'polls.expired' : 'polls.expires_in'"
>
<Timeago
:time="expiresAt"
:auto-update="60"

2
src/components/registration/registration.js
View file

@ -24,7 +24,7 @@ const registration = {
password: { required },
confirm: {
required,
sameAsPassword: sameAs('password')
sameAs: sameAs(this.password)
},
reason: { required: requiredIf(() => this.accountApprovalRequired) }
}

38
src/components/registration/registration.vue
View file

@ -12,7 +12,7 @@
<div class="text-fields">
<div
class="form-group"
:class="{ 'form-group--error': $v.user.username.$error }"
:class="{ 'form-group--error': v$.user.username.$error }"
>
<label
class="form--label"
@ -20,18 +20,18 @@
>{{ $t('login.username') }}</label>
<input
id="sign-up-username"
v-model.trim="$v.user.username.$model"
v-model.trim="v$.user.username.$model"
:disabled="isPending"
class="form-control"
:placeholder="$t('registration.username_placeholder')"
>
</div>
<div
v-if="$v.user.username.$dirty"
v-if="v$.user.username.$dirty"
class="form-error"
>
<ul>
<li v-if="!$v.user.username.required">
<li v-if="!v$.user.username.required">
<span>{{ $t('registration.validations.username_required') }}</span>
</li>
</ul>
@ -39,7 +39,7 @@
<div
class="form-group"
:class="{ 'form-group--error': $v.user.fullname.$error }"
:class="{ 'form-group--error': v$.user.fullname.$error }"
>
<label
class="form--label"
@ -47,18 +47,18 @@
>{{ $t('registration.fullname') }}</label>
<input
id="sign-up-fullname"
v-model.trim="$v.user.fullname.$model"
v-model.trim="v$.user.fullname.$model"
:disabled="isPending"
class="form-control"
:placeholder="$t('registration.fullname_placeholder')"
>
</div>
<div
v-if="$v.user.fullname.$dirty"
v-if="v$.user.fullname.$dirty"
class="form-error"
>
<ul>
<li v-if="!$v.user.fullname.required">
<li v-if="!v$.user.fullname.required">
<span>{{ $t('registration.validations.fullname_required') }}</span>
</li>
</ul>
@ -66,7 +66,7 @@
<div
class="form-group"
:class="{ 'form-group--error': $v.user.email.$error }"
:class="{ 'form-group--error': v$.user.email.$error }"
>
<label
class="form--label"
@ -74,18 +74,18 @@
>{{ $t('registration.email') }}</label>
<input
id="email"
v-model="$v.user.email.$model"
v-model="v$.user.email.$model"
:disabled="isPending"
class="form-control"
type="email"
>
</div>
<div
v-if="$v.user.email.$dirty"
v-if="v$.user.email.$dirty"
class="form-error"
>
<ul>
<li v-if="!$v.user.email.required">
<li v-if="!v$.user.email.required">
<span>{{ $t('registration.validations.email_required') }}</span>
</li>
</ul>
@ -107,7 +107,7 @@
<div
class="form-group"
:class="{ 'form-group--error': $v.user.password.$error }"
:class="{ 'form-group--error': v$.user.password.$error }"
>
<label
class="form--label"
@ -122,11 +122,11 @@
>
</div>
<div
v-if="$v.user.password.$dirty"
v-if="v$.user.password.$dirty"
class="form-error"
>
<ul>
<li v-if="!$v.user.password.required">
<li v-if="!v$.user.password.required">
<span>{{ $t('registration.validations.password_required') }}</span>
</li>
</ul>
@ -134,7 +134,7 @@
<div
class="form-group"
:class="{ 'form-group--error': $v.user.confirm.$error }"
:class="{ 'form-group--error': v$.user.confirm.$error }"
>
<label
class="form--label"
@ -149,14 +149,14 @@
>
</div>
<div
v-if="$v.user.confirm.$dirty"
v-if="v$.user.confirm.$dirty"
class="form-error"
>
<ul>
<li v-if="!$v.user.confirm.required">
<li v-if="!v$.user.confirm.required">
<span>{{ $t('registration.validations.password_confirmation_required') }}</span>
</li>
<li v-if="!$v.user.confirm.sameAsPassword">
<li v-if="!v$.user.confirm.sameAsPassword">
<span>{{ $t('registration.validations.password_confirmation_match') }}</span>
</li>
</ul>

4
src/components/selectable_list/selectable_list.vue
View file

@ -6,7 +6,7 @@
>
<div class="selectable-list-checkbox-wrapper">
<Checkbox
:modelValue="allSelected"
:model-value="allSelected"
:indeterminate="someSelected"
@change="toggleAll"
>
@ -31,7 +31,7 @@
>
<div class="selectable-list-checkbox-wrapper">
<Checkbox
:modelValue="isSelected(item)"
:model-value="isSelected(item)"
@change="checked => toggle(checked, item)"
/>
</div>

2
src/components/settings_modal/helpers/boolean_setting.vue
View file

@ -4,7 +4,7 @@
class="BooleanSetting"
>
<Checkbox
:modelValue="state"
:model-value="state"
:disabled="disabled"
@update:modelValue="update"
>

2
src/components/settings_modal/helpers/choice_setting.vue
View file

@ -6,7 +6,7 @@
<slot />
{{ ' ' }}
<Select
:modelValue="state"
:model-value="state"
:disabled="disabled"
@update:modelValue="update"
>

7
src/components/settings_modal/settings_modal.vue
View file

@ -110,12 +110,15 @@
</template>
</Popover>
<Checkbox :modelValue="!!expertLevel" @update:modelValue="expertLevel = Number($event)">
<Checkbox
:model-value="!!expertLevel"
@update:modelValue="expertLevel = Number($event)"
>
{{ $t("settings.expert_mode") }}
</Checkbox>
<span
class="extra-content"
id="unscrolled-content"
class="extra-content"
/>
</div>
</div>

2
src/components/settings_modal/tabs/profile_tab.vue
View file

@ -184,8 +184,8 @@
<button
v-if="!isDefaultBackground"
class="button-unstyled"
@click="resetBackground"
:title="$t('settings.reset_profile_background')"
@click="resetBackground"
>
<FAIcon
class="reset-button"

2
src/components/thread_tree/thread_tree.vue
View file

@ -75,8 +75,8 @@
class="thread-tree-replies thread-tree-replies-hidden"
>
<i18n-t
scope="global"
v-if="simple"
scope="global"
tag="button"
keypath="status.thread_follow_with_icon"
class="button-unstyled -link thread-tree-show-replies-button"

2
src/components/user_avatar/user_avatar.vue
View file

@ -2,7 +2,7 @@
<span
class="Avatar"
:class="{ '-compact': compact }"
>
>
<StillImage
v-if="user"
class="avatar"

2
src/components/user_reporting_modal/user_reporting_modal.vue
View file

@ -53,7 +53,7 @@
:statusoid="item"
/>
<Checkbox
:modelValue="isChecked(item.id)"
:model-value="isChecked(item.id)"
@change="checked => toggleStatus(checked, item.id)"
/>
</div>