refs #3301 Rewrite Login with composition API

This commit is contained in:
AkiraFukushima 2022-05-03 23:31:27 +09:00
parent 781d8713d8
commit de0e9a9368
No known key found for this signature in database
GPG Key ID: B6E51BAC4DE1A957
4 changed files with 117 additions and 96 deletions

View File

@ -16,25 +16,34 @@
</el-container>
</template>
<script>
import LoginForm from './Login/LoginForm'
import { mapState } from 'vuex'
<script lang="ts">
import { defineComponent } from 'vue'
import { useRouter } from 'vue-router'
import { useStore } from '@/store'
import LoginForm from './Login/LoginForm.vue'
import { ACTION_TYPES } from '@/store/Login'
export default {
export default defineComponent({
name: 'login',
components: { LoginForm },
computed: {
...mapState({
page: state => state.Login.page
})
},
methods: {
close() {
this.$store.dispatch('Login/pageBack')
return this.$router.push({ path: '/', query: { redirect: 'home' } })
setup() {
const space = 'Login'
const store = useStore()
const router = useRouter()
const close = () => {
store.dispatch(`${space}/${ACTION_TYPES.PAGE_BACK}`)
return router.push({
path: '/',
query: { redirect: 'home' }
})
}
return {
close
}
}
}
})
</script>
<style lang="scss" scoped>

View File

@ -1,9 +1,9 @@
<template>
<el-form
ref="loginForm"
ref="loginFormRef"
label-width="120px"
label-position="top"
v-on:submit.prevent="confirm('loginForm')"
v-on:submit.prevent="confirm(loginFormRef)"
class="login-form"
:rules="rules"
:model="form"
@ -26,7 +26,7 @@
type="primary"
class="search"
v-else
@click="confirm('loginForm')"
@click="confirm(loginFormRef)"
v-loading="searching"
element-loading-background="rgba(0, 0, 0, 0.8)"
>
@ -36,112 +36,118 @@
</el-form>
</template>
<script>
import { mapState } from 'vuex'
import { domainFormat } from '../../utils/validator'
<script lang="ts">
import { defineComponent, computed, reactive, ref } from 'vue'
import { useI18next } from 'vue3-i18next'
import { ElLoading, ElMessage, FormInstance, FormRules } from 'element-plus'
import { useRouter } from 'vue-router'
import { useStore } from '@/store'
import { domainFormat } from '@/utils/validator'
import { ACTION_TYPES } from '@/store/Login'
export default {
export default defineComponent({
name: 'login-form',
data() {
return {
form: {
domainName: ''
}
}
},
computed: {
...mapState({
selectedInstance: state => state.Login.selectedInstance,
searching: state => state.Login.searching,
sns: state => state.Login.sns
}),
allowLogin: function () {
return this.selectedInstance && this.form.domainName === this.selectedInstance
},
rules: {
get() {
return {
domainName: [
{
type: 'string',
required: true,
message: this.$t('validation.login.require_domain_name')
},
{
pattern: domainFormat,
trigger: 'change',
message: this.$t('validation.login.domain_format')
}
]
setup() {
const space = 'Login'
const store = useStore()
const i18n = useI18next()
const router = useRouter()
const form = reactive({
domainName: ''
})
const loginFormRef = ref<FormInstance>()
const selectedInstance = computed(() => store.state.Login.selectedInstance)
const searching = computed(() => store.state.Login.searching)
const sns = computed(() => store.state.Login.sns)
const allowLogin = computed(() => selectedInstance.value && form.domainName === selectedInstance.value)
const rules = reactive<FormRules>({
domainName: [
{
type: 'string',
required: true,
message: i18n.t('validation.login.require_domain_name')
},
{
pattern: domainFormat,
trigger: 'change',
message: i18n.t('validation.login.domain_format')
}
}
}
},
methods: {
login() {
const loading = this.$loading({
]
})
const login = () => {
const loading = ElLoading.service({
lock: true,
text: this.$t('message.loading'),
spinner: 'el-icon-loading',
text: i18n.t('message.loading'),
background: 'rgba(0, 0, 0, 0.7)'
})
this.$store
.dispatch('Login/fetchLogin')
store
.dispatch(`${space}/${ACTION_TYPES.FETCH_LOGIN}`)
.then(url => {
loading.close()
this.$store.dispatch('Login/pageBack')
this.$router.push({
store.dispatch(`${space}/${ACTION_TYPES.PAGE_BACK}`)
router.push({
path: '/authorize',
query: { url: url, sns: this.sns }
query: { url: url, sns: sns.value }
})
})
.catch(() => {
loading.close()
this.$message({
message: this.$t('message.authorize_url_error'),
.catch(err => {
ElMessage({
message: i18n.t('message.authorize_url_error'),
type: 'error'
})
console.error(err)
})
},
confirm(formName) {
this.$refs[formName].validate(valid => {
.finally(() => {
loading.close()
})
}
const confirm = async (formEl: FormInstance | undefined) => {
if (!formEl) return
await formEl.validate(valid => {
if (valid) {
this.$store
.dispatch('Login/confirmInstance', this.form.domainName)
return store
.dispatch(`${space}/${ACTION_TYPES.CONFIRM_INSTANCE}`, form.domainName)
.then(() => {
this.$message({
message: this.$t('message.domain_confirmed', {
domain: this.form.domainName
ElMessage({
message: i18n.t('message.domain_confirmed', {
domain: form.domainName
}),
type: 'success'
})
})
.catch(() => {
this.$message({
message: this.$t('message.domain_doesnt_exist', {
domain: this.form.domainName
.catch(err => {
ElMessage({
message: i18n.t('message.domain_doesnt_exist', {
domain: form.domainName
}),
type: 'error'
})
console.error(err)
})
} else {
this.$message({
message: this.$t('validation.login.domain_format'),
ElMessage({
message: i18n.t('validation.login.domain_format'),
type: 'error'
})
return false
}
})
},
handleKey(_event) {
if (!this.selectedInstance) {
this.confirm('loginForm')
} else {
this.login()
}
}
return {
form,
loginFormRef,
searching,
allowLogin,
rules,
login,
confirm
}
}
}
})
</script>
<style lang="scss" scoped>

View File

@ -3,7 +3,7 @@ import { Module, MutationTree, ActionTree } from 'vuex'
import { RootState } from '@/store'
import { MyWindow } from '~/src/types/global'
const win = (window as any) as MyWindow
const win = window as any as MyWindow
export type LoginState = {
selectedInstance: string | null
@ -35,18 +35,24 @@ const mutations: MutationTree<LoginState> = {
}
}
export const ACTION_TYPES = {
FETCH_LOGIN: 'fetchLogin',
PAGE_BACK: 'pageBack',
CONFIRM_INSTANCE: 'confirmInstance'
}
const actions: ActionTree<LoginState, RootState> = {
fetchLogin: async ({ state }): Promise<string> => {
[ACTION_TYPES.FETCH_LOGIN]: async ({ state }): Promise<string> => {
const url = await win.ipcRenderer.invoke('get-auth-url', {
instance: state.selectedInstance,
sns: state.sns
})
return url
},
pageBack: ({ commit }) => {
[ACTION_TYPES.PAGE_BACK]: ({ commit }) => {
commit(MUTATION_TYPES.CHANGE_INSTANCE, null)
},
confirmInstance: async ({ commit }, domain: string): Promise<boolean> => {
[ACTION_TYPES.CONFIRM_INSTANCE]: async ({ commit }, domain: string): Promise<boolean> => {
commit(MUTATION_TYPES.CHANGE_SEARCHING, true)
const cleanDomain = domain.trim()
try {