From 1c1e3009e9fe6263ac074629b0d7d753c78d0c8f Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Aug 2018 12:14:36 +0900 Subject: [PATCH 01/17] :v: --- src/client/app/desktop/views/pages/admin/admin.chart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.vue b/src/client/app/desktop/views/pages/admin/admin.chart.vue index 4310ce03d6..cca05fec28 100644 --- a/src/client/app/desktop/views/pages/admin/admin.chart.vue +++ b/src/client/app/desktop/views/pages/admin/admin.chart.vue @@ -318,7 +318,7 @@ export default Vue.extend({ yAxes: [{ ticks: { callback: value => { - return Vue.filter('bytes')(value); + return Vue.filter('bytes')(value, 1); } } }] @@ -327,7 +327,7 @@ export default Vue.extend({ callbacks: { label: (tooltipItem, data) => { const label = data.datasets[tooltipItem.datasetIndex].label || ''; - return `${label}: ${Vue.filter('bytes')(tooltipItem.yLabel)}`; + return `${label}: ${Vue.filter('bytes')(tooltipItem.yLabel, 1)}`; } } } From 47a5f3bc67adb4e95f027e5aa2d14b5a8bb6c697 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Aug 2018 12:28:05 +0900 Subject: [PATCH 02/17] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E5=88=86=E9=9B=A2=E3=81=99=E3=82=8B=E3=81=AA=E3=81=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 38 +++++++++---------- src/client/app/desktop/script.ts | 2 + .../charts.chart.ts} | 0 .../admin.chart.vue => components/charts.vue} | 13 ++++++- .../app/desktop/views/pages/admin/admin.vue | 9 ++--- .../app/desktop/views/pages/stats/stats.vue | 29 ++++++++++++++ 6 files changed, 65 insertions(+), 26 deletions(-) rename src/client/app/desktop/views/{pages/admin/admin.chart.chart.ts => components/charts.chart.ts} (100%) rename src/client/app/desktop/views/{pages/admin/admin.chart.vue => components/charts.vue} (98%) create mode 100644 src/client/app/desktop/views/pages/stats/stats.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index c44254439c..fae257480c 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -473,6 +473,25 @@ desktop/views/components/calendar.vue: next: "次の月" go: "クリックして時間遡行" +desktop/views/components/charts.vue: + title: "チャート" + per-day: "1日ごと" + per-hour: "1時間ごと" + notes: "投稿" + users: "ユーザー" + drive: "ドライブ" + charts: + notes: "投稿の増減 (統合)" + local-notes: "投稿の増減 (ローカル)" + remote-notes: "投稿の増減 (リモート)" + notes-total: "投稿の累計" + users: "ユーザーの増減" + users-total: "ユーザーの累計" + drive: "ドライブ使用量の増減" + drive-total: "ドライブ使用量の累計" + drive-files: "ドライブのファイル数の増減" + drive-files-total: "ドライブのファイル数の累計" + desktop/views/components/choose-file-from-drive-window.vue: choose-file: "ファイル選択中" upload: "PCからドライブにファイルをアップロード" @@ -939,25 +958,6 @@ desktop/views/pages/admin/admin.unverify-user.vue: unverify: "公式アカウントを解除する" unverified: "公式アカウントを解除しました" -desktop/views/pages/admin/admin.chart.vue: - title: "チャート" - per-day: "1日ごと" - per-hour: "1時間ごと" - notes: "投稿" - users: "ユーザー" - drive: "ドライブ" - charts: - notes: "投稿の増減 (統合)" - local-notes: "投稿の増減 (ローカル)" - remote-notes: "投稿の増減 (リモート)" - notes-total: "投稿の累計" - users: "ユーザーの増減" - users-total: "ユーザーの累計" - drive: "ドライブ使用量の増減" - drive-total: "ドライブ使用量の累計" - drive-files: "ドライブのファイル数の増減" - drive-files-total: "ドライブのファイル数の累計" - desktop/views/pages/deck/deck.tl-column.vue: is-media-only: "メディア投稿のみ" is-media-view: "メディアビュー" diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index 7f4a2d0b00..f0e8a42662 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -25,6 +25,7 @@ import updateBanner from './api/update-banner'; import MkIndex from './views/pages/index.vue'; import MkDeck from './views/pages/deck/deck.vue'; import MkAdmin from './views/pages/admin/admin.vue'; +import MkStats from './views/pages/stats/stats.vue'; import MkUser from './views/pages/user/user.vue'; import MkFavorites from './views/pages/favorites.vue'; import MkSelectDrive from './views/pages/selectdrive.vue'; @@ -57,6 +58,7 @@ init(async (launch) => { { path: '/', name: 'index', component: MkIndex }, { path: '/deck', name: 'deck', component: MkDeck }, { path: '/admin', name: 'admin', component: MkAdmin }, + { path: '/stats', name: 'stats', component: MkStats }, { path: '/i/customize-home', component: MkHomeCustomize }, { path: '/i/favorites', component: MkFavorites }, { path: '/i/messaging/:user', component: MkMessagingRoom }, diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts b/src/client/app/desktop/views/components/charts.chart.ts similarity index 100% rename from src/client/app/desktop/views/pages/admin/admin.chart.chart.ts rename to src/client/app/desktop/views/components/charts.chart.ts diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.vue b/src/client/app/desktop/views/components/charts.vue similarity index 98% rename from src/client/app/desktop/views/pages/admin/admin.chart.vue rename to src/client/app/desktop/views/components/charts.vue index cca05fec28..ff41639a10 100644 --- a/src/client/app/desktop/views/pages/admin/admin.chart.vue +++ b/src/client/app/desktop/views/components/charts.vue @@ -1,5 +1,5 @@