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/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 +++ 39 files changed, 1627 insertions(+), 1635 deletions(-) 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 (limited to 'src/web/app/common') 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 @@ + + + + + -- cgit v1.2.3-freya