From a92c7cfc436f52498f9214dd72055bc9fc37663b Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 11 Aug 2017 14:04:18 +0000 Subject: [PATCH 01/16] chore(package): update @types/chai to version 4.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8158352c0..bdf55809c 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "devDependencies": { "@types/bcryptjs": "2.4.0", "@types/body-parser": "1.16.4", - "@types/chai": "4.0.2", + "@types/chai": "4.0.3", "@types/chai-http": "3.0.1", "@types/chalk": "0.4.31", "@types/compression": "0.0.33", From 5d9b5820afcd8525278f7e661a2519c76eedca5f Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 11 Aug 2017 23:57:16 +0900 Subject: [PATCH 02/16] =?UTF-8?q?status=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit とりあえずCPU使用率だけ --- docs/setup.en.md | 1 + docs/setup.ja.md | 1 + src/config.ts | 2 + src/web/app/common/scripts/config.js | 4 +- src/web/app/desktop/tags/home-widgets/nav.tag | 2 +- src/web/app/status/script.js | 23 +++ src/web/app/status/style.styl | 12 ++ src/web/app/status/tags/index.js | 1 + src/web/app/status/tags/index.tag | 139 ++++++++++++++++++ webpack/webpack.config.ts | 9 +- 10 files changed, 188 insertions(+), 6 deletions(-) create mode 100644 src/web/app/status/script.js create mode 100644 src/web/app/status/style.styl create mode 100644 src/web/app/status/tags/index.js create mode 100644 src/web/app/status/tags/index.tag diff --git a/docs/setup.en.md b/docs/setup.en.md index 9348db667..b6391c678 100644 --- a/docs/setup.en.md +++ b/docs/setup.en.md @@ -25,6 +25,7 @@ Note that Misskey uses following subdomains: * **api**.*{primary domain}* * **auth**.*{primary domain}* * **about**.*{primary domain}* +* **status**.*{primary domain}* * **dev**.*{primary domain}* * **file**.*{secondary domain}* diff --git a/docs/setup.ja.md b/docs/setup.ja.md index fe67e3547..a770ac8c2 100644 --- a/docs/setup.ja.md +++ b/docs/setup.ja.md @@ -26,6 +26,7 @@ Misskeyは以下のサブドメインを使います: * **api**.*{primary domain}* * **auth**.*{primary domain}* * **about**.*{primary domain}* +* **status**.*{primary domain}* * **dev**.*{primary domain}* * **file**.*{secondary domain}* diff --git a/src/config.ts b/src/config.ts index ca940420e..53b7108fd 100644 --- a/src/config.ts +++ b/src/config.ts @@ -81,6 +81,7 @@ type Mixin = { api_url: string; auth_url: string; about_url: string; + status_url: string; dev_url: string; drive_url: string; }; @@ -115,6 +116,7 @@ export default function load() { mixin.auth_url = `${mixin.scheme}://auth.${mixin.host}`; mixin.dev_url = `${mixin.scheme}://dev.${mixin.host}`; mixin.about_url = `${mixin.scheme}://about.${mixin.host}`; + mixin.status_url = `${mixin.scheme}://status.${mixin.host}`; mixin.drive_url = `${mixin.secondary_scheme}://file.${mixin.secondary_host}`; return Object.assign(config, mixin); diff --git a/src/web/app/common/scripts/config.js b/src/web/app/common/scripts/config.js index 16f75d6e1..d108b834b 100644 --- a/src/web/app/common/scripts/config.js +++ b/src/web/app/common/scripts/config.js @@ -8,6 +8,7 @@ const url = `${scheme}//${host}`; const apiUrl = `${scheme}//api.${host}`; const devUrl = `${scheme}//dev.${host}`; const aboutUrl = `${scheme}//about.${host}`; +const statusUrl = `${scheme}//status.${host}`; export default { host, @@ -15,5 +16,6 @@ export default { url, apiUrl, devUrl, - aboutUrl + aboutUrl, + statusUrl }; diff --git a/src/web/app/desktop/tags/home-widgets/nav.tag b/src/web/app/desktop/tags/home-widgets/nav.tag index 304be8f95..16a93545a 100644 --- a/src/web/app/desktop/tags/home-widgets/nav.tag +++ b/src/web/app/desktop/tags/home-widgets/nav.tag @@ -1,4 +1,4 @@ -Misskeyについて・ステータス・Wiki・リポジトリ・開発者・Follow us on +Misskeyについて・ステータス・Wiki・リポジトリ・開発者・Follow us on + + + + +

CPU { percentage }%

+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webpack/webpack.config.ts b/webpack/webpack.config.ts index 0154d3b19..7035d4bb9 100644 --- a/webpack/webpack.config.ts +++ b/webpack/webpack.config.ts @@ -14,10 +14,11 @@ module.exports = langs.map(([lang, locale]) => { // Entries const entry = { - 'desktop': './src/web/app/desktop/script.js', - 'mobile': './src/web/app/mobile/script.js', - 'dev': './src/web/app/dev/script.js', - 'auth': './src/web/app/auth/script.js' + desktop: './src/web/app/desktop/script.js', + mobile: './src/web/app/mobile/script.js', + status: './src/web/app/status/script.js', + dev: './src/web/app/dev/script.js', + auth: './src/web/app/auth/script.js' }; const output = { From 692d5141fce81496abd09d1cd3c0bddaf79e4f3b Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 02:29:46 +0900 Subject: [PATCH 03/16] [Client:Status] :v: --- locales/en.yml | 4 ++ locales/ja.yml | 4 ++ src/web/app/status/style.styl | 5 +- src/web/app/status/tags/index.tag | 92 ++++++++++++++++++++++++++----- 4 files changed, 86 insertions(+), 19 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index a01392809..a91fc5709 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -426,3 +426,7 @@ mobile: all: "All" known: "You know" load-more: "More" + +status: + all-systems-maybe-operational: "All systems maybe operational" + what-is-this-site: "" diff --git a/locales/ja.yml b/locales/ja.yml index d55e690e9..efbc60475 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -427,3 +427,7 @@ mobile: all: "すべて" known: "知り合い" load-more: "もっと" + +status: + all-systems-maybe-operational: "すべてのシステムがたぶん正常に作動しています" + what-is-this-site: "" diff --git a/src/web/app/status/style.styl b/src/web/app/status/style.styl index e560febf9..b48d7aeb9 100644 --- a/src/web/app/status/style.styl +++ b/src/web/app/status/style.styl @@ -6,7 +6,4 @@ html body margin 0 - padding 32px 0 - - @media (max-width 600px) - padding 0 + padding 0 diff --git a/src/web/app/status/tags/index.tag b/src/web/app/status/tags/index.tag index b75b9710c..121f673d4 100644 --- a/src/web/app/status/tags/index.tag +++ b/src/web/app/status/tags/index.tag @@ -1,26 +1,54 @@ -

Misskey Status

+

MisskeyStatus

+

%i18n:status.all-systems-maybe-operational%

+
+ + +

MEM { percentage }%

+ + + + + - + - - - - - + + + + + + + + + +

%i18n:stats.posts-count% { stats.posts_count }

+ + + + + + +

%i18n:stats.users-count% { stats.users_count }

+ + + + + + + + Black ... Total
Blue ... Posts
Red ... Replies
Green ... Reposts + + + + + + + + + + + + + + + + diff --git a/src/web/app/status/tags/index.tag b/src/web/app/status/tags/index.tag index 121f673d4..07b9921ab 100644 --- a/src/web/app/status/tags/index.tag +++ b/src/web/app/status/tags/index.tag @@ -56,7 +56,6 @@ this.mixin('api'); this.initializing = true; - this.view = 0; this.connection = new Connection(); this.on('mount', () => { diff --git a/webpack/webpack.config.ts b/webpack/webpack.config.ts index 7035d4bb9..5199285d5 100644 --- a/webpack/webpack.config.ts +++ b/webpack/webpack.config.ts @@ -16,6 +16,7 @@ module.exports = langs.map(([lang, locale]) => { const entry = { desktop: './src/web/app/desktop/script.js', mobile: './src/web/app/mobile/script.js', + stats: './src/web/app/stats/script.js', status: './src/web/app/status/script.js', dev: './src/web/app/dev/script.js', auth: './src/web/app/auth/script.js' From d16b0ae06493a467b14439c9dcc6468f0cb9a2f9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 15:17:48 +0900 Subject: [PATCH 07/16] 2361 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a4143fcf..d4f015085 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +2361 +---- +Statsを実装するなど + 2357 ---- Statusを実装するなど diff --git a/package.json b/package.json index dc298aad7..44e6c7ea2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "0.0.2357", + "version": "0.0.2361", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", From 6391caa60c4e946c6d93a322a957fa4b54c9d212 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 15:26:56 +0900 Subject: [PATCH 08/16] :art: --- src/web/app/stats/tags/index.tag | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/web/app/stats/tags/index.tag b/src/web/app/stats/tags/index.tag index 015bf439d..0adf58b0b 100644 --- a/src/web/app/stats/tags/index.tag +++ b/src/web/app/stats/tags/index.tag @@ -144,7 +144,7 @@ From 8564a29b5aa1dd34d373cac94480612b9e573345 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 18:03:23 +0900 Subject: [PATCH 12/16] [API] Remove needless data --- src/api/endpoints/aggregation/posts.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/api/endpoints/aggregation/posts.ts b/src/api/endpoints/aggregation/posts.ts index 573816e4f..48ee22512 100644 --- a/src/api/endpoints/aggregation/posts.ts +++ b/src/api/endpoints/aggregation/posts.ts @@ -79,11 +79,6 @@ module.exports = params => new Promise(async (res, rej) => { graph.push(data); } else { graph.push({ - date: { - year: day.getFullYear(), - month: day.getMonth() + 1, // In JavaScript, month is zero-based. - day: day.getDate() - }, posts: 0, reposts: 0, replies: 0 From 1a12fa121029ce06b52c29ebcf014292ade7b684 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 18:05:50 +0900 Subject: [PATCH 13/16] 2367 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a09a6369a..cb625eaa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +2367 +---- +Statsのユーザー数グラフに「アカウントが作成された「回数」」グラフも併記するようにした + 2364 ---- デザインの微調整 diff --git a/package.json b/package.json index ad85ccf50..595471d51 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "0.0.2364", + "version": "0.0.2367", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", From 813acc824bd31879d9f1f2727ee65709b2518c79 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Aug 2017 18:06:25 +0900 Subject: [PATCH 14/16] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb625eaa4..03d36a01f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +ChangeLog +========= +主に notable な changes を書いていきます + 2367 ---- Statsのユーザー数グラフに「アカウントが作成された「回数」」グラフも併記するようにした From 0d712c914cd0f5ad0a905e4c7964cdc21acf0da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=B4=E3=81=AA=E3=81=9F=E3=81=BF=E3=81=BD?= Date: Sat, 12 Aug 2017 18:08:24 +0900 Subject: [PATCH 15/16] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03d36a01f..4101bc9d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ChangeLog 2367 ---- -Statsのユーザー数グラフに「アカウントが作成された「回数」」グラフも併記するようにした +Statsのユーザー数グラフに「アカウントが作成された**回数**」(その日時点での「アカウント数」**ではなく**)グラフも併記するようにした 2364 ---- From 42ff2295a918a76ecbf751ffd9df31c0a5772532 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sat, 12 Aug 2017 09:46:19 +0000 Subject: [PATCH 16/16] chore(package): update webpack to version 3.5.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 595471d51..d2083caf7 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "uglify-es": "3.0.27", "uglify-es-webpack-plugin": "0.10.0", "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony", - "webpack": "3.5.3" + "webpack": "3.5.4" }, "dependencies": { "accesses": "2.5.0",