From f64a921575ac10545877d706577eeb978ec55a7d Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 22 Feb 2018 17:57:14 +0900 Subject: [PATCH] wip --- src/web/app/mobile/script.ts | 2 ++ src/web/app/mobile/views/components/index.ts | 2 ++ src/web/app/mobile/views/components/notifications.vue | 11 ++++++----- .../pages/{notification.vue => notifications.vue} | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) rename src/web/app/mobile/views/pages/{notification.vue => notifications.vue} (92%) diff --git a/src/web/app/mobile/script.ts b/src/web/app/mobile/script.ts index a2f118b8f..eef7c20f0 100644 --- a/src/web/app/mobile/script.ts +++ b/src/web/app/mobile/script.ts @@ -19,6 +19,7 @@ import MkSignup from './views/pages/signup.vue'; import MkUser from './views/pages/user.vue'; import MkSelectDrive from './views/pages/selectdrive.vue'; import MkDrive from './views/pages/drive.vue'; +import MkNotifications from './views/pages/notifications.vue'; /** * init @@ -47,6 +48,7 @@ init((launch) => { app.$router.addRoutes([ { path: '/', name: 'index', component: MkIndex }, { path: '/signup', name: 'signup', component: MkSignup }, + { path: '/i/notifications', component: MkNotifications }, { path: '/i/drive', component: MkDrive }, { path: '/i/drive/folder/:folder', component: MkDrive }, { path: '/selectdrive', component: MkSelectDrive }, diff --git a/src/web/app/mobile/views/components/index.ts b/src/web/app/mobile/views/components/index.ts index f2c8ddf3e..658cc4863 100644 --- a/src/web/app/mobile/views/components/index.ts +++ b/src/web/app/mobile/views/components/index.ts @@ -13,6 +13,7 @@ import userCard from './user-card.vue'; import postDetail from './post-detail.vue'; import followButton from './follow-button.vue'; import friendsMaker from './friends-maker.vue'; +import notifications from './notifications.vue'; Vue.component('mk-ui', ui); Vue.component('mk-home', home); @@ -27,3 +28,4 @@ Vue.component('mk-user-card', userCard); Vue.component('mk-post-detail', postDetail); Vue.component('mk-follow-button', followButton); Vue.component('mk-friends-maker', friendsMaker); +Vue.component('mk-notifications', notifications); diff --git a/src/web/app/mobile/views/components/notifications.vue b/src/web/app/mobile/views/components/notifications.vue index cc4b743ac..99083ed4b 100644 --- a/src/web/app/mobile/views/components/notifications.vue +++ b/src/web/app/mobile/views/components/notifications.vue @@ -4,16 +4,16 @@ -

%i18n:mobile.tags.mk-notifications.empty%

-

%fa:spinner .pulse .fw%%i18n:common.fetching%

+

%fa:spinner .pulse .fw%%i18n:common.loading%

@@ -59,6 +59,7 @@ export default Vue.extend({ this.notifications = notifications; this.fetching = false; + this.$emit('fetched'); }); }, beforeDestroy() { diff --git a/src/web/app/mobile/views/pages/notification.vue b/src/web/app/mobile/views/pages/notifications.vue similarity index 92% rename from src/web/app/mobile/views/pages/notification.vue rename to src/web/app/mobile/views/pages/notifications.vue index 0685bd127..b1243dbc7 100644 --- a/src/web/app/mobile/views/pages/notification.vue +++ b/src/web/app/mobile/views/pages/notifications.vue @@ -1,6 +1,7 @@