Verified Commit 858d6b31 authored by les's avatar les
Browse files

minor

parent 18dc1cb1
...@@ -21,7 +21,7 @@ export default { ...@@ -21,7 +21,7 @@ export default {
}, },
methods: { methods: {
next () { next () {
window.location='/' window.location='/admin'
}, },
async start (user) { async start (user) {
this.user = { ...user } this.user = { ...user }
...@@ -29,7 +29,6 @@ export default { ...@@ -29,7 +29,6 @@ export default {
try { try {
await this.$axios.$get('/ping') await this.$axios.$get('/ping')
// window.location='/'
this.loading = false this.loading = false
} catch (e) { } catch (e) {
setTimeout(() => this.start(user), 1000) setTimeout(() => this.start(user), 1000)
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
v-text-field(type='password' v-model='db.password' label='Password' :rules="[$validators.required('password')]") v-text-field(type='password' v-model='db.password' label='Password' :rules="[$validators.required('password')]")
v-card-actions v-card-actions
v-btn(text @click='checkDb' color='primary' :loading='loading' :disabled='loading') {{$t('setup.check_db')}} v-btn(text @click='checkDb' color='primary' :loading='loading' :disabled='loading') {{$t('common.next')}}
v-icon mdi-arrow-right v-icon mdi-arrow-right
</template> </template>
<script> <script>
......
...@@ -8,7 +8,7 @@ export default ({ app }, inject) => { ...@@ -8,7 +8,7 @@ export default ({ app }, inject) => {
}, },
email: [ email: [
v => !!v || $t('validators.required', { fieldName: $t('common.email') }), v => !!v || $t('validators.required', { fieldName: $t('common.email') }),
v => (v && !!linkify.test(v, 'email')) || $t('validators.email') v => (v && (v === 'admin' || !!linkify.test(v, 'email')) || $t('validators.email'))
], ],
password: [ password: [
v => !!v || $t('validators.required', { fieldName: $t('common.password') }) v => !!v || $t('validators.required', { fieldName: $t('common.password') })
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment