From b2a6257f93612ed59a00548feff4712a5136faab Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 21 Feb 2018 01:39:51 +0900 Subject: wip --- src/web/app/auth/views/index.vue | 6 +- src/web/app/common/views/components/index.ts | 4 - .../app/common/views/components/messaging-form.vue | 186 ---------------- .../common/views/components/messaging-message.vue | 238 --------------------- .../views/components/messaging-room.form.vue | 186 ++++++++++++++++ .../views/components/messaging-room.message.vue | 238 +++++++++++++++++++++ .../app/common/views/components/messaging-room.vue | 14 +- src/web/app/desktop/views/components/activity.vue | 12 +- .../desktop/views/components/context-menu.menu.vue | 2 +- .../app/desktop/views/components/context-menu.vue | 6 +- src/web/app/desktop/views/components/drive.vue | 6 +- .../app/desktop/views/components/post-detail.vue | 2 +- .../app/desktop/views/components/posts.post.vue | 2 +- src/web/app/desktop/views/components/posts.vue | 7 +- src/web/app/desktop/views/components/settings.vue | 2 +- src/web/app/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 +- .../views/components/widgets/server.memory.vue | 2 +- .../desktop/views/components/widgets/server.vue | 12 +- src/web/app/desktop/views/pages/index.vue | 10 +- .../views/pages/user/user-followers-you-know.vue | 79 ------- .../app/desktop/views/pages/user/user-friends.vue | 119 ----------- .../app/desktop/views/pages/user/user-header.vue | 189 ---------------- src/web/app/desktop/views/pages/user/user-home.vue | 103 --------- .../app/desktop/views/pages/user/user-photos.vue | 88 -------- .../app/desktop/views/pages/user/user-profile.vue | 142 ------------ .../app/desktop/views/pages/user/user-timeline.vue | 133 ------------ .../views/pages/user/user.followers-you-know.vue | 79 +++++++ .../app/desktop/views/pages/user/user.friends.vue | 119 +++++++++++ .../app/desktop/views/pages/user/user.header.vue | 189 ++++++++++++++++ src/web/app/desktop/views/pages/user/user.home.vue | 103 +++++++++ .../app/desktop/views/pages/user/user.photos.vue | 88 ++++++++ .../app/desktop/views/pages/user/user.profile.vue | 142 ++++++++++++ .../app/desktop/views/pages/user/user.timeline.vue | 133 ++++++++++++ src/web/app/desktop/views/pages/user/user.vue | 13 +- .../app/mobile/views/components/notifications.vue | 2 +- src/web/app/mobile/views/components/posts.vue | 2 +- .../app/mobile/views/pages/user/home-activity.vue | 2 +- 40 files changed, 1342 insertions(+), 1336 deletions(-) delete mode 100644 src/web/app/common/views/components/messaging-form.vue delete mode 100644 src/web/app/common/views/components/messaging-message.vue create mode 100644 src/web/app/common/views/components/messaging-room.form.vue create mode 100644 src/web/app/common/views/components/messaging-room.message.vue delete mode 100644 src/web/app/desktop/views/pages/user/user-followers-you-know.vue delete mode 100644 src/web/app/desktop/views/pages/user/user-friends.vue delete mode 100644 src/web/app/desktop/views/pages/user/user-header.vue delete mode 100644 src/web/app/desktop/views/pages/user/user-home.vue delete mode 100644 src/web/app/desktop/views/pages/user/user-photos.vue delete mode 100644 src/web/app/desktop/views/pages/user/user-profile.vue delete mode 100644 src/web/app/desktop/views/pages/user/user-timeline.vue create mode 100644 src/web/app/desktop/views/pages/user/user.followers-you-know.vue create mode 100644 src/web/app/desktop/views/pages/user/user.friends.vue create mode 100644 src/web/app/desktop/views/pages/user/user.header.vue create mode 100644 src/web/app/desktop/views/pages/user/user.home.vue create mode 100644 src/web/app/desktop/views/pages/user/user.photos.vue create mode 100644 src/web/app/desktop/views/pages/user/user.profile.vue create mode 100644 src/web/app/desktop/views/pages/user/user.timeline.vue (limited to 'src/web') 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-form.vue deleted file mode 100644 index 470606b77f..0000000000 --- a/src/web/app/common/views/components/messaging-form.vue +++ /dev/null @@ -1,186 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/messaging-message.vue b/src/web/app/common/views/components/messaging-message.vue deleted file mode 100644 index d2e3dacb56..0000000000 --- a/src/web/app/common/views/components/messaging-message.vue +++ /dev/null @@ -1,238 +0,0 @@ - - - - - diff --git a/src/web/app/common/views/components/messaging-room.form.vue b/src/web/app/common/views/components/messaging-room.form.vue new file mode 100644 index 0000000000..470606b77f --- /dev/null +++ b/src/web/app/common/views/components/messaging-room.form.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/web/app/common/views/components/messaging-room.message.vue b/src/web/app/common/views/components/messaging-room.message.vue new file mode 100644 index 0000000000..95a6efa28b --- /dev/null +++ b/src/web/app/common/views/components/messaging-room.message.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/src/web/app/common/views/components/messaging-room.vue b/src/web/app/common/views/components/messaging-room.vue index d03799563e..5022655a25 100644 --- a/src/web/app/common/views/components/messaging-room.vue +++ b/src/web/app/common/views/components/messaging-room.vue @@ -8,14 +8,16 @@ {{ fetchingMoreMessages ? '%i18n:common.loading%' : '%i18n:common.tags.mk-messaging-room.more%' }}
@@ -23,8 +25,14 @@ diff --git a/src/web/app/desktop/views/components/ui.vue b/src/web/app/desktop/views/components/ui.vue index 9cd12f9648..87f932ff14 100644 --- a/src/web/app/desktop/views/components/ui.vue +++ b/src/web/app/desktop/views/components/ui.vue @@ -14,7 +14,7 @@ import XHeader from './ui.header.vue'; export default Vue.extend({ components: { - 'x-header': XHeader + XHeader }, mounted() { document.addEventListener('keydown', this.onKeydown); diff --git a/src/web/app/desktop/views/components/widgets/server.cpu.vue b/src/web/app/desktop/views/components/widgets/server.cpu.vue index 337ff62cec..96184d188d 100644 --- a/src/web/app/desktop/views/components/widgets/server.cpu.vue +++ b/src/web/app/desktop/views/components/widgets/server.cpu.vue @@ -15,7 +15,7 @@ import XPie from './server.pie.vue'; export default Vue.extend({ components: { - 'x-pie': XPie + XPie }, props: ['connection', 'meta'], data() { diff --git a/src/web/app/desktop/views/components/widgets/server.disk.vue b/src/web/app/desktop/views/components/widgets/server.disk.vue index c21c56290e..2af1982a96 100644 --- a/src/web/app/desktop/views/components/widgets/server.disk.vue +++ b/src/web/app/desktop/views/components/widgets/server.disk.vue @@ -16,7 +16,7 @@ import XPie from './server.pie.vue'; export default Vue.extend({ components: { - 'x-pie': XPie + XPie }, props: ['connection'], data() { diff --git a/src/web/app/desktop/views/components/widgets/server.memory.vue b/src/web/app/desktop/views/components/widgets/server.memory.vue index 2afc627fd5..834a62671d 100644 --- a/src/web/app/desktop/views/components/widgets/server.memory.vue +++ b/src/web/app/desktop/views/components/widgets/server.memory.vue @@ -16,7 +16,7 @@ import XPie from './server.pie.vue'; export default Vue.extend({ components: { - 'x-pie': XPie + XPie }, props: ['connection'], data() { diff --git a/src/web/app/desktop/views/components/widgets/server.vue b/src/web/app/desktop/views/components/widgets/server.vue index 5aa01fd4e8..00e2f8f186 100644 --- a/src/web/app/desktop/views/components/widgets/server.vue +++ b/src/web/app/desktop/views/components/widgets/server.vue @@ -33,12 +33,12 @@ export default define({ } }).extend({ components: { - 'x-cpu-and-memory': XCpuMemory, - 'x-cpu': XCpu, - 'x-memory': XMemory, - 'x-disk': XDisk, - 'x-uptimes': XUptimes, - 'x-info': XInfo + XCpuMemory, + XCpu, + XMemory, + XDisk, + XUptimes, + XInfo }, data() { return { diff --git a/src/web/app/desktop/views/pages/index.vue b/src/web/app/desktop/views/pages/index.vue index bd32c17b3b..6b8739e30f 100644 --- a/src/web/app/desktop/views/pages/index.vue +++ b/src/web/app/desktop/views/pages/index.vue @@ -1,16 +1,16 @@ diff --git a/src/web/app/desktop/views/pages/user/user-followers-you-know.vue b/src/web/app/desktop/views/pages/user/user-followers-you-know.vue deleted file mode 100644 index 6f6673a7aa..0000000000 --- a/src/web/app/desktop/views/pages/user/user-followers-you-know.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/pages/user/user-friends.vue b/src/web/app/desktop/views/pages/user/user-friends.vue deleted file mode 100644 index b173e42967..0000000000 --- a/src/web/app/desktop/views/pages/user/user-friends.vue +++ /dev/null @@ -1,119 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/pages/user/user-header.vue b/src/web/app/desktop/views/pages/user/user-header.vue deleted file mode 100644 index b4a24459ce..0000000000 --- a/src/web/app/desktop/views/pages/user/user-header.vue +++ /dev/null @@ -1,189 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/pages/user/user-home.vue b/src/web/app/desktop/views/pages/user/user-home.vue deleted file mode 100644 index 5ed901579e..0000000000 --- a/src/web/app/desktop/views/pages/user/user-home.vue +++ /dev/null @@ -1,103 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/pages/user/user-photos.vue b/src/web/app/desktop/views/pages/user/user-photos.vue deleted file mode 100644 index 4029a95cc8..0000000000 --- a/src/web/app/desktop/views/pages/user/user-photos.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/pages/user/user-profile.vue b/src/web/app/desktop/views/pages/user/user-profile.vue deleted file mode 100644 index 32c28595e9..0000000000 --- a/src/web/app/desktop/views/pages/user/user-profile.vue +++ /dev/null @@ -1,142 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/pages/user/user-timeline.vue b/src/web/app/desktop/views/pages/user/user-timeline.vue deleted file mode 100644 index 9dd07653c4..0000000000 --- a/src/web/app/desktop/views/pages/user/user-timeline.vue +++ /dev/null @@ -1,133 +0,0 @@ - - - - - diff --git a/src/web/app/desktop/views/pages/user/user.followers-you-know.vue b/src/web/app/desktop/views/pages/user/user.followers-you-know.vue new file mode 100644 index 0000000000..015b12d3d4 --- /dev/null +++ b/src/web/app/desktop/views/pages/user/user.followers-you-know.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/src/web/app/desktop/views/pages/user/user.friends.vue b/src/web/app/desktop/views/pages/user/user.friends.vue new file mode 100644 index 0000000000..d27009a82d --- /dev/null +++ b/src/web/app/desktop/views/pages/user/user.friends.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/web/app/desktop/views/pages/user/user.header.vue b/src/web/app/desktop/views/pages/user/user.header.vue new file mode 100644 index 0000000000..81174f6570 --- /dev/null +++ b/src/web/app/desktop/views/pages/user/user.header.vue @@ -0,0 +1,189 @@ + + + + + diff --git a/src/web/app/desktop/views/pages/user/user.home.vue b/src/web/app/desktop/views/pages/user/user.home.vue new file mode 100644 index 0000000000..bf96741cb8 --- /dev/null +++ b/src/web/app/desktop/views/pages/user/user.home.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/src/web/app/desktop/views/pages/user/user.photos.vue b/src/web/app/desktop/views/pages/user/user.photos.vue new file mode 100644 index 0000000000..db29a9945a --- /dev/null +++ b/src/web/app/desktop/views/pages/user/user.photos.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/web/app/desktop/views/pages/user/user.profile.vue b/src/web/app/desktop/views/pages/user/user.profile.vue new file mode 100644 index 0000000000..db2e32e808 --- /dev/null +++ b/src/web/app/desktop/views/pages/user/user.profile.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/web/app/desktop/views/pages/user/user.timeline.vue b/src/web/app/desktop/views/pages/user/user.timeline.vue new file mode 100644 index 0000000000..51c7589fd6 --- /dev/null +++ b/src/web/app/desktop/views/pages/user/user.timeline.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/web/app/desktop/views/pages/user/user.vue b/src/web/app/desktop/views/pages/user/user.vue index 84f31e8548..095df0e489 100644 --- a/src/web/app/desktop/views/pages/user/user.vue +++ b/src/web/app/desktop/views/pages/user/user.vue @@ -1,9 +1,8 @@ @@ -11,13 +10,13 @@