diff options
| -rw-r--r-- | src/web/app/mobile/script.ts | 2 | ||||
| -rw-r--r-- | src/web/app/mobile/views/components/index.ts | 2 | ||||
| -rw-r--r-- | src/web/app/mobile/views/components/notifications.vue | 11 | ||||
| -rw-r--r-- | src/web/app/mobile/views/pages/notifications.vue (renamed from src/web/app/mobile/views/pages/notification.vue) | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/src/web/app/mobile/script.ts b/src/web/app/mobile/script.ts index a2f118b8f7..eef7c20f00 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 f2c8ddf3e5..658cc48639 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 cc4b743aca..99083ed4b0 100644 --- a/src/web/app/mobile/views/components/notifications.vue +++ b/src/web/app/mobile/views/components/notifications.vue @@ -4,16 +4,16 @@ <template v-for="(notification, i) in _notifications"> <mk-notification :notification="notification" :key="notification.id"/> <p class="date" v-if="i != notifications.length - 1 && notification._date != _notifications[i + 1]._date"> - <span>%fa:angle-up%{ notification._datetext }</span> - <span>%fa:angle-down%{ _notifications[i + 1]._datetext }</span> + <span>%fa:angle-up%{{ notification._datetext }}</span> + <span>%fa:angle-down%{{ _notifications[i + 1]._datetext }}</span> </p> </template> </div> - <button class="more" v-if="moreNotifications" @click="fetchMoreNotifications" disabled={ fetchingMoreNotifications }> - <template v-if="fetchingMoreNotifications">%fa:spinner .pulse .fw%</template>{ fetchingMoreNotifications ? '%i18n:common.fetching%' : '%i18n:mobile.tags.mk-notifications.more%' } + <button class="more" v-if="moreNotifications" @click="fetchMoreNotifications" :disabled="fetchingMoreNotifications"> + <template v-if="fetchingMoreNotifications">%fa:spinner .pulse .fw%</template>{ fetchingMoreNotifications ? '%i18n:common.loading%' : '%i18n:mobile.tags.mk-notifications.more%' } </button> <p class="empty" v-if="notifications.length == 0 && !fetching">%i18n:mobile.tags.mk-notifications.empty%</p> - <p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.fetching%<mk-ellipsis/></p> + <p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p> </div> </template> @@ -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 index 0685bd1278..b1243dbc74 100644 --- a/src/web/app/mobile/views/pages/notification.vue +++ b/src/web/app/mobile/views/pages/notifications.vue @@ -1,6 +1,7 @@ <template> -<mk-ui :func="fn" func-icon="%fa:check%"> +<mk-ui :func="fn"> <span slot="header">%fa:R bell%%i18n:mobile.tags.mk-notifications-page.notifications%</span> + <span slot="funcIcon">%fa:check%</span> <mk-notifications @fetched="onFetched"/> </mk-ui> </template> |