From 4980b86d640ca795442255e4746c01bb38e0b5f8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 15 Feb 2018 18:33:34 +0900 Subject: [PATCH] wip --- src/web/app/auth/tags/index.tag | 6 +- src/web/app/ch/tags/channel.tag | 8 +- src/web/app/ch/tags/header.tag | 4 +- src/web/app/desktop/-tags/user-preview.tag | 2 +- src/web/app/desktop/-tags/users-list.tag | 2 +- src/web/app/mobile/tags/home.tag | 23 - src/web/app/mobile/tags/user.tag | 735 ------------------ src/web/app/mobile/tags/users-list.tag | 2 +- src/web/app/mobile/views/components/home.vue | 29 + .../app/mobile/views/components/post-card.vue | 85 ++ .../app/mobile/views/components/ui-nav.vue | 2 +- src/web/app/mobile/views/pages/user.vue | 226 ++++++ .../views/pages/user/followers-you-know.vue | 62 ++ .../mobile/views/pages/user/home-activity.vue | 62 ++ .../mobile/views/pages/user/home-friends.vue | 54 ++ .../mobile/views/pages/user/home-photos.vue | 78 ++ .../mobile/views/pages/user/home-posts.vue | 57 ++ src/web/app/mobile/views/pages/user/home.vue | 95 +++ 18 files changed, 761 insertions(+), 771 deletions(-) delete mode 100644 src/web/app/mobile/tags/home.tag delete mode 100644 src/web/app/mobile/tags/user.tag create mode 100644 src/web/app/mobile/views/components/home.vue create mode 100644 src/web/app/mobile/views/components/post-card.vue create mode 100644 src/web/app/mobile/views/pages/user.vue create mode 100644 src/web/app/mobile/views/pages/user/followers-you-know.vue create mode 100644 src/web/app/mobile/views/pages/user/home-activity.vue create mode 100644 src/web/app/mobile/views/pages/user/home-friends.vue create mode 100644 src/web/app/mobile/views/pages/user/home-photos.vue create mode 100644 src/web/app/mobile/views/pages/user/home-posts.vue create mode 100644 src/web/app/mobile/views/pages/user/home.vue diff --git a/src/web/app/auth/tags/index.tag b/src/web/app/auth/tags/index.tag index 3a24c2d6be..56fbbb7da2 100644 --- a/src/web/app/auth/tags/index.tag +++ b/src/web/app/auth/tags/index.tag @@ -1,5 +1,5 @@ -
+

読み込み中

@@ -15,7 +15,7 @@

セッションが存在しません。

-
+

サインインしてください

@@ -93,7 +93,7 @@ this.token = window.location.href.split('/').pop(); this.on('mount', () => { - if (!this.SIGNIN) return; + if (!this.$root.$data.os.isSignedIn) return; // Fetch session this.$root.$data.os.api('auth/session/show', { diff --git a/src/web/app/ch/tags/channel.tag b/src/web/app/ch/tags/channel.tag index d95de97376..b5c6ce1e69 100644 --- a/src/web/app/ch/tags/channel.tag +++ b/src/web/app/ch/tags/channel.tag @@ -4,7 +4,7 @@

{ channel.title }

-
+

このチャンネルをウォッチしています ウォッチ解除

このチャンネルをウォッチする

@@ -24,8 +24,8 @@

- -
+ +

参加するにはログインまたは新規登録してください


@@ -125,7 +125,7 @@ this.posts.unshift(post); this.update(); - if (document.hidden && this.SIGNIN && post.user_id !== this.$root.$data.os.i.id) { + if (document.hidden && this.$root.$data.os.isSignedIn && post.user_id !== this.$root.$data.os.i.id) { this.unreadCount++; document.title = `(${this.unreadCount}) ${this.channel.title} | Misskey`; } diff --git a/src/web/app/ch/tags/header.tag b/src/web/app/ch/tags/header.tag index 47a1e3e76a..747bec357b 100644 --- a/src/web/app/ch/tags/header.tag +++ b/src/web/app/ch/tags/header.tag @@ -3,8 +3,8 @@ Index | Misskey
- - diff --git a/src/web/app/mobile/tags/user.tag b/src/web/app/mobile/tags/user.tag deleted file mode 100644 index b9bb4e17a4..0000000000 --- a/src/web/app/mobile/tags/user.tag +++ /dev/null @@ -1,735 +0,0 @@ - -
-
- -
-
- - avatar - - -
-
-

{ user.name }

- @{ user.username } - %i18n:mobile.tags.mk-user.follows-you% -
-
{ user.description }
-
-

- %fa:map-marker%{ user.profile.location } -

-

- %fa:birthday-cake%{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' } ({ age(user.profile.birthday) }歳) -

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

%fa:R comments%%i18n:mobile.tags.mk-user-overview.recent-posts%

-
- -
-
-
-

%fa:image%%i18n:mobile.tags.mk-user-overview.images%

-
- -
-
-
-

%fa:chart-bar%%i18n:mobile.tags.mk-user-overview.activity%

-
- -
-
-
-

%fa:R comment%%i18n:mobile.tags.mk-user-overview.keywords%

-
- -
-
-
-

%fa:globe%%i18n:mobile.tags.mk-user-overview.domains%

-
- -
-
-
-

%fa:users%%i18n:mobile.tags.mk-user-overview.frequently-replied-users%

-
- -
-
-
-

%fa:users%%i18n:mobile.tags.mk-user-overview.followers-you-know%

-
- -
-
-

%i18n:mobile.tags.mk-user-overview.last-used-at%:

- - -
- - -

%fa:spinner .pulse .fw%%i18n:mobile.tags.mk-user-overview-posts.loading%

-
- -
-

%i18n:mobile.tags.mk-user-overview-posts.no-posts%

- - -
- - - -
- avatar

{ post.user.name }

-
-
- { text } -
- -
- - -
- - -

%fa:spinner .pulse .fw%%i18n:mobile.tags.mk-user-overview-photos.loading%

-
- -
-

%i18n:mobile.tags.mk-user-overview-photos.no-photos%

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

%i18n:mobile.tags.mk-user-overview-keywords.no-keywords%

- - -
- - -
- -
-

%i18n:mobile.tags.mk-user-overview-domains.no-domains%

- - -
- - -

%fa:spinner .pulse .fw%%i18n:mobile.tags.mk-user-overview-frequently-replied-users.loading%

-
- -
-

%i18n:mobile.tags.mk-user-overview-frequently-replied-users.no-users%

- - -
- - -

%fa:spinner .pulse .fw%%i18n:mobile.tags.mk-user-overview-followers-you-know.loading%

-
- -
-

%i18n:mobile.tags.mk-user-overview-followers-you-know.no-users%

- - -
diff --git a/src/web/app/mobile/tags/users-list.tag b/src/web/app/mobile/tags/users-list.tag index 2bc0c6e939..84427a18e2 100644 --- a/src/web/app/mobile/tags/users-list.tag +++ b/src/web/app/mobile/tags/users-list.tag @@ -1,7 +1,7 @@
diff --git a/src/web/app/mobile/views/components/home.vue b/src/web/app/mobile/views/components/home.vue new file mode 100644 index 0000000000..3feab581d2 --- /dev/null +++ b/src/web/app/mobile/views/components/home.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/web/app/mobile/views/components/post-card.vue b/src/web/app/mobile/views/components/post-card.vue new file mode 100644 index 0000000000..4dd6ceb282 --- /dev/null +++ b/src/web/app/mobile/views/components/post-card.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/src/web/app/mobile/views/components/ui-nav.vue b/src/web/app/mobile/views/components/ui-nav.vue index 3765ce8870..cab24787d1 100644 --- a/src/web/app/mobile/views/components/ui-nav.vue +++ b/src/web/app/mobile/views/components/ui-nav.vue @@ -2,7 +2,7 @@
- + avatar

{ I.name }

diff --git a/src/web/app/mobile/views/pages/user.vue b/src/web/app/mobile/views/pages/user.vue new file mode 100644 index 0000000000..d92f3bbe65 --- /dev/null +++ b/src/web/app/mobile/views/pages/user.vue @@ -0,0 +1,226 @@ + + + + + diff --git a/src/web/app/mobile/views/pages/user/followers-you-know.vue b/src/web/app/mobile/views/pages/user/followers-you-know.vue new file mode 100644 index 0000000000..a4358f5d90 --- /dev/null +++ b/src/web/app/mobile/views/pages/user/followers-you-know.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/web/app/mobile/views/pages/user/home-activity.vue b/src/web/app/mobile/views/pages/user/home-activity.vue new file mode 100644 index 0000000000..00a2dafc12 --- /dev/null +++ b/src/web/app/mobile/views/pages/user/home-activity.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/web/app/mobile/views/pages/user/home-friends.vue b/src/web/app/mobile/views/pages/user/home-friends.vue new file mode 100644 index 0000000000..2a7e8b9617 --- /dev/null +++ b/src/web/app/mobile/views/pages/user/home-friends.vue @@ -0,0 +1,54 @@ + + + + + diff --git a/src/web/app/mobile/views/pages/user/home-photos.vue b/src/web/app/mobile/views/pages/user/home-photos.vue new file mode 100644 index 0000000000..fc2d0e139a --- /dev/null +++ b/src/web/app/mobile/views/pages/user/home-photos.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/web/app/mobile/views/pages/user/home-posts.vue b/src/web/app/mobile/views/pages/user/home-posts.vue new file mode 100644 index 0000000000..b1451b0887 --- /dev/null +++ b/src/web/app/mobile/views/pages/user/home-posts.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/src/web/app/mobile/views/pages/user/home.vue b/src/web/app/mobile/views/pages/user/home.vue new file mode 100644 index 0000000000..56b9285591 --- /dev/null +++ b/src/web/app/mobile/views/pages/user/home.vue @@ -0,0 +1,95 @@ + + + + +