From df8a2aea358ca3bcec60c878a6399df46390e3e1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 24 Feb 2018 02:46:09 +0900 Subject: Implement #1098 --- src/api/endpoints.ts | 7 +- src/api/endpoints/i/update_home.ts | 11 +- src/api/endpoints/i/update_mobile_home.ts | 50 ++++++ src/web/app/common/define-widget.ts | 26 ++- src/web/app/common/scripts/check-for-update.ts | 4 +- src/web/app/common/views/components/index.ts | 30 ++++ .../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 +++++++++++ .../common/views/components/widgets/profile.vue | 125 +++++++++++++ .../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/desktop/views/components/index.ts | 32 +--- .../desktop/views/components/widget-container.vue | 72 ++++++++ .../views/components/widgets/access-log.vue | 108 ----------- .../desktop/views/components/widgets/broadcast.vue | 153 ---------------- .../desktop/views/components/widgets/calendar.vue | 192 -------------------- .../desktop/views/components/widgets/donation.vue | 45 ----- .../app/desktop/views/components/widgets/nav.vue | 29 --- .../views/components/widgets/photo-stream.vue | 122 ------------- .../desktop/views/components/widgets/profile.vue | 125 ------------- .../app/desktop/views/components/widgets/rss.vue | 111 ------------ .../views/components/widgets/server.cpu-memory.vue | 127 ------------- .../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 -------- .../views/components/widgets/server.pie.vue | 61 ------- .../views/components/widgets/server.uptimes.vue | 46 ----- .../desktop/views/components/widgets/server.vue | 131 -------------- .../desktop/views/components/widgets/slideshow.vue | 153 ---------------- .../app/desktop/views/components/widgets/tips.vue | 108 ----------- .../desktop/views/components/widgets/version.vue | 28 --- src/web/app/mobile/views/components/activity.vue | 62 +++++++ src/web/app/mobile/views/components/home.vue | 29 --- src/web/app/mobile/views/components/index.ts | 14 +- src/web/app/mobile/views/components/ui.header.vue | 4 +- src/web/app/mobile/views/components/ui.vue | 6 +- .../mobile/views/components/widget-container.vue | 65 +++++++ .../mobile/views/components/widgets/activity.vue | 23 +++ src/web/app/mobile/views/pages/drive.vue | 4 +- src/web/app/mobile/views/pages/home.vue | 174 +++++++++++++++++- src/web/app/mobile/views/pages/notifications.vue | 4 +- src/web/app/mobile/views/pages/user.vue | 1 - .../app/mobile/views/pages/user/home.activity.vue | 62 ------- src/web/app/mobile/views/pages/user/home.vue | 6 +- 59 files changed, 2252 insertions(+), 1940 deletions(-) create mode 100644 src/api/endpoints/i/update_mobile_home.ts create mode 100644 src/web/app/common/views/components/widgets/access-log.vue create mode 100644 src/web/app/common/views/components/widgets/broadcast.vue create mode 100644 src/web/app/common/views/components/widgets/calendar.vue create mode 100644 src/web/app/common/views/components/widgets/donation.vue create mode 100644 src/web/app/common/views/components/widgets/nav.vue create mode 100644 src/web/app/common/views/components/widgets/photo-stream.vue create mode 100644 src/web/app/common/views/components/widgets/profile.vue create mode 100644 src/web/app/common/views/components/widgets/rss.vue create mode 100644 src/web/app/common/views/components/widgets/server.cpu-memory.vue create mode 100644 src/web/app/common/views/components/widgets/server.cpu.vue create mode 100644 src/web/app/common/views/components/widgets/server.disk.vue create mode 100644 src/web/app/common/views/components/widgets/server.info.vue create mode 100644 src/web/app/common/views/components/widgets/server.memory.vue create mode 100644 src/web/app/common/views/components/widgets/server.pie.vue create mode 100644 src/web/app/common/views/components/widgets/server.uptimes.vue create mode 100644 src/web/app/common/views/components/widgets/server.vue create mode 100644 src/web/app/common/views/components/widgets/slideshow.vue create mode 100644 src/web/app/common/views/components/widgets/tips.vue create mode 100644 src/web/app/common/views/components/widgets/version.vue create mode 100644 src/web/app/desktop/views/components/widget-container.vue delete mode 100644 src/web/app/desktop/views/components/widgets/access-log.vue delete mode 100644 src/web/app/desktop/views/components/widgets/broadcast.vue delete mode 100644 src/web/app/desktop/views/components/widgets/calendar.vue delete mode 100644 src/web/app/desktop/views/components/widgets/donation.vue delete mode 100644 src/web/app/desktop/views/components/widgets/nav.vue delete mode 100644 src/web/app/desktop/views/components/widgets/photo-stream.vue delete mode 100644 src/web/app/desktop/views/components/widgets/profile.vue delete mode 100644 src/web/app/desktop/views/components/widgets/rss.vue delete mode 100644 src/web/app/desktop/views/components/widgets/server.cpu-memory.vue delete mode 100644 src/web/app/desktop/views/components/widgets/server.cpu.vue delete mode 100644 src/web/app/desktop/views/components/widgets/server.disk.vue delete mode 100644 src/web/app/desktop/views/components/widgets/server.info.vue delete mode 100644 src/web/app/desktop/views/components/widgets/server.memory.vue delete mode 100644 src/web/app/desktop/views/components/widgets/server.pie.vue delete mode 100644 src/web/app/desktop/views/components/widgets/server.uptimes.vue delete mode 100644 src/web/app/desktop/views/components/widgets/server.vue delete mode 100644 src/web/app/desktop/views/components/widgets/slideshow.vue delete mode 100644 src/web/app/desktop/views/components/widgets/tips.vue delete mode 100644 src/web/app/desktop/views/components/widgets/version.vue create mode 100644 src/web/app/mobile/views/components/activity.vue delete mode 100644 src/web/app/mobile/views/components/home.vue create mode 100644 src/web/app/mobile/views/components/widget-container.vue create mode 100644 src/web/app/mobile/views/components/widgets/activity.vue delete mode 100644 src/web/app/mobile/views/pages/user/home.activity.vue (limited to 'src') diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts index ff214c3004..cbc016f20f 100644 --- a/src/api/endpoints.ts +++ b/src/api/endpoints.ts @@ -182,7 +182,12 @@ const endpoints: Endpoint[] = [ { name: 'i/update_home', withCredential: true, - kind: 'account-write' + secure: true + }, + { + name: 'i/update_mobile_home', + withCredential: true, + secure: true }, { name: 'i/change_password', diff --git a/src/api/endpoints/i/update_home.ts b/src/api/endpoints/i/update_home.ts index 429e88529a..5dfb7d7915 100644 --- a/src/api/endpoints/i/update_home.ts +++ b/src/api/endpoints/i/update_home.ts @@ -4,16 +4,7 @@ import $ from 'cafy'; import User from '../../models/user'; -/** - * Update myself - * - * @param {any} params - * @param {any} user - * @param {any} _ - * @param {boolean} isSecure - * @return {Promise} - */ -module.exports = async (params, user, _, isSecure) => new Promise(async (res, rej) => { +module.exports = async (params, user) => new Promise(async (res, rej) => { // Get 'home' parameter const [home, homeErr] = $(params.home).optional.array().each( $().strict.object() diff --git a/src/api/endpoints/i/update_mobile_home.ts b/src/api/endpoints/i/update_mobile_home.ts new file mode 100644 index 0000000000..a87d89cad7 --- /dev/null +++ b/src/api/endpoints/i/update_mobile_home.ts @@ -0,0 +1,50 @@ +/** + * Module dependencies + */ +import $ from 'cafy'; +import User from '../../models/user'; + +module.exports = async (params, user) => new Promise(async (res, rej) => { + // Get 'home' parameter + const [home, homeErr] = $(params.home).optional.array().each( + $().strict.object() + .have('name', $().string()) + .have('id', $().string()) + .have('data', $().object())).$; + if (homeErr) return rej('invalid home param'); + + // Get 'id' parameter + const [id, idErr] = $(params.id).optional.string().$; + if (idErr) return rej('invalid id param'); + + // Get 'data' parameter + const [data, dataErr] = $(params.data).optional.object().$; + if (dataErr) return rej('invalid data param'); + + if (home) { + await User.update(user._id, { + $set: { + 'client_settings.mobile_home': home + } + }); + + res(); + } else { + if (id == null && data == null) return rej('you need to set id and data params if home param unset'); + + const _home = user.client_settings.mobile_home || []; + const widget = _home.find(w => w.id == id); + + if (widget == null) return rej('widget not found'); + + widget.data = data; + + await User.update(user._id, { + $set: { + 'client_settings.mobile_home': _home + } + }); + + res(); + } +}); diff --git a/src/web/app/common/define-widget.ts b/src/web/app/common/define-widget.ts index fd13a3395b..60cd1969c0 100644 --- a/src/web/app/common/define-widget.ts +++ b/src/web/app/common/define-widget.ts @@ -8,6 +8,10 @@ export default function(data: { props: { widget: { type: Object + }, + isMobile: { + type: Boolean, + default: false } }, computed: { @@ -21,6 +25,7 @@ export default function(data: { }; }, created() { + if (this.widget.data == null) this.widget.data = {}; if (this.props) { Object.keys(this.props).forEach(prop => { if (this.widget.data.hasOwnProperty(prop)) { @@ -30,12 +35,21 @@ export default function(data: { } this.$watch('props', newProps => { - (this as any).api('i/update_home', { - id: this.id, - data: newProps - }).then(() => { - (this as any).os.i.client_settings.home.find(w => w.id == this.id).data = newProps; - }); + if (this.isMobile) { + (this as any).api('i/update_mobile_home', { + id: this.id, + data: newProps + }).then(() => { + (this as any).os.i.client_settings.mobile_home.find(w => w.id == this.id).data = newProps; + }); + } else { + (this as any).api('i/update_home', { + id: this.id, + data: newProps + }).then(() => { + (this as any).os.i.client_settings.home.find(w => w.id == this.id).data = newProps; + }); + } }, { deep: true }); diff --git a/src/web/app/common/scripts/check-for-update.ts b/src/web/app/common/scripts/check-for-update.ts index 0855676a42..fe539407da 100644 --- a/src/web/app/common/scripts/check-for-update.ts +++ b/src/web/app/common/scripts/check-for-update.ts @@ -9,7 +9,9 @@ export default async function(mios: MiOS) { // Clear cache (serive worker) try { - navigator.serviceWorker.controller.postMessage('clear'); + if (navigator.serviceWorker.controller) { + navigator.serviceWorker.controller.postMessage('clear'); + } navigator.serviceWorker.getRegistrations().then(registrations => { registrations.forEach(registration => registration.unregister()); diff --git a/src/web/app/common/views/components/index.ts b/src/web/app/common/views/components/index.ts index ab0f1767d4..e66a323266 100644 --- a/src/web/app/common/views/components/index.ts +++ b/src/web/app/common/views/components/index.ts @@ -21,6 +21,21 @@ 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 wProfile from './widgets/profile.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); @@ -41,3 +56,18 @@ 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-profile', wProfile); +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 new file mode 100644 index 0000000000..c810c2d157 --- /dev/null +++ b/src/web/app/common/views/components/widgets/access-log.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/broadcast.vue b/src/web/app/common/views/components/widgets/broadcast.vue new file mode 100644 index 0000000000..0bb59caf43 --- /dev/null +++ b/src/web/app/common/views/components/widgets/broadcast.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/calendar.vue b/src/web/app/common/views/components/widgets/calendar.vue new file mode 100644 index 0000000000..bfcbd7f68d --- /dev/null +++ b/src/web/app/common/views/components/widgets/calendar.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/donation.vue b/src/web/app/common/views/components/widgets/donation.vue new file mode 100644 index 0000000000..08aab8ecd1 --- /dev/null +++ b/src/web/app/common/views/components/widgets/donation.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/nav.vue b/src/web/app/common/views/components/widgets/nav.vue new file mode 100644 index 0000000000..ce88e587a8 --- /dev/null +++ b/src/web/app/common/views/components/widgets/nav.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/photo-stream.vue b/src/web/app/common/views/components/widgets/photo-stream.vue new file mode 100644 index 0000000000..dcaa6624dd --- /dev/null +++ b/src/web/app/common/views/components/widgets/photo-stream.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/profile.vue b/src/web/app/common/views/components/widgets/profile.vue new file mode 100644 index 0000000000..68cf469788 --- /dev/null +++ b/src/web/app/common/views/components/widgets/profile.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/rss.vue b/src/web/app/common/views/components/widgets/rss.vue new file mode 100644 index 0000000000..e80896bea6 --- /dev/null +++ b/src/web/app/common/views/components/widgets/rss.vue @@ -0,0 +1,93 @@ + + + + + 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 new file mode 100644 index 0000000000..d75a142568 --- /dev/null +++ b/src/web/app/common/views/components/widgets/server.cpu-memory.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/server.cpu.vue b/src/web/app/common/views/components/widgets/server.cpu.vue new file mode 100644 index 0000000000..596c856da8 --- /dev/null +++ b/src/web/app/common/views/components/widgets/server.cpu.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/server.disk.vue b/src/web/app/common/views/components/widgets/server.disk.vue new file mode 100644 index 0000000000..2af1982a96 --- /dev/null +++ b/src/web/app/common/views/components/widgets/server.disk.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/server.info.vue b/src/web/app/common/views/components/widgets/server.info.vue new file mode 100644 index 0000000000..bed6a1b743 --- /dev/null +++ b/src/web/app/common/views/components/widgets/server.info.vue @@ -0,0 +1,25 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/server.memory.vue b/src/web/app/common/views/components/widgets/server.memory.vue new file mode 100644 index 0000000000..834a62671d --- /dev/null +++ b/src/web/app/common/views/components/widgets/server.memory.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/server.pie.vue b/src/web/app/common/views/components/widgets/server.pie.vue new file mode 100644 index 0000000000..ce2cff1d00 --- /dev/null +++ b/src/web/app/common/views/components/widgets/server.pie.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/server.uptimes.vue b/src/web/app/common/views/components/widgets/server.uptimes.vue new file mode 100644 index 0000000000..06713d83ce --- /dev/null +++ b/src/web/app/common/views/components/widgets/server.uptimes.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/server.vue b/src/web/app/common/views/components/widgets/server.vue new file mode 100644 index 0000000000..4ebc5767d6 --- /dev/null +++ b/src/web/app/common/views/components/widgets/server.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/slideshow.vue b/src/web/app/common/views/components/widgets/slideshow.vue new file mode 100644 index 0000000000..c2f4eb70d3 --- /dev/null +++ b/src/web/app/common/views/components/widgets/slideshow.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/tips.vue b/src/web/app/common/views/components/widgets/tips.vue new file mode 100644 index 0000000000..2991fbc3b9 --- /dev/null +++ b/src/web/app/common/views/components/widgets/tips.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/web/app/common/views/components/widgets/version.vue b/src/web/app/common/views/components/widgets/version.vue new file mode 100644 index 0000000000..ad2b27bc40 --- /dev/null +++ b/src/web/app/common/views/components/widgets/version.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/web/app/desktop/views/components/index.ts b/src/web/app/desktop/views/components/index.ts index da59d9219e..7584cb4983 100644 --- a/src/web/app/desktop/views/components/index.ts +++ b/src/web/app/desktop/views/components/index.ts @@ -27,27 +27,19 @@ import friendsMaker from './friends-maker.vue'; import followers from './followers.vue'; import following from './following.vue'; import usersList from './users-list.vue'; -import wNav from './widgets/nav.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 widgetContainer from './widget-container.vue'; + +//#region widgets import wNotifications from './widgets/notifications.vue'; -import wBroadcast from './widgets/broadcast.vue'; import wTimemachine from './widgets/timemachine.vue'; -import wProfile from './widgets/profile.vue'; -import wServer from './widgets/server.vue'; import wActivity from './widgets/activity.vue'; -import wRss from './widgets/rss.vue'; import wTrends from './widgets/trends.vue'; -import wVersion from './widgets/version.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 wAccessLog from './widgets/access-log.vue'; +//#endregion Vue.component('mk-ui', ui); Vue.component('mk-ui-notification', uiNotification); @@ -76,24 +68,16 @@ Vue.component('mk-friends-maker', friendsMaker); Vue.component('mk-followers', followers); Vue.component('mk-following', following); Vue.component('mk-users-list', usersList); -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('mk-widget-container', widgetContainer); + +//#region widgets Vue.component('mkw-notifications', wNotifications); -Vue.component('mkw-broadcast', wBroadcast); Vue.component('mkw-timemachine', wTimemachine); -Vue.component('mkw-profile', wProfile); -Vue.component('mkw-server', wServer); Vue.component('mkw-activity', wActivity); -Vue.component('mkw-rss', wRss); Vue.component('mkw-trends', wTrends); -Vue.component('mkw-version', wVersion); 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-access-log', wAccessLog); +//#endregion diff --git a/src/web/app/desktop/views/components/widget-container.vue b/src/web/app/desktop/views/components/widget-container.vue new file mode 100644 index 0000000000..7b4e1f55f0 --- /dev/null +++ b/src/web/app/desktop/views/components/widget-container.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/web/app/desktop/views/components/widgets/access-log.vue b/src/web/app/desktop/views/components/widgets/access-log.vue deleted file mode 100644 index a04da1daaf..0000000000 --- a/src/web/app/desktop/views/components/widgets/access-log.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/broadcast.vue b/src/web/app/desktop/views/components/widgets/broadcast.vue deleted file mode 100644 index e4b7e25321..0000000000 --- a/src/web/app/desktop/views/components/widgets/broadcast.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/calendar.vue b/src/web/app/desktop/views/components/widgets/calendar.vue deleted file mode 100644 index c16602db46..0000000000 --- a/src/web/app/desktop/views/components/widgets/calendar.vue +++ /dev/null @@ -1,192 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/donation.vue b/src/web/app/desktop/views/components/widgets/donation.vue deleted file mode 100644 index fbab0fca6c..0000000000 --- a/src/web/app/desktop/views/components/widgets/donation.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/nav.vue b/src/web/app/desktop/views/components/widgets/nav.vue deleted file mode 100644 index 5e04c266cf..0000000000 --- a/src/web/app/desktop/views/components/widgets/nav.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/photo-stream.vue b/src/web/app/desktop/views/components/widgets/photo-stream.vue deleted file mode 100644 index 04b71975b3..0000000000 --- a/src/web/app/desktop/views/components/widgets/photo-stream.vue +++ /dev/null @@ -1,122 +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/rss.vue b/src/web/app/desktop/views/components/widgets/rss.vue deleted file mode 100644 index 3507129716..0000000000 --- a/src/web/app/desktop/views/components/widgets/rss.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/server.cpu-memory.vue b/src/web/app/desktop/views/components/widgets/server.cpu-memory.vue deleted file mode 100644 index d75a142568..0000000000 --- a/src/web/app/desktop/views/components/widgets/server.cpu-memory.vue +++ /dev/null @@ -1,127 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/server.cpu.vue b/src/web/app/desktop/views/components/widgets/server.cpu.vue deleted file mode 100644 index 596c856da8..0000000000 --- a/src/web/app/desktop/views/components/widgets/server.cpu.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/server.disk.vue b/src/web/app/desktop/views/components/widgets/server.disk.vue deleted file mode 100644 index 2af1982a96..0000000000 --- a/src/web/app/desktop/views/components/widgets/server.disk.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/server.info.vue b/src/web/app/desktop/views/components/widgets/server.info.vue deleted file mode 100644 index bed6a1b743..0000000000 --- a/src/web/app/desktop/views/components/widgets/server.info.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/server.memory.vue b/src/web/app/desktop/views/components/widgets/server.memory.vue deleted file mode 100644 index 834a62671d..0000000000 --- a/src/web/app/desktop/views/components/widgets/server.memory.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/server.pie.vue b/src/web/app/desktop/views/components/widgets/server.pie.vue deleted file mode 100644 index ce2cff1d00..0000000000 --- a/src/web/app/desktop/views/components/widgets/server.pie.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/server.uptimes.vue b/src/web/app/desktop/views/components/widgets/server.uptimes.vue deleted file mode 100644 index 06713d83ce..0000000000 --- a/src/web/app/desktop/views/components/widgets/server.uptimes.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/server.vue b/src/web/app/desktop/views/components/widgets/server.vue deleted file mode 100644 index 1c0da84225..0000000000 --- a/src/web/app/desktop/views/components/widgets/server.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/slideshow.vue b/src/web/app/desktop/views/components/widgets/slideshow.vue deleted file mode 100644 index c2f4eb70d3..0000000000 --- a/src/web/app/desktop/views/components/widgets/slideshow.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/tips.vue b/src/web/app/desktop/views/components/widgets/tips.vue deleted file mode 100644 index 2991fbc3b9..0000000000 --- a/src/web/app/desktop/views/components/widgets/tips.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/components/widgets/version.vue b/src/web/app/desktop/views/components/widgets/version.vue deleted file mode 100644 index ad2b27bc40..0000000000 --- a/src/web/app/desktop/views/components/widgets/version.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/src/web/app/mobile/views/components/activity.vue b/src/web/app/mobile/views/components/activity.vue new file mode 100644 index 0000000000..b50044b3de --- /dev/null +++ b/src/web/app/mobile/views/components/activity.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/web/app/mobile/views/components/home.vue b/src/web/app/mobile/views/components/home.vue deleted file mode 100644 index 3feab581d2..0000000000 --- a/src/web/app/mobile/views/components/home.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/src/web/app/mobile/views/components/index.ts b/src/web/app/mobile/views/components/index.ts index 905baaf20d..d372f22332 100644 --- a/src/web/app/mobile/views/components/index.ts +++ b/src/web/app/mobile/views/components/index.ts @@ -1,7 +1,6 @@ import Vue from 'vue'; import ui from './ui.vue'; -import home from './home.vue'; import timeline from './timeline.vue'; import posts from './posts.vue'; import imagesImage from './images-image.vue'; @@ -19,9 +18,14 @@ import notificationPreview from './notification-preview.vue'; import usersList from './users-list.vue'; import userPreview from './user-preview.vue'; 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'; +//#endregion Vue.component('mk-ui', ui); -Vue.component('mk-home', home); Vue.component('mk-timeline', timeline); Vue.component('mk-posts', posts); Vue.component('mk-images-image', imagesImage); @@ -39,3 +43,9 @@ Vue.component('mk-notification-preview', notificationPreview); Vue.component('mk-users-list', usersList); 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); +//#endregion diff --git a/src/web/app/mobile/views/components/ui.header.vue b/src/web/app/mobile/views/components/ui.header.vue index 2df5ea162e..026e7eb1b4 100644 --- a/src/web/app/mobile/views/components/ui.header.vue +++ b/src/web/app/mobile/views/components/ui.header.vue @@ -9,9 +9,7 @@

Misskey

- + diff --git a/src/web/app/mobile/views/components/ui.vue b/src/web/app/mobile/views/components/ui.vue index 91d7ea29b6..325ce9d40e 100644 --- a/src/web/app/mobile/views/components/ui.vue +++ b/src/web/app/mobile/views/components/ui.vue @@ -1,7 +1,7 @@