logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://anongit.hacktivis.me/git/pleroma-fe.git/
commit: b0a0560dbd26386b34c0a38c9c48a6025c43ff3d
parent e1c614994197e106127125862685e8c179806059
Author: Henry Jameson <me@hjkos.com>
Date:   Mon, 20 Jan 2025 16:22:41 +0200

lint

Diffstat:

Msrc/components/confirm_modal/mute_confirm.vue7+++++--
Msrc/components/moderation_tools/moderation_tools.vue4++--
Msrc/components/post_status_form/post_status_form.vue2+-
Msrc/components/quick_filter_settings/quick_filter_settings.vue12+++++++++---
Msrc/components/settings_modal/admin_tabs/frontends_tab.vue2+-
Msrc/components/status_action_buttons/action_button.vue16+++++++++-------
Msrc/components/status_action_buttons/action_button_container.vue33+++++++++++++++++++++------------
Msrc/components/status_action_buttons/status_action_buttons.vue8++++----
Msrc/components/timeline/timeline.vue2+-
Msrc/components/user_card/user_card.vue4++--
10 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/components/confirm_modal/mute_confirm.vue b/src/components/confirm_modal/mute_confirm.vue @@ -18,7 +18,10 @@ <span v-text="user.screen_name_ui" /> </template> </i18n-t> - <div class="mute-expiry" v-if="type !== 'domain'"> + <div + v-if="type !== 'domain'" + class="mute-expiry" + > <p> <label> {{ $t('user_card.mute_duration_prompt') }} @@ -39,7 +42,7 @@ v-for="unit in muteExpiryUnits" :key="unit" :value="unit" - > + > {{ $t(`time.unit.${unit}_short`, ['']) }} </option> </Select> diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue @@ -64,11 +64,11 @@ <button class="main-button" @click="toggleTag(tags.FORCE_NSFW)" - > + > <span class="input menu-checkbox" :class="{ 'menu-checkbox-checked': hasTag(tags.FORCE_NSFW) }" - /> + /> {{ $t('user_card.admin_menu.force_nsfw') }} </button> </div> diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue @@ -335,8 +335,8 @@ role="menu" > <button - class="menu-item dropdown-item" v-if="!hideDraft || !disableDraft" + class="menu-item dropdown-item" role="menu" :disabled="!safeToSaveDraft && saveable" :class="{ disabled: !safeToSaveDraft }" diff --git a/src/components/quick_filter_settings/quick_filter_settings.vue b/src/components/quick_filter_settings/quick_filter_settings.vue @@ -132,16 +132,22 @@ role="menuitem" @click="openTab('filtering')" > - <FAIcon fixed-width icon="font" />{{ $t('settings.word_filter_and_more') }} + <FAIcon + fixed-width + icon="font" + />{{ $t('settings.word_filter_and_more') }} </button> </div> </div> </template> <template #trigger> <div :class="mobileLayout ? 'main-button' : ''"> - <FAIcon icon="filter" :fixed-width="nested"/> + <FAIcon + icon="filter" + :fixed-width="nested" + /> <template v-if="nested"> - {{$t('timeline.filter_settings')}} + {{ $t('timeline.filter_settings') }} </template> <FAIcon v-if="nested" diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue @@ -182,9 +182,9 @@ <template #content="{close}"> <div class="dropdown-menu"> <div - class="menu-item dropdown-item" v-for="ref in frontend.installedRefs || frontend.refs" :key="ref" + class="menu-item dropdown-item" > <button class="main-button" diff --git a/src/components/status_action_buttons/action_button.vue b/src/components/status_action_buttons/action_button.vue @@ -67,13 +67,12 @@ <span v-if="!extra && button.name === 'bookmark'" class="separator" - > - </span> + /> <Popover + v-if="button.name === 'bookmark'" trigger="hover" :placement="extra ? 'right' : 'top'" :trigger-attrs="{ class: 'extra-button' }" - v-if="button.name === 'bookmark'" > <template #trigger> <FAIcon @@ -84,13 +83,16 @@ /> </template> <template #content> - <StatusBookmarkFolderMenu v-if="button.name === 'bookmark'" :status="status" /> + <StatusBookmarkFolderMenu + v-if="button.name === 'bookmark'" + :status="status" + /> </template> </Popover> <EmojiPicker - ref="picker" v-if="button.name === 'emoji'" + ref="picker" :enable-sticker-picker="false" :hide-custom-emoji="hideCustomEmoji" class="emoji-picker-panel" @@ -99,6 +101,6 @@ </div> </template> -<script src="./action_button.js"/> +<script src="./action_button.js" /> -<style lang="scss" src="./action_button.scss"/> +<style lang="scss" src="./action_button.scss" /> diff --git a/src/components/status_action_buttons/action_button_container.vue b/src/components/status_action_buttons/action_button_container.vue @@ -1,9 +1,9 @@ <template> <div> <Popover + v-if="button.dropdown?.()" trigger="hover" :placement="$attrs.extra ? 'right' : 'top'" - v-if="button.dropdown?.()" > <template #trigger> <ActionButton @@ -15,8 +15,8 @@ <template #content> <div v-if="button.name === 'mute'" - class="dropdown-menu" :id="`popup-menu-${randomSeed}`" + class="dropdown-menu" role="menu" > <div class="menu-item dropdown-item extra-action -icon"> @@ -24,7 +24,10 @@ class="main-button" @click="toggleUserMute" > - <FAIcon icon="user" fixed-width /> + <FAIcon + icon="user" + fixed-width + /> <template v-if="userIsMuted"> {{ $t('status.unmute_user') }} </template> @@ -38,7 +41,10 @@ class="main-button" @click="toggleUserMute" > - <FAIcon icon="folder-tree" fixed-width /> + <FAIcon + icon="folder-tree" + fixed-width + /> <template v-if="threadIsMuted"> {{ $t('status.unmute_conversation') }} </template> @@ -52,7 +58,10 @@ class="main-button" @click="toggleDomainMute" > - <FAIcon icon="globe" fixed-width /> + <FAIcon + icon="globe" + fixed-width + /> <template v-if="domainIsMuted"> {{ $t('status.unmute_domain') }} </template> @@ -72,22 +81,22 @@ /> <teleport to="#modal"> <mute-confirm - type="conversation" - :status="this.status" ref="confirmConversation" + type="conversation" + :status="status" /> <mute-confirm - type="domain" - :user="this.user" ref="confirmDomain" + type="domain" + :user="user" /> <mute-confirm - type="user" - :user="this.user" ref="confirmUser" + type="user" + :user="user" /> </teleport> </div> </template> -<script src="./action_button_container.js"/> +<script src="./action_button_container.js" /> diff --git a/src/components/status_action_buttons/status_action_buttons.vue b/src/components/status_action_buttons/status_action_buttons.vue @@ -2,17 +2,17 @@ <div class="StatusActionButtons"> <span class="quick-action-buttons"> <span - class="quick-action" - :class="{ '-pin': showPin, '-toggle': button.dropdown?.() }" v-for="button in quickButtons" :key="button.name" + class="quick-action" + :class="{ '-pin': showPin, '-toggle': button.dropdown?.() }" > <ActionButtonContainer :class="{ '-pin': showPin }" :button="button" :status="status" :extra="false" - :funcArg="funcArg" + :func-arg="funcArg" :get-class="getClass" :get-component="getComponent" :close="() => {}" @@ -80,7 +80,7 @@ :button="button" :status="status" :extra="true" - :funcArg="funcArg" + :func-arg="funcArg" :get-class="getClass" :get-component="getComponent" :close="close" diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue @@ -76,8 +76,8 @@ </div> </template> <QuickFilterSettings - class="rightside-button" v-if="!mobileLayout" + class="rightside-button" /> <QuickViewSettings class="rightside-button" diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue @@ -312,9 +312,9 @@ </div> <teleport to="#modal"> <mute-confirm - type="user" - :user="this.user" ref="confirmation" + type="user" + :user="user" /> </teleport> </div>