From 5092d95ad2f11f282facd3b79e59eb9d9162b66c Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 7 Jun 2022 19:46:59 -0500
Subject: [PATCH] UI: Show flash message above content + remove double display

---
 assets/vue/App.vue                               | 4 ----
 assets/vue/components/layout/DashboardLayout.vue | 2 +-
 assets/vue/components/layout/EmptyLayout.vue     | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/assets/vue/App.vue b/assets/vue/App.vue
index e6d7b3cf91..658ccd2c3b 100644
--- a/assets/vue/App.vue
+++ b/assets/vue/App.vue
@@ -152,10 +152,6 @@ onMounted(() => {
         severity: key,
         detail: flashes[key][flashText],
       });
-      flashMessageList.value.push({
-        severity: key,
-        detail: flashes[key][flashText],
-      });
     }
   }
 });
diff --git a/assets/vue/components/layout/DashboardLayout.vue b/assets/vue/components/layout/DashboardLayout.vue
index 89543faa8a..f35060376a 100644
--- a/assets/vue/components/layout/DashboardLayout.vue
+++ b/assets/vue/components/layout/DashboardLayout.vue
@@ -9,8 +9,8 @@
       v-if="showBreadcrumb"
       :legacy="breadcrumb"
     />
-    <router-view />
     <slot />
+    <router-view />
   </div>
 </template>
 
diff --git a/assets/vue/components/layout/EmptyLayout.vue b/assets/vue/components/layout/EmptyLayout.vue
index 61b27cfa3d..83f9d0d307 100644
--- a/assets/vue/components/layout/EmptyLayout.vue
+++ b/assets/vue/components/layout/EmptyLayout.vue
@@ -1,7 +1,7 @@
 <template>
-  <router-view />
   <slot />
+  <router-view />
 </template>
 
 <script setup>
-</script>
\ No newline at end of file
+</script>