extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-04-15 21:18:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better error msg display in Errors view

Browse Source
This commit is contained in:
Bubka 2020-01-14 11:48:42 +01:00
parent c3b0138fd8
commit d46e3d5ce6
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
resources/js/views/Error.vue
View File

@ -1,26 +1,26 @@
<template> <template>
<div> <div class="error-message">
<modal v-model="ShowModal"> <modal v-model="ShowModal">
<div v-if="$route.name == '404'"> <div class="error-message" v-if="$route.name == '404'">
<p class="error-404"></p> <p class="error-404"></p>
<p>{{ $t('errors.resource_not_found') }}<router-link :to="{ name: 'accounts' }" class="is-text has-text-white">{{ $t('errors.refresh') }}</router-link></p> <p>{{ $t('errors.resource_not_found') }}</p>
<p class="">{{ $t('errors.please') }}<router-link :to="{ name: 'accounts' }" class="is-text has-text-white">{{ $t('errors.refresh') }}</router-link></p>
</div> </div>
<div v-else-if="$route.name == 'flooded'"> <div v-else-if="$route.name == 'flooded'">
<p class="error-generic"></p> <p class="error-generic"></p>
<p>{{ $t('errors.already_one_user_registered') }}<br> <p>
{{ $t('errors.cannot_register_more_user') }}<br><br> {{ $t('errors.already_one_user_registered') }}<br>
{{ $t('errors.please') }}<router-link :to="{ name: 'accounts' }" class="is-text has-text-white">{{ $t('auth.sign_in') }}</router-link></p> {{ $t('errors.cannot_register_more_user') }}
</p>
<p>{{ $t('errors.please') }}<router-link :to="{ name: 'accounts' }" class="is-text has-text-white">{{ $t('auth.sign_in') }}</router-link></p>
</div> </div>
<div v-else> <div v-else>
<p class="error-generic"></p> <p class="error-generic"></p>
<p>{{ $t('errors.error_occured') }}<router-link :to="{ name: 'accounts' }" class="is-text has-text-white">{{ $t('errors.refresh') }}</router-link></p> <p>{{ $t('errors.error_occured') }}</p>
<p v-if="debugMessage">{{ debugMessage }}</p>
<p>{{ $t('errors.please') }}<router-link :to="{ name: 'accounts' }" class="is-text has-text-white">{{ $t('errors.refresh') }}</router-link></p>
</div> </div>
<!-- <div v-if="debugMode == 'development'"> --> <!-- <div v-if="debugMode == 'development'"> -->
<p v-if="debug" class="debug">
<code>
{{ debug }}
</code>
</p>
<!-- </div> --> <!-- </div> -->
</modal> </modal>
</div> </div>
@ -34,7 +34,7 @@
data(){ data(){
return { return {
ShowModal : true, ShowModal : true,
debug : this.err ? this.err : null, debugMessage : this.err ? this.err : null,
} }
}, },

4
resources/js/vue-i18n-locales.generated.js
View File

@ -23,8 +23,8 @@ export default {
"cancel": "Cancel" "cancel": "Cancel"
}, },
"errors": { "errors": {
"resource_not_found": "Resource not found, please ", "resource_not_found": "Resource not found",
"error_occured": "An error occured, please ", "error_occured": "An error occured",
"already_one_user_registered": "There is already a registered user.", "already_one_user_registered": "There is already a registered user.",
"cannot_register_more_user": "You cannot register more than one user.", "cannot_register_more_user": "You cannot register more than one user.",
"refresh": "refresh", "refresh": "refresh",

4
resources/lang/en/errors.php
View File

@ -13,8 +13,8 @@
| |
*/ */
'resource_not_found' => 'Resource not found, please ', 'resource_not_found' => 'Resource not found',
'error_occured' => 'An error occured, please ', 'error_occured' => 'An error occured',
'already_one_user_registered' => 'There is already a registered user.', 'already_one_user_registered' => 'There is already a registered user.',
'cannot_register_more_user' => 'You cannot register more than one user.', 'cannot_register_more_user' => 'You cannot register more than one user.',
'refresh' => 'refresh', 'refresh' => 'refresh',

4
resources/sass/app.scss
View File

@ -152,6 +152,10 @@ footer .field.is-grouped {
margin-bottom: 0.75rem; margin-bottom: 0.75rem;
} }
.error-message p {
margin-bottom: 0.5rem;
}
.no-account { .no-account {
display: block; display: block;
margin-top: 1.5rem; margin-top: 1.5rem;