From f45fb56e15e2925aca192867db0ef4ebb15d1f02 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 17 Feb 2020 02:21:27 +0900 Subject: Improve instance info page --- src/client/app.vue | 21 +- src/client/components/instance-stats.vue | 665 ++++++++++++++++++++++++++++++ src/client/pages/about.vue | 18 +- src/client/pages/instance/index.vue | 674 +++++++++++++++---------------- src/client/pages/instance/monitor.vue | 381 ----------------- src/client/pages/instance/settings.vue | 413 +++++++++++++++++++ src/client/pages/instance/stats.vue | 491 ---------------------- src/client/router.ts | 3 +- 8 files changed, 1431 insertions(+), 1235 deletions(-) create mode 100644 src/client/components/instance-stats.vue delete mode 100644 src/client/pages/instance/monitor.vue create mode 100644 src/client/pages/instance/settings.vue delete mode 100644 src/client/pages/instance/stats.vue (limited to 'src/client') diff --git a/src/client/app.vue b/src/client/app.vue index 1bfcd9e158..9a984a27ff 100644 --- a/src/client/app.vue +++ b/src/client/app.vue @@ -413,9 +413,14 @@ export default Vue.extend({ this.$root.menu({ items: [{ type: 'link', - text: this.$t('statistics'), - to: '/instance/stats', - icon: faChartBar, + text: this.$t('dashboard'), + to: '/instance', + icon: faTachometerAlt, + }, null, { + type: 'link', + text: this.$t('settings'), + to: '/instance/settings', + icon: faCog, }, { type: 'link', text: this.$t('customEmojis'), @@ -431,11 +436,6 @@ export default Vue.extend({ text: this.$t('files'), to: '/instance/files', icon: faCloud, - }, { - type: 'link', - text: this.$t('monitor'), - to: '/instance/monitor', - icon: faTachometerAlt, }, { type: 'link', text: this.$t('jobQueue'), @@ -451,11 +451,6 @@ export default Vue.extend({ text: this.$t('announcements'), to: '/instance/announcements', icon: faBroadcastTower, - }, null, { - type: 'link', - text: this.$t('general'), - to: '/instance', - icon: faCog, }], align: 'left', fixed: true, diff --git a/src/client/components/instance-stats.vue b/src/client/components/instance-stats.vue new file mode 100644 index 0000000000..a2625f4ab6 --- /dev/null +++ b/src/client/components/instance-stats.vue @@ -0,0 +1,665 @@ + + + + + diff --git a/src/client/pages/about.vue b/src/client/pages/about.vue index e39600b487..a3a4b6ac73 100644 --- a/src/client/pages/about.vue +++ b/src/client/pages/about.vue @@ -12,14 +12,12 @@
{{ $t('administrator') }}{{ meta.maintainerName }}
{{ meta.maintainerEmail }}
-
-
{{ $t('users') }}{{ stats.originalUsersCount | number }}
-
{{ $t('notes') }}{{ stats.originalNotesCount | number }}
-
Misskeyv{{ version }}
+ + @@ -28,6 +26,7 @@ import Vue from 'vue'; import { faInfoCircle } from '@fortawesome/free-solid-svg-icons'; import { version } from '../config'; import i18n from '../i18n'; +import MkInstanceStats from '../components/instance-stats.vue'; export default Vue.extend({ i18n, @@ -38,10 +37,13 @@ export default Vue.extend({ }; }, + components: { + MkInstanceStats + }, + data() { return { version, - stats: null, serverInfo: null, faInfoCircle } @@ -52,12 +54,6 @@ export default Vue.extend({ return this.$store.state.instance.meta; }, }, - - created() { - this.$root.api('stats').then(res => { - this.stats = res; - }); - }, }); diff --git a/src/client/pages/instance/index.vue b/src/client/pages/instance/index.vue index 5a48232417..db88982330 100644 --- a/src/client/pages/instance/index.vue +++ b/src/client/pages/instance/index.vue @@ -1,169 +1,54 @@