From d46e3d5ce6897c6321fc27b1d4152a8a5188d4ab Mon Sep 17 00:00:00 2001
From: Bubka <858858+Bubka@users.noreply.github.com>
Date: Tue, 14 Jan 2020 11:48:42 +0100
Subject: [PATCH] Better error msg display in Errors view

---
 resources/js/views/Error.vue               | 26 +++++++++++-----------
 resources/js/vue-i18n-locales.generated.js |  4 ++--
 resources/lang/en/errors.php               |  4 ++--
 resources/sass/app.scss                    |  4 ++++
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/resources/js/views/Error.vue b/resources/js/views/Error.vue
index 92eb5f39..0028933a 100644
--- a/resources/js/views/Error.vue
+++ b/resources/js/views/Error.vue
@@ -1,26 +1,26 @@
 <template>
-    <div>
+    <div class="error-message">
         <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>{{ $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 v-else-if="$route.name == 'flooded'">
                 <p class="error-generic"></p>
-                <p>{{ $t('errors.already_one_user_registered') }}<br>
-                    {{ $t('errors.cannot_register_more_user') }}<br><br>
-                    {{ $t('errors.please') }}<router-link :to="{ name: 'accounts' }" class="is-text has-text-white">{{ $t('auth.sign_in') }}</router-link></p>
+                <p>
+                    {{ $t('errors.already_one_user_registered') }}<br>
+                    {{ $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 v-else>
                 <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 v-if="debugMode == 'development'"> -->
-                <p v-if="debug" class="debug">
-                    <code>
-                        {{ debug }}
-                    </code>
-                </p>
             <!-- </div> -->
         </modal>
     </div>
@@ -34,7 +34,7 @@
         data(){
             return {
                 ShowModal : true,
-                debug : this.err ? this.err : null,
+                debugMessage : this.err ? this.err : null,
             }
         },
 
diff --git a/resources/js/vue-i18n-locales.generated.js b/resources/js/vue-i18n-locales.generated.js
index 1d504a5a..29c8ac49 100644
--- a/resources/js/vue-i18n-locales.generated.js
+++ b/resources/js/vue-i18n-locales.generated.js
@@ -23,8 +23,8 @@ export default {
             "cancel": "Cancel"
         },
         "errors": {
-            "resource_not_found": "Resource not found, please ",
-            "error_occured": "An error occured, please ",
+            "resource_not_found": "Resource not found",
+            "error_occured": "An error occured",
             "already_one_user_registered": "There is already a registered user.",
             "cannot_register_more_user": "You cannot register more than one user.",
             "refresh": "refresh",
diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php
index f266dc90..8407e047 100644
--- a/resources/lang/en/errors.php
+++ b/resources/lang/en/errors.php
@@ -13,8 +13,8 @@
     |
     */
 
-    'resource_not_found' => 'Resource not found, please ',
-    'error_occured' => 'An error occured, please ',
+    'resource_not_found' => 'Resource not found',
+    'error_occured' => 'An error occured',
     'already_one_user_registered' => 'There is already a registered user.',
     'cannot_register_more_user' => 'You cannot register more than one user.',
     'refresh' => 'refresh',
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index dce5f00a..526d6192 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -152,6 +152,10 @@ footer .field.is-grouped {
   margin-bottom: 0.75rem;
 }
 
+.error-message p {
+  margin-bottom: 0.5rem;
+}
+
 .no-account {
   display: block;
   margin-top: 1.5rem;