From 042a25f90ada75ff09105a1b94c9b23501f23fbe Mon Sep 17 00:00:00 2001
From: rxdn <29165304+rxdn@users.noreply.github.com>
Date: Sat, 4 Jun 2022 22:43:05 +0100
Subject: [PATCH] Improve page load times

---
 .../src/components/manage/AutoCloseCard.svelte |  8 ++++----
 .../src/components/manage/SettingsCard.svelte  |  9 ++++++---
 frontend/src/views/Appearance.svelte           |  9 ++++++---
 frontend/src/views/Panels.svelte               | 18 ++++++++++--------
 frontend/src/views/Teams.svelte                | 10 +++++++---
 frontend/src/views/TicketView.svelte           |  6 ++++--
 frontend/src/views/Transcripts.svelte          | 17 +++++------------
 frontend/src/views/Whitelabel.svelte           |  8 +++++---
 8 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/frontend/src/components/manage/AutoCloseCard.svelte b/frontend/src/components/manage/AutoCloseCard.svelte
index 9f0d044..551f6d8 100644
--- a/frontend/src/components/manage/AutoCloseCard.svelte
+++ b/frontend/src/components/manage/AutoCloseCard.svelte
@@ -119,8 +119,8 @@
         }
     }
 
-    withLoadingScreen(async () => {
-        await loadPremium();
-        await loadSettings();
-    });
+    withLoadingScreen(async () => await Promise.all([
+        loadPremium(),
+        loadSettings()
+    ]));
 </script>
diff --git a/frontend/src/components/manage/SettingsCard.svelte b/frontend/src/components/manage/SettingsCard.svelte
index db278c1..81c93e8 100644
--- a/frontend/src/components/manage/SettingsCard.svelte
+++ b/frontend/src/components/manage/SettingsCard.svelte
@@ -227,9 +227,12 @@
     }
 
     withLoadingScreen(async () => {
-        await loadPanels();
-        await loadChannels();
-        await loadData();
+        await Promise.all([
+            loadPanels(),
+            loadChannels()
+        ]);
+
+        await loadData(); // Depends on channels
     });
 </script>
 
diff --git a/frontend/src/views/Appearance.svelte b/frontend/src/views/Appearance.svelte
index bf3c80a..899b9e6 100644
--- a/frontend/src/views/Appearance.svelte
+++ b/frontend/src/views/Appearance.svelte
@@ -82,9 +82,12 @@
   }
 
   withLoadingScreen(async () => {
-    setDefaultHeaders();
-    await loadPremium();
-    await loadColours();
+    setDefaultHeaders(); // TODO: Is this needed?
+
+    await Promise.all([
+        loadPremium(),
+        loadColours()
+    ]);
   });
 </script>
 
diff --git a/frontend/src/views/Panels.svelte b/frontend/src/views/Panels.svelte
index 42504d7..378cdab 100644
--- a/frontend/src/views/Panels.svelte
+++ b/frontend/src/views/Panels.svelte
@@ -332,14 +332,16 @@
     }
 
     withLoadingScreen(async () => {
-        await loadPremium();
-        await loadChannels();
-        await loadTeams();
-        await loadForms();
-        await loadRoles();
-        await loadPanels();
-        await loadMultiPanels();
-    })
+      await Promise.all([
+          loadPremium(),
+          loadChannels(),
+          loadTeams(),
+          loadForms(),
+          loadRoles(),
+          loadPanels(),
+          loadMultiPanels()
+      ]);
+    });
 </script>
 
 <style>
diff --git a/frontend/src/views/Teams.svelte b/frontend/src/views/Teams.svelte
index 22b5844..fdb5713 100644
--- a/frontend/src/views/Teams.svelte
+++ b/frontend/src/views/Teams.svelte
@@ -229,9 +229,13 @@
 
     withLoadingScreen(async () => {
         setDefaultHeaders();
-        await loadTeams();
-        await loadRoles();
-        await updateActiveTeam();
+
+        await Promise.all([
+            loadTeams(),
+            loadRoles()
+        ]);
+
+        await updateActiveTeam(); // Depends on teams
     });
 </script>
 
diff --git a/frontend/src/views/TicketView.svelte b/frontend/src/views/TicketView.svelte
index 646f8ae..2f19c1b 100644
--- a/frontend/src/views/TicketView.svelte
+++ b/frontend/src/views/TicketView.svelte
@@ -126,8 +126,10 @@
 
     withLoadingScreen(async () => {
         setDefaultHeaders();
-        await loadPremium();
-        await loadMessages();
+        await Promise.all([
+            loadPremium(),
+            loadMessages()
+        ]);
 
         scrollContainer();
 
diff --git a/frontend/src/views/Transcripts.svelte b/frontend/src/views/Transcripts.svelte
index 9889fd2..d939dcc 100644
--- a/frontend/src/views/Transcripts.svelte
+++ b/frontend/src/views/Transcripts.svelte
@@ -204,15 +204,7 @@
         panels = res.data;
     }
 
-    async function loadSettings() {
-      const res = await axios.get(`${API_URL}/api/${guildId}/settings`);
-      if (res.status !== 200) {
-        notifyError(res.data.error);
-        return;
-      }
-    }
-
-      async function loadData(paginationSettings) {
+    async function loadData(paginationSettings) {
         const res = await axios.post(`${API_URL}/api/${guildId}/transcripts`, paginationSettings);
         if (res.status !== 200) {
             notifyError(res.data.error);
@@ -224,9 +216,10 @@
     }
 
     withLoadingScreen(async () => {
-        await loadPanels();
-        await loadSettings();
-        await loadData({})
+        await Promise.all([
+            loadPanels(),
+            loadData({})
+        ])
     })
 </script>
 
diff --git a/frontend/src/views/Whitelabel.svelte b/frontend/src/views/Whitelabel.svelte
index 38192f9..e0ec06b 100644
--- a/frontend/src/views/Whitelabel.svelte
+++ b/frontend/src/views/Whitelabel.svelte
@@ -338,9 +338,11 @@
 
     withLoadingScreen(async () => {
         if (await loadBot()) {
-            await loadErrors();
-            await loadInteractionUrl();
-            await loadPublicKey();
+            await Promise.all([
+                loadErrors(),
+                loadInteractionUrl(),
+                loadPublicKey()
+            ]);
         }
     });
 </script>