From cfb1941b27f91b229433d8182e8fb5ac1c145dc8 Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Thu, 29 Dec 2022 23:21:15 +0100
Subject: [PATCH] Require less queries to be finished for app to be displayed

---
 aleksis/core/assets/App.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/aleksis/core/assets/App.vue b/aleksis/core/assets/App.vue
index 1ec07ec8f..640b7231c 100644
--- a/aleksis/core/assets/App.vue
+++ b/aleksis/core/assets/App.vue
@@ -5,9 +5,7 @@
         $apollo.loading &&
         (!currentUser ||
           !whoAmI ||
-          !systemProperties ||
-          !messages ||
-          !footerMenu)
+          !systemProperties)
       "
     >
     </loading>
@@ -197,9 +195,9 @@
         color="primary lighten-1"
       >
         <v-card flat tile class="primary white--text flex-grow-1">
-          <v-card-text v-if="footerMenu.items" class="pa-0">
+          <v-card-text class="pa-0">
             <v-container class="px-6">
-              <v-row justify="center" no-gutters>
+              <v-row justify="center" v-if="footerMenu && footerMenu.items" no-gutters>
                 <v-btn
                   v-for="menu_item in footerMenu.items"
                   :key="menu_item.name"
@@ -215,6 +213,12 @@
                   {{ menu_item.name }}
                 </v-btn>
               </v-row>
+              <v-row justify="center" v-else-if="!footerMenu">
+                <v-skeleton-loader
+                  class="ma-2"
+                  type="chip"
+                />
+              </v-row>
             </v-container>
           </v-card-text>
           <v-divider />
-- 
GitLab