moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'vue3-again' into vue3-no-compat 

* vue3-again:
  lint + fixes for registration
  fix production build's reply not working in tree mode
  lock down version?
  manual lint
  Revert "fix weird thing i somehow missed"
  Revert "lint"
  fix weird thing i somehow missed
  lint
This commit is contained in:
Henry Jameson 2022-03-29 15:35:47 +03:00
parent dc8bef7928 5bbc0e0bb5
commit 3e0bb91ff2
20 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -34,7 +34,7 @@
"punycode.js": "2.1.0", "punycode.js": "2.1.0",
"ruffle-mirror": "2021.12.31", "ruffle-mirror": "2021.12.31",
"click-outside-vue3": "4.0.1", "click-outside-vue3": "4.0.1",
"vue": "^3.1.0", "vue": "^3.2.31",
"vue-i18n": "9.1.9", "vue-i18n": "9.1.9",
"vue-router": "4.0.14", "vue-router": "4.0.14",
"vue-template-compiler": "2.6.11", "vue-template-compiler": "2.6.11",

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

@ -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)"

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

@ -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>

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

@ -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)"

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; {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;·&nbsp;
</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"

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

@ -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) }
} }

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

@ -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>

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

@ -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>

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

@ -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"
> >

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

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

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

@ -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>

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

@ -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"

9
src/components/settings_modal/tabs/theme_tab/theme_tab.vue
View File

@ -951,14 +951,16 @@
:fallback="currentShadowFallback" :fallback="currentShadowFallback"
/> />
<div v-if="shadowSelected === 'avatar' || shadowSelected === 'avatarStatus'"> <div v-if="shadowSelected === 'avatar' || shadowSelected === 'avatarStatus'">
<i18n-t scope="global" <i18n-t
scope="global"
keypath="settings.style.shadows.filter_hint.always_drop_shadow" keypath="settings.style.shadows.filter_hint.always_drop_shadow"
tag="p" tag="p"
> >
<code>filter: drop-shadow()</code> <code>filter: drop-shadow()</code>
</i18n-t> </i18n-t>
<p>{{ $t('settings.style.shadows.filter_hint.avatar_inset') }}</p> <p>{{ $t('settings.style.shadows.filter_hint.avatar_inset') }}</p>
<i18n-t scope="global" <i18n-t
scope="global"
keypath="settings.style.shadows.filter_hint.drop_shadow_syntax" keypath="settings.style.shadows.filter_hint.drop_shadow_syntax"
tag="p" tag="p"
> >
@ -966,7 +968,8 @@
<code>spread-radius</code> <code>spread-radius</code>
<code>inset</code> <code>inset</code>
</i18n-t> </i18n-t>
<i18n-t scope="global" <i18n-t
scope="global"
keypath="settings.style.shadows.filter_hint.inset_classic" keypath="settings.style.shadows.filter_hint.inset_classic"
tag="p" tag="p"
> >

3
src/components/shadow_control/shadow_control.vue
View File

@ -204,7 +204,8 @@
v-model="selected.alpha" v-model="selected.alpha"
:disabled="!present" :disabled="!present"
/> />
<i18n-t scope="global" <i18n-t
scope="global"
keypath="settings.style.shadows.hintV3" keypath="settings.style.shadows.hintV3"
tag="p" tag="p"
> >

2
src/components/status/status.js
View File

@ -69,7 +69,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
const controlledName = `controlled${camelized}` const controlledName = `controlled${camelized}`
const uncontrolledName = `uncontrolled${camelized}` const uncontrolledName = `uncontrolled${camelized}`
res[name] = function () { res[name] = function () {
return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName] return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName]
} }
return res return res
}, {}) }, {})

2
src/components/status_content/status_content.js
View File

@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
const controlledName = `controlled${camelized}` const controlledName = `controlled${camelized}`
const uncontrolledName = `uncontrolled${camelized}` const uncontrolledName = `uncontrolled${camelized}`
res[name] = function () { res[name] = function () {
return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName] return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName]
} }
return res return res
}, {}) }, {})

6
src/components/thread_tree/thread_tree.vue
View File

@ -74,8 +74,9 @@
v-if="currentReplies.length && !threadShowing" v-if="currentReplies.length && !threadShowing"
class="thread-tree-replies thread-tree-replies-hidden" class="thread-tree-replies thread-tree-replies-hidden"
> >
<i18n-t scope="global" <i18n-t
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"
@ -92,8 +93,9 @@
</span> </span>
</template> </template>
</i18n-t> </i18n-t>
<i18n-t scope="global" <i18n-t
v-else v-else
scope="global"
tag="button" tag="button"
keypath="status.thread_show_full_with_icon" keypath="status.thread_show_full_with_icon"
class="button-unstyled -link thread-tree-show-replies-button" class="button-unstyled -link thread-tree-show-replies-button"

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

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

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

@ -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>

2
yarn.lock
View File

@ -9962,7 +9962,7 @@ vue-template-compiler@2.6.11:
de-indent "^1.0.2" de-indent "^1.0.2"
he "^1.1.0" he "^1.1.0"
vue@^3.1.0: vue@^3.2.31:
version "3.2.31" version "3.2.31"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.31.tgz#e0c49924335e9f188352816788a4cca10f817ce6" resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.31.tgz#e0c49924335e9f188352816788a4cca10f817ce6"
integrity sha512-odT3W2tcffTiQCy57nOT93INw1auq5lYLLYtWpPYQQYQOOdHiqFct9Xhna6GJ+pJQaF67yZABraH47oywkJgFw== integrity sha512-odT3W2tcffTiQCy57nOT93INw1auq5lYLLYtWpPYQQYQOOdHiqFct9Xhna6GJ+pJQaF67yZABraH47oywkJgFw==