codevdesign 2.0.4 → 2.0.6

package/composants/csqcTiroir.vue

@@ -1,197 +1,197 @@
-<template>
-  <v-navigation-drawer
-    v-model="visible"
-    location="right"
-    temporary
-    class="pa-0 elevation-2 csqc-ligneBleue"
-    :persistent="persistant"
-    :width="grosseurTiroir"
-    v-bind="$attrs"
-    @keydown.esc="!persistant ? fermeture : ''"
-    @click:outside="!persistant ? fermeture : ''"
-  >
-    <v-card class="pa-0 ma-0 pl-8 pt-8">
-      <!-- Bouton en haut à droite -->
-      <v-btn
-        icon="mdi-close"
-        variant="text"
-        class="position-absolute iconeHover"
-        style="right: 5px; top: 5px"
-        @click="fermeture"
-      ></v-btn>
-
-      <v-card-title
-        class="pa-0 ma-0 pb-6 text-wrap"
-        style="font-size: 24px"
-      >
-        <slot name="titre"></slot>
-        <div text-h5>{{ titre }}</div>
-      </v-card-title>
-
-      <v-card-text class="pa-0 ma-0 pb-6 pr-6">
-        <v-container>
-          <slot></slot>
-          <slot name="content"></slot>
-        </v-container>
-      </v-card-text>
-      <v-card-actions class="my-2 d-flex justify-end pr-6 pb-5">
-        <slot name="actions"></slot>
-        <v-btn
-          v-if="btnAnnuler"
-          color="primary"
-          variant="text"
-          :loading="operationEnCours"
-          @click="fermeture"
-        >
-          {{ props.btnAnnulerTexte ? props.btnAnnulerTexte : $t('csqc.bouton.annuler') }}
-        </v-btn>
-
-        <v-btn
-          v-if="btnOk"
-          class="Gouttiere"
-          color="primary"
-          variant="flat"
-          :loading="operationEnCours"
-          :disabled="btnOkDesactiver || operationEnCours"
-          @click="okBouton"
-        >
-          {{ props.btnOkTexte ? props.btnOkTexte : $t('csqc.bouton.ok') }}
-        </v-btn>
-      </v-card-actions>
-    </v-card>
-  </v-navigation-drawer>
-  <Teleport to="body">
-    <v-fab
-      v-if="retourEnHaut && afficherBoutonHaut"
-      style="bottom: 24px; position: fixed; right: 24px; z-index: 2000"
-      elevation="8"
-      color="primary"
-      icon="mdi-arrow-up"
-      @click="allerEnHaut"
-    />
-  </Teleport>
-</template>
-<script lang="ts" setup>
-  import { ref, computed, watch, nextTick, useAttrs } from 'vue'
-  import { useDisplay } from 'vuetify'
-
-  const visible = ref(false)
-  const display = useDisplay()
-  const attrs = useAttrs()
-
-  // Déclaration des props
-  const props = defineProps({
-    titre: {
-      type: String,
-      default: '',
-      required: false,
-    },
-    btnAnnuler: {
-      type: Boolean,
-      default: true,
-      required: false,
-    },
-    btnOk: {
-      type: Boolean,
-      default: true,
-      required: false,
-    },
-    btnAnnulerTexte: {
-      type: String,
-      default: '',
-      required: false,
-    },
-    btnOkDesactiver: {
-      type: Boolean,
-      default: false,
-      required: false,
-    },
-    operationEnCours: { type: Boolean, default: false },
-    persistant: { type: Boolean, default: true },
-    btnOkTexte: {
-      type: String,
-      default: '',
-      required: false,
-    },
-    retourEnHaut: {
-      type: Boolean,
-      default: true,
-    },
-  })
-
-  // Déclaration des événements
-  const emit = defineEmits(['fermer', 'ok'])
-
-  // Back to top
-  const afficherBoutonHaut = ref(false)
-  let conteneurScroll: Element | null = null
-
-  function onScroll() {
-    afficherBoutonHaut.value = (conteneurScroll?.scrollTop ?? 0) > 350
-  }
-
-  function allerEnHaut() {
-    conteneurScroll?.scrollTo({ top: 0, behavior: 'smooth' })
-  }
-
-  watch(visible, async val => {
-    if (!props.retourEnHaut) return
-    if (val) {
-      await nextTick()
-      conteneurScroll = document.querySelector('.v-navigation-drawer--active .v-navigation-drawer__content')
-      conteneurScroll?.addEventListener('scroll', onScroll)
-    } else {
-      conteneurScroll?.removeEventListener('scroll', onScroll)
-      conteneurScroll = null
-      afficherBoutonHaut.value = false
-    }
-  })
-
-  // Méthodes
-  const ouvrir = () => {
-    visible.value = true
-  }
-
-  const fermer = () => {
-    visible.value = false
-  }
-
-  const fermeture = () => {
-    emit('fermer')
-    fermer()
-  }
-
-  const okBouton = () => {
-    emit('ok')
-    fermer()
-  }
-
-  // Calcul des tailles du tiroir en fonction du breakpoint
-  const grosseurTiroir = computed(() => {
-    if (attrs.width !== undefined && attrs.width !== null) return attrs.width as string | number
-    switch (display.name.value) {
-      case 'xs':
-        return ''
-      case 'sm':
-        return 0.95 * display.width.value
-      case 'md':
-        return 0.8 * display.width.value
-      case 'lg':
-        return 0.7 * display.width.value
-      case 'xl':
-        return 0.6 * display.width.value
-      case 'xxl':
-        return 0.5 * display.width.value
-      default:
-        return ''
-    }
-  })
-
-  defineExpose({ ouvrir, fermer })
-</script>
-
-<style>
-  .csqc-ligneBleue {
-    border-left: 30px #095797 solid !important;
-  }
-</style>
+<template>
+  <v-navigation-drawer
+    v-model="visible"
+    location="right"
+    temporary
+    class="pa-0 elevation-2 csqc-ligneBleue"
+    :persistent="persistant"
+    :width="grosseurTiroir"
+    v-bind="$attrs"
+    @keydown.esc="!persistant ? fermeture : ''"
+    @click:outside="!persistant ? fermeture : ''"
+  >
+    <v-card class="pa-0 ma-0 pl-8 pt-8">
+      <!-- Bouton en haut à droite -->
+      <v-btn
+        icon="mdi-close"
+        variant="text"
+        class="position-absolute iconeHover"
+        style="right: 5px; top: 5px"
+        @click="fermeture"
+      ></v-btn>
+
+      <v-card-title
+        class="pa-0 ma-0 pb-6 text-wrap"
+        style="font-size: 24px"
+      >
+        <slot name="titre"></slot>
+        <div text-h5>{{ titre }}</div>
+      </v-card-title>
+
+      <v-card-text class="pa-0 ma-0 pb-6 pr-6">
+        <v-container>
+          <slot></slot>
+          <slot name="content"></slot>
+        </v-container>
+      </v-card-text>
+      <v-card-actions class="my-2 d-flex justify-end pr-6 pb-5">
+        <slot name="actions"></slot>
+        <v-btn
+          v-if="btnAnnuler"
+          color="primary"
+          variant="text"
+          :loading="operationEnCours"
+          @click="fermeture"
+        >
+          {{ props.btnAnnulerTexte ? props.btnAnnulerTexte : $t('csqc.bouton.annuler') }}
+        </v-btn>
+
+        <v-btn
+          v-if="btnOk"
+          class="Gouttiere"
+          color="primary"
+          variant="flat"
+          :loading="operationEnCours"
+          :disabled="btnOkDesactiver || operationEnCours"
+          @click="okBouton"
+        >
+          {{ props.btnOkTexte ? props.btnOkTexte : $t('csqc.bouton.ok') }}
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-navigation-drawer>
+  <Teleport to="body">
+    <v-fab
+      v-if="retourEnHaut && afficherBoutonHaut"
+      style="bottom: 24px; position: fixed; right: 24px; z-index: 2000"
+      elevation="8"
+      color="primary"
+      icon="mdi-arrow-up"
+      @click="allerEnHaut"
+    />
+  </Teleport>
+</template>
+<script lang="ts" setup>
+  import { ref, computed, watch, nextTick, useAttrs } from 'vue'
+  import { useDisplay } from 'vuetify'
+
+  const visible = ref(false)
+  const display = useDisplay()
+  const attrs = useAttrs()
+
+  // Déclaration des props
+  const props = defineProps({
+    titre: {
+      type: String,
+      default: '',
+      required: false,
+    },
+    btnAnnuler: {
+      type: Boolean,
+      default: true,
+      required: false,
+    },
+    btnOk: {
+      type: Boolean,
+      default: true,
+      required: false,
+    },
+    btnAnnulerTexte: {
+      type: String,
+      default: '',
+      required: false,
+    },
+    btnOkDesactiver: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+    operationEnCours: { type: Boolean, default: false },
+    persistant: { type: Boolean, default: true },
+    btnOkTexte: {
+      type: String,
+      default: '',
+      required: false,
+    },
+    retourEnHaut: {
+      type: Boolean,
+      default: true,
+    },
+  })
+
+  // Déclaration des événements
+  const emit = defineEmits(['fermer', 'ok'])
+
+  // Back to top
+  const afficherBoutonHaut = ref(false)
+  let conteneurScroll: Element | null = null
+
+  function onScroll() {
+    afficherBoutonHaut.value = (conteneurScroll?.scrollTop ?? 0) > 350
+  }
+
+  function allerEnHaut() {
+    conteneurScroll?.scrollTo({ top: 0, behavior: 'smooth' })
+  }
+
+  watch(visible, async val => {
+    if (!props.retourEnHaut) return
+    if (val) {
+      await nextTick()
+      conteneurScroll = document.querySelector('.v-navigation-drawer--active .v-navigation-drawer__content')
+      conteneurScroll?.addEventListener('scroll', onScroll)
+    } else {
+      conteneurScroll?.removeEventListener('scroll', onScroll)
+      conteneurScroll = null
+      afficherBoutonHaut.value = false
+    }
+  })
+
+  // Méthodes
+  const ouvrir = () => {
+    visible.value = true
+  }
+
+  const fermer = () => {
+    visible.value = false
+  }
+
+  const fermeture = () => {
+    emit('fermer')
+    fermer()
+  }
+
+  const okBouton = () => {
+    emit('ok')
+    fermer()
+  }
+
+  // Calcul des tailles du tiroir en fonction du breakpoint
+  const grosseurTiroir = computed(() => {
+    if (attrs.width !== undefined && attrs.width !== null) return attrs.width as string | number
+    switch (display.name.value) {
+      case 'xs':
+        return ''
+      case 'sm':
+        return 0.95 * display.width.value
+      case 'md':
+        return 0.8 * display.width.value
+      case 'lg':
+        return 0.7 * display.width.value
+      case 'xl':
+        return 0.6 * display.width.value
+      case 'xxl':
+        return 0.5 * display.width.value
+      default:
+        return ''
+    }
+  })
+
+  defineExpose({ ouvrir, fermer })
+</script>
+
+<style>
+  .csqc-ligneBleue {
+    border-left: 30px #095797 solid !important;
+  }
+</style>

package/composants/gabarit/csqcMenu.vue

@@ -41,7 +41,7 @@
         </template>
 
         <v-list
-          style="background-color: #223654 !important"
+          :style="{ backgroundColor: couleurSousListe }"
           min-width="230px"
         >
           <v-list-item
@@ -80,7 +80,7 @@
       <v-toolbar-title
         ><label
           class="ajouterPointeur"
-          style="color: white !important"
+          style="color: rgb(var(--v-theme-blanc)) !important"
           >{{ $t('menu.menu') }}</label
         >
       </v-toolbar-title>
@@ -144,6 +144,7 @@
 <script setup lang="ts">
   import type { MenuItem, SousListe, SousListeItems } from '../../modeles/composants/csqcMenuModele'
   import { ref, computed } from 'vue'
+  import { useTheme } from 'vuetify'
 
   const props = defineProps({
     estMobile: {
@@ -165,12 +166,12 @@
     sousliste: {
       type: Array as () => SousListe[],
       required: false,
-      default: () => [],
+      default: (): SousListe[] => [],
     },
     souslisteItems: {
       type: Array as () => SousListeItems[],
       required: false,
-      default: () => [],
+      default: (): SousListeItems[] => [],
     },
     droitsMap: {
       type: Object as () => Record<string, boolean>,
@@ -179,6 +180,9 @@
     },
   })
 
+  const theme = useTheme()
+  const couleurSousListe = computed(() => (theme.current.value.colors as Record<string, string>)['bleuFonce'])
+
   const menu = ref<boolean>(false)
   const emit = defineEmits(['deconnexion'])
 
@@ -215,13 +219,14 @@
 <style lang="css" scoped>
   /* desktop background de la barre de menu et hauteur */
   .v-toolbar {
-    background-color: #223654;
+    background-color: rgb(var(--v-theme-bleuFonce));
     height: 64px;
   }
 
+
   /* desktop couleur du texte de la barre, marge du haut, padding */
   .barreMenu {
-    color: white !important;
+    color: rgb(var(--v-theme-blanc)) !important;
     padding: 0 10px 0 10px !important;
   }
   /* desktop */
@@ -244,35 +249,35 @@
   }
   /* desktop */
   .params_item {
-    background-color: #223654 !important;
-    color: white !important;
+    background-color: rgb(var(--v-theme-bleuFonce)) !important;
+    color: rgb(var(--v-theme-blanc)) !important;
     font-weight: 400;
   }
   /* desktop */
   .params_item.v-btn--active {
-    color: white !important;
+    color: rgb(var(--v-theme-blanc)) !important;
     font-weight: 600 !important;
   }
   /* desktop */
   .params_item.v-btn--active:hover {
-    background-color: #223654 !important;
-    color: white !important;
+    background-color: rgb(var(--v-theme-bleuFonce)) !important;
+    color: rgb(var(--v-theme-blanc)) !important;
   }
   /* desktop */
   .params_item.v-btn--active:hover::before {
-    color: #ffffff80 !important;
+    color: rgb(var(--v-theme-blanc) / 0.5) !important;
   }
   /* desktop */
   .params_item.v-btn--active::before {
     border-radius: 0;
-    color: #ffffff80 !important;
+    color: rgb(var(--v-theme-blanc) / 0.5) !important;
     margin-top: 1px !important;
     opacity: 0.24;
   }
 
   /* mobile couleur du texte de la barre, marge du haut, padding */
   .barreMenuMobile {
-    color: white !important;
+    color: rgb(var(--v-theme-blanc)) !important;
     padding: 0 10px 0 10px !important;
   }