Merge branch 'cherry-pick-ce3d3387' into 'release/2.0.2'

Merge branch 'feature/display-status-counts-by-scope' into 'master'

See merge request pleroma/admin-fe!115
This commit is contained in:
feld 2020-03-31 17:53:22 +00:00
commit 2a0aced674
10 changed files with 46 additions and 13 deletions

View file

@ -30,6 +30,15 @@ export async function fetchStatuses({ godmode, localOnly, authHost, token, pageS
})
}
export async function fetchStatusesCount(authHost, token) {
return await request({
baseURL: baseName(authHost),
url: `/api/pleroma/admin/stats`,
method: 'get',
headers: authHeaders(token)
})
}
export async function fetchStatusesByInstance({ instance, authHost, token, pageSize, page }) {
return await request({
baseURL: baseName(authHost),

View file

@ -241,12 +241,16 @@ export default {
resendConfirmation: 'Resend confirmation email'
},
statuses: {
statuses: 'Statuses by instance',
statuses: 'Statuses',
instanceFilter: 'Instance filter',
loadMore: 'Load more',
noInstances: 'No other instances found',
onlyLocalStatuses: 'Show only local statuses',
showPrivateStatuses: 'Show private statuses'
showPrivateStatuses: 'Show private statuses',
direct: 'Direct',
private: 'Private',
public: 'Public',
unlisted: 'Unlisted'
},
userProfile: {
tags: 'Tags',

View file

@ -1,4 +1,4 @@
import { changeStatusScope, deleteStatus, fetchStatuses, fetchStatusesByInstance } from '@/api/status'
import { changeStatusScope, deleteStatus, fetchStatuses, fetchStatusesCount, fetchStatusesByInstance } from '@/api/status'
const status = {
state: {
@ -12,7 +12,8 @@ const status = {
pageSize: 20,
buttonLoading: false,
allLoaded: false
}
},
statusVisibility: {}
},
mutations: {
CHANGE_GODMODE_CHECKBOX_VALUE: (state, value) => {
@ -41,6 +42,9 @@ const status = {
},
SET_LOADING: (state, status) => {
state.loading = status
},
SET_STATUS_VISIBILITY: (state, visibility) => {
state.statusVisibility = visibility
}
},
actions: {
@ -64,6 +68,12 @@ const status = {
dispatch('FetchStatusesByInstance')
}
},
async FetchStatusesCount({ commit, getters }) {
commit('SET_LOADING', true)
const { data } = await fetchStatusesCount(getters.authHost, getters.token)
commit('SET_STATUS_VISIBILITY', data.status_visibility)
commit('SET_LOADING', false)
},
async FetchStatusesByInstance({ commit, getters, state, rootState }) {
commit('SET_LOADING', true)
if (state.statusesByInstance.selectedInstance === '') {

View file

@ -155,7 +155,7 @@ export default {
margin: 0 30px;
}
.emoji-packs-header {
margin: 22px 0 20px 15px;
margin: 10px 0 20px 15px;
}
.import-pack-button {
margin-left: 10px;

View file

@ -246,7 +246,7 @@ export default {
padding: 5px 20px 0 20px
}
h1 {
margin: 22px 0 0 15px;
margin: 10px 0 0 15px;
}
.icon {
margin-right: 5px;

View file

@ -130,7 +130,7 @@ export default {
margin: 0 15px;
}
h1 {
margin: 22px 0 20px 0;
margin: 10px 0 20px 0;
}
.el-timeline {
margin: 25px 45px 0 0;

View file

@ -50,7 +50,7 @@ export default {
padding-bottom: 0
}
h1 {
margin: 22px 0 0 15px;
margin: 10px 0 0 15px;
}
.no-reports-message {
color: gray;

View file

@ -457,7 +457,7 @@
margin: 0;
}
.settings-header-container {
margin: 15px;
margin: 10px 15px 15px 15px;
}
.nav-container {
display: flex;

View file

@ -3,6 +3,12 @@
<h1>
{{ $t('statuses.statuses') }}
</h1>
<el-button-group>
<el-button plain>{{ $t('statuses.direct') }}: {{ statusVisibility.direct }}</el-button>
<el-button plain>{{ $t('statuses.private') }}: {{ statusVisibility.private }}</el-button>
<el-button plain>{{ $t('statuses.public') }}: {{ statusVisibility.public }}</el-button>
<el-button plain>{{ $t('statuses.unlisted') }}: {{ statusVisibility.unlisted }}</el-button>
</el-button-group>
<div class="filter-container">
<el-select
v-model="selectedInstance"
@ -111,10 +117,14 @@ export default {
},
statuses() {
return this.$store.state.status.fetchedStatuses
},
statusVisibility() {
return this.$store.state.status.statusVisibility
}
},
mounted() {
this.$store.dispatch('FetchPeers')
this.$store.dispatch('FetchStatusesCount')
},
methods: {
handleFilterChange() {
@ -142,6 +152,9 @@ export default {
<style rel='stylesheet/scss' lang='scss'>
.statuses-container {
padding: 0 15px;
h1 {
margin: 10px 0 15px 0;
}
.status-container {
margin: 0 0 10px;
}
@ -163,9 +176,6 @@ export default {
padding: 15px 0;
text-align: center;
}
h1 {
margin: 22px 0 0 0;
}
@media only screen and (max-width:480px) {
.checkbox-container {

View file

@ -245,7 +245,7 @@ export default {
}
.users-container {
h1 {
margin: 22px 0 0 15px;
margin: 10px 0 0 15px;
}
.pagination {