From 7602e8f9383be37c0f7d9359f862c366b7f2fa00 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 24 Apr 2018 18:13:06 +0900 Subject: cafy 5.xに移行 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/api/endpoints/users/show.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/api/endpoints/users/show.ts') diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts index 7e7f5dc488..64adb5963b 100644 --- a/src/server/api/endpoints/users/show.ts +++ b/src/server/api/endpoints/users/show.ts @@ -1,7 +1,7 @@ /** * Module dependencies */ -import $ from 'cafy'; +import $ from 'cafy'; import ID from '../../../../cafy-id'; import User, { pack } from '../../../../models/user'; import resolveRemoteUser from '../../../../remote/resolve-user'; @@ -14,7 +14,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => { let user; // Get 'userId' parameter - const [userId, userIdErr] = $(params.userId).optional.id().$; + const [userId, userIdErr] = $(params.userId).optional.type(ID).$; if (userIdErr) return rej('invalid userId param'); // Get 'username' parameter -- cgit v1.2.3-freya From 7ea42af0ba9f3678985270f382279560609623be Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Apr 2018 22:37:08 +0900 Subject: wip --- .../app/desktop/views/components/lists-window.vue | 46 -------- src/client/app/desktop/views/components/notes.vue | 8 +- .../desktop/views/components/ui.header.account.vue | 4 +- .../views/components/user-list-timeline.vue | 2 + .../desktop/views/components/user-lists-window.vue | 46 ++++++++ .../app/desktop/views/pages/user-list.users.vue | 131 +++++++++++++++++++++ src/client/app/desktop/views/pages/user-list.vue | 5 + src/server/api/endpoints/users/show.ts | 58 +++++---- 8 files changed, 225 insertions(+), 75 deletions(-) delete mode 100644 src/client/app/desktop/views/components/lists-window.vue create mode 100644 src/client/app/desktop/views/components/user-lists-window.vue create mode 100644 src/client/app/desktop/views/pages/user-list.users.vue (limited to 'src/server/api/endpoints/users/show.ts') diff --git a/src/client/app/desktop/views/components/lists-window.vue b/src/client/app/desktop/views/components/lists-window.vue deleted file mode 100644 index 30b1794a29..0000000000 --- a/src/client/app/desktop/views/components/lists-window.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - - - diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue index ae36c899d5..01e1f5c2f0 100644 --- a/src/client/app/desktop/views/components/notes.vue +++ b/src/client/app/desktop/views/components/notes.vue @@ -223,18 +223,18 @@ root(isDark) background $theme-color > footer - > * + > button display block margin 0 padding 16px width 100% text-align center color #ccc + background isDark ? #282C37 : #fff border-top solid 1px isDark ? #1c2023 : #eaeaea - border-bottom-left-radius 4px - border-bottom-right-radius 4px + border-bottom-left-radius 6px + border-bottom-right-radius 6px - > button &:hover background isDark ? #2e3440 : #f5f5f5 diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue index 93ee5aa195..b91448af49 100644 --- a/src/client/app/desktop/views/components/ui.header.account.vue +++ b/src/client/app/desktop/views/components/ui.header.account.vue @@ -45,7 +45,7 @@ + + diff --git a/src/client/app/desktop/views/pages/user-list.users.vue b/src/client/app/desktop/views/pages/user-list.users.vue new file mode 100644 index 0000000000..63070ed609 --- /dev/null +++ b/src/client/app/desktop/views/pages/user-list.users.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/client/app/desktop/views/pages/user-list.vue b/src/client/app/desktop/views/pages/user-list.vue index a01da97f6e..2241b84e5e 100644 --- a/src/client/app/desktop/views/pages/user-list.vue +++ b/src/client/app/desktop/views/pages/user-list.vue @@ -3,6 +3,7 @@

{{ list.title }}

+
@@ -13,8 +14,12 @@