player menu in lower third refreshes

all components now wait for state to load before first-time mount resolve #45
ebshimizu · Apr 17, 2021 · f72e0f5 · f72e0f5
1 parent 3cc9bce
commit f72e0f5
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
@@ -210,7 +210,7 @@
             </v-btn>
           </template>
         </v-banner>
-        <router-view></router-view>
+        <router-view v-if="stateReady"></router-view>
       </v-container>
     </v-main>
 
@@ -316,6 +316,8 @@ export default {
         this.$i18n.locale = state.app.locale
       }
 
+      this.stateReady = true
+      this.loadStatus = 'Mounting Components'
       setTimeout(() => {
         this.loadStatus = 'Load Complete'
         this.appReady = true
@@ -333,6 +335,7 @@ export default {
       updateAvailable: false,
       showUpdateStatus: false,
       updateVersion: undefined,
+      stateReady: false,
     }
   },
   methods: {

diff --git a/src/renderer/components/LowerThird.vue b/src/renderer/components/LowerThird.vue
@@ -30,7 +30,7 @@
             <v-col cols="2" v-show="erbsPlayerStat">
               <v-combobox
                 label="Player Name"
-                :items="$store.getters.playerPoolItems"
+                :items="playerSelect"
                 :value="erbsPlayer.playerName"
                 @input="(v) => updateErbsPlayer('playerName', v)"
                 @change="(v) => checkForExistingPlayer(v)"
@@ -160,14 +160,28 @@ export default {
       status: '',
       error: false,
       apiLoading: false,
+      playerSelect: [],
     }
   },
+  watch: {
+    players(val) {
+      this.playerSelect = val.map((p) => p.name)
+    },
+  },
+  beforeMount() {
+    this.playerSelect = Object.values(this.$store.state.show.playerPool).map(
+      (p) => p.name,
+    )
+  },
   computed: {
     seasons() {
       return Object.entries(SEASONS).map(([text, value]) => {
         return { text, value }
       })
     },
+    players() {
+      return Object.values(this.$store.state.show.playerPool)
+    },
     squadSizes() {
       return Object.entries(SQUAD_SIZES).map(([text, value]) => {
         return { text, value }

diff --git a/src/renderer/data/gameConfig/erbs/characters.json b/src/renderer/data/gameConfig/erbs/characters.json
@@ -154,5 +154,11 @@
     "name": "Barbara",
     "classname": "Barbara",
     "ltImgSrc": "/img/erbs/sm-portrait/26-Barbara.png"
+  },
+  "27": {
+    "code": 27,
+    "name": "Alex",
+    "classname": "Alex",
+    "ltImgSrc": "/img/erbs/sm-portrait/27-Alex.png"
   }
 }