diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/index.ts | 2 | ||||
| -rw-r--r-- | src/client/app/common/views/components/password-settings.vue (renamed from src/client/app/desktop/views/components/settings.password.vue) | 0 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/settings.vue | 4 | ||||
| -rw-r--r-- | src/client/app/mobile/views/pages/settings.vue | 7 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts index 2f2217f8d2..9eed2efc91 100644 --- a/src/client/app/common/views/components/index.ts +++ b/src/client/app/common/views/components/index.ts @@ -3,6 +3,7 @@ import Vue from 'vue'; import muteAndBlock from './mute-and-block.vue'; import error from './error.vue'; import apiSettings from './api-settings.vue'; +import passwordSettings from './password-settings.vue'; import driveSettings from './drive-settings.vue'; import profileEditor from './profile-editor.vue'; import noteSkeleton from './note-skeleton.vue'; @@ -54,6 +55,7 @@ import formRadio from './ui/form/radio.vue'; Vue.component('mk-mute-and-block', muteAndBlock); Vue.component('mk-error', error); Vue.component('mk-api-settings', apiSettings); +Vue.component('mk-password-settings', passwordSettings); Vue.component('mk-drive-settings', driveSettings); Vue.component('mk-profile-editor', profileEditor); Vue.component('mk-note-skeleton', noteSkeleton); diff --git a/src/client/app/desktop/views/components/settings.password.vue b/src/client/app/common/views/components/password-settings.vue index 82b163f1fa..82b163f1fa 100644 --- a/src/client/app/desktop/views/components/settings.password.vue +++ b/src/client/app/common/views/components/password-settings.vue diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index 4bc2f80479..983a0b9bc2 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -214,7 +214,7 @@ <ui-card class="password" v-show="page == 'security'"> <div slot="title">%fa:unlock-alt% %i18n:@password%</div> <section> - <x-password/> + <mk-password-settings/> </section> </ui-card> @@ -286,7 +286,6 @@ <script lang="ts"> import Vue from 'vue'; -import XPassword from './settings.password.vue'; import X2fa from './settings.2fa.vue'; import XApps from './settings.apps.vue'; import XSignins from './settings.signins.vue'; @@ -296,7 +295,6 @@ import checkForUpdate from '../../../common/scripts/check-for-update'; export default Vue.extend({ components: { - XPassword, X2fa, XApps, XSignins, diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue index 267cfdb440..4512e9b2c2 100644 --- a/src/client/app/mobile/views/pages/settings.vue +++ b/src/client/app/mobile/views/pages/settings.vue @@ -128,6 +128,13 @@ <mk-api-settings /> <ui-card> + <div slot="title">%fa:unlock-alt% %i18n:@password%</div> + <section> + <mk-password-settings/> + </section> + </ui-card> + + <ui-card> <div slot="title">%fa:sync-alt% %i18n:@update%</div> <section> |