test

typo
Merge branch 'feat/mqtt-button'
2024-02-27 08:53:18 +00:00 · 2024-02-27 08:40:21 +00:00 · 2024-02-26 22:06:40 +01:00 · 2024-02-26 22:03:34 +01:00 · 2024-02-26 21:55:23 +01:00 · 2024-02-26 14:25:49 +00:00
37 changed files with 646 additions and 8864 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,5 @@
+[*.{js,jsx,ts,tsx,vue}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
--- a/.gitignore
+++ b/.gitignore
@ -31,3 +31,4 @@ coverage

 # Local configuration file
 /src/config.js
+/components.d.ts
--- a/index.html
+++ b/index.html
@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="fr">
  <head>
    <meta charset="UTF-8">
    <link rel="icon" href="/favicon.ico">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <title>Brain Blast</title>
  </head>
  <body>
    <div id="app"></div>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -11,8 +11,9 @@
    "format": "prettier --write src/"
  },
  "dependencies": {
-    "@vue/cli": "^5.0.8",
+    "@mdi/font": "^7.4.47",
    "mqtt": "^5.3.5",
+    "roboto-fontface": "^0.10.0",
    "vue": "^3.4.19",
    "vue-router": "^4.2.5"
  },
@ -23,6 +24,8 @@
    "eslint": "^8.49.0",
    "eslint-plugin-vue": "^9.17.0",
    "prettier": "^3.0.3",
-    "vite": "^5.0.11"
+    "unplugin-fonts": "^1.1.1",
+    "vite": "^5.1.4",
+    "vite-plugin-vuetify": "^2.0.1"
  }
 }
--- a/src/App.vue
+++ b/src/App.vue
@ -1,86 +1,27 @@
-<script setup>
-import { RouterLink, RouterView } from 'vue-router'
-import HelloWorld from './components/HelloWorld.vue'
-</script>
-
 <template>
-  <header>
-    <img alt="Vue logo" class="logo" src="@/assets/logo.svg" width="125" height="125" />
-
-    <div class="wrapper">
-      <HelloWorld msg="You did it!" />
-
-      <nav>
-        <RouterLink to="/">Home</RouterLink>
-        <RouterLink to="/about">About</RouterLink>
-        <RouterLink to="/mqtt-debugger">MQTT Debugger</RouterLink>
-      </nav>
-    </div>
-  </header>
-
+  <v-app>
+    <BrainBlastBar />
+    <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-app>
 </template>

+<script setup>
+
+import BrainBlastBar from '@/components/BrainBlastBar.vue'
+import GameStatus from '@/components/GameStatus.vue'
+
+</script>
+
 <style scoped>
-header {
-  line-height: 1.5;
-  max-height: 100vh;
-}
-
-.logo {
-  display: block;
-  margin: 0 auto 2rem;
-}
-
-nav {
-  width: 100%;
-  font-size: 12px;
-  text-align: center;
-  margin-top: 2rem;
-}
-
-nav a.router-link-exact-active {
-  color: var(--color-text);
-}
-
-nav a.router-link-exact-active:hover {
-  background-color: transparent;
-}
-
-nav a {
-  display: inline-block;
-  padding: 0 1rem;
-  border-left: 1px solid var(--color-border);
-}
-
-nav a:first-of-type {
-  border: 0;
-}
-
-@media (min-width: 1024px) {
-  header {
-    display: flex;
-    place-items: center;
-    padding-right: calc(var(--section-gap) / 2);
-  }
-
-  .logo {
-    margin: 0 2rem 0 0;
-  }
-
-  header .wrapper {
-    display: flex;
-    place-items: flex-start;
-    flex-wrap: wrap;
-  }
-
-  nav {
-    text-align: left;
-    margin-left: -1rem;
-    font-size: 1rem;
-
-    padding: 1rem 0;
-    margin-top: 1rem;
-  }
+  .footer {
+    position: fixed; /* Fixe le footer en bas de la page */
+    bottom: 0; /* Aligne le footer en bas de la page */
+    left: 0; /* Aligne le footer à gauche */
+    width: 100%; /* Ajuste la largeur du footer en fonction de la largeur de l'écran */
+    z-index: 1000; /* Assure que le footer est au-dessus des autres éléments */
  }
 </style>
--- a/src/assets/BrainBlast-Ai-Upscaled.jpg
+++ b/src/assets/BrainBlast-Ai-Upscaled.jpg
--- a/src/assets/BrainBlast-For-HomeView-Alpha.png
+++ b/src/assets/BrainBlast-For-HomeView-Alpha.png
--- a/src/assets/BrainBlast-For-HomeView.jpg
+++ b/src/assets/BrainBlast-For-HomeView.jpg
--- a/src/assets/base.css
+++ b/src/assets/base.css
@ -1,86 +0,0 @@
-/* color palette from <https://github.com/vuejs/theme> */
-:root {
-  --vt-c-white: #ffffff;
-  --vt-c-white-soft: #f8f8f8;
-  --vt-c-white-mute: #f2f2f2;
-
-  --vt-c-black: #181818;
-  --vt-c-black-soft: #222222;
-  --vt-c-black-mute: #282828;
-
-  --vt-c-indigo: #2c3e50;
-
-  --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
-  --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
-  --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
-  --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
-
-  --vt-c-text-light-1: var(--vt-c-indigo);
-  --vt-c-text-light-2: rgba(60, 60, 60, 0.66);
-  --vt-c-text-dark-1: var(--vt-c-white);
-  --vt-c-text-dark-2: rgba(235, 235, 235, 0.64);
-}
-
-/* semantic color variables for this project */
-:root {
-  --color-background: var(--vt-c-white);
-  --color-background-soft: var(--vt-c-white-soft);
-  --color-background-mute: var(--vt-c-white-mute);
-
-  --color-border: var(--vt-c-divider-light-2);
-  --color-border-hover: var(--vt-c-divider-light-1);
-
-  --color-heading: var(--vt-c-text-light-1);
-  --color-text: var(--vt-c-text-light-1);
-
-  --section-gap: 160px;
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    --color-background: var(--vt-c-black);
-    --color-background-soft: var(--vt-c-black-soft);
-    --color-background-mute: var(--vt-c-black-mute);
-
-    --color-border: var(--vt-c-divider-dark-2);
-    --color-border-hover: var(--vt-c-divider-dark-1);
-
-    --color-heading: var(--vt-c-text-dark-1);
-    --color-text: var(--vt-c-text-dark-2);
-  }
-}
-
-*,
-*::before,
-*::after {
-  box-sizing: border-box;
-  margin: 0;
-  font-weight: normal;
-}
-
-body {
-  min-height: 100vh;
-  color: var(--color-text);
-  background: var(--color-background);
-  transition:
-    color 0.5s,
-    background-color 0.5s;
-  line-height: 1.6;
-  font-family:
-    Inter,
-    -apple-system,
-    BlinkMacSystemFont,
-    'Segoe UI',
-    Roboto,
-    Oxygen,
-    Ubuntu,
-    Cantarell,
-    'Fira Sans',
-    'Droid Sans',
-    'Helvetica Neue',
-    sans-serif;
-  font-size: 15px;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
--- a/src/assets/main.css
+++ b/src/assets/main.css
@ -1,35 +0,0 @@
-@import './base.css';
-
-#app {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-  font-weight: normal;
-}
-
-a,
-.green {
-  text-decoration: none;
-  color: hsla(160, 100%, 37%, 1);
-  transition: 0.4s;
-  padding: 3px;
-}
-
-@media (hover: hover) {
-  a:hover {
-    background-color: hsla(160, 100%, 37%, 0.2);
-  }
-}
-
-@media (min-width: 1024px) {
-  body {
-    display: flex;
-    place-items: center;
-  }
-
-  #app {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    padding: 0 2rem;
-  }
-}
--- a/src/components/BrainBlastBar.vue
+++ b/src/components/BrainBlastBar.vue
@ -0,0 +1,27 @@
+<template>
+  <v-app-bar :elevation="5">
+    <RouterMenu />
+    <v-app-bar-title>Brain Blast</v-app-bar-title>
+
+    <template v-slot:append>
+      <v-btn icon @click="toggleTheme">
+        <v-icon>{{ darkTheme ? 'mdi-white-balance-sunny' : 'mdi-moon-waning-crescent' }}</v-icon>
+      </v-btn>
+    </template>
+  </v-app-bar>
+</template>
+
+<script setup>
+  import { ref } from 'vue'
+  import { useTheme } from 'vuetify'
+  import RouterMenu from '@/components/RouterMenu.vue'
+
+  const theme = useTheme()
+  const darkTheme = ref(true)
+
+  function toggleTheme() {
+    darkTheme.value = !darkTheme.value
+    theme.global.name.value = theme.global.current.value.dark ? 'light' : 'dark'
+  }
+
+</script>
--- a/src/components/CardControl.vue
+++ b/src/components/CardControl.vue
@ -0,0 +1,36 @@
+<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>
+      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>
+        </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>
+        </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>
+        </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>
+        </v-col>
+      </v-row>
+    </v-container>
+  </v-card>
+</template>
+
+<script setup>
+  import MqttButton from './MqttButton.vue';
+</script>
--- a/src/components/CardSolution.vue
+++ b/src/components/CardSolution.vue
@ -0,0 +1,30 @@
+<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>
+      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-container>
+      </v-row>
+    </v-container>
+  </v-card>
+</template>
+<style>
+@media (min-width: 1024px) {
+  .image-container {
+    width: 300px;
+    overflow: hidden; /* Pour masquer le dépassement de l'image */
+    border: 1px solid #ccc; /* Bordure de l'image */
+  }
+  .image-container img {
+    width: 100%; /* Pour remplir complètement le conteneur */
+    height: auto; /* Pour maintenir le ratio d'aspect de l'image */
+    display: block; /* Pour éviter l'espace réservé pour les images */
+  }
+}
+</style>
--- a/src/components/CardSoundboard.vue
+++ b/src/components/CardSoundboard.vue
@ -0,0 +1,43 @@
+<template>
+  <v-card tile outlined class="card" color="">
+    <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>
+      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>
+        </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>
+        </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>
+        </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>
+        </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>
+          </mqtt-button>
+        </v-col>
+      </v-row>
+    </v-container>
+  </v-card>
+</template>
+
+<script setup>
+  import MqttButton from './MqttButton.vue';
+</script>
--- a/src/components/GameStatus.vue
+++ b/src/components/GameStatus.vue
@ -0,0 +1,9 @@
+<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>
--- a/src/components/HelloWorld.vue
+++ b/src/components/HelloWorld.vue
@ -1,44 +0,0 @@
-<script setup>
-defineProps({
-  msg: {
-    type: String,
-    required: true
-  }
-})
-</script>
-
-<template>
-  <div class="greetings">
-    <h1 class="green">{{ msg }}</h1>
-    <h3>
-      You’ve successfully created a project with
-      <a href="https://vitejs.dev/" target="_blank" rel="noopener">Vite</a> +
-      <a href="https://vuejs.org/" target="_blank" rel="noopener">Vue 3</a>.
-    </h3>
-  </div>
-</template>
-
-<style scoped>
-h1 {
-  font-weight: 500;
-  font-size: 2.6rem;
-  position: relative;
-  top: -10px;
-}
-
-h3 {
-  font-size: 1.2rem;
-}
-
-.greetings h1,
-.greetings h3 {
-  text-align: center;
-}
-
-@media (min-width: 1024px) {
-  .greetings h1,
-  .greetings h3 {
-    text-align: left;
-  }
-}
-</style>
--- a/src/components/MqttButton.vue
+++ b/src/components/MqttButton.vue
@ -0,0 +1,22 @@
+<template>
+  <v-btn @click="_publishMessage" v-bind="$attrs">
+    <slot/>
+  </v-btn>
+</template>
+
+<script setup>
+  import { publishMessage } from '@/services/mqttService'
+  import { ref, defineProps } from 'vue'
+
+  const props = defineProps({
+    topic: String,
+    message: null
+  })
+
+  const disabled = ref(false)
+
+  const _publishMessage = () => {
+    publishMessage(props.topic, JSON.stringify(props.message))
+    disabled.value = true
+  }
+</script>
--- a/src/components/RouterMenu.vue
+++ b/src/components/RouterMenu.vue
@ -0,0 +1,24 @@
+<template>
+  <v-app-bar-nav-icon v-on:click="menu = !menu"></v-app-bar-nav-icon>
+  <v-menu v-model="menu" class="menu-below-bar">
+    <v-list>
+      <v-list-item v-for="route in routes" :key="route.name" :to="route.path">{{ route.name }}</v-list-item>
+    </v-list>
+  </v-menu>
+</template>
+
+<script setup>
+  import { ref } from 'vue'
+  import { useRouter } from 'vue-router'
+
+  const router = useRouter()
+  const routes = router.options.routes
+
+  let menu = ref(false)
+</script>
+
+<style scoped>
+  .menu-below-bar {
+    margin-top: 48px; /* La hauteur de la barre d'application */
+  }
+</style>
--- a/src/components/TheWelcome.vue
+++ b/src/components/TheWelcome.vue
@ -1,88 +0,0 @@
-<script setup>
-import WelcomeItem from './WelcomeItem.vue'
-import DocumentationIcon from './icons/IconDocumentation.vue'
-import ToolingIcon from './icons/IconTooling.vue'
-import EcosystemIcon from './icons/IconEcosystem.vue'
-import CommunityIcon from './icons/IconCommunity.vue'
-import SupportIcon from './icons/IconSupport.vue'
-</script>
-
-<template>
-  <WelcomeItem>
-    <template #icon>
-      <DocumentationIcon />
-    </template>
-    <template #heading>Documentation</template>
-
-    Vue’s
-    <a href="https://vuejs.org/" target="_blank" rel="noopener">official documentation</a>
-    provides you with all information you need to get started.
-  </WelcomeItem>
-
-  <WelcomeItem>
-    <template #icon>
-      <ToolingIcon />
-    </template>
-    <template #heading>Tooling</template>
-
-    This project is served and bundled with
-    <a href="https://vitejs.dev/guide/features.html" target="_blank" rel="noopener">Vite</a>. The
-    recommended IDE setup is
-    <a href="https://code.visualstudio.com/" target="_blank" rel="noopener">VSCode</a> +
-    <a href="https://github.com/johnsoncodehk/volar" target="_blank" rel="noopener">Volar</a>. If
-    you need to test your components and web pages, check out
-    <a href="https://www.cypress.io/" target="_blank" rel="noopener">Cypress</a> and
-    <a href="https://on.cypress.io/component" target="_blank" rel="noopener"
-      >Cypress Component Testing</a
-    >.
-
-    <br />
-
-    More instructions are available in <code>README.md</code>.
-  </WelcomeItem>
-
-  <WelcomeItem>
-    <template #icon>
-      <EcosystemIcon />
-    </template>
-    <template #heading>Ecosystem</template>
-
-    Get official tools and libraries for your project:
-    <a href="https://pinia.vuejs.org/" target="_blank" rel="noopener">Pinia</a>,
-    <a href="https://router.vuejs.org/" target="_blank" rel="noopener">Vue Router</a>,
-    <a href="https://test-utils.vuejs.org/" target="_blank" rel="noopener">Vue Test Utils</a>, and
-    <a href="https://github.com/vuejs/devtools" target="_blank" rel="noopener">Vue Dev Tools</a>. If
-    you need more resources, we suggest paying
-    <a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">Awesome Vue</a>
-    a visit.
-  </WelcomeItem>
-
-  <WelcomeItem>
-    <template #icon>
-      <CommunityIcon />
-    </template>
-    <template #heading>Community</template>
-
-    Got stuck? Ask your question on
-    <a href="https://chat.vuejs.org" target="_blank" rel="noopener">Vue Land</a>, our official
-    Discord server, or
-    <a href="https://stackoverflow.com/questions/tagged/vue.js" target="_blank" rel="noopener"
-      >StackOverflow</a
-    >. You should also subscribe to
-    <a href="https://news.vuejs.org" target="_blank" rel="noopener">our mailing list</a> and follow
-    the official
-    <a href="https://twitter.com/vuejs" target="_blank" rel="noopener">@vuejs</a>
-    twitter account for latest news in the Vue world.
-  </WelcomeItem>
-
-  <WelcomeItem>
-    <template #icon>
-      <SupportIcon />
-    </template>
-    <template #heading>Support Vue</template>
-
-    As an independent project, Vue relies on community backing for its sustainability. You can help
-    us by
-    <a href="https://vuejs.org/sponsor/" target="_blank" rel="noopener">becoming a sponsor</a>.
-  </WelcomeItem>
-</template>
--- a/src/components/WelcomeItem.vue
+++ b/src/components/WelcomeItem.vue
@ -1,86 +0,0 @@
-<template>
-  <div class="item">
-    <i>
-      <slot name="icon"></slot>
-    </i>
-    <div class="details">
-      <h3>
-        <slot name="heading"></slot>
-      </h3>
-      <slot></slot>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-.item {
-  margin-top: 2rem;
-  display: flex;
-  position: relative;
-}
-
-.details {
-  flex: 1;
-  margin-left: 1rem;
-}
-
-i {
-  display: flex;
-  place-items: center;
-  place-content: center;
-  width: 32px;
-  height: 32px;
-  color: var(--color-text);
-}
-
-h3 {
-  font-size: 1.2rem;
-  font-weight: 500;
-  margin-bottom: 0.4rem;
-  color: var(--color-heading);
-}
-
-@media (min-width: 1024px) {
-  .item {
-    margin-top: 0;
-    padding: 0.4rem 0 1rem calc(var(--section-gap) / 2);
-  }
-
-  i {
-    top: calc(50% - 25px);
-    left: -26px;
-    position: absolute;
-    border: 1px solid var(--color-border);
-    background: var(--color-background);
-    border-radius: 8px;
-    width: 50px;
-    height: 50px;
-  }
-
-  .item:before {
-    content: ' ';
-    border-left: 1px solid var(--color-border);
-    position: absolute;
-    left: 0;
-    bottom: calc(50% + 25px);
-    height: calc(50% - 25px);
-  }
-
-  .item:after {
-    content: ' ';
-    border-left: 1px solid var(--color-border);
-    position: absolute;
-    left: 0;
-    top: calc(50% + 25px);
-    height: calc(50% - 25px);
-  }
-
-  .item:first-of-type:before {
-    display: none;
-  }
-
-  .item:last-of-type:after {
-    display: none;
-  }
-}
-</style>
--- a/src/components/icons/IconCommunity.vue
+++ b/src/components/icons/IconCommunity.vue
@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
-    <path
-      d="M15 4a1 1 0 1 0 0 2V4zm0 11v-1a1 1 0 0 0-1 1h1zm0 4l-.707.707A1 1 0 0 0 16 19h-1zm-4-4l.707-.707A1 1 0 0 0 11 14v1zm-4.707-1.293a1 1 0 0 0-1.414 1.414l1.414-1.414zm-.707.707l-.707-.707.707.707zM9 11v-1a1 1 0 0 0-.707.293L9 11zm-4 0h1a1 1 0 0 0-1-1v1zm0 4H4a1 1 0 0 0 1.707.707L5 15zm10-9h2V4h-2v2zm2 0a1 1 0 0 1 1 1h2a3 3 0 0 0-3-3v2zm1 1v6h2V7h-2zm0 6a1 1 0 0 1-1 1v2a3 3 0 0 0 3-3h-2zm-1 1h-2v2h2v-2zm-3 1v4h2v-4h-2zm1.707 3.293l-4-4-1.414 1.414 4 4 1.414-1.414zM11 14H7v2h4v-2zm-4 0c-.276 0-.525-.111-.707-.293l-1.414 1.414C5.42 15.663 6.172 16 7 16v-2zm-.707 1.121l3.414-3.414-1.414-1.414-3.414 3.414 1.414 1.414zM9 12h4v-2H9v2zm4 0a3 3 0 0 0 3-3h-2a1 1 0 0 1-1 1v2zm3-3V3h-2v6h2zm0-6a3 3 0 0 0-3-3v2a1 1 0 0 1 1 1h2zm-3-3H3v2h10V0zM3 0a3 3 0 0 0-3 3h2a1 1 0 0 1 1-1V0zM0 3v6h2V3H0zm0 6a3 3 0 0 0 3 3v-2a1 1 0 0 1-1-1H0zm3 3h2v-2H3v2zm1-1v4h2v-4H4zm1.707 4.707l.586-.586-1.414-1.414-.586.586 1.414 1.414z"
-    />
-  </svg>
-</template>
--- a/src/components/icons/IconDocumentation.vue
+++ b/src/components/icons/IconDocumentation.vue
@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" fill="currentColor">
-    <path
-      d="M11 2.253a1 1 0 1 0-2 0h2zm-2 13a1 1 0 1 0 2 0H9zm.447-12.167a1 1 0 1 0 1.107-1.666L9.447 3.086zM1 2.253L.447 1.42A1 1 0 0 0 0 2.253h1zm0 13H0a1 1 0 0 0 1.553.833L1 15.253zm8.447.833a1 1 0 1 0 1.107-1.666l-1.107 1.666zm0-14.666a1 1 0 1 0 1.107 1.666L9.447 1.42zM19 2.253h1a1 1 0 0 0-.447-.833L19 2.253zm0 13l-.553.833A1 1 0 0 0 20 15.253h-1zm-9.553-.833a1 1 0 1 0 1.107 1.666L9.447 14.42zM9 2.253v13h2v-13H9zm1.553-.833C9.203.523 7.42 0 5.5 0v2c1.572 0 2.961.431 3.947 1.086l1.107-1.666zM5.5 0C3.58 0 1.797.523.447 1.42l1.107 1.666C2.539 2.431 3.928 2 5.5 2V0zM0 2.253v13h2v-13H0zm1.553 13.833C2.539 15.431 3.928 15 5.5 15v-2c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM5.5 15c1.572 0 2.961.431 3.947 1.086l1.107-1.666C9.203 13.523 7.42 13 5.5 13v2zm5.053-11.914C11.539 2.431 12.928 2 14.5 2V0c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM14.5 2c1.573 0 2.961.431 3.947 1.086l1.107-1.666C18.203.523 16.421 0 14.5 0v2zm3.5.253v13h2v-13h-2zm1.553 12.167C18.203 13.523 16.421 13 14.5 13v2c1.573 0 2.961.431 3.947 1.086l1.107-1.666zM14.5 13c-1.92 0-3.703.523-5.053 1.42l1.107 1.666C11.539 15.431 12.928 15 14.5 15v-2z"
-    />
-  </svg>
-</template>
--- a/src/components/icons/IconEcosystem.vue
+++ b/src/components/icons/IconEcosystem.vue
@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" fill="currentColor">
-    <path
-      d="M11.447 8.894a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm0 1.789a1 1 0 1 0 .894-1.789l-.894 1.789zM7.447 7.106a1 1 0 1 0-.894 1.789l.894-1.789zM10 9a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0H8zm9.447-5.606a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm2 .789a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zM18 5a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0h-2zm-5.447-4.606a1 1 0 1 0 .894-1.789l-.894 1.789zM9 1l.447-.894a1 1 0 0 0-.894 0L9 1zm-2.447.106a1 1 0 1 0 .894 1.789l-.894-1.789zm-6 3a1 1 0 1 0 .894 1.789L.553 4.106zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zm-2-.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 2.789a1 1 0 1 0 .894-1.789l-.894 1.789zM2 5a1 1 0 1 0-2 0h2zM0 7.5a1 1 0 1 0 2 0H0zm8.553 12.394a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 1a1 1 0 1 0 .894 1.789l-.894-1.789zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zM8 19a1 1 0 1 0 2 0H8zm2-2.5a1 1 0 1 0-2 0h2zm-7.447.394a1 1 0 1 0 .894-1.789l-.894 1.789zM1 15H0a1 1 0 0 0 .553.894L1 15zm1-2.5a1 1 0 1 0-2 0h2zm12.553 2.606a1 1 0 1 0 .894 1.789l-.894-1.789zM17 15l.447.894A1 1 0 0 0 18 15h-1zm1-2.5a1 1 0 1 0-2 0h2zm-7.447-5.394l-2 1 .894 1.789 2-1-.894-1.789zm-1.106 1l-2-1-.894 1.789 2 1 .894-1.789zM8 9v2.5h2V9H8zm8.553-4.894l-2 1 .894 1.789 2-1-.894-1.789zm.894 0l-2-1-.894 1.789 2 1 .894-1.789zM16 5v2.5h2V5h-2zm-4.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zm-2.894-1l-2 1 .894 1.789 2-1L8.553.106zM1.447 5.894l2-1-.894-1.789-2 1 .894 1.789zm-.894 0l2 1 .894-1.789-2-1-.894 1.789zM0 5v2.5h2V5H0zm9.447 13.106l-2-1-.894 1.789 2 1 .894-1.789zm0 1.789l2-1-.894-1.789-2 1 .894 1.789zM10 19v-2.5H8V19h2zm-6.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zM2 15v-2.5H0V15h2zm13.447 1.894l2-1-.894-1.789-2 1 .894 1.789zM18 15v-2.5h-2V15h2z"
-    />
-  </svg>
-</template>
--- a/src/components/icons/IconSupport.vue
+++ b/src/components/icons/IconSupport.vue
@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
-    <path
-      d="M10 3.22l-.61-.6a5.5 5.5 0 0 0-7.666.105 5.5 5.5 0 0 0-.114 7.665L10 18.78l8.39-8.4a5.5 5.5 0 0 0-.114-7.665 5.5 5.5 0 0 0-7.666-.105l-.61.61z"
-    />
-  </svg>
-</template>
--- a/src/components/icons/IconTooling.vue
+++ b/src/components/icons/IconTooling.vue
@ -1,19 +0,0 @@
-<!-- This icon is from <https://github.com/Templarian/MaterialDesign>, distributed under Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0) license-->
-<template>
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    aria-hidden="true"
-    role="img"
-    class="iconify iconify--mdi"
-    width="24"
-    height="24"
-    preserveAspectRatio="xMidYMid meet"
-    viewBox="0 0 24 24"
-  >
-    <path
-      d="M20 18v-4h-3v1h-2v-1H9v1H7v-1H4v4h16M6.33 8l-1.74 4H7v-1h2v1h6v-1h2v1h2.41l-1.74-4H6.33M9 5v1h6V5H9m12.84 7.61c.1.22.16.48.16.8V18c0 .53-.21 1-.6 1.41c-.4.4-.85.59-1.4.59H4c-.55 0-1-.19-1.4-.59C2.21 19 2 18.53 2 18v-4.59c0-.32.06-.58.16-.8L4.5 7.22C4.84 6.41 5.45 6 6.33 6H7V5c0-.55.18-1 .57-1.41C7.96 3.2 8.44 3 9 3h6c.56 0 1.04.2 1.43.59c.39.41.57.86.57 1.41v1h.67c.88 0 1.49.41 1.83 1.22l2.34 5.39z"
-      fill="currentColor"
-    ></path>
-  </svg>
-</template>
--- a/src/fetch.txt
+++ b/src/fetch.txt
@ -0,0 +1 @@
+test
--- a/src/main.js
+++ b/src/main.js
@ -1,11 +1,9 @@
-import './assets/main.css'
+import { registerPlugins } from '@/plugins'

 import { createApp } from 'vue'
 import App from './App.vue'
-import router from './router'

 const app = createApp(App)
-
-app.use(router)
+registerPlugins(app)

 app.mount('#app')
--- a/src/plugins/README.md
+++ b/src/plugins/README.md
@ -0,0 +1,3 @@
+# Plugins
+
+Plugins are a way to extend the functionality of your Vue application. Use this folder for registering plugins that you want to use globally.
--- a/src/plugins/index.js
+++ b/src/plugins/index.js
@ -0,0 +1,14 @@
+/**
+ * plugins/index.js
+ *
+ * Automatically included in `./src/main.js`
+ */
+
+// Plugins
+import vuetify from './vuetify'
+import router from './router'
+
+export function registerPlugins (app) {
+  app.use(vuetify)
+  app.use(router)
+}
--- a/src/plugins/router.js
+++ b/src/plugins/router.js
@ -6,21 +6,31 @@ const router = createRouter({
  routes: [
    {
      path: '/',
-      name: 'home',
+      name: 'Home',
      component: HomeView
    },
    {
      path: '/about',
-      name: 'about',
+      name: 'About',
      // route level code-splitting
      // this generates a separate chunk (About.[hash].js) for this route
      // which is lazy-loaded when the route is visited.
-      component: () => import('../views/AboutView.vue')
+      component: () => import('@/views/AboutView.vue')
+    },
+    {
+      path: '/game/control',
+      name: 'Game Control (Présentateur)',
+      component: () => import('@/views/GameControl.vue')
+    },
+    {
+      path: '/game/display',
+      name: 'Game Display (Projection)',
+      component: () => import('@/views/GameDisplay.vue')
    },
    {
      path: '/mqtt-debugger',
      name: 'Debugger MQTT',
-      component: () => import('../views/MQTTDebugView.vue')
+      component: () => import('@/views/MQTTDebugView.vue')
    }
  ]
 })
--- a/src/plugins/vuetify.js
+++ b/src/plugins/vuetify.js
@ -0,0 +1,40 @@
+/**
+ * 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',
+  }
+})
--- a/src/views/AboutView.vue
+++ b/src/views/AboutView.vue
@ -1,6 +1,16 @@
 <template>
  <div class="about">
    <h1>This is an about page</h1>
+    <hr/>
+    <p>
+      Exemple d'une page
+    </p><p>
+      Ou il y a un scroll
+    </p><p>
+      Pour mettre en valeur leu footer fixe en bas de page
+    </p><p>
+      Cette page n'a aucun interet et pourra etre supprimée
+    </p>
  </div>
 </template>

@ -8,7 +18,6 @@
@media (min-width: 1024px) {
  .about {
    min-height: 100vh;
-    display: flex;
    align-items: center;
  }
 }
--- a/src/views/GameControl.vue
+++ b/src/views/GameControl.vue
@ -0,0 +1,42 @@
+<template>
+<v-container>
+  <v-row no-gutters>
+    <v-col class="align-start">
+      <card-control />
+    </v-col>
+    <v-col class="pl-3">
+      <card-soundboard />
+    </v-col>
+  </v-row>
+</v-container>
+<v-container>
+  <v-row no-gutters>
+    <v-col>
+      <card-solution />
+    </v-col>
+  </v-row>
+</v-container>
+</template>
+
+<script setup>
+
+import CardSolution from '@/components/CardSolution.vue'
+import CardControl from '@/components/CardControl.vue'
+import CardSoundboard from '@/components/CardSoundboard.vue';
+
+</script>
+
+<style>
+@media (min-width: 1024px) {
+  .card__title.primary {
+      background-color: #2979FF; /* 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 */
+  }
+}
+</style>
--- a/src/views/GameDisplay.vue
+++ b/src/views/GameDisplay.vue
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@ -1,9 +1,11 @@
-<script setup>
-import TheWelcome from '../components/TheWelcome.vue'
+<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>

-<template>
-  <main>
-    <TheWelcome />
-  </main>
-</template>
--- a/vite.config.js
+++ b/vite.config.js
@ -1,13 +1,29 @@
-import { fileURLToPath, URL } from 'node:url'
-
-import { defineConfig } from 'vite'
+// Plugins
 import vue from '@vitejs/plugin-vue'
+import Vuetify, { transformAssetUrls } from 'vite-plugin-vuetify'
+import ViteFonts from 'unplugin-fonts/vite'
+
+// Utilities
+import { fileURLToPath, URL } from 'node:url'
+import { defineConfig } from 'vite'

 // https://vitejs.dev/config/
 export default defineConfig({
  plugins: [
-    vue(),
+    vue({
+      template: { transformAssetUrls }
+    }),
+    Vuetify(),
+    ViteFonts({
+      google: {
+        families: [{
+          name: 'Roboto',
+          styles: 'wght@100;300;400;500;700;900',
+        }]
+      }
+    }),
  ],
+  define: { 'process.env': {} },
  resolve: {
    alias: {
      '@': fileURLToPath(new URL('./src', import.meta.url))
Author	SHA1	Message	Date
Laurent	b73865157d	test	2024-02-27 08:53:18 +00:00
Laurent	ac2fb16703	typo	2024-02-27 08:40:21 +00:00
Jérémy CHOMAZ	ef29ef3d82	Merge branch 'feat/mqtt-button'	2024-02-26 22:06:40 +01:00
Jérémy CHOMAZ	4d1f4ea120	Patch sur deux espaces manquant de deux bouttons devant le paramètre 'topic'	2024-02-26 22:03:34 +01:00
Jérémy CHOMAZ	6bfa1547f9	Modification CSS + certaines propriétés des button	2024-02-26 21:55:23 +01:00
Laurent	f3511277f9	Utilise les MqttButton dans les cartes de contrôle et soundboard	2024-02-26 14:25:49 +00:00
Laurent	de18d4957b	Implémentation du mqtt-button	2024-02-26 10:27:27 +00:00
Laurent	c10bb714a9	supprime un fichier d'origine	2024-02-25 17:20:42 +00:00
Laurent	117490fc3c	Sépare les cartes en plusieurs composants	2024-02-25 17:16:08 +00:00
Jérémy CHOMAZ	ed23344d78	Merge branch 'HomeView'	2024-02-25 16:16:56 +01:00
Jérémy CHOMAZ	8e9f9d3825	Ajout de l'image avec le canal alpha en fond de la page d'accueil	2024-02-25 16:12:53 +01:00
Jérémy CHOMAZ	b3c655df58	Merge branch 'GameControlPage'	2024-02-25 15:46:04 +01:00
Jérémy CHOMAZ	955956b13f	Préparation au merge	2024-02-25 15:42:52 +01:00
Jérémy CHOMAZ	f7ca05513c	Mise en page de la vue GameControl	2024-02-25 15:02:28 +01:00
Jérémy CHOMAZ	d57b2c39ee	Ajout des boutons	2024-02-25 13:22:18 +01:00
Jérémy CHOMAZ	9f81c7c8c0	Changement du nom de branche	2024-02-25 12:55:12 +01:00
Jérémy CHOMAZ	5aca026391	Test de commit avec une modif dans brainblatbar	2024-02-25 11:37:06 +01:00
Jérémy CHOMAZ	bbe2db581a	Je remet le config.js.example	2024-02-25 11:33:44 +01:00
Jérémy CHOMAZ	0ce6139924	Mise à jour du toggle de thème pour qu'il change d'icon lorsque le thème est en dark ou light (icone lune ou soleil)	2024-02-25 11:30:42 +01:00
Laurent	7d6c8d0f10	Ajoute les deux composants pour les vues de l'applications	2024-02-24 18:01:26 +00:00
Laurent	34d5d33f4a	Page a propos, a supprimer un de ces jours	2024-02-24 18:01:05 +00:00
Laurent	43a6b11168	utilise @ pour les imports	2024-02-24 18:00:51 +00:00
Laurent	0615fb0859	footer OK	2024-02-24 17:47:57 +00:00
Laurent	ff7861567d	Supprime les composants du template original	2024-02-24 17:43:32 +00:00
Laurent	7d60308304	Cosmetique : titre des pages	2024-02-24 17:42:58 +00:00
Laurent	cc0418c35c	suprimme le commentaire dans la balise script	2024-02-24 17:38:13 +00:00
Laurent	f47ddff911	Sépare le menu dans un composant dédié	2024-02-24 17:36:48 +00:00
Laurent	132383122a	Génère le menu en fonction de la configuration du routeur	2024-02-24 17:31:30 +00:00
Laurent	a614f381d3	Positionnement du menu sous la barre d'application	2024-02-24 17:21:23 +00:00
Laurent	172d648568	Menu clickable	2024-02-24 17:07:42 +00:00
Laurent	e619db9643	Ajoute les imports manquants	2024-02-24 17:05:24 +00:00
Laurent	24e1004d87	Désactivation de l'autoimport des composants	2024-02-24 00:01:12 +00:00
Laurent	3ce7e95068	nouveau nom pour la bar	2024-02-23 16:34:31 +00:00
Laurent	bf695dc5ef	Sépare l'app-bar et le navigation drawer dans deux composants	2024-02-23 16:33:03 +00:00
Laurent	0e5f144ffb	Creation d'un composant pour l'app bar	2024-02-21 06:50:02 +00:00
Laurent	c4806cd2c5	Template de base + toggle theme	2024-02-20 20:51:36 +00:00
Laurent	61bab12fc5	Clean App.vue	2024-02-20 17:41:24 +00:00
Laurent	e6f8a3ea03	enable plugins	2024-02-20 17:29:44 +00:00
Laurent	a6c89a145a	enable coding convention	2024-02-20 17:29:30 +00:00
Laurent	bde4a575e2	update configuration to enable vuetify	2024-02-20 17:20:57 +00:00