From 8d7c033cf597265195aad864d575db0989155c6a Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 4 Nov 2018 21:21:34 +0900 Subject: [PATCH] Clean up --- locales/ja-JP.yml | 32 - package.json | 2 - .../app/common/views/components/nav.vue | 2 - src/client/app/desktop/script.ts | 2 - .../desktop/views/components/charts.chart.ts | 42 - .../app/desktop/views/components/charts.vue | 723 ------------------ .../app/desktop/views/pages/stats/stats.vue | 65 -- 7 files changed, 868 deletions(-) delete mode 100644 src/client/app/desktop/views/components/charts.chart.ts delete mode 100644 src/client/app/desktop/views/components/charts.vue delete mode 100644 src/client/app/desktop/views/pages/stats/stats.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index ec3896bdf..37ee05a60 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -599,32 +599,6 @@ desktop/views/components/calendar.vue: next: "次の月" go: "クリックして時間遡行" -desktop/views/components/charts.vue: - title: "チャート" - per-day: "1日ごと" - per-hour: "1時間ごと" - federation: "フェデレーション" - notes: "投稿" - users: "ユーザー" - drive: "ドライブ" - network: "ネットワーク" - charts: - federation-instances: "インスタンスの増減" - federation-instances-total: "インスタンスの積算" - notes: "投稿の増減 (統合)" - local-notes: "投稿の増減 (ローカル)" - remote-notes: "投稿の増減 (リモート)" - notes-total: "投稿の積算" - users: "ユーザーの増減" - users-total: "ユーザーの積算" - drive: "ドライブ使用量の増減" - drive-total: "ドライブ使用量の積算" - drive-files: "ドライブのファイル数の増減" - drive-files-total: "ドライブのファイル数の積算" - network-requests: "リクエスト" - network-time: "応答時間" - network-usage: "通信量" - desktop/views/components/choose-file-from-drive-window.vue: choose-file: "ファイル選択中" upload: "PCからドライブにファイルをアップロード" @@ -1173,12 +1147,6 @@ desktop/views/pages/deck/deck.user-column.vue: pinned-notes: "ピン留めされた投稿" push-to-a-list: "リストに追加" -desktop/views/pages/stats/stats.vue: - all-users: "全てのユーザー" - original-users: "このインスタンスのユーザー" - all-notes: "全ての投稿" - original-notes: "このインスタンスの投稿" - desktop/views/pages/welcome.vue: about: "詳しく..." gotit: "わかった" diff --git a/package.json b/package.json index e024e3186..2d9c14634 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,6 @@ "chai": "4.2.0", "chai-http": "4.2.0", "chalk": "2.4.1", - "chart.js": "2.7.3", "commander": "2.19.0", "crc-32": "1.2.0", "css-loader": "1.0.1", @@ -211,7 +210,6 @@ "uuid": "3.3.2", "v-animate-css": "0.0.2", "vue": "2.5.17", - "vue-chartjs": "3.4.0", "vue-color": "2.7.0", "vue-content-loading": "1.5.3", "vue-cropperjs": "2.2.2", diff --git a/src/client/app/common/views/components/nav.vue b/src/client/app/common/views/components/nav.vue index d52c8e27a..27e66358e 100644 --- a/src/client/app/common/views/components/nav.vue +++ b/src/client/app/common/views/components/nav.vue @@ -2,8 +2,6 @@ %i18n:@about% - %i18n:@stats% - %i18n:@repository% %i18n:@feedback% diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index 255589b01..eabb1fe16 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -23,7 +23,6 @@ import updateBanner from './api/update-banner'; import MkIndex from './views/pages/index.vue'; import MkHome from './views/pages/home.vue'; import MkDeck from './views/pages/deck/deck.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'; @@ -56,7 +55,6 @@ init(async (launch) => { { path: '/', name: 'index', component: MkIndex }, { path: '/home', name: 'home', component: MkHome }, { path: '/deck', name: 'deck', component: MkDeck }, - { 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/components/charts.chart.ts b/src/client/app/desktop/views/components/charts.chart.ts deleted file mode 100644 index 513db6076..000000000 --- a/src/client/app/desktop/views/components/charts.chart.ts +++ /dev/null @@ -1,42 +0,0 @@ -import Vue from 'vue'; -import { Line } from 'vue-chartjs'; -import * as mergeOptions from 'merge-options'; - -export default Vue.extend({ - extends: Line, - props: { - data: { - required: true - }, - opts: { - required: false - } - }, - watch: { - data() { - this.render(); - } - }, - mounted() { - this.render(); - }, - methods: { - render() { - this.renderChart(this.data, mergeOptions({ - responsive: true, - maintainAspectRatio: false, - scales: { - xAxes: [{ - type: 'time', - distribution: 'series' - }] - }, - tooltips: { - intersect: false, - mode: 'index', - position: 'nearest' - } - }, this.opts || {})); - } - } -}); diff --git a/src/client/app/desktop/views/components/charts.vue b/src/client/app/desktop/views/components/charts.vue deleted file mode 100644 index 2601e830e..000000000 --- a/src/client/app/desktop/views/components/charts.vue +++ /dev/null @@ -1,723 +0,0 @@ - - - - - diff --git a/src/client/app/desktop/views/pages/stats/stats.vue b/src/client/app/desktop/views/pages/stats/stats.vue deleted file mode 100644 index 219885fb9..000000000 --- a/src/client/app/desktop/views/pages/stats/stats.vue +++ /dev/null @@ -1,65 +0,0 @@ - - - - -