From 3a1978cb653f294ddccba0ec6b8cdeb064eea15c Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 5 Mar 2018 18:11:07 +0900 Subject: [PATCH] :v: --- package.json | 1 + src/web/app/common/-tags/authorized-apps.tag | 34 ----- src/web/app/common/-tags/signin-history.tag | 116 ------------------ .../views/components/settings.apps.vue | 39 ++++++ .../views/components/settings.signins.vue | 98 +++++++++++++++ .../app/desktop/views/components/settings.vue | 10 +- src/web/app/init.ts | 2 + 7 files changed, 147 insertions(+), 153 deletions(-) delete mode 100644 src/web/app/common/-tags/authorized-apps.tag delete mode 100644 src/web/app/common/-tags/signin-history.tag create mode 100644 src/web/app/desktop/views/components/settings.apps.vue create mode 100644 src/web/app/desktop/views/components/settings.signins.vue diff --git a/package.json b/package.json index 5efd04b41f..d59f342ec0 100644 --- a/package.json +++ b/package.json @@ -185,6 +185,7 @@ "vue": "2.5.13", "vue-cropperjs": "2.2.0", "vue-js-modal": "1.3.12", + "vue-json-tree-view": "^2.1.3", "vue-loader": "14.1.1", "vue-router": "3.0.1", "vue-template-compiler": "2.5.13", diff --git a/src/web/app/common/-tags/authorized-apps.tag b/src/web/app/common/-tags/authorized-apps.tag deleted file mode 100644 index ed1570650a..0000000000 --- a/src/web/app/common/-tags/authorized-apps.tag +++ /dev/null @@ -1,34 +0,0 @@ - -
-

%fa:info-circle%%i18n:common.tags.mk-authorized-apps.no-apps%

-
-
-
-

{ app.name }

-

{ app.description }

-
-
- - -
diff --git a/src/web/app/common/-tags/signin-history.tag b/src/web/app/common/-tags/signin-history.tag deleted file mode 100644 index a347c7c235..0000000000 --- a/src/web/app/common/-tags/signin-history.tag +++ /dev/null @@ -1,116 +0,0 @@ - -
- -
- - -
- - -
- - - { rec.ip } - -
-
{ JSON.stringify(rec.headers, null, 2) }
- - - - -
diff --git a/src/web/app/desktop/views/components/settings.apps.vue b/src/web/app/desktop/views/components/settings.apps.vue new file mode 100644 index 0000000000..0503b03abd --- /dev/null +++ b/src/web/app/desktop/views/components/settings.apps.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/src/web/app/desktop/views/components/settings.signins.vue b/src/web/app/desktop/views/components/settings.signins.vue new file mode 100644 index 0000000000..ddc567f06f --- /dev/null +++ b/src/web/app/desktop/views/components/settings.signins.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/src/web/app/desktop/views/components/settings.vue b/src/web/app/desktop/views/components/settings.vue index 0eb18770a5..096ba57fd7 100644 --- a/src/web/app/desktop/views/components/settings.vue +++ b/src/web/app/desktop/views/components/settings.vue @@ -81,7 +81,7 @@

アプリケーション

- +
@@ -101,7 +101,7 @@
@@ -161,6 +161,8 @@ import XMute from './settings.mute.vue'; import XPassword from './settings.password.vue'; import X2fa from './settings.2fa.vue'; import XApi from './settings.api.vue'; +import XApps from './settings.apps.vue'; +import XSignins from './settings.signins.vue'; import { docsUrl, license, lang, version } from '../../../config'; import checkForUpdate from '../../../common/scripts/check-for-update'; @@ -170,7 +172,9 @@ export default Vue.extend({ XMute, XPassword, X2fa, - XApi + XApi, + XApps, + XSignins }, data() { return { diff --git a/src/web/app/init.ts b/src/web/app/init.ts index 716fe45e7a..38b74d450d 100644 --- a/src/web/app/init.ts +++ b/src/web/app/init.ts @@ -5,6 +5,7 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; import VModal from 'vue-js-modal'; +import * as TreeView from 'vue-json-tree-view'; import Element from 'element-ui'; import ElementLocaleEn from 'element-ui/lib/locale/lang/en'; import ElementLocaleJa from 'element-ui/lib/locale/lang/ja'; @@ -23,6 +24,7 @@ switch (lang) { Vue.use(VueRouter); Vue.use(VModal); +Vue.use(TreeView); Vue.use(Element, { locale: elementLocale }); // Register global directives