[Client] Make possible to change password in mobile

モバイル版からパスワードの変更を行えるように
This commit is contained in:
syuilo 2018-11-03 21:53:03 +09:00
parent 5bebdb2511
commit 84218abf2b
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
5 changed files with 12 additions and 4 deletions

View file

@ -981,7 +981,7 @@ common/views/components/mute-and-block.vue:
no-muted-users: "ミュートしているユーザーはいません" no-muted-users: "ミュートしているユーザーはいません"
no-blocked-users: "ブロックしているユーザーはいません" no-blocked-users: "ブロックしているユーザーはいません"
desktop/views/components/settings.password.vue: common/views/components/password-settings.vue:
reset: "パスワードを変更する" reset: "パスワードを変更する"
enter-current-password: "現在のパスワードを入力してください" enter-current-password: "現在のパスワードを入力してください"
enter-new-password: "新しいパスワードを入力してください" enter-new-password: "新しいパスワードを入力してください"
@ -1564,6 +1564,7 @@ mobile/views/pages/settings.vue:
sound: "サウンド" sound: "サウンド"
enable-sounds: "サウンドを有効にする" enable-sounds: "サウンドを有効にする"
mark-as-read-all-unread-notes: "すべての投稿を既読にする" mark-as-read-all-unread-notes: "すべての投稿を既読にする"
password: "パスワード"
mobile/views/pages/user.vue: mobile/views/pages/user.vue:
follows-you: "フォローされています" follows-you: "フォローされています"

View file

@ -3,6 +3,7 @@ import Vue from 'vue';
import muteAndBlock from './mute-and-block.vue'; import muteAndBlock from './mute-and-block.vue';
import error from './error.vue'; import error from './error.vue';
import apiSettings from './api-settings.vue'; import apiSettings from './api-settings.vue';
import passwordSettings from './password-settings.vue';
import driveSettings from './drive-settings.vue'; import driveSettings from './drive-settings.vue';
import profileEditor from './profile-editor.vue'; import profileEditor from './profile-editor.vue';
import noteSkeleton from './note-skeleton.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-mute-and-block', muteAndBlock);
Vue.component('mk-error', error); Vue.component('mk-error', error);
Vue.component('mk-api-settings', apiSettings); Vue.component('mk-api-settings', apiSettings);
Vue.component('mk-password-settings', passwordSettings);
Vue.component('mk-drive-settings', driveSettings); Vue.component('mk-drive-settings', driveSettings);
Vue.component('mk-profile-editor', profileEditor); Vue.component('mk-profile-editor', profileEditor);
Vue.component('mk-note-skeleton', noteSkeleton); Vue.component('mk-note-skeleton', noteSkeleton);

View file

@ -214,7 +214,7 @@
<ui-card class="password" v-show="page == 'security'"> <ui-card class="password" v-show="page == 'security'">
<div slot="title">%fa:unlock-alt% %i18n:@password%</div> <div slot="title">%fa:unlock-alt% %i18n:@password%</div>
<section> <section>
<x-password/> <mk-password-settings/>
</section> </section>
</ui-card> </ui-card>
@ -286,7 +286,6 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import XPassword from './settings.password.vue';
import X2fa from './settings.2fa.vue'; import X2fa from './settings.2fa.vue';
import XApps from './settings.apps.vue'; import XApps from './settings.apps.vue';
import XSignins from './settings.signins.vue'; import XSignins from './settings.signins.vue';
@ -296,7 +295,6 @@ import checkForUpdate from '../../../common/scripts/check-for-update';
export default Vue.extend({ export default Vue.extend({
components: { components: {
XPassword,
X2fa, X2fa,
XApps, XApps,
XSignins, XSignins,

View file

@ -127,6 +127,13 @@
<mk-api-settings /> <mk-api-settings />
<ui-card>
<div slot="title">%fa:unlock-alt% %i18n:@password%</div>
<section>
<mk-password-settings/>
</section>
</ui-card>
<ui-card> <ui-card>
<div slot="title">%fa:sync-alt% %i18n:@update%</div> <div slot="title">%fa:sync-alt% %i18n:@update%</div>