oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues 1 Pull Requests Packages Releases 2 Activity

Fix #6026

Browse Source
This commit is contained in:
syuilo 2020-02-20 23:07:20 +09:00
parent 32fc6ae2eb
commit 4263dbef31
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/components/dialog.vue
View File

@ -55,6 +55,7 @@ import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-i
import MkButton from './ui/button.vue'; import MkButton from './ui/button.vue';
import MkInput from './ui/input.vue'; import MkInput from './ui/input.vue';
import MkSelect from './ui/select.vue'; import MkSelect from './ui/select.vue';
import MkSignin from './signin.vue';
import parseAcct from '../../misc/acct/parse'; import parseAcct from '../../misc/acct/parse';
import i18n from '../i18n'; import i18n from '../i18n';
@ -65,6 +66,7 @@ export default Vue.extend({
MkButton, MkButton,
MkInput, MkInput,
MkSelect, MkSelect,
MkSignin,
}, },
props: { props: {

6
src/client/components/signin-dialog.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<x-window ref="window" @closed="() => { $emit('closed'); destroyDom(); }"> <x-window ref="window" @closed="() => { $emit('closed'); destroyDom(); }">
<template #header>{{ $t('login') }}</template> <template #header>{{ $t('login') }}</template>
<x-signin :auto-set="autoSet" @login="onLogin"/> <mk-signin :auto-set="autoSet" @login="onLogin"/>
</x-window> </x-window>
</template> </template>
@ -9,13 +9,13 @@
import Vue from 'vue'; import Vue from 'vue';
import i18n from '../i18n'; import i18n from '../i18n';
import XWindow from './window.vue'; import XWindow from './window.vue';
import XSignin from './signin.vue'; import MkSignin from './signin.vue';
export default Vue.extend({ export default Vue.extend({
i18n, i18n,
components: { components: {
XSignin, MkSignin,
XWindow, XWindow,
}, },

4
src/client/pages/auth.vue
View File

@ -34,11 +34,13 @@
import Vue from 'vue'; import Vue from 'vue';
import i18n from '../i18n'; import i18n from '../i18n';
import XForm from './auth.form.vue'; import XForm from './auth.form.vue';
import MkSignin from '../components/signin.vue';
export default Vue.extend({ export default Vue.extend({
i18n, i18n,
components: { components: {
XForm XForm,
MkSignin,
}, },
data() { data() {
return { return {