encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
lesion
2021-10-18 15:45:16 +02:00
parent 18dc1cb15c
commit 858d6b31c8
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pages/setup/Completed.vue
View File

@@ -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 {
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)

2
pages/setup/DbStep.vue
View File

@@ -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>

2
plugins/validators.js
View File

@@ -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') })