From b2a6257f93612ed59a00548feff4712a5136faab Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 21 Feb 2018 01:39:51 +0900 Subject: [PATCH] wip --- src/web/app/auth/views/index.vue | 6 ++-- src/web/app/common/views/components/index.ts | 4 --- ...aging-form.vue => messaging-room.form.vue} | 0 ...message.vue => messaging-room.message.vue} | 12 +++---- .../views/components/messaging-room.vue | 14 ++++++-- .../app/desktop/views/components/activity.vue | 12 +++---- .../views/components/context-menu.menu.vue | 2 +- .../desktop/views/components/context-menu.vue | 6 ++-- .../app/desktop/views/components/drive.vue | 6 ++-- .../desktop/views/components/post-detail.vue | 2 +- .../desktop/views/components/posts.post.vue | 2 +- .../app/desktop/views/components/posts.vue | 7 ++-- .../app/desktop/views/components/settings.vue | 2 +- .../desktop/views/components/ui.header.vue | 12 +++---- src/web/app/desktop/views/components/ui.vue | 2 +- .../views/components/widgets/server.cpu.vue | 2 +- .../views/components/widgets/server.disk.vue | 2 +- .../components/widgets/server.memory.vue | 2 +- .../views/components/widgets/server.vue | 12 +++---- src/web/app/desktop/views/pages/index.vue | 10 +++--- ...u-know.vue => user.followers-you-know.vue} | 4 +-- .../{user-friends.vue => user.friends.vue} | 4 +-- .../user/{user-header.vue => user.header.vue} | 4 +-- .../user/{user-home.vue => user.home.vue} | 34 +++++++++---------- .../user/{user-photos.vue => user.photos.vue} | 4 +-- .../{user-profile.vue => user.profile.vue} | 4 +-- .../{user-timeline.vue => user.timeline.vue} | 4 +-- src/web/app/desktop/views/pages/user/user.vue | 13 ++++--- .../mobile/views/components/notifications.vue | 2 +- src/web/app/mobile/views/components/posts.vue | 2 +- .../mobile/views/pages/user/home-activity.vue | 2 +- 31 files changed, 100 insertions(+), 94 deletions(-) rename src/web/app/common/views/components/{messaging-form.vue => messaging-room.form.vue} (100%) rename src/web/app/common/views/components/{messaging-message.vue => messaging-room.message.vue} (96%) rename src/web/app/desktop/views/pages/user/{user-followers-you-know.vue => user.followers-you-know.vue} (95%) rename src/web/app/desktop/views/pages/user/{user-friends.vue => user.friends.vue} (98%) rename src/web/app/desktop/views/pages/user/{user-header.vue => user.header.vue} (97%) rename src/web/app/desktop/views/pages/user/{user-home.vue => user.home.vue} (65%) rename src/web/app/desktop/views/pages/user/{user-photos.vue => user.photos.vue} (97%) rename src/web/app/desktop/views/pages/user/{user-profile.vue => user.profile.vue} (98%) rename src/web/app/desktop/views/pages/user/{user-timeline.vue => user.timeline.vue} (98%) diff --git a/src/web/app/auth/views/index.vue b/src/web/app/auth/views/index.vue index 56a7bac7a3..1e372c0bde 100644 --- a/src/web/app/auth/views/index.vue +++ b/src/web/app/auth/views/index.vue @@ -2,7 +2,7 @@

読み込み中

- import Vue from 'vue'; -import Form from './form.vue'; +import XForm from './form.vue'; export default Vue.extend({ components: { - 'fo-rm': Form + XForm }, data() { return { diff --git a/src/web/app/common/views/components/index.ts b/src/web/app/common/views/components/index.ts index 021e45a8dc..a61022dbe0 100644 --- a/src/web/app/common/views/components/index.ts +++ b/src/web/app/common/views/components/index.ts @@ -15,9 +15,7 @@ import specialMessage from './special-message.vue'; import streamIndicator from './stream-indicator.vue'; import ellipsis from './ellipsis.vue'; import messaging from './messaging.vue'; -import messagingForm from './messaging-form.vue'; import messagingRoom from './messaging-room.vue'; -import messagingMessage from './messaging-message.vue'; import urlPreview from './url-preview.vue'; Vue.component('mk-signin', signin); @@ -35,7 +33,5 @@ Vue.component('mk-special-message', specialMessage); Vue.component('mk-stream-indicator', streamIndicator); Vue.component('mk-ellipsis', ellipsis); Vue.component('mk-messaging', messaging); -Vue.component('mk-messaging-form', messagingForm); Vue.component('mk-messaging-room', messagingRoom); -Vue.component('mk-messaging-message', messagingMessage); Vue.component('mk-url-preview', urlPreview); diff --git a/src/web/app/common/views/components/messaging-form.vue b/src/web/app/common/views/components/messaging-room.form.vue similarity index 100% rename from src/web/app/common/views/components/messaging-form.vue rename to src/web/app/common/views/components/messaging-room.form.vue diff --git a/src/web/app/common/views/components/messaging-message.vue b/src/web/app/common/views/components/messaging-room.message.vue similarity index 96% rename from src/web/app/common/views/components/messaging-message.vue rename to src/web/app/common/views/components/messaging-room.message.vue index d2e3dacb56..95a6efa28b 100644 --- a/src/web/app/common/views/components/messaging-message.vue +++ b/src/web/app/common/views/components/messaging-room.message.vue @@ -1,5 +1,5 @@