Modification des données affichée dans la gestion des scores en vu d'une migration vers du dialog via WebSocket entre le serveur backend et le frontend

src/assets/logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 261.76 226.69"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/></svg>

src/components/GameStatus.vue

@@ -1,9 +0,0 @@
-<template>
-  <v-navigation-drawer>
-    <v-list-item title="Brain Blast" subtitle="The cultural quizzzz"></v-list-item>
-    <v-divider></v-divider>
-    <v-list-item link title="List Item 1"></v-list-item>
-    <v-list-item link title="List Item 2"></v-list-item>
-    <v-list-item link title="List Item 3"></v-list-item>
-  </v-navigation-drawer>
-</template>

src/fetch.txt

@@ -1 +0,0 @@
-test

src/plugins/vuetify.js

@@ -1,40 +0,0 @@
-/**
- * plugins/vuetify.js
- *
- * Framework documentation: https://vuetifyjs.com`
- */
-
-// Styles
-import '@mdi/font/css/materialdesignicons.css'
-import 'vuetify/styles'
-
-// Composables
-import { createVuetify } from 'vuetify'
-
-// https://vuetifyjs.com/en/introduction/why-vuetify/#feature-guides
-export default createVuetify({
-  theme: {
-    themes: {
-      light: {
-        background: '#212121',
-        primary: '#cc0000',
-        controls: '#cc0000',
-        soundboard: '#9A2779',
-        secondary: '#b0bec5',
-        feedback: '#2E7D32',
-        accent: '#8c9eff',
-        error: '#b71c1c',
-      },
-      dark: {
-        background: '#121212',
-        primary: '#2979FF',
-        controls: '#AB47B',
-        secondary: '#90a4ae',
-        feedback: '#2E7D32',
-        accent: '#8c9eff',
-        error: '#b71c1c',
-      },
-    },
-    defaultTheme: 'dark',
-  }
-})

src/views/HomeView.vue

@@ -1,11 +0,0 @@
-<template>
-    <v-img width="1645" src="../assets/BrainBlast-For-HomeView-Alpha.png"></v-img>
-</template>
-
-<script>
-export default {
-  name: 'VotreComposant', // Assurez-vous de donner un nom à votre composant
-  // Votre logique JavaScript ici, par exemple des méthodes, des données, etc.
-};
-</script>
-

ui/package-lock.json

@@ -22,7 +22,7 @@
         "eslint-plugin-vue": "^9.17.0",
         "prettier": "^3.0.3",
         "unplugin-fonts": "^1.1.1",
-        "vite": "^5.1.4",
+        "vite": "^5.1.6",
         "vite-plugin-vuetify": "^2.0.1"
       }
     },
@@ -2814,9 +2814,9 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/vite": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.4.tgz",
-      "integrity": "sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.6.tgz",
+      "integrity": "sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",

ui/package.json

@@ -25,7 +25,7 @@
     "eslint-plugin-vue": "^9.17.0",
     "prettier": "^3.0.3",
     "unplugin-fonts": "^1.1.1",
-    "vite": "^5.1.4",
+    "vite": "^5.1.6",
     "vite-plugin-vuetify": "^2.0.1"
   }
 }

ui/src/App.vue

@@ -1,11 +1,11 @@
 <template>
   <v-app>
     <BrainBlastBar />
-    <GameStatus />
+      <GameStatus v-if="$route.name === 'Game Control (Présentateur)'"></GameStatus>
     <v-main>
       <RouterView />
     </v-main>
-    <v-footer class="footer" :elevation=12 border><v-row justify="center">© 2024 - ASCO section Fablab</v-row></v-footer>
+    <!-- <v-footer class="footer" :elevation=12 border><v-row justify="center">© 2024 - ASCO section Fablab</v-row></v-footer> -->
   </v-app>
 </template>
 

ui/src/components/BrainBlastBar.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-app-bar :elevation="5">
+  <v-app-bar :elevation="5" height="50">
     <RouterMenu />
     <v-app-bar-title>Brain Blast</v-app-bar-title>
 
@@ -21,7 +21,7 @@
 
   function toggleTheme() {
     darkTheme.value = !darkTheme.value
-    theme.global.name.value = theme.global.current.value.dark ? 'light' : 'dark'
+    theme.global.name.value = theme.global.current.value.dark ? 'CustomThemeLight' : 'CustomThemeDark'
   }
 
 </script>

ui/src/components/CardControl.vue

@@ -1,29 +1,29 @@
 <template>
   <v-card tile outlined class="card">
     <v-card-title class="card__title primary">
-      <v-icon left class="white--text pr-5 pl-2" size="50">mdi-camera-control</v-icon>
+      <v-icon left class="white--text pr-5 pl-2" size="40">mdi-camera-control</v-icon>
       Contrôles
     </v-card-title>
     <v-container class="text-center">
       <v-row justify="center">
         <v-col cols="12" sm="6" md="5" class="mt-4">
-          <mqtt-button width="240" height="130" class="btn xs12 sm6 md3" topic="/display/control" message="previous">
-            <v-icon left size="100">mdi-skip-previous</v-icon>
+          <mqtt-button width="220" height="110" class="btn xs12 sm6 md3" topic="/display/control" message="previous">
+            <v-icon left size="80">mdi-skip-previous</v-icon>
           </mqtt-button>
         </v-col>
         <v-col cols="12" sm="6" md="5" class="mt-4">
-          <mqtt-button width="240" height="130" class="btn card xs12 sm6 md3" topic="/display/control" message="next">
-            <v-icon left size="100">mdi-skip-next</v-icon>
+          <mqtt-button width="240" height="110" class="btn card xs12 sm6 md3" topic="/display/control" message="next">
+            <v-icon left size="80">mdi-skip-next</v-icon>
           </mqtt-button>
         </v-col>
         <v-col cols="12" sm="6" md="5" class="mb-4">
-          <mqtt-button width="240" height="130" class="btn card xs12 sm6 md3" topic="/display/control" message="pause">
-            <v-icon left size="100">mdi-pause</v-icon>
+          <mqtt-button width="240" height="110" class="btn card xs12 sm6 md3" topic="/display/control" message="pause">
+            <v-icon left size="80">mdi-pause</v-icon>
           </mqtt-button>
         </v-col>
         <v-col cols="12" sm="6" md="5" class="mb-4">
-          <mqtt-button width="240" height="130" class="btn card xs12 sm6 md3 " topic="/display/control" message="play">
-            <v-icon left size="100">mdi-play</v-icon>
+          <mqtt-button width="240" height="110" class="btn card xs12 sm6 md3 " topic="/display/control" message="play">
+            <v-icon left size="80">mdi-play</v-icon>
           </mqtt-button>
         </v-col>
       </v-row>

ui/src/components/CardSolution.vue

@@ -1,14 +1,14 @@
 <template>
   <v-card tile outlined class="card">
     <v-card-title class="card__title feedback">
-      <v-icon left class="white--text pr-5 pl-2" size="50">mdi-play-network-outline</v-icon>
+      <v-icon left class="white--text pr-5 pl-2" size="40">mdi-play-network-outline</v-icon>
       Solution
     </v-card-title>
     <v-container class="text-center">
       <v-row justify="center">
         <v-container class="text-center">
           <!-- Utilisation de styles CSS personnalisés pour centrer l'image -->
-          <v-img width="450" src="https://c4.wallpaperflare.com/wallpaper/908/893/291/funny-middle-finger-black-background-wallpaper-preview.jpg" style="margin: 0 auto;"></v-img>
+          <v-img width="400" src="https://c4.wallpaperflare.com/wallpaper/908/893/291/funny-middle-finger-black-background-wallpaper-preview.jpg" style="margin: 0 auto;"></v-img>
         </v-container>
       </v-row>
     </v-container>

ui/src/components/CardSoundboard.vue

@@ -1,36 +1,36 @@
 <template>
-  <v-card tile outlined class="card" color="">
+  <v-card tile outlined class="card">
     <v-card-title class="card__title primary">
-      <v-icon left class="white--text pr-5 pl-2" size="50">mdi-music-box-multiple</v-icon>
+      <v-icon left class="white--text pr-5 pl-2" size="40">mdi-music-box-multiple</v-icon>
       Soundboard
     </v-card-title>
     <v-container class="text-center">
       <v-row justify="center">
         <v-col cols="12" sm="6" md="4" class="mt-4">
-          <mqtt-button class="btn" width="200" height="130" topic="/sound/playsound" message="good-response" rounded>
-            <v-icon size="100">mdi-check-circle-outline</v-icon>
+          <mqtt-button class="btn" width="200" height="110" topic="/sound/playsound" message="good-response" rounded>
+            <v-icon size="70">mdi-check-circle-outline</v-icon>
           </mqtt-button>
         </v-col>
         <v-col cols="12" sm="6" md="4" class="mt-4">
-          <mqtt-button class="btn" width="200" height="130" topic="/sound/playsound" message="bad-response" rounded>
-            <v-icon size="100">mdi-close-circle-outline</v-icon>
+          <mqtt-button class="btn" width="200" height="110" topic="/sound/playsound" message="bad-response" rounded>
+            <v-icon size="70">mdi-close-circle-outline</v-icon>
           </mqtt-button>
         </v-col>
         <v-col cols="12" sm="6" md="4" class="mt-4">
-          <mqtt-button class="btn" width="200" height="130" topic="/sound/playsound" message="timer" rounded>
-            <v-icon size="100">mdi-timer-outline</v-icon>
+          <mqtt-button class="btn" width="200" height="110" topic="/sound/playsound" message="timer" rounded>
+            <v-icon size="70">mdi-timer-outline</v-icon>
           </mqtt-button>
         </v-col>
       </v-row>
       <v-row justify="center">
         <v-col cols="12" sm="6" md="4" class="mb-4">
-          <mqtt-button class="btn" width="220" height="130" topic="/sound/playsound" message="applause" rounded>
-            <v-icon size="100">mdi-human-handsup</v-icon>
+          <mqtt-button class="btn" width="220" height="110" topic="/sound/playsound" message="applause" rounded>
+            <v-icon size="70">mdi-human-handsup</v-icon>
           </mqtt-button>
         </v-col>
-        <v-col cols="12" sm="6" md="s" class="mb-4">
-          <mqtt-button class="btn" width="220" height="130" topic="/sound/playsound" message="bell" rounded>
-            <v-icon size="100">mdi-bell-outline</v-icon>
+        <v-col cols="12" sm="6" md="4" class="mb-4">
+          <mqtt-button class="btn" width="220" height="110" topic="/sound/playsound" message="bell" rounded>
+            <v-icon size="70">mdi-bell-outline</v-icon>
           </mqtt-button>
         </v-col>
       </v-row>

ui/src/components/GameStatus.vue

@@ -0,0 +1,97 @@
+<template>
+  <v-navigation-drawer width="250">
+    <div class="label-pos">
+    <v-label class="labelTitle-style">Buzzer connectés</v-label>
+    </div>
+
+    <v-row no-gutters justify="space-around" class="button-pos">
+      <v-icon color="BuzzerRed">mdi-radiobox-marked</v-icon>
+      <v-icon color="BuzzerBlue">mdi-radiobox-marked</v-icon>
+      <v-icon color="BuzzerOrange">mdi-radiobox-marked</v-icon>
+      <v-icon color="BuzzerGreen">mdi-radiobox-marked</v-icon>
+    </v-row>
+
+    <v-divider :thickness="2" class="border-opacity-100" color="primary"/>
+    <div class="label-pos">
+      <v-label class="labelTitle-style pb-7">Scores</v-label>
+    </div>
+    <div>
+      <v-row no-gutters justify="space-around" class="scorebox-1-pos">
+        <v-row>
+          <v-col class="align-start scorediv-style-red pr-1">
+            <v-label class="labelScore-style">{{ RedScore }}</v-label>
+          </v-col>
+          <v-col class="align-start scorediv-style-blue pl-1">
+            <v-label class="labelScore-style">{{ BlueScore }}</v-label>
+          </v-col>
+        </v-row>
+      </v-row>
+    </div>
+    <div>
+      <v-row no-gutters justify="space-around" class="scorebox-2-pos mb-0">
+        <v-row>
+          <v-col class="align-start scorediv-style-orange pr-1">
+            <v-label class="labelScore-style">{{ OrangeScore }}</v-label>
+          </v-col>
+          <v-col class="align-start scorediv-style-green pl-1">
+            <v-label class="labelScore-style">{{ GreenScore }}</v-label>
+          </v-col>
+        </v-row>
+      </v-row>
+    </div>
+  </v-navigation-drawer>
+</template>
+
+<script setup>
+import { ref} from 'vue'; // Import des fonctions de Vue 3
+import variables from '@/variables.js';
+
+// Déclaration des variables locales pour les scores
+const RedScore = ref(variables.RedScore);
+const BlueScore = ref(variables.BlueScore);
+const OrangeScore = ref(variables.OrangeScore);
+const GreenScore = ref(variables.GreenScore);
+
+</script>
+
+<style>
+  .label-pos{
+    padding-top: 15px;
+    text-align: center;
+  }
+  .labelTitle-style{
+    font-size: 20px !important;
+    font-weight: 500;
+    color: #e91e1e !important;
+    opacity: 90% !important;
+  }
+  .labelScore-style{
+    opacity: 100% !important;
+  }
+  .button-pos{
+    padding-top: 10px;
+    padding-bottom: 15px;
+  }
+  .scorebox-1-pos{
+    padding-bottom: 15px;
+    text-align: center;
+    margin:auto;
+  }
+  .scorebox-2-pos{
+    padding-top: 9px;
+    text-align: center;
+    margin:auto;
+  }
+  .scorediv-style-red{
+    background-color: #d42828 !important;
+  }
+  .scorediv-style-orange{
+    background-color: #d48f28 !important;
+  }
+  .scorediv-style-blue{
+    background-color: #2867d4 !important;
+  }
+  .scorediv-style-green{
+    background-color: #28d42e !important;
+  }
+</style>

ui/src/config.js

@@ -0,0 +1,8 @@
+// Fichier vide, regarde config.js.example pour personaliser ce fichier.
+// Note de dev : Normalement ce fichier ne devrait plus avoir de
+// modifications
+
+// config.js
+export default {
+  mqttBrokerUrl: 'ws://localhost:9001'
+};

ui/src/plugins/router.js

@@ -31,6 +31,11 @@ const router = createRouter({
       path: '/mqtt-debugger',
       name: 'Debugger MQTT',
       component: () => import('@/views/MQTTDebugView.vue')
+    },
+    {
+      path: '/settings',
+      name: 'Paramètres',
+      component: () => import('@/views/SettingsView.vue')
     }
   ]
 })

ui/src/plugins/vuetify.js

@@ -0,0 +1,54 @@
+/**
+ * plugins/vuetify.js
+ *
+ * Framework documentation: https://vuetifyjs.com`
+ */
+
+// Styles
+import '@mdi/font/css/materialdesignicons.css'
+import 'vuetify/styles'
+
+// Composables
+import { createVuetify } from 'vuetify'
+
+const CustomThemeDark = {
+  dark: true,
+  colors: {
+    background: '#121212',
+    primary: '#e91e1e',
+    secondary: '#F44336',
+    accent: '#FFC107',
+    error: '#e91e1e',
+    warning: '#FFC107',
+    info: '#607D8B',
+    success: '#e91e1e',
+    BuzzerBlue: '#2867d4',
+    BuzzerOrange: '#d48f28',
+    BuzzerRed: '#d42828',
+    BuzzerGreen: '#28d42e',
+  }
+}
+const CustomThemeLight = {
+  dark: false,
+  colors: {
+    background: '#ffffff',
+    primary: '#e91e1e',
+    secondary: '#F44336',
+    accent: '#FFC107',
+    error: '#e91e1e',
+    warning: '#FFC107',
+    info: '#607D8B',
+    success: '#4CAF50'
+  }
+}
+
+// https://vuetifyjs.com/en/introduction/why-vuetify/#feature-guides
+export default createVuetify({
+  theme: {
+    defaultTheme: 'CustomThemeDark',
+    themes: {
+      CustomThemeDark,
+      CustomThemeLight,
+    },
+  },
+})

ui/src/variables.js

@@ -0,0 +1,24 @@
+export default {
+  // Gestion des score et des Buzzers
+  RedScore: 9999,
+  BlueScore: 1321,
+  OrangeScore: 10,
+  GreenScore: 10,
+  BuzzerRed: false,
+  BuzzerBlue: false,
+  BuzzerOrange: false,
+  BuzzerGreen: false,
+
+
+  
+  // Ajoutez d'autres variables globales ici
+};
+
+// Variables localStorage
+export const localStorageVars = {
+    // Exemple de variable localStorage
+    RedScorelocal: localStorage.getItem('RedScore') || '',
+    BlueScorelocal: localStorage.getItem('BlueScore') || '',
+    OrangeScorelocal: localStorage.getItem('OrangeScore') || '',
+    GreenScorelocal: localStorage.getItem('GreenScore') || '',
+  }; 

ui/src/views/GameControl.vue

@@ -29,14 +29,14 @@ import CardSoundboard from '@/components/CardSoundboard.vue';
 <style>
 @media (min-width: 1024px) {
   .card__title.primary {
-      background-color: #2979FF; /* Changez la couleur en fonction de votre thème */
+      background-color: #e91e1e; /* Changez la couleur en fonction de votre thème */
   }
   .card__title.feedback {
       background-color: #2E7D32; /* Changez la couleur en fonction de votre thème */
   }
   .btn{
     border-radius:30px!important;
-    background-color: #2979FF; /* Changez la couleur en fonction de votre thème */
+    background-color: #e91e1e; /* Changez la couleur en fonction de votre thème */
   }
 }
 </style>

ui/src/views/GameDisplay.vue

@@ -0,0 +1,15 @@
+<template>
+    <v-container>
+        <v-btn @click="update"></v-btn>
+    </v-container>
+</template>
+
+<script setup>
+    import { ref} from 'vue'; // Import des fonctions de Vue 3
+    import variables from '@/variables.js';
+
+    function update() {
+        variables.RedScore = '10'
+        
+    }
+</script>

ui/src/views/HomeView.vue

@@ -0,0 +1,3 @@
+<template>
+  <v-img src="../assets/BrainBlast-For-HomeView-Alpha.png" class="fill-height"></v-img>
+</template>

ui/src/views/SettingsView.vue

@@ -0,0 +1,71 @@
+<template>
+
+    <h1 class="title mb-4 ml-5 mt-5">Paramètres</h1>
+    <v-divider :thickness="2" class="border-opacity-100" color="primary"/>
+    <h2 class="title ml-10 mb-5 mt-5">Son</h2>
+    <div style="display: flex; align-items: center;">
+      <v-switch label="Activer le son intégré" v-model="EmbeddedSound" class="ml-15" color="primary"/>
+      <div style="width: 250px; margin-left: 16px;">
+        <v-slider class="ml-15" :disabled="EmbeddedSound === false" v-model="EmbeddedSoundVolume" color="primary"/>
+      </div>
+    </div>
+    <v-switch label="Activer le son MQTT" v-model="MQTTSound" class="ml-15" color="primary"/>
+    <v-divider />
+    <h2 class="title ml-10 mb-5 mt-5">Affichage</h2>
+    <v-switch label="Activer l'affichage des sattelites" v-model="SattelitesDisplay" class="ml-15" color="primary"/>
+    <v-divider />
+    <h2 class="title ml-10 mb-5 mt-5">MQTT</h2>
+    <div style="display: flex; align-items: center;">
+      <v-icon v-model="MQTTBrokerState" class="ml-15 mb-5" color="error" icon="record">mdi-record</v-icon>
+      <v-label class="ml-2 mb-10 mt-5">Etat du serveur MQTT</v-label>
+    </div>
+    <v-divider />
+</template>
+
+  
+<script setup>
+  import { ref, onMounted, watch } from 'vue';
+
+  const EmbeddedSound = ref(false);  // Définition d'une référence pour la case à cocher. Initialement décochée.
+  const EmbeddedSoundVolume = ref(50);  // Définition d'une référence pour la case à cocher. Initialement décochée.
+  const MQTTSound = ref(false);  // Définition d'une référence pour la case à cocher. Initialement décochée.
+  const MQTTBrokerState = ref(false);  // Définition d'une référence pour la case à cocher. Initialement décochée.
+  const SattelitesDisplay = ref(false);
+
+  onMounted(() => {
+      if (localStorage.getItem('EmbeddedSound')) {
+        EmbeddedSound.value = localStorage.getItem('EmbeddedSound') === 'true';  // Si l'état de la case à cocher est stocké, le mettre dans la référence
+      }  
+      if (localStorage.getItem('MQTTSound')) {
+        MQTTSound.value = localStorage.getItem('MQTTSound') === 'true';  // Si l'état de la case à cocher est stocké, le mettre dans la référence
+      } 
+      if (localStorage.getItem('EmbeddedSoundVolume')) {
+        EmbeddedSoundVolume.value = localStorage.getItem('EmbeddedSoundVolume');  // Si l'état de la case à cocher est stocké, le mettre dans la référence
+      } 
+      if (localStorage.getItem('SattelitesDisplay')) {
+        SattelitesDisplay.value = localStorage.getItem('SattelitesDisplay') === 'true';  // Added a default value for this switch
+      } 
+  });
+  watch(EmbeddedSound, (EmbeddedSoundNewValue) => {
+      if (EmbeddedSoundNewValue !== null) {
+          localStorage.setItem('EmbeddedSound', EmbeddedSoundNewValue);  // Mettre à jour l'état de la case à cocher dans le LocalStorage chaque fois qu'il change.
+      } 
+  });
+  watch(EmbeddedSoundVolume, (EmbeddedSoundVolumeNewValue) => {
+      if (EmbeddedSoundVolumeNewValue !== null) {
+          localStorage.setItem('EmbeddedSoundVolume', EmbeddedSoundVolumeNewValue);  // Mettre à jour l'état de la case à cocher dans le LocalStorage chaque fois qu'il change.
+      } 
+  });
+  watch(MQTTSound, (MQTTSoundNewValue) => {
+
+      if (MQTTSoundNewValue !== null) {
+          localStorage.setItem('MQTTSound', MQTTSoundNewValue);  // Mettre à jour l'état de la case à cocher dans le LocalStorage chaque fois qu'il change.
+      }  
+  });
+  watch(SattelitesDisplay, (SattelitesDisplaynewValue) => {
+    if (SattelitesDisplaynewValue !== null) {
+        localStorage.setItem('SattelitesDisplay', SattelitesDisplaynewValue);  // Added a default value for this switch
+    } 
+});
+ 
+</script>