logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 80600137d1be64c83737ca3296f4aaae1033870c
parent 7d13f38d8807fb090397af159b485a195c379fb3
Author: Henry Jameson <me@hjkos.com>
Date:   Fri, 12 Aug 2022 01:27:09 +0300

lint

Diffstat:

Msrc/components/desktop_nav/desktop_nav.vue2+-
Msrc/components/lists_menu/lists_menu_content.vue11++++++++---
Msrc/components/mobile_nav/mobile_nav.vue2+-
Msrc/components/nav_panel/nav_panel.vue36++++++++++++++++++++++++++----------
Msrc/components/navigation/navigation_entry.vue64++++++++++++++++++++++++++++++++--------------------------------
Msrc/components/navigation/navigation_pins.vue12+++++++-----
Msrc/components/search_bar/search_bar.vue4++--
Msrc/components/timeline/timeline.vue5++++-
Msrc/components/timeline_menu/timeline_menu.vue17+++++++++++++----
9 files changed, 94 insertions(+), 59 deletions(-)

diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue @@ -61,7 +61,7 @@ :title="$t('nav.administration')" /> </a> - <span class="spacer"/> + <span class="spacer" /> <button v-if="currentUser" class="button-unstyled nav-icon" diff --git a/src/components/lists_menu/lists_menu_content.vue b/src/components/lists_menu/lists_menu_content.vue @@ -1,7 +1,12 @@ <template> -<ul> - <NavigationEntry v-for="item in lists" :key="item.name" :show-pin="showPin" :item="item" /> -</ul> + <ul> + <NavigationEntry + v-for="item in lists" + :key="item.name" + :show-pin="showPin" + :item="item" + /> + </ul> </template> <script src="./lists_menu_content.js"></script> diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue @@ -21,7 +21,7 @@ class="alert-dot" /> </button> - <NavigationPins class="pins"/> + <NavigationPins class="pins" /> </div> <div class="item right"> <button v-if="currentUser" diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue @@ -6,7 +6,7 @@ class="panel-heading" > <NavigationPins :limit="6" /> - <div class="spacer"/> + <div class="spacer" /> <button class="button-unstyled" @click="toggleCollapse" @@ -18,7 +18,10 @@ /> </button> </div> - <ul class="panel-body" v-if="!collapsed || forceExpand"> + <ul + v-if="!collapsed || forceExpand" + class="panel-body" + > <li v-if="currentUser || !privateMode"> <button class="button-unstyled menu-item" @@ -40,7 +43,12 @@ class="timelines-background" > <ul class="timelines"> - <NavigationEntry v-for="item in timelinesItems" :key="item.name" :show-pin="true" :item="item" /> + <NavigationEntry + v-for="item in timelinesItems" + :key="item.name" + :show-pin="true" + :item="item" + /> </ul> </div> </li> @@ -49,11 +57,11 @@ class="button-unstyled menu-item" @click="toggleLists" > - <FAIcon - fixed-width - class="fa-scale-110" - icon="list" - />{{ $t("nav.lists") }} + <FAIcon + fixed-width + class="fa-scale-110" + icon="list" + />{{ $t("nav.lists") }} <FAIcon class="timelines-chevron" fixed-width @@ -74,10 +82,18 @@ v-show="showLists" class="timelines-background" > - <ListsMenuContent :showPin="true" class="timelines" /> + <ListsMenuContent + :show-pin="true" + class="timelines" + /> </div> </li> - <NavigationEntry v-for="item in rootItems" :key="item.name" :show-pin="true" :item="item" /> + <NavigationEntry + v-for="item in rootItems" + :key="item.name" + :show-pin="true" + :item="item" + /> </ul> </div> </div> diff --git a/src/components/navigation/navigation_entry.vue b/src/components/navigation/navigation_entry.vue @@ -1,42 +1,42 @@ <template> -<li class="NavigationEntry"> - <router-link - class="menu-item" - :to="item.routeObject || { name: (currentUser || item.anon) ? item.route : item.anonRoute, params: { username: currentUser.screen_name } }" + <li class="NavigationEntry"> + <router-link + class="menu-item" + :to="item.routeObject || { name: (currentUser || item.anon) ? item.route : item.anonRoute, params: { username: currentUser.screen_name } }" > - <FAIcon - v-if="item.icon" - fixed-width - class="fa-scale-110" - :icon="item.icon" - /> - <span - class="icon iconLetter fa-scale-110" - v-if="item.iconLetter" - >{{ item.iconLetter }} - </span>{{ item.labelRaw || $t(item.label) }} - <button - type="button" - class="button-unstyled" - @click.stop.prevent="togglePin(item.name)" - > <FAIcon - v-if="showPin && currentUser" + v-if="item.icon" fixed-width class="fa-scale-110" - :class="{ 'veryfaint': !isPinned(item.name) }" - :transform="!isPinned(item.name) ? 'rotate-45' : ''" - icon="thumbtack" + :icon="item.icon" + /> + <span + v-if="item.iconLetter" + class="icon iconLetter fa-scale-110" + >{{ item.iconLetter }} + </span>{{ item.labelRaw || $t(item.label) }} + <button + type="button" + class="button-unstyled" + @click.stop.prevent="togglePin(item.name)" + > + <FAIcon + v-if="showPin && currentUser" + fixed-width + class="fa-scale-110" + :class="{ 'veryfaint': !isPinned(item.name) }" + :transform="!isPinned(item.name) ? 'rotate-45' : ''" + icon="thumbtack" /> - <div - v-if="item.badgeGetter && getters[item.badgeGetter]" - class="badge badge-notification" + <div + v-if="item.badgeGetter && getters[item.badgeGetter]" + class="badge badge-notification" > - {{ getters[item.badgeGetter] }} - </div> - </button> - </router-link> -</li> + {{ getters[item.badgeGetter] }} + </div> + </button> + </router-link> + </li> </template> <script src="./navigation_entry.js"></script> diff --git a/src/components/navigation/navigation_pins.vue b/src/components/navigation/navigation_pins.vue @@ -1,22 +1,24 @@ <template> <span class="NavigationPins"> <router-link - v-for="item in pinnedList" :key="item.name" class="pinned-item" + v-for="item in pinnedList" + :key="item.name" + class="pinned-item" :to="item.routeObject || { name: (currentUser || item.anon) ? item.route : item.anonRoute, params: { username: currentUser.screen_name } }" - > + > <FAIcon v-if="item.icon" fixed-width :icon="item.icon" - /> + /> <span v-if="item.iconLetter" class="iconLetter fa-scale-110 fa-old-padding" - >{{ item.iconLetter }}</span> + >{{ item.iconLetter }}</span> <div v-if="item.badgeGetter && getters[item.badgeGetter]" class="alert-dot" - /> + /> </router-link> </span> </template> diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue @@ -47,8 +47,8 @@ class="cancel-icon fa-scale-110 fa-old-padding" /> </button> - <span class="spacer"/> - <span class="spacer"/> + <span class="spacer" /> + <span class="spacer" /> </template> </div> </template> diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue @@ -1,7 +1,10 @@ <template> <div :class="['Timeline', classes.root]"> <div :class="classes.header"> - <TimelineMenu v-if="!embedded" :timeline-name="timelineName"/> + <TimelineMenu + v-if="!embedded" + :timeline-name="timelineName" + /> <button v-if="showLoadButton" class="button-default loadmore-button" diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue @@ -10,10 +10,19 @@ @close="() => isOpen = false" > <template #content> - <ListsMenuContent v-if="useListsMenu" :showPin="false" class="timelines" /> - <ul v-else> - <NavigationEntry v-for="item in timelinesList" :key="item.name" :show-pin="false" :item="item" /> - </ul> + <ListsMenuContent + v-if="useListsMenu" + :show-pin="false" + class="timelines" + /> + <ul v-else> + <NavigationEntry + v-for="item in timelinesList" + :key="item.name" + :show-pin="false" + :item="item" + /> + </ul> </template> <template #trigger> <span class="button-unstyled title timeline-menu-title">