From 36c11e1f0f24f5fc451ad1a38fd054c2cfa4d508 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 25 Feb 2018 00:18:09 +0900 Subject: Refactor --- src/web/app/app.vue | 2 +- src/web/app/auth/script.ts | 23 --- src/web/app/common/mios.ts | 15 +- src/web/app/common/views/components/index.ts | 28 --- .../common/views/components/widgets/access-log.vue | 90 ---------- .../common/views/components/widgets/broadcast.vue | 161 ----------------- .../common/views/components/widgets/calendar.vue | 199 --------------------- .../common/views/components/widgets/donation.vue | 58 ------ .../app/common/views/components/widgets/nav.vue | 31 ---- .../views/components/widgets/photo-stream.vue | 104 ----------- .../app/common/views/components/widgets/rss.vue | 93 ---------- .../views/components/widgets/server.cpu-memory.vue | 127 ------------- .../common/views/components/widgets/server.cpu.vue | 68 ------- .../views/components/widgets/server.disk.vue | 76 -------- .../views/components/widgets/server.info.vue | 25 --- .../views/components/widgets/server.memory.vue | 76 -------- .../common/views/components/widgets/server.pie.vue | 61 ------- .../views/components/widgets/server.uptimes.vue | 46 ----- .../app/common/views/components/widgets/server.vue | 93 ---------- .../common/views/components/widgets/slideshow.vue | 153 ---------------- .../app/common/views/components/widgets/tips.vue | 108 ----------- .../common/views/components/widgets/version.vue | 28 --- src/web/app/common/views/widgets/access-log.vue | 90 ++++++++++ src/web/app/common/views/widgets/broadcast.vue | 161 +++++++++++++++++ src/web/app/common/views/widgets/calendar.vue | 199 +++++++++++++++++++++ src/web/app/common/views/widgets/donation.vue | 58 ++++++ src/web/app/common/views/widgets/index.ts | 25 +++ src/web/app/common/views/widgets/nav.vue | 31 ++++ src/web/app/common/views/widgets/photo-stream.vue | 104 +++++++++++ src/web/app/common/views/widgets/rss.vue | 93 ++++++++++ .../app/common/views/widgets/server.cpu-memory.vue | 127 +++++++++++++ src/web/app/common/views/widgets/server.cpu.vue | 68 +++++++ src/web/app/common/views/widgets/server.disk.vue | 76 ++++++++ src/web/app/common/views/widgets/server.info.vue | 25 +++ src/web/app/common/views/widgets/server.memory.vue | 76 ++++++++ src/web/app/common/views/widgets/server.pie.vue | 61 +++++++ .../app/common/views/widgets/server.uptimes.vue | 46 +++++ src/web/app/common/views/widgets/server.vue | 93 ++++++++++ src/web/app/common/views/widgets/slideshow.vue | 153 ++++++++++++++++ src/web/app/common/views/widgets/tips.vue | 108 +++++++++++ src/web/app/common/views/widgets/version.vue | 28 +++ src/web/app/desktop/script.ts | 1 + src/web/app/desktop/views/components/index.ts | 26 --- .../desktop/views/components/widgets/activity.vue | 31 ---- .../components/widgets/channel.channel.form.vue | 67 ------- .../components/widgets/channel.channel.post.vue | 64 ------- .../views/components/widgets/channel.channel.vue | 106 ----------- .../desktop/views/components/widgets/channel.vue | 107 ----------- .../desktop/views/components/widgets/messaging.vue | 59 ------ .../views/components/widgets/notifications.vue | 70 -------- .../app/desktop/views/components/widgets/polls.vue | 122 ------------- .../desktop/views/components/widgets/post-form.vue | 109 ----------- .../desktop/views/components/widgets/profile.vue | 125 ------------- .../views/components/widgets/timemachine.vue | 28 --- .../desktop/views/components/widgets/trends.vue | 128 ------------- .../app/desktop/views/components/widgets/users.vue | 170 ------------------ src/web/app/desktop/views/widgets/activity.vue | 31 ++++ .../desktop/views/widgets/channel.channel.form.vue | 67 +++++++ .../desktop/views/widgets/channel.channel.post.vue | 64 +++++++ .../app/desktop/views/widgets/channel.channel.vue | 106 +++++++++++ src/web/app/desktop/views/widgets/channel.vue | 107 +++++++++++ src/web/app/desktop/views/widgets/index.ts | 23 +++ src/web/app/desktop/views/widgets/messaging.vue | 59 ++++++ .../app/desktop/views/widgets/notifications.vue | 70 ++++++++ src/web/app/desktop/views/widgets/polls.vue | 122 +++++++++++++ src/web/app/desktop/views/widgets/post-form.vue | 109 +++++++++++ src/web/app/desktop/views/widgets/profile.vue | 125 +++++++++++++ src/web/app/desktop/views/widgets/timemachine.vue | 28 +++ src/web/app/desktop/views/widgets/trends.vue | 128 +++++++++++++ src/web/app/desktop/views/widgets/users.vue | 170 ++++++++++++++++++ src/web/app/init.ts | 32 ++-- src/web/app/mobile/script.ts | 1 + src/web/app/mobile/views/components/index.ts | 10 -- .../mobile/views/components/widgets/activity.vue | 32 ---- .../mobile/views/components/widgets/profile.vue | 62 ------- src/web/app/mobile/views/widgets/activity.vue | 32 ++++ src/web/app/mobile/views/widgets/index.ts | 7 + src/web/app/mobile/views/widgets/profile.vue | 62 +++++++ src/web/app/stats/script.ts | 23 --- src/web/app/status/script.ts | 23 --- 80 files changed, 2955 insertions(+), 3038 deletions(-) delete mode 100644 src/web/app/auth/script.ts delete mode 100644 src/web/app/common/views/components/widgets/access-log.vue delete mode 100644 src/web/app/common/views/components/widgets/broadcast.vue delete mode 100644 src/web/app/common/views/components/widgets/calendar.vue delete mode 100644 src/web/app/common/views/components/widgets/donation.vue delete mode 100644 src/web/app/common/views/components/widgets/nav.vue delete mode 100644 src/web/app/common/views/components/widgets/photo-stream.vue delete mode 100644 src/web/app/common/views/components/widgets/rss.vue delete mode 100644 src/web/app/common/views/components/widgets/server.cpu-memory.vue delete mode 100644 src/web/app/common/views/components/widgets/server.cpu.vue delete mode 100644 src/web/app/common/views/components/widgets/server.disk.vue delete mode 100644 src/web/app/common/views/components/widgets/server.info.vue delete mode 100644 src/web/app/common/views/components/widgets/server.memory.vue delete mode 100644 src/web/app/common/views/components/widgets/server.pie.vue delete mode 100644 src/web/app/common/views/components/widgets/server.uptimes.vue delete mode 100644 src/web/app/common/views/components/widgets/server.vue delete mode 100644 src/web/app/common/views/components/widgets/slideshow.vue delete mode 100644 src/web/app/common/views/components/widgets/tips.vue delete mode 100644 src/web/app/common/views/components/widgets/version.vue create mode 100644 src/web/app/common/views/widgets/access-log.vue create mode 100644 src/web/app/common/views/widgets/broadcast.vue create mode 100644 src/web/app/common/views/widgets/calendar.vue create mode 100644 src/web/app/common/views/widgets/donation.vue create mode 100644 src/web/app/common/views/widgets/index.ts create mode 100644 src/web/app/common/views/widgets/nav.vue create mode 100644 src/web/app/common/views/widgets/photo-stream.vue create mode 100644 src/web/app/common/views/widgets/rss.vue create mode 100644 src/web/app/common/views/widgets/server.cpu-memory.vue create mode 100644 src/web/app/common/views/widgets/server.cpu.vue create mode 100644 src/web/app/common/views/widgets/server.disk.vue create mode 100644 src/web/app/common/views/widgets/server.info.vue create mode 100644 src/web/app/common/views/widgets/server.memory.vue create mode 100644 src/web/app/common/views/widgets/server.pie.vue create mode 100644 src/web/app/common/views/widgets/server.uptimes.vue create mode 100644 src/web/app/common/views/widgets/server.vue create mode 100644 src/web/app/common/views/widgets/slideshow.vue create mode 100644 src/web/app/common/views/widgets/tips.vue create mode 100644 src/web/app/common/views/widgets/version.vue delete mode 100644 src/web/app/desktop/views/components/widgets/activity.vue delete mode 100644 src/web/app/desktop/views/components/widgets/channel.channel.form.vue delete mode 100644 src/web/app/desktop/views/components/widgets/channel.channel.post.vue delete mode 100644 src/web/app/desktop/views/components/widgets/channel.channel.vue delete mode 100644 src/web/app/desktop/views/components/widgets/channel.vue delete mode 100644 src/web/app/desktop/views/components/widgets/messaging.vue delete mode 100644 src/web/app/desktop/views/components/widgets/notifications.vue delete mode 100644 src/web/app/desktop/views/components/widgets/polls.vue delete mode 100644 src/web/app/desktop/views/components/widgets/post-form.vue delete mode 100644 src/web/app/desktop/views/components/widgets/profile.vue delete mode 100644 src/web/app/desktop/views/components/widgets/timemachine.vue delete mode 100644 src/web/app/desktop/views/components/widgets/trends.vue delete mode 100644 src/web/app/desktop/views/components/widgets/users.vue create mode 100644 src/web/app/desktop/views/widgets/activity.vue create mode 100644 src/web/app/desktop/views/widgets/channel.channel.form.vue create mode 100644 src/web/app/desktop/views/widgets/channel.channel.post.vue create mode 100644 src/web/app/desktop/views/widgets/channel.channel.vue create mode 100644 src/web/app/desktop/views/widgets/channel.vue create mode 100644 src/web/app/desktop/views/widgets/index.ts create mode 100644 src/web/app/desktop/views/widgets/messaging.vue create mode 100644 src/web/app/desktop/views/widgets/notifications.vue create mode 100644 src/web/app/desktop/views/widgets/polls.vue create mode 100644 src/web/app/desktop/views/widgets/post-form.vue create mode 100644 src/web/app/desktop/views/widgets/profile.vue create mode 100644 src/web/app/desktop/views/widgets/timemachine.vue create mode 100644 src/web/app/desktop/views/widgets/trends.vue create mode 100644 src/web/app/desktop/views/widgets/users.vue delete mode 100644 src/web/app/mobile/views/components/widgets/activity.vue delete mode 100644 src/web/app/mobile/views/components/widgets/profile.vue create mode 100644 src/web/app/mobile/views/widgets/activity.vue create mode 100644 src/web/app/mobile/views/widgets/index.ts create mode 100644 src/web/app/mobile/views/widgets/profile.vue delete mode 100644 src/web/app/stats/script.ts delete mode 100644 src/web/app/status/script.ts (limited to 'src/web/app') diff --git a/src/web/app/app.vue b/src/web/app/app.vue index 321e003930..7a46e7dea0 100644 --- a/src/web/app/app.vue +++ b/src/web/app/app.vue @@ -1,3 +1,3 @@ diff --git a/src/web/app/auth/script.ts b/src/web/app/auth/script.ts deleted file mode 100644 index dd598d1ed6..0000000000 --- a/src/web/app/auth/script.ts +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Authorize Form - */ - -// Style -import './style.styl'; - -import * as riot from 'riot'; -require('./tags'); -import init from '../init'; - -document.title = 'Misskey | アプリの連携'; - -/** - * init - */ -init(() => { - mount(document.createElement('mk-index')); -}); - -function mount(content) { - riot.mount(document.getElementById('app').appendChild(content)); -} diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts index e20f4bfe4e..6c95e5b9b5 100644 --- a/src/web/app/common/mios.ts +++ b/src/web/app/common/mios.ts @@ -1,5 +1,7 @@ import Vue from 'vue'; import { EventEmitter } from 'eventemitter3'; + +import { apiUrl, swPublickey, version, lang } from '../config'; import api from './scripts/api'; import signout from './scripts/signout'; import Progress from './scripts/loading'; @@ -11,13 +13,6 @@ import MessagingIndexStreamManager from './scripts/streaming/messaging-index-str import Err from '../common/views/components/connect-failed.vue'; -//#region environment variables -declare const _VERSION_: string; -declare const _LANG_: string; -declare const _API_URL_: string; -declare const _SW_PUBLICKEY_: string; -//#endregion - export type API = { chooseDriveFile: (opts: { title?: string; @@ -204,7 +199,7 @@ export default class MiOS extends EventEmitter { } // Fetch user - fetch(`${_API_URL_}/i`, { + fetch(`${apiUrl}/i`, { method: 'POST', body: JSON.stringify({ i: token @@ -311,7 +306,7 @@ export default class MiOS extends EventEmitter { // A public key your push server will use to send // messages to client apps via a push server. - applicationServerKey: urlBase64ToUint8Array(_SW_PUBLICKEY_) + applicationServerKey: urlBase64ToUint8Array(swPublickey) }; // Subscribe push notification @@ -348,7 +343,7 @@ export default class MiOS extends EventEmitter { }); // The path of service worker script - const sw = `/sw.${_VERSION_}.${_LANG_}.js`; + const sw = `/sw.${version}.${lang}.js`; // Register service worker navigator.serviceWorker.register(sw).then(registration => { diff --git a/src/web/app/common/views/components/index.ts b/src/web/app/common/views/components/index.ts index 5460d75779..ab0f1767d4 100644 --- a/src/web/app/common/views/components/index.ts +++ b/src/web/app/common/views/components/index.ts @@ -21,20 +21,6 @@ import urlPreview from './url-preview.vue'; import twitterSetting from './twitter-setting.vue'; import fileTypeIcon from './file-type-icon.vue'; -//#region widgets -import wAccessLog from './widgets/access-log.vue'; -import wVersion from './widgets/version.vue'; -import wRss from './widgets/rss.vue'; -import wServer from './widgets/server.vue'; -import wBroadcast from './widgets/broadcast.vue'; -import wCalendar from './widgets/calendar.vue'; -import wPhotoStream from './widgets/photo-stream.vue'; -import wSlideshow from './widgets/slideshow.vue'; -import wTips from './widgets/tips.vue'; -import wDonation from './widgets/donation.vue'; -import wNav from './widgets/nav.vue'; -//#endregion - Vue.component('mk-signin', signin); Vue.component('mk-signup', signup); Vue.component('mk-forkit', forkit); @@ -55,17 +41,3 @@ Vue.component('mk-messaging-room', messagingRoom); Vue.component('mk-url-preview', urlPreview); Vue.component('mk-twitter-setting', twitterSetting); Vue.component('mk-file-type-icon', fileTypeIcon); - -//#region widgets -Vue.component('mkw-nav', wNav); -Vue.component('mkw-calendar', wCalendar); -Vue.component('mkw-photo-stream', wPhotoStream); -Vue.component('mkw-slideshow', wSlideshow); -Vue.component('mkw-tips', wTips); -Vue.component('mkw-donation', wDonation); -Vue.component('mkw-broadcast', wBroadcast); -Vue.component('mkw-server', wServer); -Vue.component('mkw-rss', wRss); -Vue.component('mkw-version', wVersion); -Vue.component('mkw-access-log', wAccessLog); -//#endregion diff --git a/src/web/app/common/views/components/widgets/access-log.vue b/src/web/app/common/views/components/widgets/access-log.vue deleted file mode 100644 index c810c2d157..0000000000 --- a/src/web/app/common/views/components/widgets/access-log.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/broadcast.vue b/src/web/app/common/views/components/widgets/broadcast.vue deleted file mode 100644 index 0bb59caf43..0000000000 --- a/src/web/app/common/views/components/widgets/broadcast.vue +++ /dev/null @@ -1,161 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/calendar.vue b/src/web/app/common/views/components/widgets/calendar.vue deleted file mode 100644 index bfcbd7f68d..0000000000 --- a/src/web/app/common/views/components/widgets/calendar.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/donation.vue b/src/web/app/common/views/components/widgets/donation.vue deleted file mode 100644 index 08aab8ecd1..0000000000 --- a/src/web/app/common/views/components/widgets/donation.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/nav.vue b/src/web/app/common/views/components/widgets/nav.vue deleted file mode 100644 index ce88e587a8..0000000000 --- a/src/web/app/common/views/components/widgets/nav.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/photo-stream.vue b/src/web/app/common/views/components/widgets/photo-stream.vue deleted file mode 100644 index dcaa6624dd..0000000000 --- a/src/web/app/common/views/components/widgets/photo-stream.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/rss.vue b/src/web/app/common/views/components/widgets/rss.vue deleted file mode 100644 index 186d495d00..0000000000 --- a/src/web/app/common/views/components/widgets/rss.vue +++ /dev/null @@ -1,93 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/server.cpu-memory.vue b/src/web/app/common/views/components/widgets/server.cpu-memory.vue deleted file mode 100644 index d75a142568..0000000000 --- a/src/web/app/common/views/components/widgets/server.cpu-memory.vue +++ /dev/null @@ -1,127 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/server.cpu.vue b/src/web/app/common/views/components/widgets/server.cpu.vue deleted file mode 100644 index 596c856da8..0000000000 --- a/src/web/app/common/views/components/widgets/server.cpu.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/server.disk.vue b/src/web/app/common/views/components/widgets/server.disk.vue deleted file mode 100644 index 2af1982a96..0000000000 --- a/src/web/app/common/views/components/widgets/server.disk.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/server.info.vue b/src/web/app/common/views/components/widgets/server.info.vue deleted file mode 100644 index bed6a1b743..0000000000 --- a/src/web/app/common/views/components/widgets/server.info.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/server.memory.vue b/src/web/app/common/views/components/widgets/server.memory.vue deleted file mode 100644 index 834a62671d..0000000000 --- a/src/web/app/common/views/components/widgets/server.memory.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/server.pie.vue b/src/web/app/common/views/components/widgets/server.pie.vue deleted file mode 100644 index ce2cff1d00..0000000000 --- a/src/web/app/common/views/components/widgets/server.pie.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/server.uptimes.vue b/src/web/app/common/views/components/widgets/server.uptimes.vue deleted file mode 100644 index 06713d83ce..0000000000 --- a/src/web/app/common/views/components/widgets/server.uptimes.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/server.vue b/src/web/app/common/views/components/widgets/server.vue deleted file mode 100644 index 4ebc5767d6..0000000000 --- a/src/web/app/common/views/components/widgets/server.vue +++ /dev/null @@ -1,93 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/slideshow.vue b/src/web/app/common/views/components/widgets/slideshow.vue deleted file mode 100644 index c2f4eb70d3..0000000000 --- a/src/web/app/common/views/components/widgets/slideshow.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/tips.vue b/src/web/app/common/views/components/widgets/tips.vue deleted file mode 100644 index 2991fbc3b9..0000000000 --- a/src/web/app/common/views/components/widgets/tips.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/widgets/version.vue b/src/web/app/common/views/components/widgets/version.vue deleted file mode 100644 index ad2b27bc40..0000000000 --- a/src/web/app/common/views/components/widgets/version.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/widgets/access-log.vue b/src/web/app/common/views/widgets/access-log.vue new file mode 100644 index 0000000000..f7bb17d833 --- /dev/null +++ b/src/web/app/common/views/widgets/access-log.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/web/app/common/views/widgets/broadcast.vue b/src/web/app/common/views/widgets/broadcast.vue new file mode 100644 index 0000000000..bf41a5fc67 --- /dev/null +++ b/src/web/app/common/views/widgets/broadcast.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/src/web/app/common/views/widgets/calendar.vue b/src/web/app/common/views/widgets/calendar.vue new file mode 100644 index 0000000000..2bcdb07f9e --- /dev/null +++ b/src/web/app/common/views/widgets/calendar.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/web/app/common/views/widgets/donation.vue b/src/web/app/common/views/widgets/donation.vue new file mode 100644 index 0000000000..e218df06e1 --- /dev/null +++ b/src/web/app/common/views/widgets/donation.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/web/app/common/views/widgets/index.ts b/src/web/app/common/views/widgets/index.ts new file mode 100644 index 0000000000..e41030e85a --- /dev/null +++ b/src/web/app/common/views/widgets/index.ts @@ -0,0 +1,25 @@ +import Vue from 'vue'; + +import wAccessLog from './access-log.vue'; +import wVersion from './version.vue'; +import wRss from './rss.vue'; +import wServer from './server.vue'; +import wBroadcast from './broadcast.vue'; +import wCalendar from './calendar.vue'; +import wPhotoStream from './photo-stream.vue'; +import wSlideshow from './slideshow.vue'; +import wTips from './tips.vue'; +import wDonation from './donation.vue'; +import wNav from './nav.vue'; + +Vue.component('mkw-nav', wNav); +Vue.component('mkw-calendar', wCalendar); +Vue.component('mkw-photo-stream', wPhotoStream); +Vue.component('mkw-slideshow', wSlideshow); +Vue.component('mkw-tips', wTips); +Vue.component('mkw-donation', wDonation); +Vue.component('mkw-broadcast', wBroadcast); +Vue.component('mkw-server', wServer); +Vue.component('mkw-rss', wRss); +Vue.component('mkw-version', wVersion); +Vue.component('mkw-access-log', wAccessLog); diff --git a/src/web/app/common/views/widgets/nav.vue b/src/web/app/common/views/widgets/nav.vue new file mode 100644 index 0000000000..7bd5a7832f --- /dev/null +++ b/src/web/app/common/views/widgets/nav.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/web/app/common/views/widgets/photo-stream.vue b/src/web/app/common/views/widgets/photo-stream.vue new file mode 100644 index 0000000000..78864cc8bf --- /dev/null +++ b/src/web/app/common/views/widgets/photo-stream.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/src/web/app/common/views/widgets/rss.vue b/src/web/app/common/views/widgets/rss.vue new file mode 100644 index 0000000000..4d74b2f7a4 --- /dev/null +++ b/src/web/app/common/views/widgets/rss.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/web/app/common/views/widgets/server.cpu-memory.vue b/src/web/app/common/views/widgets/server.cpu-memory.vue new file mode 100644 index 0000000000..d75a142568 --- /dev/null +++ b/src/web/app/common/views/widgets/server.cpu-memory.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/web/app/common/views/widgets/server.cpu.vue b/src/web/app/common/views/widgets/server.cpu.vue new file mode 100644 index 0000000000..596c856da8 --- /dev/null +++ b/src/web/app/common/views/widgets/server.cpu.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/web/app/common/views/widgets/server.disk.vue b/src/web/app/common/views/widgets/server.disk.vue new file mode 100644 index 0000000000..2af1982a96 --- /dev/null +++ b/src/web/app/common/views/widgets/server.disk.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/web/app/common/views/widgets/server.info.vue b/src/web/app/common/views/widgets/server.info.vue new file mode 100644 index 0000000000..bed6a1b743 --- /dev/null +++ b/src/web/app/common/views/widgets/server.info.vue @@ -0,0 +1,25 @@ + + + + + diff --git a/src/web/app/common/views/widgets/server.memory.vue b/src/web/app/common/views/widgets/server.memory.vue new file mode 100644 index 0000000000..834a62671d --- /dev/null +++ b/src/web/app/common/views/widgets/server.memory.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/web/app/common/views/widgets/server.pie.vue b/src/web/app/common/views/widgets/server.pie.vue new file mode 100644 index 0000000000..ce2cff1d00 --- /dev/null +++ b/src/web/app/common/views/widgets/server.pie.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/web/app/common/views/widgets/server.uptimes.vue b/src/web/app/common/views/widgets/server.uptimes.vue new file mode 100644 index 0000000000..06713d83ce --- /dev/null +++ b/src/web/app/common/views/widgets/server.uptimes.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/web/app/common/views/widgets/server.vue b/src/web/app/common/views/widgets/server.vue new file mode 100644 index 0000000000..3d5248998f --- /dev/null +++ b/src/web/app/common/views/widgets/server.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/web/app/common/views/widgets/slideshow.vue b/src/web/app/common/views/widgets/slideshow.vue new file mode 100644 index 0000000000..56eb654c2b --- /dev/null +++ b/src/web/app/common/views/widgets/slideshow.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/src/web/app/common/views/widgets/tips.vue b/src/web/app/common/views/widgets/tips.vue new file mode 100644 index 0000000000..bdecc068e1 --- /dev/null +++ b/src/web/app/common/views/widgets/tips.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/web/app/common/views/widgets/version.vue b/src/web/app/common/views/widgets/version.vue new file mode 100644 index 0000000000..5072d9b74a --- /dev/null +++ b/src/web/app/common/views/widgets/version.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/web/app/desktop/script.ts b/src/web/app/desktop/script.ts index bbd8e9598b..f0412805ef 100644 --- a/src/web/app/desktop/script.ts +++ b/src/web/app/desktop/script.ts @@ -37,6 +37,7 @@ init(async (launch) => { // Register components require('./views/components'); + require('./views/widgets'); // Launch the app const [app, os] = launch(os => ({ diff --git a/src/web/app/desktop/views/components/index.ts b/src/web/app/desktop/views/components/index.ts index 5cb09e0319..52b9680baa 100644 --- a/src/web/app/desktop/views/components/index.ts +++ b/src/web/app/desktop/views/components/index.ts @@ -29,19 +29,6 @@ import following from './following.vue'; import usersList from './users-list.vue'; import widgetContainer from './widget-container.vue'; -//#region widgets -import wNotifications from './widgets/notifications.vue'; -import wTimemachine from './widgets/timemachine.vue'; -import wActivity from './widgets/activity.vue'; -import wTrends from './widgets/trends.vue'; -import wUsers from './widgets/users.vue'; -import wPolls from './widgets/polls.vue'; -import wPostForm from './widgets/post-form.vue'; -import wMessaging from './widgets/messaging.vue'; -import wChannel from './widgets/channel.vue'; -import wProfile from './widgets/profile.vue'; -//#endregion - Vue.component('mk-ui', ui); Vue.component('mk-ui-notification', uiNotification); Vue.component('mk-home', home); @@ -70,16 +57,3 @@ Vue.component('mk-followers', followers); Vue.component('mk-following', following); Vue.component('mk-users-list', usersList); Vue.component('mk-widget-container', widgetContainer); - -//#region widgets -Vue.component('mkw-notifications', wNotifications); -Vue.component('mkw-timemachine', wTimemachine); -Vue.component('mkw-activity', wActivity); -Vue.component('mkw-trends', wTrends); -Vue.component('mkw-users', wUsers); -Vue.component('mkw-polls', wPolls); -Vue.component('mkw-post-form', wPostForm); -Vue.component('mkw-messaging', wMessaging); -Vue.component('mkw-channel', wChannel); -Vue.component('mkw-profile', wProfile); -//#endregion diff --git a/src/web/app/desktop/views/components/widgets/activity.vue b/src/web/app/desktop/views/components/widgets/activity.vue deleted file mode 100644 index 2ff5fe4f03..0000000000 --- a/src/web/app/desktop/views/components/widgets/activity.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/src/web/app/desktop/views/components/widgets/channel.channel.form.vue b/src/web/app/desktop/views/components/widgets/channel.channel.form.vue deleted file mode 100644 index 392ba5924b..0000000000 --- a/src/web/app/desktop/views/components/widgets/channel.channel.form.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/channel.channel.post.vue b/src/web/app/desktop/views/components/widgets/channel.channel.post.vue deleted file mode 100644 index faaf0fb731..0000000000 --- a/src/web/app/desktop/views/components/widgets/channel.channel.post.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/channel.channel.vue b/src/web/app/desktop/views/components/widgets/channel.channel.vue deleted file mode 100644 index 09154390c4..0000000000 --- a/src/web/app/desktop/views/components/widgets/channel.channel.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/channel.vue b/src/web/app/desktop/views/components/widgets/channel.vue deleted file mode 100644 index 5c3afd9ecf..0000000000 --- a/src/web/app/desktop/views/components/widgets/channel.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/messaging.vue b/src/web/app/desktop/views/components/widgets/messaging.vue deleted file mode 100644 index ae7d6934af..0000000000 --- a/src/web/app/desktop/views/components/widgets/messaging.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/notifications.vue b/src/web/app/desktop/views/components/widgets/notifications.vue deleted file mode 100644 index 978cf5218e..0000000000 --- a/src/web/app/desktop/views/components/widgets/notifications.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/polls.vue b/src/web/app/desktop/views/components/widgets/polls.vue deleted file mode 100644 index f1b34ceed0..0000000000 --- a/src/web/app/desktop/views/components/widgets/polls.vue +++ /dev/null @@ -1,122 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/post-form.vue b/src/web/app/desktop/views/components/widgets/post-form.vue deleted file mode 100644 index ab87ba7217..0000000000 --- a/src/web/app/desktop/views/components/widgets/post-form.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/profile.vue b/src/web/app/desktop/views/components/widgets/profile.vue deleted file mode 100644 index 68cf469788..0000000000 --- a/src/web/app/desktop/views/components/widgets/profile.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/timemachine.vue b/src/web/app/desktop/views/components/widgets/timemachine.vue deleted file mode 100644 index 7420482168..0000000000 --- a/src/web/app/desktop/views/components/widgets/timemachine.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - diff --git a/src/web/app/desktop/views/components/widgets/trends.vue b/src/web/app/desktop/views/components/widgets/trends.vue deleted file mode 100644 index 934351b8a5..0000000000 --- a/src/web/app/desktop/views/components/widgets/trends.vue +++ /dev/null @@ -1,128 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/users.vue b/src/web/app/desktop/views/components/widgets/users.vue deleted file mode 100644 index f3a1509cfd..0000000000 --- a/src/web/app/desktop/views/components/widgets/users.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/widgets/activity.vue b/src/web/app/desktop/views/widgets/activity.vue new file mode 100644 index 0000000000..0bdf4622af --- /dev/null +++ b/src/web/app/desktop/views/widgets/activity.vue @@ -0,0 +1,31 @@ + + + diff --git a/src/web/app/desktop/views/widgets/channel.channel.form.vue b/src/web/app/desktop/views/widgets/channel.channel.form.vue new file mode 100644 index 0000000000..392ba5924b --- /dev/null +++ b/src/web/app/desktop/views/widgets/channel.channel.form.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/src/web/app/desktop/views/widgets/channel.channel.post.vue b/src/web/app/desktop/views/widgets/channel.channel.post.vue new file mode 100644 index 0000000000..faaf0fb731 --- /dev/null +++ b/src/web/app/desktop/views/widgets/channel.channel.post.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/web/app/desktop/views/widgets/channel.channel.vue b/src/web/app/desktop/views/widgets/channel.channel.vue new file mode 100644 index 0000000000..70dac316cf --- /dev/null +++ b/src/web/app/desktop/views/widgets/channel.channel.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/web/app/desktop/views/widgets/channel.vue b/src/web/app/desktop/views/widgets/channel.vue new file mode 100644 index 0000000000..fc143bb1df --- /dev/null +++ b/src/web/app/desktop/views/widgets/channel.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/web/app/desktop/views/widgets/index.ts b/src/web/app/desktop/views/widgets/index.ts new file mode 100644 index 0000000000..77d771d6b3 --- /dev/null +++ b/src/web/app/desktop/views/widgets/index.ts @@ -0,0 +1,23 @@ +import Vue from 'vue'; + +import wNotifications from './notifications.vue'; +import wTimemachine from './timemachine.vue'; +import wActivity from './activity.vue'; +import wTrends from './trends.vue'; +import wUsers from './users.vue'; +import wPolls from './polls.vue'; +import wPostForm from './post-form.vue'; +import wMessaging from './messaging.vue'; +import wChannel from './channel.vue'; +import wProfile from './profile.vue'; + +Vue.component('mkw-notifications', wNotifications); +Vue.component('mkw-timemachine', wTimemachine); +Vue.component('mkw-activity', wActivity); +Vue.component('mkw-trends', wTrends); +Vue.component('mkw-users', wUsers); +Vue.component('mkw-polls', wPolls); +Vue.component('mkw-post-form', wPostForm); +Vue.component('mkw-messaging', wMessaging); +Vue.component('mkw-channel', wChannel); +Vue.component('mkw-profile', wProfile); diff --git a/src/web/app/desktop/views/widgets/messaging.vue b/src/web/app/desktop/views/widgets/messaging.vue new file mode 100644 index 0000000000..2c9f473bd1 --- /dev/null +++ b/src/web/app/desktop/views/widgets/messaging.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/web/app/desktop/views/widgets/notifications.vue b/src/web/app/desktop/views/widgets/notifications.vue new file mode 100644 index 0000000000..1a2b3d3f89 --- /dev/null +++ b/src/web/app/desktop/views/widgets/notifications.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/web/app/desktop/views/widgets/polls.vue b/src/web/app/desktop/views/widgets/polls.vue new file mode 100644 index 0000000000..fda4e17d87 --- /dev/null +++ b/src/web/app/desktop/views/widgets/polls.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/web/app/desktop/views/widgets/post-form.vue b/src/web/app/desktop/views/widgets/post-form.vue new file mode 100644 index 0000000000..e51b4f3577 --- /dev/null +++ b/src/web/app/desktop/views/widgets/post-form.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/src/web/app/desktop/views/widgets/profile.vue b/src/web/app/desktop/views/widgets/profile.vue new file mode 100644 index 0000000000..e067a0eb24 --- /dev/null +++ b/src/web/app/desktop/views/widgets/profile.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/web/app/desktop/views/widgets/timemachine.vue b/src/web/app/desktop/views/widgets/timemachine.vue new file mode 100644 index 0000000000..6db3b14c62 --- /dev/null +++ b/src/web/app/desktop/views/widgets/timemachine.vue @@ -0,0 +1,28 @@ + + + diff --git a/src/web/app/desktop/views/widgets/trends.vue b/src/web/app/desktop/views/widgets/trends.vue new file mode 100644 index 0000000000..09cad9ba4a --- /dev/null +++ b/src/web/app/desktop/views/widgets/trends.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/web/app/desktop/views/widgets/users.vue b/src/web/app/desktop/views/widgets/users.vue new file mode 100644 index 0000000000..f7af8205ec --- /dev/null +++ b/src/web/app/desktop/views/widgets/users.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/src/web/app/init.ts b/src/web/app/init.ts index 6011871e48..4a8f34f8d1 100644 --- a/src/web/app/init.ts +++ b/src/web/app/init.ts @@ -2,11 +2,6 @@ * App initializer */ -declare const _VERSION_: string; -declare const _LANG_: string; -declare const _HOST_: string; -//declare const __CONSTS__: any; - import Vue from 'vue'; import VueRouter from 'vue-router'; import VModal from 'vue-js-modal'; @@ -19,6 +14,7 @@ require('./common/views/directives'); // Register global components require('./common/views/components'); +require('./common/views/widgets'); // Register global filters require('./common/filters'); @@ -35,12 +31,13 @@ import App from './app.vue'; import checkForUpdate from './common/scripts/check-for-update'; import MiOS, { API } from './common/mios'; +import { version, host, lang } from './config'; /** * APP ENTRY POINT! */ -console.info(`Misskey v${_VERSION_} (葵 aoi)`); +console.info(`Misskey v${version} (葵 aoi)`); console.info( '%cここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。', 'color: red; background: yellow; font-size: 16px;'); @@ -49,13 +46,13 @@ console.info( window.clearTimeout((window as any).mkBootTimer); delete (window as any).mkBootTimer; -if (_HOST_ != 'localhost') { - document.domain = _HOST_; +if (host != 'localhost') { + document.domain = host; } //#region Set lang attr const html = document.documentElement; -html.setAttribute('lang', _LANG_); +html.setAttribute('lang', lang); //#endregion //#region Set description meta tag @@ -66,9 +63,6 @@ meta.setAttribute('content', '%i18n:common.misskey%'); head.appendChild(meta); //#endregion -// Set global configuration -//(riot as any).mixin(__CONSTS__); - // iOSでプライベートモードだとlocalStorageが使えないので既存のメソッドを上書きする try { localStorage.setItem('kyoppie', 'yuppie'); @@ -132,10 +126,14 @@ export default (callback: (launch: (api: (os: MiOS) => API) => [Vue, MiOS]) => v panic(e); } - // 更新チェック - setTimeout(() => { - checkForUpdate(os); - }, 3000); + //#region 更新チェック + const preventUpdate = localStorage.getItem('preventUpdate') == 'true'; + if (!preventUpdate) { + setTimeout(() => { + checkForUpdate(os); + }, 3000); + } + //#endregion }); }; @@ -152,7 +150,7 @@ function panic(e) { + '
' + `

エラーコード: ${e.toString()}

` + `

ブラウザ バージョン: ${navigator.userAgent}

` - + `

クライアント バージョン: ${_VERSION_}

` + + `

クライアント バージョン: ${version}

` + '
' + '

問題が解決しない場合は、上記の情報をお書き添えの上 syuilotan@yahoo.co.jp までご連絡ください。

' + '

Thank you for using Misskey.

' diff --git a/src/web/app/mobile/script.ts b/src/web/app/mobile/script.ts index fe73155c7c..eeadfd92b0 100644 --- a/src/web/app/mobile/script.ts +++ b/src/web/app/mobile/script.ts @@ -38,6 +38,7 @@ init((launch) => { // Register components require('./views/components'); + require('./views/widgets'); // http://qiita.com/junya/items/3ff380878f26ca447f85 document.body.setAttribute('ontouchstart', ''); diff --git a/src/web/app/mobile/views/components/index.ts b/src/web/app/mobile/views/components/index.ts index ea2349802b..fe65aab207 100644 --- a/src/web/app/mobile/views/components/index.ts +++ b/src/web/app/mobile/views/components/index.ts @@ -21,11 +21,6 @@ import userTimeline from './user-timeline.vue'; import activity from './activity.vue'; import widgetContainer from './widget-container.vue'; -//#region widgets -import wActivity from './widgets/activity.vue'; -import wProfile from './widgets/profile.vue'; -//#endregion - Vue.component('mk-ui', ui); Vue.component('mk-timeline', timeline); Vue.component('mk-posts', posts); @@ -46,8 +41,3 @@ Vue.component('mk-user-preview', userPreview); Vue.component('mk-user-timeline', userTimeline); Vue.component('mk-activity', activity); Vue.component('mk-widget-container', widgetContainer); - -//#region widgets -Vue.component('mkw-activity', wActivity); -Vue.component('mkw-profile', wProfile); -//#endregion diff --git a/src/web/app/mobile/views/components/widgets/activity.vue b/src/web/app/mobile/views/components/widgets/activity.vue deleted file mode 100644 index c4d30b07af..0000000000 --- a/src/web/app/mobile/views/components/widgets/activity.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - - diff --git a/src/web/app/mobile/views/components/widgets/profile.vue b/src/web/app/mobile/views/components/widgets/profile.vue deleted file mode 100644 index 9336068e57..0000000000 --- a/src/web/app/mobile/views/components/widgets/profile.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - - diff --git a/src/web/app/mobile/views/widgets/activity.vue b/src/web/app/mobile/views/widgets/activity.vue new file mode 100644 index 0000000000..48dcafb3ed --- /dev/null +++ b/src/web/app/mobile/views/widgets/activity.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/src/web/app/mobile/views/widgets/index.ts b/src/web/app/mobile/views/widgets/index.ts new file mode 100644 index 0000000000..4de912b64c --- /dev/null +++ b/src/web/app/mobile/views/widgets/index.ts @@ -0,0 +1,7 @@ +import Vue from 'vue'; + +import wActivity from './activity.vue'; +import wProfile from './profile.vue'; + +Vue.component('mkw-activity', wActivity); +Vue.component('mkw-profile', wProfile); diff --git a/src/web/app/mobile/views/widgets/profile.vue b/src/web/app/mobile/views/widgets/profile.vue new file mode 100644 index 0000000000..6bc7bfffc6 --- /dev/null +++ b/src/web/app/mobile/views/widgets/profile.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/web/app/stats/script.ts b/src/web/app/stats/script.ts deleted file mode 100644 index 3bbd80c339..0000000000 --- a/src/web/app/stats/script.ts +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Stats - */ - -// Style -import './style.styl'; - -import * as riot from 'riot'; -require('./tags'); -import init from '../init'; - -document.title = 'Misskey Statistics'; - -/** - * init - */ -init(() => { - mount(document.createElement('mk-index')); -}); - -function mount(content) { - riot.mount(document.getElementById('app').appendChild(content)); -} diff --git a/src/web/app/status/script.ts b/src/web/app/status/script.ts deleted file mode 100644 index 84483acab7..0000000000 --- a/src/web/app/status/script.ts +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Status - */ - -// Style -import './style.styl'; - -import * as riot from 'riot'; -require('./tags'); -import init from '../init'; - -document.title = 'Misskey System Status'; - -/** - * init - */ -init(() => { - mount(document.createElement('mk-index')); -}); - -function mount(content) { - riot.mount(document.getElementById('app').appendChild(content)); -} -- cgit v1.2.3-freya