From 135c7f5bbfc49e3193d64d7842584c5a4f627b06 Mon Sep 17 00:00:00 2001
From: Solomon Cammack <solomon@solomon.eu.com>
Date: Sun, 10 Sep 2023 22:19:14 +0100
Subject: [PATCH] Minor comms changes

---
 .../components/website/dashboard/CommsControls.vue  | 13 +++++--------
 website/src/views/Dashboard.vue                     | 10 ++++++----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/website/src/components/website/dashboard/CommsControls.vue b/website/src/components/website/dashboard/CommsControls.vue
index 87fcf73c..d55be2eb 100644
--- a/website/src/components/website/dashboard/CommsControls.vue
+++ b/website/src/components/website/dashboard/CommsControls.vue
@@ -1,12 +1,9 @@
 <template>
-    <div class="mt-2">
-        <b-button class="mr-1" :variant="enabledComms === 1 ? 'primary' : 'secondary'" @click="() => enableComms(1)">
-            <i class="fas fa-fw mr-1 fa-microphone"></i>{{ teamName(0) }} Comms
+    <div class="p-2">
+        <b-button class="mr-1" v-for="(team, i) in teams" :key="team.id" :variant="enabledComms === i+1 ? 'primary' : 'secondary'" @click="() => enableComms(i+1)">
+            <i class="fas fa-fw mr-1 fa-microphone"></i>{{ team?.name || `Team ${i+1}` }} Comms
         </b-button>
-        <b-button class="mr-1" :variant="enabledComms === 2 ? 'primary' : 'secondary'" @click="() => enableComms(2)">
-            <i class="fas fa-fw mr-1 fa-microphone"></i>{{ teamName(1) }} Comms
-        </b-button>
-        <b-button class="mr-1" variant="dark" @click="disableComms"><i class="fas mr-1 fa-microphone-slash"></i>Disable Comms</b-button>
+        <b-button class="mr-1 text-light" variant="outline-secondary" @click="disableComms"><i class="fas mr-1 fa-microphone-slash"></i>Disable Comms</b-button>
     </div>
 </template>
 
@@ -14,7 +11,7 @@
 import { BButton } from "bootstrap-vue";
 
 export default {
-    name: "CommsControl",
+    name: "CommsControls",
     props: ["match"],
     components: { BButton },
     data: () => ({
diff --git a/website/src/views/Dashboard.vue b/website/src/views/Dashboard.vue
index 7446222f..c6b60cd9 100644
--- a/website/src/views/Dashboard.vue
+++ b/website/src/views/Dashboard.vue
@@ -47,7 +47,7 @@
             <Bracket :scale="0.75" v-for="bracket in bracketData" :event="liveMatch.event" :bracket="bracket" :key="bracket.id"></Bracket>
         </DashboardModule>
         <ScheduleEditor class="broadcast-schedule-editor mb-2" :broadcast="broadcast"></ScheduleEditor>
-        <DashboardModule title="Twitch Controls" icon-class="fas fa-wrench" content-class="p-2" v-if="broadcast && broadcast.channel">
+        <DashboardModule class="mb-2" title="Twitch Controls" icon-class="fas fa-wrench" content-class="p-2" v-if="broadcast && broadcast.channel">
             <template v-slot:header v-if="streamLink">{{ streamLink }}</template>
             <Predictions v-if="liveMatch" :client="client"/>
             <Commercials v-if="hasPermission('Full broadcast permissions')" :client="client" />
@@ -66,7 +66,9 @@
                 </b-button>
             </div>
         </DashboardModule>
-        <CommsControl v-if="useTeamComms" :match="liveMatch"/>
+        <DashboardModule class="mb-2" v-if="useTeamComms" icon-class="fas fa-microphone" title="Team Comms Listen-In">
+            <CommsControls :match="liveMatch"/>
+        </DashboardModule>
     </div>
 </template>
 
@@ -79,7 +81,7 @@ import MatchEditor from "@/components/website/dashboard/MatchEditor";
 import { BButton } from "bootstrap-vue";
 import { updateAutomaticTitle } from "@/utils/dashboard";
 import Predictions from "@/components/website/dashboard/Predictions";
-import CommsControl from "@/components/website/dashboard/CommsControls";
+import CommsControls from "@/components/website/dashboard/CommsControls";
 import Commercials from "@/components/website/dashboard/Commercials";
 import BroadcastEditor from "@/components/website/dashboard/BroadcastEditor";
 import ScheduleEditor from "@/components/website/dashboard/ScheduleEditor";
@@ -95,7 +97,7 @@ import GFXController from "@/views/GFXController.vue";
 
 export default {
     name: "Dashboard",
-    components: { GFXController, ThemeLogo, DeskTextEditor, DeskEditor, Bracket, PreviewProgramDisplay, BracketImplications, DashboardModule, DashboardClock, ScheduleEditor, BroadcastEditor, CommsControl, Commercials, Predictions, MatchEditor, MatchThumbnail, BroadcastSwitcher, BButton },
+    components: { GFXController, ThemeLogo, DeskTextEditor, DeskEditor, Bracket, PreviewProgramDisplay, BracketImplications, DashboardModule, DashboardClock, ScheduleEditor, BroadcastEditor, CommsControls, Commercials, Predictions, MatchEditor, MatchThumbnail, BroadcastSwitcher, BButton },
     data: () => ({
         titleProcessing: false
     }),