From be80c98ee5d536790a07eb753b63479022e9357e Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 13 Feb 2018 09:12:54 +0900 Subject: [PATCH] wip --- src/web/app/desktop/-tags/ellipsis-icon.tag | 37 -- .../desktop/-tags/home-widgets/timeline.tag | 143 -------- src/web/app/desktop/-tags/pages/entrance.tag | 342 ------------------ .../views/components/ellipsis-icon.vue | 37 ++ src/web/app/desktop/views/components/index.ts | 12 +- ...meline-post-sub.vue => posts-post-sub.vue} | 4 +- .../{timeline-post.vue => posts-post.vue} | 6 +- .../app/desktop/views/components/posts.vue | 69 ++++ .../app/desktop/views/components/timeline.vue | 141 +++++--- 9 files changed, 217 insertions(+), 574 deletions(-) delete mode 100644 src/web/app/desktop/-tags/ellipsis-icon.tag delete mode 100644 src/web/app/desktop/-tags/home-widgets/timeline.tag delete mode 100644 src/web/app/desktop/-tags/pages/entrance.tag create mode 100644 src/web/app/desktop/views/components/ellipsis-icon.vue rename src/web/app/desktop/views/components/{timeline-post-sub.vue => posts-post-sub.vue} (96%) rename src/web/app/desktop/views/components/{timeline-post.vue => posts-post.vue} (98%) create mode 100644 src/web/app/desktop/views/components/posts.vue diff --git a/src/web/app/desktop/-tags/ellipsis-icon.tag b/src/web/app/desktop/-tags/ellipsis-icon.tag deleted file mode 100644 index 619f0d84f7..0000000000 --- a/src/web/app/desktop/-tags/ellipsis-icon.tag +++ /dev/null @@ -1,37 +0,0 @@ - -
-
-
- -
diff --git a/src/web/app/desktop/-tags/home-widgets/timeline.tag b/src/web/app/desktop/-tags/home-widgets/timeline.tag deleted file mode 100644 index 4668ebfa87..0000000000 --- a/src/web/app/desktop/-tags/home-widgets/timeline.tag +++ /dev/null @@ -1,143 +0,0 @@ - - -
- -
-

%fa:R comments%自分の投稿や、自分がフォローしているユーザーの投稿が表示されます。

- - - - - - - - -
diff --git a/src/web/app/desktop/-tags/pages/entrance.tag b/src/web/app/desktop/-tags/pages/entrance.tag deleted file mode 100644 index 56cec34909..0000000000 --- a/src/web/app/desktop/-tags/pages/entrance.tag +++ /dev/null @@ -1,342 +0,0 @@ - -
-
-

どこにいても、ここにあります

-

ようこそ! MisskeyはTwitter風ミニブログSNSです――思ったこと、共有したいことをシンプルに書き残せます。タイムラインを見れば、皆の反応や皆がどう思っているのかもすぐにわかります。

-

これまでに{ stats.posts_count }投稿されました

-
-
- - -
- - -
-
-
- -
-
- -

{ _COPYRIGHT_ }

-
-
- - - - -
- - - %fa:question% -
-

-

{ user ? user.name : 'アカウント' }

-

- -
- Twitterでサインイン -
or
- Misskeyについて - - -
- - - - - - diff --git a/src/web/app/desktop/views/components/ellipsis-icon.vue b/src/web/app/desktop/views/components/ellipsis-icon.vue new file mode 100644 index 0000000000..c54a7db29d --- /dev/null +++ b/src/web/app/desktop/views/components/ellipsis-icon.vue @@ -0,0 +1,37 @@ + + + diff --git a/src/web/app/desktop/views/components/index.ts b/src/web/app/desktop/views/components/index.ts index 71a049a62c..a529537442 100644 --- a/src/web/app/desktop/views/components/index.ts +++ b/src/web/app/desktop/views/components/index.ts @@ -11,13 +11,15 @@ import uiHeaderSearch from './ui-header-search.vue'; import uiNotification from './ui-notification.vue'; import home from './home.vue'; import timeline from './timeline.vue'; -import timelinePost from './timeline-post.vue'; -import timelinePostSub from './timeline-post-sub.vue'; +import posts from './posts.vue'; +import postsPost from './posts-post.vue'; +import postsPostSub from './posts-post-sub.vue'; import subPostContent from './sub-post-content.vue'; import window from './window.vue'; import postFormWindow from './post-form-window.vue'; import repostFormWindow from './repost-form-window.vue'; import analogClock from './analog-clock.vue'; +import ellipsisIcon from './ellipsis-icon.vue'; Vue.component('mk-ui', ui); Vue.component('mk-ui-header', uiHeader); @@ -30,10 +32,12 @@ Vue.component('mk-ui-header-search', uiHeaderSearch); Vue.component('mk-ui-notification', uiNotification); Vue.component('mk-home', home); Vue.component('mk-timeline', timeline); -Vue.component('mk-timeline-post', timelinePost); -Vue.component('mk-timeline-post-sub', timelinePostSub); +Vue.component('mk-posts', posts); +Vue.component('mk-posts-post', postsPost); +Vue.component('mk-posts-post-sub', postsPostSub); Vue.component('mk-sub-post-content', subPostContent); Vue.component('mk-window', window); Vue.component('mk-post-form-window', postFormWindow); Vue.component('mk-repost-form-window', repostFormWindow); Vue.component('mk-analog-clock', analogClock); +Vue.component('mk-ellipsis-icon', ellipsisIcon); diff --git a/src/web/app/desktop/views/components/timeline-post-sub.vue b/src/web/app/desktop/views/components/posts-post-sub.vue similarity index 96% rename from src/web/app/desktop/views/components/timeline-post-sub.vue rename to src/web/app/desktop/views/components/posts-post-sub.vue index 1209396996..89aeb04829 100644 --- a/src/web/app/desktop/views/components/timeline-post-sub.vue +++ b/src/web/app/desktop/views/components/posts-post-sub.vue @@ -1,5 +1,5 @@