From 366e0d6bde2996d109ff7b2e7f2a0c2c8b92a07c Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sat, 25 Aug 2018 04:40:46 +0000 Subject: [PATCH 1/5] fix(package): update @types/node to version 10.9.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 89954c7bae..c55a677bea 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@types/mocha": "5.2.3", "@types/mongodb": "3.1.4", "@types/ms": "0.7.30", - "@types/node": "10.9.1", + "@types/node": "10.9.2", "@types/portscanner": "2.1.0", "@types/pug": "2.0.4", "@types/qrcode": "1.2.0", From 81969ea8b2ed0037ab8840359879447fcde45eb8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Aug 2018 15:25:16 +0900 Subject: [PATCH 2/5] :art: --- .../app/desktop/views/components/charts.vue | 195 ++++++++++-------- .../app/desktop/views/pages/stats/stats.vue | 2 +- 2 files changed, 108 insertions(+), 89 deletions(-) diff --git a/src/client/app/desktop/views/components/charts.vue b/src/client/app/desktop/views/components/charts.vue index ff41639a10..37d95577cd 100644 --- a/src/client/app/desktop/views/components/charts.vue +++ b/src/client/app/desktop/views/components/charts.vue @@ -34,10 +34,25 @@ import Vue from 'vue'; import XChart from './charts.chart.ts'; +const colors = { + local: 'rgb(246, 88, 79)', + remote: 'rgb(65, 221, 222)', + + localPlus: 'rgb(52, 178, 118)', + remotePlus: 'rgb(158, 255, 209)', + localMinus: 'rgb(255, 97, 74)', + remoteMinus: 'rgb(255, 149, 134)' +}; + +const rgba = (color: string): string => { + return color.replace('rgb', 'rgba').replace(')', ', 0.1)'); +}; + export default Vue.extend({ components: { XChart }, + data() { return { chart: null, @@ -45,6 +60,7 @@ export default Vue.extend({ span: 'hour' }; }, + computed: { data(): any { if (this.chart == null) return null; @@ -61,6 +77,7 @@ export default Vue.extend({ case 'drive-files-total': return this.driveFilesTotalChart(); } }, + stats(): any[] { return ( this.span == 'day' ? this.chart.perDay : @@ -69,11 +86,13 @@ export default Vue.extend({ ); } }, + created() { (this as any).api('chart').then(chart => { this.chart = chart; }); }, + methods: { notesChart(type: string): any { const data = this.stats.slice().reverse().map(x => ({ @@ -160,24 +179,24 @@ export default Vue.extend({ pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.remoteCount + x.localCount })) - }, { - label: 'Remote', - fill: true, - backgroundColor: 'rgba(65, 221, 222, 0.1)', - borderColor: '#41ddde', - borderWidth: 2, - pointBackgroundColor: '#fff', - lineTension: 0, - data: data.map(x => ({ t: x.date, y: x.remoteCount })) }, { label: 'Local', fill: true, - backgroundColor: 'rgba(246, 88, 79, 0.1)', - borderColor: '#f6584f', + backgroundColor: rgba(colors.local), + borderColor: colors.local, borderWidth: 2, pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.localCount })) + }, { + label: 'Remote', + fill: true, + backgroundColor: rgba(colors.remote), + borderColor: colors.remote, + borderWidth: 2, + pointBackgroundColor: '#fff', + lineTension: 0, + data: data.map(x => ({ t: x.date, y: x.remoteCount })) }] }, { scales: { @@ -217,24 +236,24 @@ export default Vue.extend({ pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.remoteCount + x.localCount })) - }, { - label: 'Remote', - fill: true, - backgroundColor: 'rgba(65, 221, 222, 0.1)', - borderColor: '#41ddde', - borderWidth: 2, - pointBackgroundColor: '#fff', - lineTension: 0, - data: data.map(x => ({ t: x.date, y: x.remoteCount })) }, { label: 'Local', fill: true, - backgroundColor: 'rgba(246, 88, 79, 0.1)', - borderColor: '#f6584f', + backgroundColor: rgba(colors.local), + borderColor: colors.local, borderWidth: 2, pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.localCount })) + }, { + label: 'Remote', + fill: true, + backgroundColor: rgba(colors.remote), + borderColor: colors.remote, + borderWidth: 2, + pointBackgroundColor: '#fff', + lineTension: 0, + data: data.map(x => ({ t: x.date, y: x.remoteCount })) }] }, { scales: { @@ -276,29 +295,11 @@ export default Vue.extend({ pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.localInc + x.localDec + x.remoteInc + x.remoteDec })) - }, { - label: 'Remote +', - fill: true, - backgroundColor: 'rgba(65, 221, 222, 0.1)', - borderColor: '#41ddde', - borderWidth: 2, - pointBackgroundColor: '#fff', - lineTension: 0, - data: data.map(x => ({ t: x.date, y: x.remoteInc })) - }, { - label: 'Remote -', - fill: true, - backgroundColor: 'rgba(65, 221, 222, 0.1)', - borderColor: '#41ddde', - borderWidth: 2, - pointBackgroundColor: '#fff', - lineTension: 0, - data: data.map(x => ({ t: x.date, y: x.remoteDec })) }, { label: 'Local +', fill: true, - backgroundColor: 'rgba(246, 88, 79, 0.1)', - borderColor: '#f6584f', + backgroundColor: rgba(colors.localPlus), + borderColor: colors.localPlus, borderWidth: 2, pointBackgroundColor: '#fff', lineTension: 0, @@ -306,12 +307,30 @@ export default Vue.extend({ }, { label: 'Local -', fill: true, - backgroundColor: 'rgba(246, 88, 79, 0.1)', - borderColor: '#f6584f', + backgroundColor: rgba(colors.localMinus), + borderColor: colors.localMinus, borderWidth: 2, pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.localDec })) + }, { + label: 'Remote +', + fill: true, + backgroundColor: rgba(colors.remotePlus), + borderColor: colors.remotePlus, + borderWidth: 2, + pointBackgroundColor: '#fff', + lineTension: 0, + data: data.map(x => ({ t: x.date, y: x.remoteInc })) + }, { + label: 'Remote -', + fill: true, + backgroundColor: rgba(colors.remoteMinus), + borderColor: colors.remoteMinus, + borderWidth: 2, + pointBackgroundColor: '#fff', + lineTension: 0, + data: data.map(x => ({ t: x.date, y: x.remoteDec })) }] }, { scales: { @@ -351,24 +370,24 @@ export default Vue.extend({ pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.remoteSize + x.localSize })) - }, { - label: 'Remote', - fill: true, - backgroundColor: 'rgba(65, 221, 222, 0.1)', - borderColor: '#41ddde', - borderWidth: 2, - pointBackgroundColor: '#fff', - lineTension: 0, - data: data.map(x => ({ t: x.date, y: x.remoteSize })) }, { label: 'Local', fill: true, - backgroundColor: 'rgba(246, 88, 79, 0.1)', - borderColor: '#f6584f', + backgroundColor: rgba(colors.local), + borderColor: colors.local, borderWidth: 2, pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.localSize })) + }, { + label: 'Remote', + fill: true, + backgroundColor: rgba(colors.remote), + borderColor: colors.remote, + borderWidth: 2, + pointBackgroundColor: '#fff', + lineTension: 0, + data: data.map(x => ({ t: x.date, y: x.remoteSize })) }] }, { scales: { @@ -410,29 +429,11 @@ export default Vue.extend({ pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.localInc + x.localDec + x.remoteInc + x.remoteDec })) - }, { - label: 'Remote +', - fill: true, - backgroundColor: 'rgba(65, 221, 222, 0.1)', - borderColor: '#41ddde', - borderWidth: 2, - pointBackgroundColor: '#fff', - lineTension: 0, - data: data.map(x => ({ t: x.date, y: x.remoteInc })) - }, { - label: 'Remote -', - fill: true, - backgroundColor: 'rgba(65, 221, 222, 0.1)', - borderColor: '#41ddde', - borderWidth: 2, - pointBackgroundColor: '#fff', - lineTension: 0, - data: data.map(x => ({ t: x.date, y: x.remoteDec })) }, { label: 'Local +', fill: true, - backgroundColor: 'rgba(246, 88, 79, 0.1)', - borderColor: '#f6584f', + backgroundColor: rgba(colors.localPlus), + borderColor: colors.localPlus, borderWidth: 2, pointBackgroundColor: '#fff', lineTension: 0, @@ -440,12 +441,30 @@ export default Vue.extend({ }, { label: 'Local -', fill: true, - backgroundColor: 'rgba(246, 88, 79, 0.1)', - borderColor: '#f6584f', + backgroundColor: rgba(colors.localMinus), + borderColor: colors.localMinus, borderWidth: 2, pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.localDec })) + }, { + label: 'Remote +', + fill: true, + backgroundColor: rgba(colors.remotePlus), + borderColor: colors.remotePlus, + borderWidth: 2, + pointBackgroundColor: '#fff', + lineTension: 0, + data: data.map(x => ({ t: x.date, y: x.remoteInc })) + }, { + label: 'Remote -', + fill: true, + backgroundColor: rgba(colors.remoteMinus), + borderColor: colors.remoteMinus, + borderWidth: 2, + pointBackgroundColor: '#fff', + lineTension: 0, + data: data.map(x => ({ t: x.date, y: x.remoteDec })) }] }, { scales: { @@ -485,24 +504,24 @@ export default Vue.extend({ pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.localCount + x.remoteCount })) - }, { - label: 'Remote', - fill: true, - backgroundColor: 'rgba(65, 221, 222, 0.1)', - borderColor: '#41ddde', - borderWidth: 2, - pointBackgroundColor: '#fff', - lineTension: 0, - data: data.map(x => ({ t: x.date, y: x.remoteCount })) }, { label: 'Local', fill: true, - backgroundColor: 'rgba(246, 88, 79, 0.1)', - borderColor: '#f6584f', + backgroundColor: rgba(colors.local), + borderColor: colors.local, borderWidth: 2, pointBackgroundColor: '#fff', lineTension: 0, data: data.map(x => ({ t: x.date, y: x.localCount })) + }, { + label: 'Remote', + fill: true, + backgroundColor: rgba(colors.remote), + borderColor: colors.remote, + borderWidth: 2, + pointBackgroundColor: '#fff', + lineTension: 0, + data: data.map(x => ({ t: x.date, y: x.remoteCount })) }] }, { scales: { diff --git a/src/client/app/desktop/views/pages/stats/stats.vue b/src/client/app/desktop/views/pages/stats/stats.vue index 77ef8ca457..5b1d780ae6 100644 --- a/src/client/app/desktop/views/pages/stats/stats.vue +++ b/src/client/app/desktop/views/pages/stats/stats.vue @@ -38,7 +38,7 @@ export default Vue.extend({ .tcrwdhwpuxrwmcttxjcsehgpagpstqey width 100% - padding 16px 32px + padding 16px > .stats display flex From 4d46a6105146b54aa0879aacf80082551d0d7388 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Aug 2018 15:26:13 +0900 Subject: [PATCH 3/5] :v: --- locales/ja-JP.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index bce6ddb24e..238f1fbecb 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -934,8 +934,8 @@ desktop/views/pages/admin/admin.dashboard.vue: dashboard: "ダッシュボード" all-users: "全てのユーザー" original-users: "このインスタンスのユーザー" - all-notes: "全てのノート" - original-notes: "このインスタンスのノート" + all-notes: "全ての投稿" + original-notes: "このインスタンスの投稿" invite: "招待" desktop/views/pages/admin/admin.suspend-user.vue: @@ -971,8 +971,8 @@ desktop/views/pages/deck/deck.note.vue: desktop/views/pages/stats/stats.vue: all-users: "全てのユーザー" original-users: "このインスタンスのユーザー" - all-notes: "全てのノート" - original-notes: "このインスタンスのノート" + all-notes: "全ての投稿" + original-notes: "このインスタンスの投稿" desktop/views/pages/welcome.vue: about: "詳しく..." From 739c99391111a1867340a65a1c2180653f4bbab3 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Aug 2018 15:30:48 +0900 Subject: [PATCH 4/5] Fix #2466 --- src/client/app/mobile/views/pages/user.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue index e72867352f..8918847a8f 100644 --- a/src/client/app/mobile/views/pages/user.vue +++ b/src/client/app/mobile/views/pages/user.vue @@ -11,7 +11,7 @@ avatar - +
From 2b556aba03abc954d2ba412e038b3ca23d505f9e Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Aug 2018 15:34:10 +0900 Subject: [PATCH 5/5] 8.11.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c55a677bea..eac4025388 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "misskey", "author": "syuilo ", - "version": "8.10.0", - "clientVersion": "1.0.8972", + "version": "8.11.0", + "clientVersion": "1.0.8979", "codename": "nighthike", "main": "./built/index.js", "private": true,