diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2020-10-17 20:12:00 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 20:12:00 +0900 |
| commit | 7199e6f4e0b3a2c2bc198e689c3e0cd0d0f0354a (patch) | |
| tree | 2263a06acec7fa21882366bae26d1a983ce21135 /src/client/components/instance-stats.vue | |
| parent | CW の input でも投稿ショートカットが動作するように (#6690) (diff) | |
| download | sharkey-7199e6f4e0b3a2c2bc198e689c3e0cd0d0f0354a.tar.gz sharkey-7199e6f4e0b3a2c2bc198e689c3e0cd0d0f0354a.tar.bz2 sharkey-7199e6f4e0b3a2c2bc198e689c3e0cd0d0f0354a.zip | |
Migrate to Vue3 (#6587)
* Update reaction.vue
* fix bug
* wip
* wip
* wjio
* wip
* Revert "wip"
This reverts commit e427f2160adf4e8a4147006e25a89854edab0033.
* wip
* wip
* wip
* Update init.ts
* Update drive-window.vue
* wip
* wip
* Use PascalCase for components
* Use PascalCase for components
* update dep
* wip
* wip
* wip
* Update init.ts
* wip
* Update paging.ts
* Update test.vue
* watch deep
* wip
* lint
* wip
* wip
* wip
* wip
* wiop
* wip
* Update webpack.config.ts
* alllow null poll
* wip
* wip
* wip
* wiop
* UI redesign & refactor (#6714)
* wip
* wip
* wip
* wip
* wip
* Update drive.vue
* Update word-mute.vue
* wip
* wip
* wip
* clean up
* wip
* Update default.vue
* wip
* Update notes.vue
* Update mfm.ts
* Update index.home.vue
* Update post-form.vue
* Update post-form-attaches.vue
* wip
* Update post-form.vue
* Update sidebar.vue
* wip
* wip
* Update index.vue
* wip
* Update default.vue
* Update index.vue
* Update index.vue
* wip
* Update post-form-attaches.vue
* Update note.vue
* wip
* clean up
* Update notes.vue
* wip
* wip
* Update ja-JP.yml
* wip
* wip
* Update index.vue
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Update default.vue
* wip
* Update _dark.json5
* wip
* wip
* wip
* clean up
* wip
* wip
* Update index.vue
* Update test.vue
* wip
* wip
* fix
* wip
* wip
* wip
* wip
* clena yop
* wip
* wip
* Update store.ts
* Update messaging-room.vue
* Update default.widgets.vue
* fix
* wip
* wip
* Update modal.vue
* wip
* Update os.ts
* Update os.ts
* Update deck.vue
* Update init.ts
* wip
* Update ja-JP.yml
* v-sizeは単にwindowのresizeを監視するだけで良いかもしれない
* Update modal.vue
* wip
* Update tooltip.ts
* wip
* wip
* wip
* wip
* wip
* Update image-viewer.vue
* wip
* wip
* Update style.scss
* Update style.scss
* Update visitor.vue
* wip
* Update init.ts
* Update init.ts
* wip
* wip
* Update visitor.vue
* Update visitor.vue
* Update visitor.vue
* Update visitor.vue
* wip
* wip
* Update modal.vue
* Update header.vue
* Update menu.vue
* Update about.vue
* Update about-misskey.vue
* wip
* wip
* Update visitor.vue
* Update tooltip.ts
* wip
* Update drive.vue
* wip
* Update style.scss
* Update header.vue
* wip
* wip
* Update users.user.vue
* Update announcements.vue
* wip
* wip
* wip
* Update emojis.vue
* wip
* Update emojis.vue
* Update style.scss
* Update users.vue
* wip
* Update style.scss
* wip
* Update welcome.entrance.vue
* Update radio.vue
* Update size.ts
* Update emoji-edit-dialog.vue
* wip
* Update emojis.vue
* wip
* Update emojis.vue
* Update emojis.vue
* Update emojis.vue
* wip
* wip
* wip
* wip
* Update file-dialog.vue
* wip
* wip
* Update token-generate-window.vue
* Update notification-setting-window.vue
* wip
* wip
* Update _error_.vue
* Update ja-JP.yml
* wip
* wip
* Update store.ts
* Update emojis.vue
* Update emojis.vue
* Update emojis.vue
* Update announcements.vue
* Update store.ts
* wip
* Update page-editor.vue
* wip
* wip
* Update modal.vue
* wip
* Update select-file.ts
* Update timeline.vue
* Update emojis.vue
* Update os.ts
* wip
* Update user-select.vue
* Update mfm.ts
* Update get-file-info.ts
* Update drive.vue
* Update init.ts
* Update mfm.ts
* wip
* wip
* Update window.vue
* Update note.vue
* wip
* wip
* Update user-info.vue
* wip
* wip
* wip
* wip
* wip
* Update header.vue
* Update header.vue
* wip
* Update explore.vue
* wip
* wip
* wip
* Update webpack.config.ts
* wip
* wip
* wip
* wip
* wip
* wip
* Update autocomplete.ts
* wip
* wip
* wip
* Update toast.vue
* wip
* Update post-form-dialog.vue
* wip
* wip
* wip
* wip
* wip
* Update users.vue
* wip
* Update explore.vue
* wip
* wip
* wip
* Update package.json
* wip
* Update icon-dialog.vue
* wip
* wip
* Update user-preview.ts
* wip
* wip
* wip
* wip
* wip
* Update instance.vue
* Update user-name.vue
* Update federation.vue
* Update instance.vue
* wip
* wip
* Update tag.vue
* wip
* wip
* wip
* wip
* wip
* Update instance.vue
* wip
* Update os.ts
* Update os.ts
* wip
* wip
* wip
* Update router.ts
* wip
* Update init.ts
* Update note.vue
* Update messages.vue
* wip
* wip
* wip
* wip
* wip
* google
* wip
* wip
* wip
* wip
* Update theme-editor.vue
* wip
* wip
* Update room.vue
* Update channel-editor.vue
* wip
* Update window.vue
* Update window.vue
* wip
* Update window.vue
* Update window.vue
* wip
* Update menu.vue
* wip
* wip
* wip
* wip
* Update messaging-room.vue
* wip
* Update post-form.vue
* Update default.widgets.vue
* Update window.vue
* wip
Diffstat (limited to 'src/client/components/instance-stats.vue')
| -rw-r--r-- | src/client/components/instance-stats.vue | 80 |
1 files changed, 42 insertions, 38 deletions
diff --git a/src/client/components/instance-stats.vue b/src/client/components/instance-stats.vue index 1f3d45d4d9..dcb3c75fa0 100644 --- a/src/client/components/instance-stats.vue +++ b/src/client/components/instance-stats.vue @@ -1,93 +1,93 @@ <template> -<div class="zbcjwnqg" v-size="{ max: [550, 1200] }"> +<div class="zbcjwnqg" v-size="{ max: [550, 1000] }"> <div class="stats" v-if="info"> <div class="_panel"> <div> - <b><fa :icon="faUser"/>{{ $t('users') }}</b> + <b><Fa :icon="faUser"/>{{ $t('users') }}</b> <small>{{ $t('local') }}</small> </div> <div> <dl class="total"> <dt>{{ $t('total') }}</dt> - <dd>{{ info.originalUsersCount | number }}</dd> + <dd>{{ number(info.originalUsersCount) }}</dd> </dl> <dl class="diff" :class="{ inc: usersLocalDoD > 0 }"> <dt>{{ $t('dayOverDayChanges') }}</dt> - <dd>{{ usersLocalDoD | number }}</dd> + <dd>{{ number(usersLocalDoD) }}</dd> </dl> <dl class="diff" :class="{ inc: usersLocalWoW > 0 }"> <dt>{{ $t('weekOverWeekChanges') }}</dt> - <dd>{{ usersLocalWoW | number }}</dd> + <dd>{{ number(usersLocalWoW) }}</dd> </dl> </div> </div> <div class="_panel"> <div> - <b><fa :icon="faUser"/>{{ $t('users') }}</b> + <b><Fa :icon="faUser"/>{{ $t('users') }}</b> <small>{{ $t('remote') }}</small> </div> <div> <dl class="total"> <dt>{{ $t('total') }}</dt> - <dd>{{ (info.usersCount - info.originalUsersCount) | number }}</dd> + <dd>{{ number((info.usersCount - info.originalUsersCount)) }}</dd> </dl> <dl class="diff" :class="{ inc: usersRemoteDoD > 0 }"> <dt>{{ $t('dayOverDayChanges') }}</dt> - <dd>{{ usersRemoteDoD | number }}</dd> + <dd>{{ number(usersRemoteDoD) }}</dd> </dl> <dl class="diff" :class="{ inc: usersRemoteWoW > 0 }"> <dt>{{ $t('weekOverWeekChanges') }}</dt> - <dd>{{ usersRemoteWoW | number }}</dd> + <dd>{{ number(usersRemoteWoW) }}</dd> </dl> </div> </div> <div class="_panel"> <div> - <b><fa :icon="faPencilAlt"/>{{ $t('notes') }}</b> + <b><Fa :icon="faPencilAlt"/>{{ $t('notes') }}</b> <small>{{ $t('local') }}</small> </div> <div> <dl class="total"> <dt>{{ $t('total') }}</dt> - <dd>{{ info.originalNotesCount | number }}</dd> + <dd>{{ number(info.originalNotesCount) }}</dd> </dl> <dl class="diff" :class="{ inc: notesLocalDoD > 0 }"> <dt>{{ $t('dayOverDayChanges') }}</dt> - <dd>{{ notesLocalDoD | number }}</dd> + <dd>{{ number(notesLocalDoD) }}</dd> </dl> <dl class="diff" :class="{ inc: notesLocalWoW > 0 }"> <dt>{{ $t('weekOverWeekChanges') }}</dt> - <dd>{{ notesLocalWoW | number }}</dd> + <dd>{{ number(notesLocalWoW) }}</dd> </dl> </div> </div> <div class="_panel"> <div> - <b><fa :icon="faPencilAlt"/>{{ $t('notes') }}</b> + <b><Fa :icon="faPencilAlt"/>{{ $t('notes') }}</b> <small>{{ $t('remote') }}</small> </div> <div> <dl class="total"> <dt>{{ $t('total') }}</dt> - <dd>{{ (info.notesCount - info.originalNotesCount) | number }}</dd> + <dd>{{ number((info.notesCount - info.originalNotesCount)) }}</dd> </dl> <dl class="diff" :class="{ inc: notesRemoteDoD > 0 }"> <dt>{{ $t('dayOverDayChanges') }}</dt> - <dd>{{ notesRemoteDoD | number }}</dd> + <dd>{{ number(notesRemoteDoD) }}</dd> </dl> <dl class="diff" :class="{ inc: notesRemoteWoW > 0 }"> <dt>{{ $t('weekOverWeekChanges') }}</dt> - <dd>{{ notesRemoteWoW | number }}</dd> + <dd>{{ number(notesRemoteWoW) }}</dd> </dl> </div> </div> </div> <section class="_card"> - <div class="_title" style="position: relative;"><fa :icon="faChartBar"/> {{ $t('statistics') }}<button @click="fetchChart" class="_button" style="position: absolute; right: 0; bottom: 0; top: 0; padding: inherit;"><fa :icon="faSync"/></button></div> + <div class="_title" style="position: relative;"><Fa :icon="faChartBar"/> {{ $t('statistics') }}<button @click="fetchChart" class="_button" style="position: absolute; right: 0; bottom: 0; top: 0; padding: inherit;"><Fa :icon="faSync"/></button></div> <div class="_content" style="margin-top: -8px;"> <div class="selects" style="display: flex;"> - <mk-select v-model="chartSrc" style="margin: 0; flex: 1;"> + <MkSelect v-model:value="chartSrc" style="margin: 0; flex: 1;"> <optgroup :label="$t('federation')"> <option value="federation-instances">{{ $t('_charts.federationInstancesIncDec') }}</option> <option value="federation-instances-total">{{ $t('_charts.federationInstancesTotal') }}</option> @@ -109,11 +109,11 @@ <option value="drive">{{ $t('_charts.storageUsageIncDec') }}</option> <option value="drive-total">{{ $t('_charts.storageUsageTotal') }}</option> </optgroup> - </mk-select> - <mk-select v-model="chartSpan" style="margin: 0;"> + </MkSelect> + <MkSelect v-model:value="chartSpan" style="margin: 0;"> <option value="hour">{{ $t('perHour') }}</option> <option value="day">{{ $t('perDay') }}</option> - </mk-select> + </MkSelect> </div> <canvas ref="chart"></canvas> </div> @@ -122,10 +122,11 @@ </template> <script lang="ts"> -import Vue from 'vue'; +import { defineComponent, markRaw } from 'vue'; import { faChartBar, faUser, faPencilAlt, faSync } from '@fortawesome/free-solid-svg-icons'; import Chart from 'chart.js'; import MkSelect from './ui/select.vue'; +import number from '@/filters/number'; const sum = (...arr) => arr.reduce((r, a) => r.map((b, i) => a[i] + b)); const negate = arr => arr.map(x => -x); @@ -136,8 +137,9 @@ const alpha = (hex, a) => { const b = parseInt(result[3], 16); return `rgba(${r}, ${g}, ${b}, ${a})`; }; +import * as os from '@/os'; -export default Vue.extend({ +export default defineComponent({ components: { MkSelect }, @@ -216,7 +218,7 @@ export default Vue.extend({ }, async created() { - this.info = await this.$root.api('stats'); + this.info = await os.api('stats'); this.now = new Date(); @@ -226,17 +228,17 @@ export default Vue.extend({ methods: { async fetchChart() { const [perHour, perDay] = await Promise.all([Promise.all([ - this.$root.api('charts/federation', { limit: this.chartLimit, span: 'hour' }), - this.$root.api('charts/users', { limit: this.chartLimit, span: 'hour' }), - this.$root.api('charts/active-users', { limit: this.chartLimit, span: 'hour' }), - this.$root.api('charts/notes', { limit: this.chartLimit, span: 'hour' }), - this.$root.api('charts/drive', { limit: this.chartLimit, span: 'hour' }), + os.api('charts/federation', { limit: this.chartLimit, span: 'hour' }), + os.api('charts/users', { limit: this.chartLimit, span: 'hour' }), + os.api('charts/active-users', { limit: this.chartLimit, span: 'hour' }), + os.api('charts/notes', { limit: this.chartLimit, span: 'hour' }), + os.api('charts/drive', { limit: this.chartLimit, span: 'hour' }), ]), Promise.all([ - this.$root.api('charts/federation', { limit: this.chartLimit, span: 'day' }), - this.$root.api('charts/users', { limit: this.chartLimit, span: 'day' }), - this.$root.api('charts/active-users', { limit: this.chartLimit, span: 'day' }), - this.$root.api('charts/notes', { limit: this.chartLimit, span: 'day' }), - this.$root.api('charts/drive', { limit: this.chartLimit, span: 'day' }), + os.api('charts/federation', { limit: this.chartLimit, span: 'day' }), + os.api('charts/users', { limit: this.chartLimit, span: 'day' }), + os.api('charts/active-users', { limit: this.chartLimit, span: 'day' }), + os.api('charts/notes', { limit: this.chartLimit, span: 'day' }), + os.api('charts/drive', { limit: this.chartLimit, span: 'day' }), ])]); const chart = { @@ -279,7 +281,7 @@ export default Vue.extend({ const gridColor = this.$store.state.device.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)'; Chart.defaults.global.defaultFontColor = getComputedStyle(document.documentElement).getPropertyValue('--fg'); - this.chartInstance = new Chart(this.$refs.chart, { + this.chartInstance = markRaw(new Chart(this.$refs.chart, { type: 'line', data: { labels: new Array(this.chartLimit).fill(0).map((_, i) => this.getDate(i).toLocaleString()).slice().reverse(), @@ -344,7 +346,7 @@ export default Vue.extend({ mode: 'index', } } - }); + })); }, getDate(ago: number) { @@ -622,13 +624,15 @@ export default Vue.extend({ }] }; }, + + number } }); </script> <style lang="scss" scoped> .zbcjwnqg { - &.max-width_1200px { + &.max-width_1000px { > .stats { grid-template-columns: 1fr 1fr; grid-template-rows: 1fr 1fr; |