Merge branch 'quotes-count' into 'develop'
Display quotes count on posts and add quotes list page See merge request pleroma/pleroma-fe!1885
This commit is contained in:
commit
3e99006e2a
15 changed files with 84 additions and 11 deletions
26
src/components/quotes_timeline/quotes_timeline.js
Normal file
26
src/components/quotes_timeline/quotes_timeline.js
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
import Timeline from '../timeline/timeline.vue'
|
||||
|
||||
const QuotesTimeline = {
|
||||
created () {
|
||||
this.$store.commit('clearTimeline', { timeline: 'quotes' })
|
||||
this.$store.dispatch('startFetchingTimeline', { timeline: 'quotes', statusId: this.statusId })
|
||||
},
|
||||
components: {
|
||||
Timeline
|
||||
},
|
||||
computed: {
|
||||
statusId () { return this.$route.params.id },
|
||||
timeline () { return this.$store.state.statuses.timelines.quotes }
|
||||
},
|
||||
watch: {
|
||||
statusId () {
|
||||
this.$store.commit('clearTimeline', { timeline: 'quotes' })
|
||||
this.$store.dispatch('startFetchingTimeline', { timeline: 'quotes', statusId: this.statusId })
|
||||
}
|
||||
},
|
||||
unmounted () {
|
||||
this.$store.dispatch('stopFetchingTimeline', 'quotes')
|
||||
}
|
||||
}
|
||||
|
||||
export default QuotesTimeline
|
||||
10
src/components/quotes_timeline/quotes_timeline.vue
Normal file
10
src/components/quotes_timeline/quotes_timeline.vue
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<template>
|
||||
<Timeline
|
||||
:title="$t('nav.quotes')"
|
||||
:timeline="timeline"
|
||||
:timeline-name="'quotes'"
|
||||
:status-id="statusId"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script src='./quotes_timeline.js'></script>
|
||||
|
|
@ -373,6 +373,9 @@ const Status = {
|
|||
hidePostStats () {
|
||||
return this.mergedConfig.hidePostStats
|
||||
},
|
||||
shouldDisplayFavsAndRepeats () {
|
||||
return !this.hidePostStats && this.isFocused && (this.combinedFavsAndRepeatsUsers.length > 0 || this.statusFromGlobalRepository.quotes_count)
|
||||
},
|
||||
muteBotStatuses () {
|
||||
return this.mergedConfig.muteBotStatuses
|
||||
},
|
||||
|
|
|
|||
|
|
@ -374,6 +374,7 @@
|
|||
font-weight: bolder;
|
||||
font-size: 1.1em;
|
||||
line-height: 1em;
|
||||
color: var(--text);
|
||||
}
|
||||
|
||||
&:hover .stat-title {
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@
|
|||
|
||||
<transition name="fade">
|
||||
<div
|
||||
v-if="!hidePostStats && isFocused && combinedFavsAndRepeatsUsers.length > 0"
|
||||
v-if="shouldDisplayFavsAndRepeats"
|
||||
class="favs-repeated-users"
|
||||
>
|
||||
<div class="stats">
|
||||
|
|
@ -512,6 +512,19 @@
|
|||
</div>
|
||||
</div>
|
||||
</UserListPopover>
|
||||
<router-link
|
||||
v-if="statusFromGlobalRepository.quotes_count > 0"
|
||||
:to="{ name: 'quotes', params: { id: status.id } }"
|
||||
>
|
||||
<div
|
||||
class="stat-count"
|
||||
>
|
||||
<a class="stat-title">{{ $t('status.quotes') }}</a>
|
||||
<div class="stat-number">
|
||||
{{ statusFromGlobalRepository.quotes_count }}
|
||||
</div>
|
||||
</div>
|
||||
</router-link>
|
||||
<div class="avatar-row">
|
||||
<AvatarList :users="combinedFavsAndRepeatsUsers" />
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ const Timeline = {
|
|||
'title',
|
||||
'userId',
|
||||
'listId',
|
||||
'statusId',
|
||||
'tag',
|
||||
'embedded',
|
||||
'count',
|
||||
|
|
@ -121,6 +122,7 @@ const Timeline = {
|
|||
showImmediately,
|
||||
userId: this.userId,
|
||||
listId: this.listId,
|
||||
statusId: this.statusId,
|
||||
tag: this.tag
|
||||
})
|
||||
},
|
||||
|
|
@ -183,6 +185,7 @@ const Timeline = {
|
|||
showImmediately: true,
|
||||
userId: this.userId,
|
||||
listId: this.listId,
|
||||
statusId: this.statusId,
|
||||
tag: this.tag
|
||||
}).then(({ statuses }) => {
|
||||
if (statuses && statuses.length === 0) {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ export const timelineNames = () => {
|
|||
bookmarks: 'nav.bookmarks',
|
||||
dms: 'nav.dms',
|
||||
'public-timeline': 'nav.public_tl',
|
||||
'public-external-timeline': 'nav.twkn'
|
||||
'public-external-timeline': 'nav.twkn',
|
||||
quotes: 'nav.quotes'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue