Fix #6026
This commit is contained in:
		
							parent
							
								
									32fc6ae2eb
								
							
						
					
					
						commit
						4263dbef31
					
				
					 3 changed files with 8 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -55,6 +55,7 @@ import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-i
 | 
			
		|||
import MkButton from './ui/button.vue';
 | 
			
		||||
import MkInput from './ui/input.vue';
 | 
			
		||||
import MkSelect from './ui/select.vue';
 | 
			
		||||
import MkSignin from './signin.vue';
 | 
			
		||||
import parseAcct from '../../misc/acct/parse';
 | 
			
		||||
import i18n from '../i18n';
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -65,6 +66,7 @@ export default Vue.extend({
 | 
			
		|||
		MkButton,
 | 
			
		||||
		MkInput,
 | 
			
		||||
		MkSelect,
 | 
			
		||||
		MkSignin,
 | 
			
		||||
	},
 | 
			
		||||
 | 
			
		||||
	props: {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
<template>
 | 
			
		||||
<x-window ref="window" @closed="() => { $emit('closed'); destroyDom(); }">
 | 
			
		||||
	<template #header>{{ $t('login') }}</template>
 | 
			
		||||
	<x-signin :auto-set="autoSet" @login="onLogin"/>
 | 
			
		||||
	<mk-signin :auto-set="autoSet" @login="onLogin"/>
 | 
			
		||||
</x-window>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -9,13 +9,13 @@
 | 
			
		|||
import Vue from 'vue';
 | 
			
		||||
import i18n from '../i18n';
 | 
			
		||||
import XWindow from './window.vue';
 | 
			
		||||
import XSignin from './signin.vue';
 | 
			
		||||
import MkSignin from './signin.vue';
 | 
			
		||||
 | 
			
		||||
export default Vue.extend({
 | 
			
		||||
	i18n,
 | 
			
		||||
 | 
			
		||||
	components: {
 | 
			
		||||
		XSignin,
 | 
			
		||||
		MkSignin,
 | 
			
		||||
		XWindow,
 | 
			
		||||
	},
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -34,11 +34,13 @@
 | 
			
		|||
import Vue from 'vue';
 | 
			
		||||
import i18n from '../i18n';
 | 
			
		||||
import XForm from './auth.form.vue';
 | 
			
		||||
import MkSignin from '../components/signin.vue';
 | 
			
		||||
 | 
			
		||||
export default Vue.extend({
 | 
			
		||||
	i18n,
 | 
			
		||||
	components: {
 | 
			
		||||
		XForm
 | 
			
		||||
		XForm,
 | 
			
		||||
		MkSignin,
 | 
			
		||||
	},
 | 
			
		||||
	data() {
 | 
			
		||||
		return {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue