fix : layout admin

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.49'
+    app.version: '0.0.47'

frontend/components/card-link.vue

@@ -2,7 +2,7 @@
 
 <template>
     <NuxtLink :to="link">
-        <div class="w-[300px] h-[216px] border border-black rounded-lg p-6 flex flex-col justify-between gap-4">
+        <div class="w-[324px] h-[228px] border border-black rounded-lg p-6 flex flex-col justify-between">
             <div class="flex justify-between">
                 <div class="rounded-full w-[80px] h-[80px] bg-[#D9D9D9] flex justify-center items-center">
                     <Icon :name="iconName" style="color: black" size="44" />
@@ -12,12 +12,12 @@
                 </div>
             </div>
             <div class="uppercase font-bold">
-                <p class="text-3xl text-primary-500">
+                <p class="text-3xl"> {{ label }} </p>
-                    <slot name="label">{{ label }}</slot>
-                </p>
             </div>
         </div>
         </NuxtLink>
+
+
 </template>
 
 <script setup lang="ts">
@@ -27,3 +27,4 @@ const props = defineProps<{
     label: string
 }>()
 </script>
+

frontend/components/reception/reception-bovine-received.vue

@@ -2,7 +2,7 @@
     <div
         v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
         class="flex flex-col items-center gap-16">
-        <h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des races réceptionnées</h1>
+        <h1 class="text-4xl uppercase font-bold">Sélection des races réceptionnées</h1>
         <div
             class="flex flex-row gap-8 items-center">
             <div

frontend/components/reception/reception-form.vue

@@ -1,7 +1,7 @@
 <template>
     <form @submit.prevent="validate">
         <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
-            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Réception</h1>
+            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1">Réception</h1>
             <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="reception-user"
@@ -81,8 +81,21 @@
                 select-class="h-[34px]"
                 wrapper-class="col-start-2 row-start-3"
             />
+            <!--    Chauffeur (LIOT)        -->
+            <UiSelect
+                id="reception-driver"
+                v-model="form.driverId"
+                label="Nom du chauffeur si LIOT"
+                :options="filteredDrivers.map((driver) => ({
+                    value: String(driver.id),
+                    label: driver.name
+                }))"
+                :loading="isLoadingDrivers"
+                v-if="isLiotCarrier"
+                wrapper-class="col-start-2 row-start-4"
+            />
             <!--    Plaque d'immatriculation       -->
-            <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
                 <UiLicensePlateInput
                     v-model="form.licensePlate"
                     v-model:allowAny="allowAnyLicensePlate"
@@ -100,28 +113,15 @@
                 }))"
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
-                wrapper-class="col-start-2 row-start-4 h-[64px]"
-            />
-            <!--    Chauffeur (LIOT)        -->
-            <UiSelect
-                id="reception-driver"
-                v-model="form.driverId"
-                label="Nom du chauffeur si LIOT"
-                :options="filteredDrivers.map((driver) => ({
-                    value: String(driver.id),
-                    label: driver.name
-                }))"
-                :loading="isLoadingDrivers"
-                v-if="isLiotCarrier"
                 wrapper-class="col-start-2 row-start-5"
             />
         </div>
         <div class="flex justify-center">
-            <UiButton
+            <button
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
             >Valider
-            </UiButton>
+            </button>
         </div>
     </form>
 

frontend/components/reception/reception-product-received.vue

@@ -3,7 +3,7 @@
         <div
             v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
             class="flex flex-col gap-16 items-center w-full">
-            <h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des marchandises réceptionnnées</h1>
+            <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
             <UiSelect
                 id="merchandise-type"
                 v-model="selectedMerchandiseTypeId"
@@ -47,7 +47,7 @@
             >
                 <div class="grid grid-cols-1 gap-10 md:grid-cols-4">
                     <div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
-                        <p class="font-bold uppercase text-primary-500">{{ type.label }}</p>
+                        <p class="font-bold uppercase">{{ type.label }}</p>
                         <div
                             v-for="building in buildings"
                             :key="building.id"

frontend/components/reception/reception-weight.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="flex justify-center">
         <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
+            <h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
 <!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
-            <p class="text-primary-500 uppercase text-2xl text-primary-500 mt-2">Pont-bascule connecté</p>
+            <p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
             <div
                 v-if="showLoadingBox"
                 class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
@@ -11,27 +11,27 @@
             </div>
             <div v-else-if="displayWeight !== null" class="w-full">
                 <div
-                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl text-primary-500">
+                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
                     {{ displayWeight }} kg
                 </div>
             </div>
         </div>
     </div>
     <div class="flex justify-center mt-[54px]">
-        <UiButton
+        <button
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
+        >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
-        <UiButton
+        <button
             v-if="displayWeight !== null && !showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="saveWeight"
-        >Valider la pesée</UiButton>
+        >Valider</button>
-        <UiButton
+        <button
             v-if="showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="printReceipt"
-        >Générer le bon</UiButton>
+        >Générer le bon</button>
     </div>
 </template>
 

frontend/components/reception/update-bovin.vue

@@ -27,12 +27,12 @@
                 />
             </div>
         </div>
-        <UiButton
+        <button
             type="submit"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             :disabled="!auth.isAdmin"
         >Valider
-        </UiButton>
+        </button>
     </div>
     </form>
 </template>

frontend/components/reception/update-merchandise.vue

@@ -67,13 +67,13 @@
                     </div>
                 </div>
             </div>
-            <UiButton
+            <button
                 v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="!auth.isAdmin"
             >Valider
-            </UiButton>
+            </button>
         </div>
     </form>
 </template>

frontend/components/reception/update-weight.vue

@@ -30,14 +30,14 @@
         </div>
 
         <div class="flex justify-center">
-            <UiButton
+            <button
                 v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
 
             >
                 Valider
-            </UiButton>
+            </button>
         </div>
 
     </form>

frontend/components/shipment/shipment-form.vue

@@ -1,7 +1,7 @@
 <template>
     <form @submit.prevent="validate">
         <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
-            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Expédition</h1>
+            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1">Expédition</h1>
             <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="shipment-user"
@@ -23,11 +23,11 @@
             />
             <!--    Type d'expédition        -->
             <div class="col-start-1 row-start-4 h-[64px]">
-                <div class="flex items-end gap-8 justify-between">
+                <div class="flex items-end gap-8">
                     <UiRadioGroup
                         id="shipment-type"
                         name="shipment-type"
-                        label="Type d'expédition bovine"
+                        label="Type d'expédition"
                         v-model="selectedShipmentTypeId"
                         :options="bovineShipment.map((type) => ({
                             value: String(type.id),
@@ -89,8 +89,21 @@
                 }))"
                 wrapper-class="col-start-2 row-start-3"
             />
+            <!--  Chauffeur (LIOT)        -->
+            <UiSelect
+                id="shipment-driver"
+                v-model="form.driverId"
+                label="Nom du chauffeur si LIOT"
+                :options="filteredDrivers.map((driver) => ({
+                    value: String(driver.id),
+                    label: driver.name
+                }))"
+                :loading="isLoadingDrivers"
+                wrapper-class="col-start-2 row-start-4"
+                v-if="isLiotCarrier"
+            />
             <!-- Plaque d'immatriculation (hors LIOT)        -->
-            <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
                 <UiLicensePlateInput
                     v-model="form.licencePlate"
                     v-model:allowAny="allowAnyLicensePlate"
@@ -108,28 +121,15 @@
                 }))"
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
-                wrapper-class="col-start-2 row-start-4"
-            />
-            <!--  Chauffeur (LIOT)        -->
-            <UiSelect
-                id="shipment-driver"
-                v-model="form.driverId"
-                label="Nom du chauffeur si LIOT"
-                :options="filteredDrivers.map((driver) => ({
-                    value: String(driver.id),
-                    label: driver.name
-                }))"
-                :loading="isLoadingDrivers"
                 wrapper-class="col-start-2 row-start-5"
-                v-if="isLiotCarrier"
             />
         </div>
         <div class="flex justify-center">
-            <UiButton
+            <button
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
             >Valider
-            </UiButton>
+            </button>
         </div>
     </form>
 </template>

frontend/components/shipment/shipment-loading.vue

@@ -1,14 +1,14 @@
 <template>
-    <div class="flex flex-col items-center gap-[118px]">
+    <div class="flex flex-col items-center gap-16">
-        <h1 class="font-bold text-5xl uppercase text-primary-500">Charment des bovins</h1>
+        <h1 class="font-bold text-5xl uppercase">Charment des bovins</h1>
         <div
             class="w-full flex flex-col items-center justify-center">
             <UiLoadingDots />
         </div>
-        <UiButton
+        <button
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="goNext"
-        >Peser</UiButton>
+        >Pesée</button>
     </div>
 </template>
 

frontend/components/shipment/shipment-weight.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="flex justify-center">
         <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
+            <h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
 <!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
             <p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
             <div
@@ -11,27 +11,27 @@
             </div>
             <div v-else-if="displayWeight !== null" class="w-full">
                 <div
-                    class="w-full flex flex-col items-center justify-center border border-primary-500 h-[90px] mt-12 mb-[25px] text-4xl text-primary-500">
+                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
                     {{ displayWeight }} kg
                 </div>
             </div>
         </div>
     </div>
     <div class="flex justify-center mt-[54px]">
-        <UiButton
+        <button
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
+        >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
-        <UiButton
+        <button
             v-if="displayWeight !== null && !showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="saveWeight"
-        >Valider la pesée</UiButton>
+        >Valider la pesée</button>
-        <UiButton
+        <button
             v-if="showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="printReceipt"
-        >Générer le bon</UiButton>
+        >Générer le bon</button>
     </div>
 </template>
 

frontend/components/ui/UiButton.vue

@@ -1,39 +0,0 @@
-<template>
-    <component
-        :is="'button'"
-        :type="type"
-        :disabled="isDisabled"
-        class="inline-flex items-center justify-center rounded-md"
-        :class="[
-            isDisabled ? 'cursor-not-allowed opacity-60' : 'cursor-pointer',
-            buttonClass
-        ]"
-        v-bind="attrs"
-    >
-        <slot v-if="!loading" />
-        <UiLoadingDots v-else />
-    </component>
-</template>
-
-<script setup lang="ts">
-import {computed, useAttrs} from 'vue'
-
-defineOptions({inheritAttrs: false})
-
-const props = withDefaults(
-    defineProps<{
-        type?: 'button' | 'submit' | 'reset'
-        disabled?: boolean
-        loading?: boolean
-        buttonClass?: string
-    }>(),
-    {
-        disabled: false,
-        loading: false,
-        buttonClass: ''
-    }
-)
-
-const attrs = useAttrs()
-const isDisabled = computed(() => props.disabled || props.loading)
-</script>

frontend/components/ui/UiCheckbox.vue

@@ -1,14 +1,14 @@
 <template>
     <div :class="wrapperClass">
         <label
-            class="flex items-center gap-2 cursor-pointer text-primary-500"
+            class="flex items-center gap-2 cursor-pointer"
             :class="labelClass"
         >
             <input
                 type="checkbox"
                 :checked="checked"
                 :disabled="disabled"
-                :class="['cursor-pointer text-primary-500', inputClass]"
+                :class="['cursor-pointer', inputClass]"
                 @change="onChange"
             >
             <span v-if="label">{{ label }}</span>

frontend/components/ui/UiDateInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl text-primary-500"
+            class="font-bold uppercase text-xl"
             :class="labelClass"
         >
             {{ label }}
@@ -14,7 +14,7 @@
             :value="modelValue ?? ''"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl text-primary-500 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
+            class="border-b border-black justify-self-start text-xl py-[6px] uppercase bg-transparent appearance-none h-[34px]"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-pointer',

frontend/components/ui/UiNumberInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="text-xl flex items-center gap-2 text-primary-500"
+            class="text-xl flex items-center gap-2"
             :class="labelClass"
         >
             <span
@@ -25,7 +25,7 @@
             :step="step"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl bg-transparent w-16 text-primary-500"
+            class="border-b border-black text-xl bg-transparent w-16"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',

frontend/components/ui/UiRadioGroup.vue

@@ -2,7 +2,7 @@
     <div :class="['flex flex-col', wrapperClass]">
         <label
             v-if="label"
-            class="font-bold uppercase text-xl text-primary-500"
+            class="font-bold uppercase text-xl"
             :class="labelClass"
         >
             {{ label }}
@@ -16,7 +16,7 @@
                 v-for="option in options"
                 :key="String(option.value)"
                 :for="`${id || 'radio'}-${option.value}`"
-                class="flex items-center gap-2 text-primary-500"
+                class="flex items-center gap-2"
                 :class="itemClass"
             >
                 <input

frontend/components/ui/UiSelect.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl text-primary-500"
+            class="font-bold uppercase text-xl"
             :class="labelClass"
         >
             {{ label }}
@@ -13,7 +13,7 @@
             :value="modelValue ?? ''"
             :disabled="disabled || loading"
             v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl text-primary-500 py-[6px] bg-transparent"
+            class="border-b border-black justify-self-start text-xl py-[6px] bg-transparent"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled || loading ? 'cursor-not-allowed' : 'cursor-pointer',

frontend/components/ui/UiTextInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl text-primary-500"
+            class="font-bold uppercase text-xl"
             :class="labelClass"
         >
             {{ label }}
@@ -16,7 +16,7 @@
             :maxlength="maxlength"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl py-[6px] bg-transparent text-primary-500"
+            class="border-b border-black text-xl py-[6px] bg-transparent"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',

frontend/components/ui/license-plate-input.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col">
-    <label :for="inputId" class="font-bold uppercase text-xl text-primary-500">{{ label }}</label>
+    <label :for="inputId" class="font-bold uppercase text-xl">{{ label }}</label>
       <div class="flex items-end gap-8">
           <input
               :id="inputId"
@@ -9,7 +9,7 @@
               type="text"
               :maxlength="maxLength"
               :placeholder="placeholderText"
-              class="border-b border-black flex-1 min-w-0 text-xl text-primary-500 uppercase h-[36px] py-[6px]"
+              class="border-b border-black flex-1 min-w-0 text-xl uppercase h-[30px]"
               @input="handleInput"
           />
           <UiCheckbox

frontend/components/ui/stepper.vue

@@ -4,7 +4,7 @@
             <div
                 v-for="(label, index) in labels"
                 :key="label"
-                class="absolute top-0 whitespace-nowrap text-primary-500"
+                class="absolute top-0 whitespace-nowrap"
                 :class="labelClass(index)"
                 :style="positionStyle(index)"
             >

frontend/layouts/admin.vue

@@ -0,0 +1,132 @@
+<template>
+    <div class="min-h-screen text-neutral-900 grid grid-rows-[85px,1fr]">
+        <!-- HEADER -->
+        <header class="w-full border-b border-neutral-200 bg-primary-500 ">
+            <div class="flex w-full items-center p-3 ">
+                <NuxtLink to="/" class="ml-4 shrink-0">
+          <span
+              class="flex items-center justify-center bg-white text-xl font-bold uppercase px-6 py-4"
+          >
+            LOGO
+          </span>
+                </NuxtLink>
+                <!-- NAV centré (desktop) -->
+                <nav
+                    class="flex flex-1 items-center justify-center gap-8 text-xl font-semibold uppercase text-white">
+                    <NuxtLink to="/admin/dashboard" custom v-slot="{ href, navigate }">
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path === '/admin/dashboard' ? 'opacity-100' : 'opacity-65 hover:opacity-100 transition'"
+                        >
+                            Accueil
+                        </a>
+                    </NuxtLink>
+
+                    <NuxtLink to="/admin/supplier/supplier-list" custom v-slot="{ href, navigate }">
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path.startsWith('/admin/supplier') ? 'opacity-100' : 'opacity-65 hover:opacity-100 transition'"
+                        >
+                            Fournisseurs
+                        </a>
+                    </NuxtLink>
+
+                    <NuxtLink to="/admin/carrier/carrier-list" custom v-slot="{ href, navigate }">
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path.startsWith('/admin/carrier') ? 'opacity-100' : 'opacity-65 hover:opacity-100 transition'"
+                        >
+                            Transporteurs
+                        </a>
+                    </NuxtLink>
+
+                    <NuxtLink to="/admin/user/list" custom v-slot="{ href, navigate }">
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path.startsWith('/admin/user') ? 'opacity-100' : 'opacity-65 hover:opacity-100 transition'"
+                        >
+                            Utilisateurs
+                        </a>
+                    </NuxtLink>
+
+                    <NuxtLink to="/admin/customer/customer-list" custom v-slot="{ href, navigate }">
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path.startsWith('/admin/customer') ? 'opacity-100' : 'opacity-65 hover:opacity-100 transition'"
+                        >
+                            Clients
+                        </a>
+                    </NuxtLink>
+                </nav>
+
+                <!-- User dropdown à droite (desktop) -->
+                <div class="ml-auto relative flex items-center text-white">
+                    <button
+                        type="button"
+                        class="inline-flex items-center gap-2 text-xl leading-none transition hover:opacity-80"
+                        @click="toggleUserMenu"
+                        aria-haspopup="true"
+                        :aria-expanded="isUserMenuOpen ? 'true' : 'false'"
+                    >
+                        <span class="capitalize">{{ userDisplayName }}</span>
+                        <span class="inline-flex items-center">
+                            <Icon v-if="isUserMenuOpen" name="mdi:chevron-up" size="20"/>
+                            <Icon v-else name="mdi:chevron-down" size="20"/>
+                        </span>
+                    </button>
+                    <div
+                        v-if="isUserMenuOpen"
+                        class="absolute right-0 top-full z-10 mt-2 w-56 rounded-md bg-primary-500 py-2 text-neutral-900 border-neutral-300 border shadow-lg"
+                        role="menu"
+                    >
+                        <button
+                            type="button"
+                            class="w-full px-4 py-2 text-left text-sm font-semibold text-white opacity-85 hover:opacity-100 transition' "
+                            @click="handleLogout"
+                        >
+                            Déconnexion
+                        </button>
+                    </div>
+                </div>
+
+            </div>
+        </header>
+
+        <main class="mx-auto w-full max-w-[1280px] py-2">
+            <slot/>
+        </main>
+
+        <footer class="w-full mt-8 bg-primary-500 px-6 py-3">
+            <p class="font-bold text-white text-right">v{{ version }}</p>
+        </footer>
+    </div>
+</template>
+
+<script setup lang="ts">
+import {useAuthStore} from '~/stores/auth'
+
+const route = useRoute()
+const auth = useAuthStore()
+const {version} = useAppVersion()
+const isUserMenuOpen = ref(false)
+
+const userDisplayName = computed(() => auth.user?.username ?? 'Utilisateur')
+
+const toggleUserMenu = () => {
+    isUserMenuOpen.value = !isUserMenuOpen.value
+}
+
+const handleLogout = async () => {
+    try {
+        await auth.logout()
+    } finally {
+        isUserMenuOpen.value = false
+        await navigateTo('/login')
+    }
+}
+</script>

frontend/layouts/default.vue

@@ -1,147 +1,54 @@
 <template>
-    <div class="min-h-screen text-neutral-900 flex flex-col">
+    <div class="min-h-screen text-neutral-900 grid grid-rows-[85px,1fr]">
-        <!-- HEADER -->
+    <header class="w-full border-b border-neutral-200 bg-primary-500">
-        <header class="w-full bg-primary-500 py-5 px-6">
+            <div class="flex w-full items-center justify-center px-6 py-4">
-            <div class="flex w-full items-center justify-between">
-                <!-- Burger (mobile) -->
                 <button
                     type="button"
                     class="inline-flex items-center justify-center text-3xl text-white md:hidden"
                     aria-label="Ouvrir le menu"
                     @click="toggleMenu"
                 >
-          <span aria-hidden="true" class="flex items-center">
+                    <span aria-hidden="true" class="flex items-center"><Icon name="mdi:menu" size="44"/></span>
-            <Icon name="mdi:menu" size="44"/>
-          </span>
                 </button>
-
+                <nav class="ml-4 hidden items-center gap-8 text-2xl font-bold uppercase text-white md:flex">
-                <!-- Logo -->
+                    <NuxtLink to="/" custom v-slot="{ href, navigate, isExactActive }">
-                <NuxtLink to="/" class="shrink-0">
-          <span class="flex items-center justify-center bg-white text-xl font-bold uppercase px-6 py-4">
-            LOGO
-          </span>
-                </NuxtLink>
-
-                <!-- NAV centré (desktop) -->
-                <nav
-                    class="hidden md:flex flex-1 items-center justify-center gap-8 text-xl font-bold uppercase text-white"
-                >
-                    <NuxtLink to="/" custom v-slot="{ href, navigate }">
                         <a
                             :href="href"
                             @click="navigate"
-                            :class="route.path === '/'
+                            :class="isExactActive ? 'opacity-100' : 'opacity-50'"
-                ? 'opacity-100'
-                : 'opacity-65 hover:opacity-100 transition'"
                         >
                             Accueil
                         </a>
                     </NuxtLink>
-
                     <NuxtLink
+                        to="/admin/dashboard" custom v-slot="{ href, navigate, isExactActive }"
                         v-if="auth.isAdmin"
-                        to="/admin/supplier/supplier-list"
-                        custom
-                        v-slot="{ href, navigate }"
                     >
                         <a
                             :href="href"
                             @click="navigate"
-                            :class="route.path.startsWith('/admin/supplier')
+                            :class="isExactActive ? 'opacity-100' : 'opacity-50'"
-                ? 'opacity-100'
-                : 'opacity-65 hover:opacity-100 transition'"
                         >
-                            Fournisseurs
+                            Admin
-                        </a>
-                    </NuxtLink>
-
-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/carrier/carrier-list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/carrier')
-                ? 'opacity-100'
-                : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Transporteurs
-                        </a>
-                    </NuxtLink>
-
-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/user/list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/user')
-                ? 'opacity-100'
-                : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Utilisateurs
-                        </a>
-                    </NuxtLink>
-
-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/customer/customer-list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/customer')
-                ? 'opacity-100'
-                : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Clients
                         </a>
                     </NuxtLink>
                 </nav>
-
+                <NuxtLink to="/" class="flex flex-1 items-center justify-center gap-3">
-                <!-- Spacer mobile (pour centrer visuellement le header si besoin) -->
+                  <span
+                      class="flex items-center justify-center bg-white text-xl font-bold uppercase text-primary-500 p-4"
+                  >
+                    LOGO
+                  </span>
+                </NuxtLink>
                 <div class="w-[44px] md:hidden"></div>
-
+                <button
-                <!-- User dropdown à droite (desktop) -->
+                    type="button"
-                <div v-if="auth.isAuthenticated" class="ml-auto relative hidden md:flex items-center text-white group">
+                    class="ml-auto hidden text-xl font-bold uppercase text-white transition hover:opacity-80 md:inline-flex"
-                    <button
+                    @click="handleLogout"
-                        type="button"
+                >
-                        class="inline-flex items-center py-2 -my-2 text-xl leading-none transition hover:opacity-80"
+                    Déconnexion
-                        aria-haspopup="true"
+                </button>
-                    >
-                        <span class="capitalize font-bold">{{ userDisplayName }}</span>
-                        <span class="ml-[6px] inline-flex items-center font-bold transition-transform group-hover:rotate-180 group-focus-within:rotate-180">
-                            <Icon name="mdi:chevron-down" size="20"/>
-                        </span>
-                    </button>
-
-                    <div
-                        class="absolute right-0 top-full z-10 w-56 rounded-md bg-primary-500 py-2 border-neutral-300 border shadow-lg
-                        opacity-0 invisible pointer-events-none transition
-                        group-hover:opacity-100 group-hover:visible group-hover:pointer-events-auto
-                        group-focus-within:opacity-100 group-focus-within:visible group-focus-within:pointer-events-auto"
-                        role="menu"
-                    >
-                        <button
-                            type="button"
-                            class="w-full px-4 py-2 text-left text-sm font-semibold text-white opacity-85 hover:opacity-100 transition"
-                            @click="handleLogout"
-                        >
-                            Déconnexion
-                        </button>
-                    </div>
-                </div>
             </div>
-
-            <!-- Overlay (mobile) -->
             <transition
                 enter-active-class="transition duration-200 ease-out"
                 enter-from-class="opacity-0"
@@ -156,8 +63,6 @@
                     @click="closeMenu"
                 />
             </transition>
-
-            <!-- Drawer (mobile) -->
             <transition
                 enter-active-class="transition duration-200 ease-out"
                 enter-from-class="-translate-x-full"
@@ -168,7 +73,9 @@
             >
                 <aside
                     v-if="isMenuOpen"
-                    class="fixed left-0 top-0 z-50 h-full w-full bg-primary-500 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
+                    class="fixed left-0 top-0 z-50 h-full w-full bg-primary-600 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
+                    role="dialog"
+                    aria-modal="true"
                 >
                     <div class="flex items-center justify-between">
                         <span class="text-2xl font-bold uppercase">Menu</span>
@@ -181,27 +88,12 @@
                             <Icon name="mdi:close" size="44"/>
                         </button>
                     </div>
-
                     <nav class="mt-8 flex flex-col gap-6 text-xl font-bold uppercase">
-                        <NuxtLink to="/admin/dashboard" @click="closeMenu">Accueil</NuxtLink>
+                        <NuxtLink to="/" class="opacity-100" @click="closeMenu">Accueil</NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/supplier/supplier-list" @click="closeMenu">
-                            Fournisseurs
-                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/carrier/carrier-list" @click="closeMenu">
-                            Transporteurs
-                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/user/list" @click="closeMenu">
-                            Utilisateurs
-                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/customer/customer-list" @click="closeMenu">
-                            Clients
-                        </NuxtLink>
                     </nav>
-
                     <button
-                        v-if="auth.isAuthenticated"
                         type="button"
-                        class="mt-6 text-xl font-bold uppercase"
+                        class="mt-5 text-xl font-bold uppercase"
                         @click="handleLogout"
                     >
                         Déconnexion
@@ -209,10 +101,10 @@
                 </aside>
             </transition>
         </header>
-        <main class="mx-auto w-full max-w-[1280px] mt-16">
+        <main class="mx-auto w-full max-w-[1280px]">
             <slot/>
         </main>
-        <footer class="w-full mt-auto bg-primary-500 px-6 py-3">
+        <footer class="w-full mt-8 bg-primary-500 px-6 py-3">
             <p class="font-bold text-white text-right">v{{ version }}</p>
         </footer>
     </div>
@@ -223,11 +115,8 @@ import {useAuthStore} from '~/stores/auth'
 
 const route = useRoute()
 const auth = useAuthStore()
-const {version} = useAppVersion()
-
 const isMenuOpen = ref(false)
-
+const {version} = useAppVersion()
-const userDisplayName = computed(() => auth.user?.username ?? 'Utilisateur')
 
 const closeMenu = () => {
     isMenuOpen.value = false

frontend/pages/admin/carrier/[[id]].vue

@@ -1,19 +1,19 @@
 
 <template>
     <form @submit.prevent="validate">
-    <div class="flex items-center justify-between">
+    <div class="flex items-center justify-between ">
         <h1 class="text-3xl font-bold uppercase">
             {{ route.params.id ? 'Modifier transporteur' : 'Ajout transporteur' }}
         </h1>
 
-        <UiButton
+        <button
             type="submit"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
         >Enregistrer
-        </UiButton>
+        </button>
     </div>
 
-    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
+    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
         <UiTextInput
             label = "nom du fournisseur"
             id="carrier-name"
@@ -33,27 +33,19 @@
 <script setup lang="ts">
 import {createCarrier, getCarrier, updateCarrier} from "~/services/carrier";
 import type {CarrierData, CarrierFormData} from "~/services/dto/carrier-data";
-import {computed} from "vue";
 const router = useRouter()
 const route = useRoute()
-const idCarrier = computed(() => resolveId(route.params.id))
+const idCarrier = Number(route.params.id)
 const isLoading = ref(false)
 const isHydrating = ref(false)
 
-const resolveId = (param: unknown) => {
-    const idStr = Array.isArray(param) ? param[0] : param
-    if (!idStr) return null
-    const id = Number(idStr)
-    return Number.isFinite(id) ? id : null
-}
-
 const form = reactive<CarrierFormData>({
     code:'',
     name:''
 })
 
 definePageMeta({
-    layout: 'default'
+    layout: 'admin'
 })
 
 const hydrateFromUser = (carrier: CarrierData | null) => {
@@ -67,7 +59,7 @@ const hydrateFromUser = (carrier: CarrierData | null) => {
 }
 
 watch(
-    () => idCarrier.value,
+    () => idCarrier,
     async (id) => {
         if (id === null) {
             return
@@ -93,8 +85,8 @@ async function validate() {
 
     }
 
-    if(idCarrier.value){
+    if(idCarrier){
-        await updateCarrier(idCarrier.value, basePayload)
+        await updateCarrier(idCarrier, basePayload)
         navigate()
         return
     }

frontend/pages/admin/carrier/carrier-list.vue

@@ -1,13 +1,11 @@
 <template>
 
     <div class="flex items-center justify-between ">
-            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
+            <h1 class="text-3xl font-bold uppercase">listes des transporteurs</h1>
             <NuxtLink
                 to="/admin/carrier"
-                class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
+                class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            >
+            >Ajouter
-                <Icon name="mdi:plus" size="28"  />
-                Ajouter
             </NuxtLink>
     </div>
 
@@ -44,7 +42,7 @@ const goToCarrier = (id: number) => {
 }
 
 definePageMeta({
-    layout: 'default'
+    layout: 'admin'
 })
 
 onMounted(async () => {

frontend/pages/admin/customer/[[id]].vue

@@ -5,13 +5,13 @@
                 {{ customerId ? "Modifications du client" : "Ajout d'un client" }}
             </h1>
 
-            <UiButton
+            <button
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
                 {{ customerId ? "Sauvegarder" : "Ajouter" }}
-            </UiButton>
+            </button>
         </div>
 
         <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
@@ -23,14 +23,14 @@
         <div class="mx-24 mb-4 py-6 border-t border-black"></div>
         <div class="flex items-center justify-between mb-4">
             <h2 class="text-3xl font-bold uppercase">Adresses client</h2>
-            <UiButton
+            <button
                 type="button"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="customerId === null || !auth.isAdmin"
                 @click="goToAddAddress"
             >
                 Ajouter
-            </UiButton>
+            </button>
         </div>
         <div class="overflow-x-auto mb-10">
             <table class="w-full border-collapse">
@@ -80,7 +80,7 @@ import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
 import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
 import {useAuthStore} from "~/stores/auth"
 
-definePageMeta({layout: "default"})
+definePageMeta({layout: "admin"})
 
 const route = useRoute()
 const router = useRouter()

frontend/pages/admin/customer/address.vue

@@ -8,7 +8,7 @@ import { createAddress, getAddress, updateAddress } from "~/services/address"
 import { getCustomer, updateCustomer } from "~/services/customer"
 import type { CustomerData } from "~/services/dto/customer-data"
 
-definePageMeta({ layout: "default" })
+definePageMeta({ layout: "admin" })
 
 const route = useRoute()
 const router = useRouter()

frontend/pages/admin/customer/customer-list.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des Clients</h1>
+        <h1 class="text-3xl font-bold uppercase">Liste des Clients</h1>
         <NuxtLink
             to="/admin/customer"
-            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
+            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
             @click="handleAddClick"
         >
-            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
     </div>
@@ -94,7 +93,7 @@ import { getCustomerList } from "~/services/customer"
 import type { CustomerData } from "~/services/dto/customer-data"
 import { useAuthStore } from "~/stores/auth"
 
-definePageMeta({ layout: "default" })
+definePageMeta({ layout: "admin" })
 
 const customerList = ref<CustomerData[]>([])
 const router = useRouter()

frontend/pages/admin/dashboard.vue

@@ -2,6 +2,6 @@
 </template>
 <script setup lang="ts">
 definePageMeta({
-    layout: 'default'
+    layout: 'admin'
 })
 </script>

frontend/pages/admin/supplier/[[id]].vue

@@ -5,13 +5,13 @@
                 {{ supplierId ? "Modifications du fournisseur" : "Ajout d'un fournisseur" }}
             </h1>
 
-            <UiButton
+            <button
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
                 {{ supplierId ? "Sauvegarder" : "Ajouter" }}
-            </UiButton>
+            </button>
         </div>
 
         <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
@@ -23,14 +23,14 @@
         <div class="mx-24 mb-4 py-6 border-t border-black"></div>
         <div class="flex items-center justify-between mb-4">
             <h2 class="text-3xl font-bold uppercase">Adresses fournisseur</h2>
-            <UiButton
+            <button
                 type="button"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="supplierId === null || !auth.isAdmin"
                 @click="goToAddAddress"
             >
                 Ajouter
-            </UiButton>
+            </button>
         </div>
         <div class="overflow-x-auto mb-10">
             <table class="w-full border-collapse">
@@ -80,7 +80,7 @@ import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
 import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
 import {useAuthStore} from "~/stores/auth"
 
-definePageMeta({layout: "default"})
+definePageMeta({layout: "admin"})
 
 const route = useRoute()
 const router = useRouter()

frontend/pages/admin/supplier/address.vue

@@ -8,7 +8,7 @@ import {createAddress, getAddress, updateAddress} from "~/services/address";
 import {getSupplier, updateSupplier} from "~/services/supplier";
 import type {SupplierData} from "~/services/dto/supplier-data";
 
-definePageMeta({ layout: "default" })
+definePageMeta({ layout: "admin" })
 
 const route = useRoute()
 const router = useRouter()

frontend/pages/admin/supplier/supplier-list.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des fournisseurs</h1>
+        <h1 class="text-3xl font-bold uppercase">Liste des fournisseurs</h1>
         <NuxtLink
             to="/admin/supplier"
-            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
+            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
             @click="handleAddClick"
         >
-            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
     </div>
@@ -90,7 +89,7 @@ import { getSupplierList } from "~/services/supplier"
 import type { SupplierData } from "~/services/dto/supplier-data"
 import { useAuthStore } from "~/stores/auth"
 
-definePageMeta({ layout: "default" })
+definePageMeta({ layout: "admin" })
 
 const supplierList = ref<SupplierData[]>([])
 const router = useRouter()

frontend/pages/admin/user/[[id]].vue

@@ -5,15 +5,15 @@
             <h1 class="text-3xl font-bold uppercase">
                 {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
             </h1>
-            <UiButton
+            <button
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
             >
                 {{ userId ? 'Sauvegarder' : 'Ajouter' }}
-            </UiButton>
+            </button>
         </div>
 
-        <div class="grid gap-y-16 gap-x-40 py-12">
+        <div class="grid gap-y-16 gap-x-40 mb-16">
             <UiTextInput
                 id="user-name"
                 v-model="form.username"
@@ -39,7 +39,7 @@
 </template>
 <script setup lang="ts">
 definePageMeta({
-    layout: 'default'
+    layout: 'admin'
 })
 
 import {computed, reactive, ref, watch} from 'vue'

frontend/pages/admin/user/list.vue

@@ -1,11 +1,10 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
+        <h1 class="text-3xl font-bold uppercase">Liste des utilisateurs</h1>
         <NuxtLink
-            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
+            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="router.push('/admin/user/')"
         >
-            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
 
@@ -39,7 +38,7 @@
 
 <script setup lang="ts">
 definePageMeta({
-    layout: 'default'
+    layout: 'admin'
 })
 
 import type {UserData} from "~/services/dto/user-data";

frontend/pages/index.vue

@@ -1,27 +1,15 @@
 <script setup lang="ts">
 </script>
 <template>
-    <div class="flex flex-wrap justify-center pb-16 gap-12">
+    <div class="flex flex-wrap justify-center mt-8 gap-12 mb-8 md:mb-0">
         <card-link label="NOUVELLE RÉCEPTION" link="/reception" iconName="mdi:truck-outline" />
         <card-link label="NOUVELLE EXPÉDITION" link="/shipment" iconName="mdi:truck-fast-outline" />
         <card-link label="PLAN DE SITE" link="/" iconName="material-symbols:warehouse-outline-rounded" />
-        <card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
+        <card-link label="RÉCEPTIONS EN ATTENTE" link="/reception/waiting-reception" iconName="mdi:truck-remove-outline" />
-            <template #label>
+        <card-link label="EXPÉDITIONS EN ATTENTE" link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container" />
-                Réceptions<br>EN ATTENTE
-            </template>
-        </card-link>
-        <card-link link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
-            <template #label>
-                EXPÉDITIONS<br>EN ATTENTE
-            </template>
-        </card-link>
         <card-link label="CASES" link="/" iconName="material-symbols:bottom-sheets-outline" />
         <card-link label="RÉCEPTIONS FINIES" link="/reception/finish-reception" iconName="mdi:truck-check-outline" />
         <card-link label="EXPÉDITIONS FINIES" link="/shipment/finish-shipment" iconName="mdi:truck-delivery-outline" />
-        <card-link link="/" iconName="mdi:cow">
+        <card-link label="PASSEPORT DU BOVIN" link="/" iconName="mdi:cow" />
-            <template #label>
-                PASSEPORT<br>DU BOVIN
-            </template>
-        </card-link>
     </div>
 </template>

frontend/pages/login.vue

@@ -39,13 +39,13 @@
         />
       </div>
 
-      <UiButton
+      <button
         type="submit"
         class="w-full rounded-md bg-primary-500 px-4 py-2 text-base font-semibold text-white transition hover:bg-primary-600 disabled:cursor-not-allowed disabled:opacity-60"
         :disabled="isSubmitting"
       >
         Connexion
-      </UiButton>
+      </button>
           <p class="font-bold">v{{ version }}</p>
       </form>
   </div>

frontend/pages/reception/[[id]].vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="flex justify-between h-[52px] mb-[80px]">
+    <div class="flex justify-between h-[52px] mt-16 mb-[80px]">
         <div class="flex flex-1 mr-16">
             <UiStepper
                 :labels="RECEPTION_STEP_LABELS"
@@ -7,12 +7,12 @@
                 @select="handleStepSelect"
             />
         </div>
-        <UiButton
+        <button
             type="button"
             class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
             @click="saveAndHold"
         >Mettre en attente
-        </UiButton>
+        </button>
     </div>
     <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
     <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>

frontend/pages/reception/finish-reception.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class="flex items-center justify-start gap-10">
+    <div class="flex items-center justify-start gap-10 mt-16">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
-            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions finie</h1>
+            <h1 class="text-3xl font-bold uppercase">listes des réceptions finie</h1>
     </div>
 
     <div class="px-[86px]">
@@ -27,7 +27,7 @@
                 <div>{{ reception.supplier?.name }}</div>
                 <div>{{ reception.address?.fullAddress }}</div>
                 <div>{{ reception.receptionType?.label }}</div>
-                <div>{{ formatWeighing(reception) }}</div>
+                <div>Plein : {{ formatWeighing(reception, 'gross') }} <br> Vide : {{ formatWeighing(reception, 'tare') }}</div>
             </div>
         </div>
     </div>
@@ -36,20 +36,16 @@
 <script setup lang="ts">
 import type {ReceptionData} from "~/services/dto/reception-data";
 import {getReceptionList} from "~/services/reception";
-import type {ShipmentData} from "~/services/dto/shipment-data";
 
 const receptionList = ref<ReceptionData[]>()
 const router = useRouter()
 
-const formatWeighing = (reception: ReceptionData) => {
+const formatWeighing = (reception: ReceptionData, type: 'gross' | 'tare') => {
-    const gross = reception.weights?.find((weight) => weight.type === 'gross')?.weight
+    const entry = reception.weights?.find((weight) => weight.type === type)
-    const tare = reception.weights?.find((weight) => weight.type === 'tare')?.weight
+    if (!entry || entry.weight == null || entry.dsd == null) {
-
-    if (gross == null || tare == null) {
         return '—'
     }
-
+    return `${entry.weight} kg`
-    return `${gross - tare} kg`
 }
 
 const goToReception = (id: number) => {

frontend/pages/reception/update/[[id]].vue

@@ -115,14 +115,14 @@
             />
         </div>
         <div class="flex justify-center mb-2">
-            <UiButton
+            <button
                 v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] mb-16"
 
             >
                 Enregistrer
-            </UiButton>
+            </button>
         </div>
             <div class="flex justify-evenly gap-y-8 gap-x-40 mb-8 border-b border-slate-400">
                 <h1

frontend/pages/reception/waiting-reception.vue

@@ -1,13 +1,13 @@
 <template>
-    <div class="flex items-center justify-between">
+    <div class="flex items-center justify-between mt-16">
         <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
-            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions en attente</h1>
+            <h1 class="text-3xl font-bold uppercase">listes des réceptions en attente</h1>
         </div>
     </div>
 
     <div class="px-[86px]">
-        <div class="mt-6 border border-slate-200 mb-16">
+        <div class="mt-6 border border-slate-200 mb-16 ">
             <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
                 <div>Fournisseur</div>
                 <div>Adresse</div>

frontend/pages/shipment/[[id]].vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="flex justify-between h-[52px] mb-[80px]">
+        <div class="flex justify-between h-[52px] mt-16 mb-[80px]">
             <div class="flex flex-1 mr-16">
                 <UiStepper
                     :labels="SHIPMENT_STEP_LABELS"
@@ -9,12 +9,12 @@
 
                 />
             </div>
-            <UiButton
+            <button
                 type="button"
                 class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
                 @click="saveAndHold"
             >Mettre en attente
-            </UiButton>
+            </button>
         </div>
         <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0" ref="shipmentFormRef"/>
         <ShipmentWeight v-if="storeShipment?.currentStep === 1" mode="gross"/>

frontend/pages/shipment/finish-shipment.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class="flex items-center justify-start gap-10">
+    <div class="flex items-center justify-start gap-10 mt-16">
-        <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+        <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
-        <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions finie</h1>
+        <h1 class="text-3xl font-bold uppercase">listes des expéditions finie</h1>
     </div>
 
     <div class="px-[86px]">
@@ -38,7 +38,7 @@
                         </div>
                     </template>
                 </div>
-                <div>{{ formatWeighing(shipment) }}</div>
+                <div>Vide : {{ formatWeighing(shipment, 'tare') }} <br>  Plein :{{ formatWeighing(shipment, 'gross') }}</div>
             </div>
         </div>
     </div>
@@ -51,15 +51,12 @@ import {getShipmentList} from "~/services/shipment";
 const shipmentList = ref<ShipmentData[]>()
 const router = useRouter()
 
-const formatWeighing = (shipment: ShipmentData) => {
+const formatWeighing = (shipment: ShipmentData, type: 'gross' | 'tare') => {
-    const gross = shipment.weights?.find((weight) => weight.type === 'gross')?.weight
+    const entry = shipment.weights?.find((weight) => weight.type === type)
-    const tare = shipment.weights?.find((weight) => weight.type === 'tare')?.weight
+    if (!entry || entry.weight == null || entry.dsd == null) {
-
-    if (gross == null || tare == null) {
         return '—'
     }
-
+    return `${entry.weight} kg`
-    return `${gross - tare} kg`
 }
 
 const formatBovinShipmentLines = (shipment: ShipmentData) => {

frontend/pages/shipment/waiting-shipment.vue

@@ -1,8 +1,8 @@
 <template>
-    <div class="flex items-center justify-between">
+    <div class="flex items-center justify-between mt-16">
         <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
-            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions en attente</h1>
+            <h1 class="text-3xl font-bold uppercase">listes des expéditions en attente</h1>
         </div>
     </div>
 

frontend/tailwind.config.ts

@@ -8,7 +8,16 @@ export default <Partial<Config>>{
       },
       colors: {
         primary: {
-          500: '#456452',
+          50: '#f6f9ea',
+          100: '#eaf2cf',
+          200: '#d6e3a4',
+          300: '#c1d47a',
+          400: '#afc85a',
+          500: '#9ebb43',
+          600: '#7e9735',
+          700: '#607228',
+          800: '#414d1a',
+          900: '#24290d'
         }
       }
     }

src/Command/SeedCommand.php

@@ -251,8 +251,8 @@ class SeedCommand extends Command
     private function seedShipmentTypes(): void
     {
         $shipmentTypes = [
-            ['label' => 'Boucherie', 'code' => 'BDB'],
+            ['label' => 'Bovin de boucherie', 'code' => 'BDB'],
-            ['label' => 'Équarrissage', 'code' => 'BE'],
+            ['label' => "Bovin d'équarrissage", 'code' => 'BE'],
         ];
         foreach ($shipmentTypes as $type) {
             $this->upsertByCode(ShipmentType::class, $type['code'], static function (ShipmentType $entity) use ($type) {
@@ -540,10 +540,10 @@ class SeedCommand extends Command
                 'addresses' => [
                     [
                         'label'       => 'Les producteurs de la marche (LPM)',
-                        'street'      => 'Malonze',
+                        'street'      => 'Rue de Nexon',
                         'street2'     => null,
-                        'postalCode'  => '23300',
+                        'postalCode'  => '87000',
-                        'city'        => 'LA SOUTERRAINE',
+                        'city'        => 'LIMOGES',
                         'countryCode' => 'FR',
                     ],
                 ],
@@ -565,15 +565,15 @@ class SeedCommand extends Command
             ],
             [
                 'name'      => 'TERRENA',
-                'phone'     => '02.40.98.90.00',
+                'phone'     => '02.51.67.17.98',
-                'email'     => 'scouillaud@terrena.fr',
+                'email'     => null,
                 'addresses' => [
                     [
                         'label'       => 'TERRENA',
-                        'street'      => 'LA NOELLE',
+                        'street'      => 'La Blanchardière',
-                        'street2'     => 'BP 20199',
+                        'street2'     => null,
-                        'postalCode'  => '44155',
+                        'postalCode'  => '44522',
-                        'city'        => 'ANCENIS CEDEX',
+                        'city'        => 'MESANGER',
                         'countryCode' => 'FR',
                     ],
                 ],

src/DataFixtures/ReferenceFixtures.php

@@ -378,10 +378,10 @@ class ReferenceFixtures extends Fixture
                 'addresses' => [
                     [
                         'label'       => 'Les producteurs de la marche (LPM)',
-                        'street'      => 'Malonze',
+                        'street'      => 'Rue de Nexon',
                         'street2'     => null,
-                        'postalCode'  => '23300',
+                        'postalCode'  => '87000',
-                        'city'        => 'LA SOUTERRAINE',
+                        'city'        => 'LIMOGES',
                         'countryCode' => 'FR',
                     ],
                 ],
@@ -403,15 +403,15 @@ class ReferenceFixtures extends Fixture
             ],
             [
                 'name'      => 'TERRENA',
-                'phone'     => '02.40.98.90.00',
+                'phone'     => '02.51.67.17.98',
-                'email'     => 'scouillaud@terrena.fr',
+                'email'     => null,
                 'addresses' => [
                     [
                         'label'       => 'TERRENA',
-                        'street'      => 'LA NOELLE',
+                        'street'      => 'La Blanchardière',
-                        'street2'     => 'BP 20199',
+                        'street2'     => null,
-                        'postalCode'  => '44155',
+                        'postalCode'  => '44522',
-                        'city'        => 'ANCENIS CEDEX',
+                        'city'        => 'MESANGER',
                         'countryCode' => 'FR',
                     ],
                 ],