From 560bb6538413a1e969a1177a739b18bfa91391e3 Mon Sep 17 00:00:00 2001 From: mei23 Date: Wed, 31 Oct 2018 04:59:01 +0900 Subject: [PATCH 1/2] blockings list --- locales/ja-JP.yml | 4 ++ .../views/components/settings.blocking.vue | 31 ++++++++++ .../app/desktop/views/components/settings.vue | 10 ++++ src/server/api/endpoints/blocking/list.ts | 59 +++++++++++++++++++ 4 files changed, 104 insertions(+) create mode 100644 src/client/app/desktop/views/components/settings.blocking.vue create mode 100644 src/server/api/endpoints/blocking/list.ts diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index bc7559b14..69fde53f5 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -833,6 +833,7 @@ desktop/views/components/settings.vue: notification: "通知" apps: "アプリ" mute: "ミュート" + blocking: "ブロック" security: "セキュリティ" signin: "サインイン履歴" password: "パスワード" @@ -976,6 +977,9 @@ common/views/components/drive-settings.vue: desktop/views/components/settings.mute.vue: no-users: "ミュートしているユーザーはいません" +desktop/views/components/settings.blocking.vue: + no-users: "ブロックしているユーザーはいません" + desktop/views/components/settings.password.vue: reset: "パスワードを変更する" enter-current-password: "現在のパスワードを入力してください" diff --git a/src/client/app/desktop/views/components/settings.blocking.vue b/src/client/app/desktop/views/components/settings.blocking.vue new file mode 100644 index 000000000..43e4bf920 --- /dev/null +++ b/src/client/app/desktop/views/components/settings.blocking.vue @@ -0,0 +1,31 @@ + + + diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index b5c02e486..e77320bef 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -8,6 +8,7 @@

%fa:cloud .fw%%i18n:common.drive%

%fa:hashtag .fw%%i18n:@tags%

%fa:ban .fw%%i18n:@mute%

+

%fa:ban .fw%%i18n:@blocking%

%fa:puzzle-piece .fw%%i18n:@apps%

%fa:unlock-alt .fw%%i18n:@security%

%fa:key .fw%API

@@ -207,6 +208,13 @@ + +
%fa:ban% %i18n:@blocking%
+
+ +
+
+
%fa:puzzle-piece% %i18n:@apps%
@@ -290,6 +298,7 @@ diff --git a/src/client/app/desktop/views/components/settings.blocking.vue b/src/client/app/desktop/views/components/settings.blocking.vue deleted file mode 100644 index 43e4bf920..000000000 --- a/src/client/app/desktop/views/components/settings.blocking.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/src/client/app/desktop/views/components/settings.mute.vue b/src/client/app/desktop/views/components/settings.mute.vue deleted file mode 100644 index 792afa923..000000000 --- a/src/client/app/desktop/views/components/settings.mute.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index e77320bef..74cedf9ec 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -7,8 +7,7 @@

%fa:R bell .fw%%i18n:@notification%

%fa:cloud .fw%%i18n:common.drive%

%fa:hashtag .fw%%i18n:@tags%

-

%fa:ban .fw%%i18n:@mute%

-

%fa:ban .fw%%i18n:@blocking%

+

%fa:ban .fw%%i18n:@mute-and-block%

%fa:puzzle-piece .fw%%i18n:@apps%

%fa:unlock-alt .fw%%i18n:@security%

%fa:key .fw%API

@@ -201,19 +200,9 @@
- -
%fa:ban% %i18n:@mute%
-
- -
-
- - -
%fa:ban% %i18n:@blocking%
-
- -
-
+
+ +
%fa:puzzle-piece% %i18n:@apps%
@@ -297,8 +286,6 @@