Merge pull request MrBrax#144 from MrBrax/develop-ts

add back removed settings fetch
lucas19961 · Apr 28, 2022 · 1ded139 · 1ded139
2 parents 9e56bf9 + e8769c5
commit 1ded139
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/client-vue/package.json b/client-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twitchautomator-client",
-  "version": "0.7.4",
+  "version": "0.7.4a",
   "private": true,
   "homepage": "https://github.com/MrBrax/TwitchAutomator",
   "scripts": {

diff --git a/client-vue/src/views/SettingsView.vue b/client-vue/src/views/SettingsView.vue
@@ -136,8 +136,8 @@ export default defineComponent({
         fetchData() {
             console.debug("Fetching settings and games data");
             this.loading = true;
-            this.$http
-                .get(`api/v0/games`)
+            this.$http.all([
+                this.$http.get(`api/v0/games`)
                 .then((response) => {
                     const json: ApiGamesResponse = response.data;
                     if (json.message) alert(json.message);
@@ -148,7 +148,24 @@ export default defineComponent({
                     console.error("settings fetch error", err.response);
                 }).finally(() => {
                     this.loading = false;
-                });
+                }),
+                this.$http
+                        .get(`api/v0/settings`)
+                        .then((response) => {
+                            const json: ApiSettingsResponse = response.data;
+                            if (json.message) alert(json.message);
+                            const config = json.data.config;
+                            const channels: ApiChannelConfig[] = json.data.channels;
+                            const favourites = json.data.favourite_games;
+                            this.favouritesData = favourites;
+                            this.formChannels = channels.sort((a, b) => a.login.localeCompare(b.login));
+                        })
+                        .catch((err) => {
+                            console.error("settings fetch error", err.response);
+                        }),
+            ]).finally(() => {
+                this.loading = false;
+            });
                 
         },
     },