From fe0af4dd99c6c6165f6b165179d344cd68759857 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 11 Aug 2017 23:57:16 +0900 Subject: [PATCH] =?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 = {