From 53422ffcb296be404c0f3ef7e175bedecca4fb4d Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 15 Feb 2019 05:08:59 +0900 Subject: Improve desktop UX (#4262) * wip * wip * wip * wip * wip * wip * Merge * wip * wip * wip * wip * wip * wip --- locales/ja-JP.yml | 14 +- .../app/common/views/components/activity.vue | 111 +++++ src/client/app/common/views/components/dummy.vue | 11 + .../app/common/views/components/follow-button.vue | 11 +- src/client/app/common/views/components/index.ts | 2 + src/client/app/common/views/widgets/index.ts | 2 + src/client/app/common/views/widgets/instance.vue | 14 + src/client/app/desktop/script.ts | 37 +- src/client/app/desktop/views/components/home.vue | 396 ---------------- src/client/app/desktop/views/components/index.ts | 4 - .../app/desktop/views/components/settings.vue | 19 +- .../app/desktop/views/components/timeline.core.vue | 195 -------- .../app/desktop/views/components/timeline.vue | 264 ----------- .../desktop/views/components/ui.header.account.vue | 7 - .../app/desktop/views/components/ui.header.nav.vue | 19 +- .../app/desktop/views/components/ui.sidebar.vue | 2 +- .../app/desktop/views/deck/deck.column-core.vue | 49 ++ src/client/app/desktop/views/deck/deck.column.vue | 421 +++++++++++++++++ .../app/desktop/views/deck/deck.direct-column.vue | 46 ++ src/client/app/desktop/views/deck/deck.direct.vue | 101 ++++ .../desktop/views/deck/deck.favorites-column.vue | 88 ++++ .../app/desktop/views/deck/deck.hashtag-column.vue | 119 +++++ .../app/desktop/views/deck/deck.hashtag-tl.vue | 126 +++++ src/client/app/desktop/views/deck/deck.list-tl.vue | 136 ++++++ .../desktop/views/deck/deck.mentions-column.vue | 46 ++ .../app/desktop/views/deck/deck.mentions.vue | 97 ++++ .../app/desktop/views/deck/deck.note-column.vue | 77 ++++ src/client/app/desktop/views/deck/deck.notes.vue | 245 ++++++++++ .../app/desktop/views/deck/deck.notification.vue | 193 ++++++++ .../views/deck/deck.notifications-column.vue | 40 ++ .../app/desktop/views/deck/deck.notifications.vue | 223 +++++++++ .../app/desktop/views/deck/deck.tl-column.vue | 105 +++++ src/client/app/desktop/views/deck/deck.tl.vue | 151 ++++++ .../app/desktop/views/deck/deck.user-column.vue | 507 +++++++++++++++++++++ src/client/app/desktop/views/deck/deck.vue | 385 ++++++++++++++++ .../app/desktop/views/deck/deck.widgets-column.vue | 172 +++++++ src/client/app/desktop/views/home/favorites.vue | 83 ++++ src/client/app/desktop/views/home/home.vue | 400 ++++++++++++++++ src/client/app/desktop/views/home/note.vue | 63 +++ src/client/app/desktop/views/home/tag.vue | 117 +++++ .../app/desktop/views/home/timeline.core.vue | 195 ++++++++ src/client/app/desktop/views/home/timeline.vue | 273 +++++++++++ .../views/home/user/user.followers-you-know.vue | 84 ++++ .../app/desktop/views/home/user/user.friends.vue | 112 +++++ .../app/desktop/views/home/user/user.header.vue | 272 +++++++++++ .../home/user/user.integrations.integration.vue | 14 + .../desktop/views/home/user/user.integrations.vue | 63 +++ .../app/desktop/views/home/user/user.photos.vue | 106 +++++ .../app/desktop/views/home/user/user.timeline.vue | 175 +++++++ src/client/app/desktop/views/home/user/user.vue | 109 +++++ .../desktop/views/pages/deck/deck.column-core.vue | 49 -- .../app/desktop/views/pages/deck/deck.column.vue | 424 ----------------- .../views/pages/deck/deck.direct-column.vue | 46 -- .../app/desktop/views/pages/deck/deck.direct.vue | 101 ---- .../views/pages/deck/deck.hashtag-column.vue | 112 ----- .../desktop/views/pages/deck/deck.hashtag-tl.vue | 126 ----- .../app/desktop/views/pages/deck/deck.list-tl.vue | 136 ------ .../views/pages/deck/deck.mentions-column.vue | 46 -- .../app/desktop/views/pages/deck/deck.mentions.vue | 97 ---- .../desktop/views/pages/deck/deck.note-column.vue | 70 --- .../app/desktop/views/pages/deck/deck.notes.vue | 245 ---------- .../desktop/views/pages/deck/deck.notification.vue | 193 -------- .../views/pages/deck/deck.notifications-column.vue | 40 -- .../views/pages/deck/deck.notifications.vue | 223 --------- .../desktop/views/pages/deck/deck.tl-column.vue | 105 ----- .../app/desktop/views/pages/deck/deck.tl.vue | 151 ------ .../desktop/views/pages/deck/deck.user-column.vue | 505 -------------------- src/client/app/desktop/views/pages/deck/deck.vue | 433 ------------------ .../views/pages/deck/deck.widgets-column.vue | 172 ------- src/client/app/desktop/views/pages/favorites.vue | 87 ---- .../app/desktop/views/pages/home-customize.vue | 3 - src/client/app/desktop/views/pages/home.vue | 39 -- src/client/app/desktop/views/pages/index.vue | 25 - src/client/app/desktop/views/pages/note.vue | 66 --- src/client/app/desktop/views/pages/tag.vue | 126 ----- .../views/pages/user/user.followers-you-know.vue | 84 ---- .../app/desktop/views/pages/user/user.friends.vue | 112 ----- .../app/desktop/views/pages/user/user.header.vue | 253 ---------- .../pages/user/user.integrations.integration.vue | 14 - .../desktop/views/pages/user/user.integrations.vue | 63 --- .../app/desktop/views/pages/user/user.photos.vue | 106 ----- .../app/desktop/views/pages/user/user.profile.vue | 66 --- .../app/desktop/views/pages/user/user.timeline.vue | 175 ------- src/client/app/desktop/views/pages/user/user.vue | 155 ------- src/client/app/desktop/views/widgets/customize.vue | 21 + src/client/app/desktop/views/widgets/index.ts | 2 + src/client/app/init.ts | 9 +- .../app/mobile/views/components/activity.vue | 108 ----- src/client/app/mobile/views/pages/user/home.vue | 2 +- src/client/app/mobile/views/widgets/activity.vue | 2 +- src/client/app/store.ts | 9 +- 91 files changed, 5606 insertions(+), 5696 deletions(-) create mode 100644 src/client/app/common/views/components/activity.vue create mode 100644 src/client/app/common/views/components/dummy.vue create mode 100644 src/client/app/common/views/widgets/instance.vue delete mode 100644 src/client/app/desktop/views/components/home.vue delete mode 100644 src/client/app/desktop/views/components/timeline.core.vue delete mode 100644 src/client/app/desktop/views/components/timeline.vue create mode 100644 src/client/app/desktop/views/deck/deck.column-core.vue create mode 100644 src/client/app/desktop/views/deck/deck.column.vue create mode 100644 src/client/app/desktop/views/deck/deck.direct-column.vue create mode 100644 src/client/app/desktop/views/deck/deck.direct.vue create mode 100644 src/client/app/desktop/views/deck/deck.favorites-column.vue create mode 100644 src/client/app/desktop/views/deck/deck.hashtag-column.vue create mode 100644 src/client/app/desktop/views/deck/deck.hashtag-tl.vue create mode 100644 src/client/app/desktop/views/deck/deck.list-tl.vue create mode 100644 src/client/app/desktop/views/deck/deck.mentions-column.vue create mode 100644 src/client/app/desktop/views/deck/deck.mentions.vue create mode 100644 src/client/app/desktop/views/deck/deck.note-column.vue create mode 100644 src/client/app/desktop/views/deck/deck.notes.vue create mode 100644 src/client/app/desktop/views/deck/deck.notification.vue create mode 100644 src/client/app/desktop/views/deck/deck.notifications-column.vue create mode 100644 src/client/app/desktop/views/deck/deck.notifications.vue create mode 100644 src/client/app/desktop/views/deck/deck.tl-column.vue create mode 100644 src/client/app/desktop/views/deck/deck.tl.vue create mode 100644 src/client/app/desktop/views/deck/deck.user-column.vue create mode 100644 src/client/app/desktop/views/deck/deck.vue create mode 100644 src/client/app/desktop/views/deck/deck.widgets-column.vue create mode 100644 src/client/app/desktop/views/home/favorites.vue create mode 100644 src/client/app/desktop/views/home/home.vue create mode 100644 src/client/app/desktop/views/home/note.vue create mode 100644 src/client/app/desktop/views/home/tag.vue create mode 100644 src/client/app/desktop/views/home/timeline.core.vue create mode 100644 src/client/app/desktop/views/home/timeline.vue create mode 100644 src/client/app/desktop/views/home/user/user.followers-you-know.vue create mode 100644 src/client/app/desktop/views/home/user/user.friends.vue create mode 100644 src/client/app/desktop/views/home/user/user.header.vue create mode 100644 src/client/app/desktop/views/home/user/user.integrations.integration.vue create mode 100644 src/client/app/desktop/views/home/user/user.integrations.vue create mode 100644 src/client/app/desktop/views/home/user/user.photos.vue create mode 100644 src/client/app/desktop/views/home/user/user.timeline.vue create mode 100644 src/client/app/desktop/views/home/user/user.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.column-core.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.column.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.direct-column.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.direct.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.hashtag-column.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.hashtag-tl.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.list-tl.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.mentions-column.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.mentions.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.note-column.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.notes.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.notification.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.notifications-column.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.notifications.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.tl-column.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.tl.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.user-column.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.vue delete mode 100644 src/client/app/desktop/views/pages/deck/deck.widgets-column.vue delete mode 100644 src/client/app/desktop/views/pages/favorites.vue delete mode 100644 src/client/app/desktop/views/pages/home-customize.vue delete mode 100644 src/client/app/desktop/views/pages/home.vue delete mode 100644 src/client/app/desktop/views/pages/index.vue delete mode 100644 src/client/app/desktop/views/pages/note.vue delete mode 100644 src/client/app/desktop/views/pages/tag.vue delete mode 100644 src/client/app/desktop/views/pages/user/user.followers-you-know.vue delete mode 100644 src/client/app/desktop/views/pages/user/user.friends.vue delete mode 100644 src/client/app/desktop/views/pages/user/user.header.vue delete mode 100644 src/client/app/desktop/views/pages/user/user.integrations.integration.vue delete mode 100644 src/client/app/desktop/views/pages/user/user.integrations.vue delete mode 100644 src/client/app/desktop/views/pages/user/user.photos.vue delete mode 100644 src/client/app/desktop/views/pages/user/user.profile.vue delete mode 100644 src/client/app/desktop/views/pages/user/user.timeline.vue delete mode 100644 src/client/app/desktop/views/pages/user/user.vue create mode 100644 src/client/app/desktop/views/widgets/customize.vue delete mode 100644 src/client/app/mobile/views/components/activity.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 27542dd96c..7df81de90a 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -28,6 +28,7 @@ common: load-more: "もっと読み込む" enter-password: "パスワードを入力してください" 2fa: "二段階認証" + customize-home: "ホームをカスタマイズ" got-it: "わかった" customization-tips: @@ -893,14 +894,10 @@ desktop/views/components/settings.vue: web-search-engine-desc: "例: https://www.google.com/?#q={{query}}" auto-popout: "ウィンドウの自動ポップアウト" auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。" - deck-nav: "デッキ内ナビゲーション" - deck-nav-desc: "デッキを使用しているとき、ナビゲーションが発生する際にページ遷移を行わずに一時的なカラムで受けるようにします。" keep-cw: "CW保持" keep-cw-desc: "投稿にリプライする際、リプライ元の投稿にCWが設定されていたとき、デフォルトで同じCWを設定するようにします。" - deck-default: "デッキをデフォルトのUIにする" display: "デザインと表示" - customize: "ホームをカスタマイズ" wallpaper: "壁紙" choose-wallpaper: "壁紙を選択" delete-wallpaper: "壁紙を削除" @@ -1076,7 +1073,6 @@ desktop/views/components/ui.header.account.vue: favorites: "お気に入り" lists: "リスト" follow-requests: "フォロー申請" - customize: "ホームのカスタマイズ" admin: "管理" settings: "設定" signout: "サインアウト" @@ -1447,9 +1443,6 @@ desktop/views/pages/welcome.vue: desktop/views/pages/drive.vue: title: "Misskey Drive" -desktop/views/pages/home-customize.vue: - title: "ホームのカスタマイズ" - desktop/views/pages/note.vue: prev: "前の投稿" next: "次の投稿" @@ -1490,10 +1483,6 @@ desktop/views/pages/user/user.photos.vue: loading: "読み込み中" no-photos: "写真はありません" -desktop/views/pages/user/user.profile.vue: - follows-you: "フォローされています" - menu: "メニュー" - desktop/views/pages/user/user.header.vue: posts: "投稿" following: "フォロー" @@ -1503,6 +1492,7 @@ desktop/views/pages/user/user.header.vue: year: "年" month: "月" day: "日" + follows-you: "フォローされています" desktop/views/pages/user/user.timeline.vue: default: "投稿" diff --git a/src/client/app/common/views/components/activity.vue b/src/client/app/common/views/components/activity.vue new file mode 100644 index 0000000000..1e9f87cf04 --- /dev/null +++ b/src/client/app/common/views/components/activity.vue @@ -0,0 +1,111 @@ + + + diff --git a/src/client/app/common/views/components/dummy.vue b/src/client/app/common/views/components/dummy.vue new file mode 100644 index 0000000000..5634efc509 --- /dev/null +++ b/src/client/app/common/views/components/dummy.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/client/app/common/views/components/follow-button.vue b/src/client/app/common/views/components/follow-button.vue index 6d120f52b4..71d3a63e4c 100644 --- a/src/client/app/common/views/components/follow-button.vue +++ b/src/client/app/common/views/components/follow-button.vue @@ -1,8 +1,9 @@