diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a5916f6..e368ae70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Ability to confirm users' emails and resend confirmation emails - Report notes - Ability to moderate users on the statuses page -- Stats page: status counts are displayed here ### Fixed diff --git a/README.md b/README.md index 413802c2..84ce067d 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,6 @@ Features, that can be disabled: - moderation log: `DISABLED_FEATURES: '["moderationLog"]'` - settings: `DISABLED_FEATURES: '["settings"]'` - emoji packs: `DISABLED_FEATURES: '["emojiPacks"]'` -- stats: `DISABLED_FEATURES: '["stats"]'` Of course, you can disable multiple features just by adding to the array, e.g. `DISABLED_FEATURES: '["emojiPacks", "settings"]'` will have both emoji packs and settings disabled. diff --git a/src/api/instance.js b/src/api/peers.js similarity index 66% rename from src/api/instance.js rename to src/api/peers.js index a4e3ad9b..4b80d7ab 100644 --- a/src/api/instance.js +++ b/src/api/peers.js @@ -11,13 +11,4 @@ export async function fetchPeers(authHost, token) { }) } -export async function fetchInstanceInfo(authHost, token) { - return await request({ - baseURL: baseName(authHost), - url: `/api/v1/instance`, - method: 'get', - headers: authHeaders(token) - }) -} - const authHeaders = (token) => token ? { 'Authorization': `Bearer ${getToken()}` } : {} diff --git a/src/lang/en.js b/src/lang/en.js index d9b696b5..3dcd9bdd 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -67,8 +67,7 @@ export default { reports: 'Reports', settings: 'Settings', moderationLog: 'Moderation Log', - 'emoji-packs': 'Emoji packs', - stats: 'Stats' + 'emoji-packs': 'Emoji packs' }, navbar: { logOut: 'Log Out', @@ -433,14 +432,5 @@ export default { emailSent: 'Invite was sent', submitFormError: 'There are invalid values in the form. Please fix them before continuing.', inviteViaEmailAlert: 'To send invite via email make sure to enable `invites_enabled` and disable `registrations_open`' - }, - stats: { - stats: 'Instance stats', - statusCounts: 'Status counts', - all: 'All', - public: 'Public', - unlisted: 'Unlisted', - direct: 'Direct', - private: 'Private' } } diff --git a/src/router/index.js b/src/router/index.js index c4b48385..8a7f9e36 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -77,20 +77,6 @@ const moderationLog = { ] } -const statsDisabled = disabledFeatures.includes('stats') -const stats = { - path: '/stats', - component: Layout, - children: [ - { - path: 'index', - component: () => import('@/views/stats/index'), - name: 'Stats', - meta: { title: 'stats', icon: 'chart', noCache: true } - } - ] -} - export const constantRouterMap = [ { path: '/redirect', @@ -159,7 +145,6 @@ export const asyncRouterMap = [ ...(invitesDisabled ? [] : [invites]), ...(moderationLogDisabled ? [] : [moderationLog]), ...(settingsDisabled ? [] : [settings]), - ...(statsDisabled ? [] : [stats]), { path: '/users/:id', component: Layout, diff --git a/src/store/getters.js b/src/store/getters.js index 0722b4c2..159fb48c 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -49,7 +49,7 @@ const getters = { http: state => state.settings.settings['http'], httpSecurity: state => state.settings.settings['http_security'], instance: state => state.settings.settings['instance'], - instances: state => state.instance.fetchedPeers, + instances: state => state.peers.fetchedPeers, kocaptcha: state => state.settings.settings['Pleroma.Captcha.Kocaptcha'], level: state => state.settings.settings['level'], ldap: state => state.settings.settings['ldap'], @@ -84,7 +84,6 @@ const getters = { suggestions: state => state.settings.settings['suggestions'], scheduledActivity: state => state.settings.settings['Pleroma.ScheduledActivity'], statuses: state => state.status.fetchedStatuses, - statusCounts: state => state.instance.fetchedStatusCounts, teslaAdapter: state => state.settings.settings['adapter'], twitter: state => state.settings.settings['Ueberauth.Strategy.Twitter.OAuth'], ueberauth: state => state.settings.settings['Ueberauth'], diff --git a/src/store/index.js b/src/store/index.js index bb654676..586f2b07 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -4,7 +4,7 @@ import app from './modules/app' import errorLog from './modules/errorLog' import moderationLog from './modules/moderationLog' import invites from './modules/invites' -import instance from './modules/instance' +import peers from './modules/peers' import permission from './modules/permission' import relays from './modules/relays' import reports from './modules/reports' @@ -25,7 +25,7 @@ const store = new Vuex.Store({ errorLog, moderationLog, invites, - instance, + peers, permission, relays, reports, diff --git a/src/store/modules/instance.js b/src/store/modules/instance.js deleted file mode 100644 index cec33c91..00000000 --- a/src/store/modules/instance.js +++ /dev/null @@ -1,40 +0,0 @@ -import { fetchPeers, fetchInstanceInfo } from '@/api/instance' - -const instance = { - state: { - fetchedPeers: [], - peersLoading: true, - fetchedStatusCounts: {}, - statusCountsLoading: true - }, - mutations: { - SET_PEERS: (state, peers) => { - state.fetchedPeers = peers - }, - SET_PEERS_LOADING: (state, status) => { - state.peersLoading = status - }, - SET_STATUS_COUNTS: (state, counts) => { - state.fetchedStatusCounts = counts - }, - SET_STATUS_COUNTS_LOADING: (state, status) => { - state.statusCountsLoading = status - } - }, - actions: { - async FetchPeers({ commit, getters }) { - const peers = await fetchPeers(getters.authHost, getters.token) - - commit('SET_PEERS', peers.data) - commit('SET_PEERS_LOADING', false) - }, - async FetchStatusCounts({ commit, getters }) { - const info = await fetchInstanceInfo(getters.authHost, getters.token) - - commit('SET_STATUS_COUNTS', info.data.stats.status_count) - commit('SET_STATUS_COUNTS_LOADING', false) - } - } -} - -export default instance diff --git a/src/store/modules/peers.js b/src/store/modules/peers.js new file mode 100644 index 00000000..fa37a1d0 --- /dev/null +++ b/src/store/modules/peers.js @@ -0,0 +1,28 @@ +import { fetchPeers } from '@/api/peers' + +const peers = { + state: { + fetchedPeers: [], + loading: true + }, + + mutations: { + SET_PEERS: (state, peers) => { + state.fetchedPeers = peers + }, + SET_LOADING: (state, status) => { + state.loading = status + } + }, + + actions: { + async FetchPeers({ commit, getters }) { + const peers = await fetchPeers(getters.authHost, getters.token) + + commit('SET_PEERS', peers.data) + commit('SET_LOADING', false) + } + } +} + +export default peers diff --git a/src/views/stats/index.vue b/src/views/stats/index.vue deleted file mode 100644 index 7b58b0af..00000000 --- a/src/views/stats/index.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - - diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue index 0651d247..408d3e24 100644 --- a/src/views/statuses/index.vue +++ b/src/views/statuses/index.vue @@ -49,7 +49,7 @@ export default { }, computed: { loadingPeers() { - return this.$store.state.instance.peersLoading + return this.$store.state.peers.loading }, ...mapGetters([ 'instances',